Re: [Fix] editors/helix
Hi,
It looks good to me.
Maybe use the link to the exact commit in helix (instead of the commit as
proposed)
https://github.com/helix-editor/helix/commit/de0ef8af15945fb7f761503c615a2d6213d2fd82
ok semarie@ (but let's Maintainer time to reply too).
Thanks.
--
Sebastien Marie
On Fri, Sep 15, 2023 at 08:56:31PM +0200, Volker Schlecht wrote:
> Cc: Maintainer
>
> Seems like editors/helix has a bug when building with lang/rust > 1.70.
> See
>
> https://github.com/rust-lang/rust/issues/112171#issuecomment-1575573079
> https://github.com/helix-editor/helix/pull/7227
>
> for details.
>
> This backports the upstream patch, which fixes the issue for me (amd64).
>
> ok?
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/helix/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 19 May 2023 16:24:08 - 1.4
> +++ Makefile 15 Sep 2023 18:52:16 -
> @@ -2,6 +2,7 @@ COMMENT = modal text editor
>
> VER =23.05
> DISTNAME = helix-${VER}
> +REVISION = 0
>
> CATEGORIES = editors
>
> Index: patches/patch-helix-vcs_src_diff_line_cache_rs
> ===
> RCS file: patches/patch-helix-vcs_src_diff_line_cache_rs
> diff -N patches/patch-helix-vcs_src_diff_line_cache_rs
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-helix-vcs_src_diff_line_cache_rs15 Sep 2023 18:52:16
> -
> @@ -0,0 +1,60 @@
> +Backport upstream compatibility fix for rust >= 1.71
> +https://github.com/helix-editor/helix/pull/7227/commits/269f637847140ddb9537efde4968bd92c91c9e1e
> +Index: helix-vcs/src/diff/line_cache.rs
> +--- helix-vcs/src/diff/line_cache.rs.orig
> helix-vcs/src/diff/line_cache.rs
> +@@ -20,8 +20,8 @@ use super::{MAX_DIFF_BYTES, MAX_DIFF_LINES};
> + /// A cache that stores the `lines` of a rope as a vector.
> + /// It allows safely reusing the allocation of the vec when updating the
> rope
> + pub(crate) struct InternedRopeLines {
> +-diff_base: Rope,
> +-doc: Rope,
> ++diff_base: Box,
> ++doc: Box,
> + num_tokens_diff_base: u32,
> + interned: InternedInput>,
> + }
> +@@ -34,8 +34,8 @@ impl InternedRopeLines {
> + after: Vec::with_capacity(doc.len_lines()),
> + interner: Interner::new(diff_base.len_lines() +
> doc.len_lines()),
> + },
> +-diff_base,
> +-doc,
> ++diff_base: Box::new(diff_base),
> ++doc: Box::new(doc),
> + // will be populated by update_diff_base_impl
> + num_tokens_diff_base: 0,
> + };
> +@@ -44,19 +44,19 @@ impl InternedRopeLines {
> + }
> +
> + pub fn doc() -> Rope {
> +-self.doc.clone()
> ++Rope::clone(&*self.doc)
> + }
> +
> + pub fn diff_base() -> Rope {
> +-self.diff_base.clone()
> ++Rope::clone(&*self.diff_base)
> + }
> +
> + /// Updates the `diff_base` and optionally the document if `doc` is not
> None
> + pub fn update_diff_base( self, diff_base: Rope, doc: Option) {
> + self.interned.clear();
> +-self.diff_base = diff_base;
> ++self.diff_base = Box::new(diff_base);
> + if let Some(doc) = doc {
> +-self.doc = doc
> ++self.doc = Box::new(doc)
> + }
> + if !self.is_too_large() {
> + self.update_diff_base_impl();
> +@@ -74,7 +74,7 @@ impl InternedRopeLines {
> + .interner
> + .erase_tokens_after(self.num_tokens_diff_base.into());
> +
> +-self.doc = doc;
> ++self.doc = Box::new(doc);
> + if self.is_too_large() {
> + self.interned.after.clear();
> + } else {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/09/15 20:33:21 Modified files: lang/pcc : Makefile.inc lang/pcc/pcc : distinfo lang/pcc/pcc-libs: distinfo Log message: update to pcc 20230914
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2023/09/15 20:32:38 Modified files: graphics/py-matplotlib: Makefile distinfo graphics/py-matplotlib/pkg: PLIST Log message: update to matplotlib 3.7.3 ok bket@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/15 20:11:14 Modified files: emulators/ppsspp: Makefile Log message: Disable IBT CFI. The CFI violations appear to be in PPSSPP's JIT used for MIPS CPU emulation.
Re: [NEW] games/vcmi
Kirill Bychkov writes:
> Attached is a port of VCMI-1.3.1, an open source Heroes
> of Might and Magic III engine.
> Played some campaigns and scenarios.
Cool, this works with my GOG copy. Some comments:
- The patches against included minizip are unnecessary since the port
uses system minizip.
- The second hunk of patch-lib_Interprocess.h seems unintentional. The
first hunk also doesn't appear to be needed either?
- Is -DUSE_FILE32API another leftover that can be removed?
- CXXFLAGS=-I${X11BASE}/include can be rolled into CMAKE_CXX_FLAGS.
- It takes a long time to compile, so debug packages should be enabled,
imo.
- Can this use GH_* instead of a self-hosted distfile, so portroach can
catch updates?
- Looks like 1.3.2 was released this morning.
Re: [NEW] games/vcmi
On Fri, Sep 15, 2023 at 05:37:17PM +0300, Kirill Bychkov wrote: > Hi, > Attached is a port of VCMI-1.3.1, an open source Heroes > of Might and Magic III engine. > Played some campaigns and scenarios. > OK to import? Wow, great! The project has come a long way - I tried it 3-4 years ago and remember it as very buggy at the time. I built it and checked out the beginning of the first scenario of the first campaign - all working nicely. My only suggestion is about DESCR: "We hope to support..." "However, although working, the game is not finished. There are still many features and functionalities to add, both old and brand new." I would probably change this to more neutral language that doesn't make the reader think that the port speaks in anyway for the VCMI project, and keeping the details of how finished it is shorter ... maybe: "VCMI is still undergoing active development." With some kind of a bit more ports-adequate wording in pkg/DESCR, this is ok thfr@
Re: [update] ocaml - add X11 libs to LDFLAGS
Now with 100% more revision bumps ...
On 9/15/23 23:39, Volker Schlecht wrote:
I haven't run across a case where it was needed, but it makes sense.
ok for the attached diff?
On 9/13/23 20:57, Anil Madhavapeddy wrote:
Yes, that looks fine. Doesn't CFLAGS need a similar change
to propagate the include dirs?
Anil
On 13 Sep 2023, at 11:48, Volker Schlecht
wrote:
Ping, and Cc: Maintainer which I forgot initially.
Forwarded Message
Subject: [update] ocaml - add X11 libs to LDFLAGS
Date: Wed, 06 Sep 2023 14:55:59 +0200
From: Volker Schlecht
To: ports@openbsd.org
OCaml propagates its build time LDFLAGS to the Software it builds.
The attached diff does add ${X11BASE}/lib to that.
While that's not strictly needed right now afaict, it'll help when
updating some of our ports to their latest versions that are 5.x
compatible.
ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile 3 Sep 2023 14:57:17 - 1.98
+++ Makefile 15 Sep 2023 21:42:00 -
@@ -3,7 +3,7 @@ COMMENT = ML language with complete c
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
VERSION= 4.12.1
-REVISION= 4
+REVISION= 5
# if the ocaml compiler gains support for BTI, as well as
# removing USE_NOBTCFI here (or changing to an arch-dependent
@@ -42,8 +42,10 @@ CONFIGURE_ENV+= OBJDUMP=/usr/bin/llvm-o
CONFIGURE_ARGS += --disable-force-safe-string \
--enable-ocamltest
-CFLAGS += -I${LOCALBASE}/include
-LDFLAGS += -L${LOCALBASE}/lib
+CFLAGS += -I${LOCALBASE}/include \
+ -I${X11BASE}/include
+LDFLAGS += -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib
# non-PIC assembly in asmrun/i386.S
.if ${MACHINE_ARCH} == "i386"
Re: [update] ocaml - add X11 libs to LDFLAGS
I haven't run across a case where it was needed, but it makes sense.
ok for the attached diff?
On 9/13/23 20:57, Anil Madhavapeddy wrote:
Yes, that looks fine. Doesn't CFLAGS need a similar change
to propagate the include dirs?
Anil
On 13 Sep 2023, at 11:48, Volker Schlecht wrote:
Ping, and Cc: Maintainer which I forgot initially.
Forwarded Message
Subject: [update] ocaml - add X11 libs to LDFLAGS
Date: Wed, 06 Sep 2023 14:55:59 +0200
From: Volker Schlecht
To: ports@openbsd.org
OCaml propagates its build time LDFLAGS to the Software it builds.
The attached diff does add ${X11BASE}/lib to that.
While that's not strictly needed right now afaict, it'll help when
updating some of our ports to their latest versions that are 5.x
compatible.
ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile 3 Sep 2023 14:57:17 - 1.98
+++ Makefile 15 Sep 2023 21:36:33 -
@@ -42,8 +42,10 @@ CONFIGURE_ENV+= OBJDUMP=/usr/bin/llvm-o
CONFIGURE_ARGS += --disable-force-safe-string \
--enable-ocamltest
-CFLAGS += -I${LOCALBASE}/include
-LDFLAGS += -L${LOCALBASE}/lib
+CFLAGS += -I${LOCALBASE}/include \
+ -I${X11BASE}/include
+LDFLAGS += -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib
# non-PIC assembly in asmrun/i386.S
.if ${MACHINE_ARCH} == "i386"
audio/espeak-ng without audio?
On my amd64 systems espeak-ng does not produce audio output.
Interestingly it seems to have broken with the last commit:
https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/audio/espeak/Makefile?rev=1.27=text/x-cvsweb-markup
because when I add CPPFLAGS to CONFIGURE_ENV, it does actually
speak, but it seems to be somehow important, that there are no
line breaks in CONFIGURE_ENV.
i.e. with the below patch it produces audio output. Does that
make sense to anyone?
Index: Makefile
===
RCS file: /cvs/ports/audio/espeak/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile1 Jun 2023 20:58:21 - 1.27
+++ Makefile15 Sep 2023 20:35:15 -
@@ -4,7 +4,7 @@ GH_ACCOUNT= espeak-ng
GH_PROJECT=espeak-ng
GH_TAGNAME=1.51
PKGNAME= ${DISTNAME:S/-ng//}
-REVISION= 1
+REVISION= 2
SHARED_LIBS += espeak-ng 0.0 # 2.51
@@ -29,8 +29,11 @@ AUTORECONF= ./autogen.sh
CONFIGURE_STYLE= autoreconf
# upstream is doing something odd and doesn't add LDFLAGS/CXXFLAGS if
CPPFLAGS is set
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CPPFLAGS="-I${LOCALBASE}/include"
DEBUG_PACKAGES=${BUILD_PACKAGES}
[update] security/osv-scanner to 1.4.0
Hello,
Here's an update for osv-scanner to the latest that's been working fine. New
in this release is the ability to do offline runs, rust call analysis, and
custom parsing. See the changelog for full details:
https://github.com/google/osv-scanner/releases/tag/v1.4.0
In other news, a new addition is osv-reporter which is a GitHub Actions output
generator. I'm not sure how useful it would be (is anyone actually running
GitHub Actions with OpenBSD?), so I could remove it from the PLIST, but if it
doesn't hurt anything, so be it and it can stay.
Thoughts?
Thanks,
Lucas
diff /usr/ports
commit - c35fdf747e95cf242c140307d8c7981716e3f635
path + /usr/ports
blob - 25a4538a3f77b67a371da9904a478aff5c237914
file + security/osv-scanner/Makefile
--- security/osv-scanner/Makefile
+++ security/osv-scanner/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = aarch64 amd64 mips64 riscv64
COMMENT = scan your project's dependencies for vulnerabilities
-V =1.3.6
+V =1.4.0
MODGO_MODNAME =github.com/google/osv-scanner
MODGO_VERSION =v${V}
blob - 6b9d009c4a04f996bec806b0f9162b897b3b304f
file + security/osv-scanner/distinfo
--- security/osv-scanner/distinfo
+++ security/osv-scanner/distinfo
@@ -1,25 +1,28 @@
+SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.mod) =
4jxLgDpsbm5FdHlG6H0kcEzXd1bMSEvf0XtXIjvzINY=
+SHA256 (go_modules/dario.cat/mergo/@v/v1.0.0.zip) =
Gn7zlnCcWDUha7R7qSGN1ECsUwdYPGnReYzp5FfxMR0=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.mod) =
JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.3.2.zip) =
XeJGoMtMJW8/1dDbigihFPWK8MLhk7vwrZASEErbtrI=
-SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.7.1.mod) =
uqvhVbf1hOh1/U4bvuiQTjf0qn4QJl1WfdKYiAY/5oM=
-SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.7.1.zip) =
+D2ExgswC7p36y6FOYnFDHq/mMWWIPtaC24x2gd3aAU=
+SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.7.2.mod) =
X1TYnaBD7V3Tmb6nIG+3k3AcVSRgAH6nq+sCUVmMX9s=
+SHA256 (go_modules/github.com/!cyclone!d!x/cyclonedx-go/@v/v0.7.2.zip) =
DsmnxTivkuiE18rtiMYokNXqrcPQuw4uDg18XQy1/bs=
SHA256 (go_modules/github.com/!microsoft/go-winio/@v/v0.5.2.mod) =
Gbj76dRBkni7Hp0M8v1a7IeeQoKcU7o+/VZWuNGzWuc=
-SHA256 (go_modules/github.com/!microsoft/go-winio/@v/v0.5.2.zip) =
9HnUI0H97R0KmFQHEzOZIHdPdUDt96drhJf7wRSTE4w=
-SHA256
(go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230518184743-7afd39499903.mod)
= c5utQto6BBturc3aZUav/UKzWoeiPIzZf5ZZTz6xINs=
-SHA256
(go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230518184743-7afd39499903.zip)
= j71XEZnCFibGo3KFP5bUkA5PS4dmP1kihOrk8G5JE6c=
+SHA256 (go_modules/github.com/!microsoft/go-winio/@v/v0.6.1.mod) =
GR3dd4wdsbe9WoL7ainnVfCh1ZujT026AyNTay/OvwY=
+SHA256 (go_modules/github.com/!microsoft/go-winio/@v/v0.6.1.zip) =
/f7Ii562GJWrOe06YYHZnXg2Zjj4amCRcNdkF7oBj1M=
+SHA256
(go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230717121422-5aa5874ade95.mod)
= QN3pYrzx0TZG3Np4fmjzXpUa/oaZqf2L5Vt+RgWo/zQ=
+SHA256
(go_modules/github.com/!proton!mail/go-crypto/@v/v0.0.0-20230717121422-5aa5874ade95.zip)
= OO4fNj8Du6isuuM7NZASI5QRG9M8ubL40qkZsQ8UAD0=
SHA256 (go_modules/github.com/acomagu/bufpipe/@v/v1.0.4.mod) =
Iaxsw323lcL/h53Hl9IqRY/0F1um/IBgrFx8/DYOoWw=
SHA256 (go_modules/github.com/acomagu/bufpipe/@v/v1.0.4.zip) =
Oj1OO/HH5GpaEMpDGEcx1fFnEgE6YoMIfzYy9xw/P8U=
SHA256
(go_modules/github.com/anchore/go-struct-converter/@v/v0.0.0-20221118182256-c68fdcfa2092.mod)
= WggzYMJ2oV0NvIKxftIioKjw0UBjFCKw6YbWdrPy93k=
SHA256
(go_modules/github.com/anchore/go-struct-converter/@v/v0.0.0-20221118182256-c68fdcfa2092.zip)
= Ocmj9VeqVIbAhoGmJoWLydfDM6809s4iFC+xV4KNAPE=
SHA256
(go_modules/github.com/anmitsu/go-shlex/@v/v0.0.0-20200514113438-38f4b401e2be.mod)
= YFvwqg2YIjVA9dr3+pcJHq+79ImJx9F2Uq+ZLKdkr7Y=
SHA256
(go_modules/github.com/anmitsu/go-shlex/@v/v0.0.0-20200514113438-38f4b401e2be.zip)
= Klz3yaJwn2Sf1QjLrLK+luT7pNU0oooSLuTXV0r0C14=
+SHA256 (go_modules/github.com/apparentlymart/go-textseg/v13/@v/v13.0.0.mod) =
NdcnVgVICjaT++/9ORMz5kYJct+bZr7Rbtk+AZ4O+3g=
+SHA256 (go_modules/github.com/apparentlymart/go-textseg/v13/@v/v13.0.0.zip) =
8wNf/YObOfOcGALN5PmiYe7FA1DEfo7fFyC/jvLQ2fo=
SHA256
(go_modules/github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod)
= eH9fmKshF09xFkyrjuplEl5gqnL111F+EuCOe47szNI=
SHA256
(go_modules/github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip)
= 9HPm3OgmoFUmOYM89yz6qLxxQdqntTdiLX946s/Z37M=
SHA256 (go_modules/github.com/bradleyjkemp/cupaloy/v2/@v/v2.8.0.mod) =
Irw2AV+FCyXe73ShEsNARxdI76cC9taJWn6pcIumIZM=
SHA256 (go_modules/github.com/bradleyjkemp/cupaloy/v2/@v/v2.8.0.zip) =
+nOEG0auVcwJj3c5M4gl5XREHETrknHSzqt1rMDbPtc=
-SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v/v1.2.0.mod) =
NorKF1e+h0XM47kN60Aee+V0CWPKU1nEqVTMA1AtjwM=
SHA256 (go_modules/github.com/bwesterb/go-ristretto/@v/v1.2.3.mod) =
NorKF1e+h0XM47kN60Aee+V0CWPKU1nEqVTMA1AtjwM=
SHA256
Re: [revision] fix missing libdep for net/transmission
On Fri, Sep 15, 2023 at 07:53:16PM +0200, Antoine Jacoutot wrote:
> I don???t think icewm is in scope for this change :-)
Oh, man. Sorry for the trailing garbage.
The "v3" attached used `$ git diff master transmission .` and should
only have the appropriate commit.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 335908e903f..ce94928b0ad 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -10,9 +10,9 @@ PKGNAME-qt= transmission-qt-${VER}
CATEGORIES=net
HOMEPAGE= https://transmissionbt.com/
MAINTAINER=Josh Grosse
-REVISION-gtk= 0
-REVISION-main= 0
-REVISION-qt= 0
+REVISION-gtk= 1
+REVISION-main= 1
+REVISION-qt= 1
# GPLv2+
PERMIT_PACKAGE=Yes
@@ -31,7 +31,8 @@ FLAVOR?=
.include
-WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl
ssl
+WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl deflate
+WANTLIB-common += m miniupnpc natpmp psl ssl
WANTLIB-main = ${WANTLIB-common}
@@ -46,7 +47,8 @@ WANTLIB-qt += Qt6Widgets
MODULES += devel/cmake \
textproc/intltool
-LIB_DEPENDS-common += net/curl \
+LIB_DEPENDS-common += archivers/libdeflate \
+ net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
[Fix] editors/helix
Cc: Maintainer
Seems like editors/helix has a bug when building with lang/rust > 1.70.
See
https://github.com/rust-lang/rust/issues/112171#issuecomment-1575573079
https://github.com/helix-editor/helix/pull/7227
for details.
This backports the upstream patch, which fixes the issue for me (amd64).
ok?
Index: Makefile
===
RCS file: /cvs/ports/editors/helix/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 19 May 2023 16:24:08 - 1.4
+++ Makefile 15 Sep 2023 18:52:16 -
@@ -2,6 +2,7 @@ COMMENT = modal text editor
VER = 23.05
DISTNAME = helix-${VER}
+REVISION = 0
CATEGORIES = editors
Index: patches/patch-helix-vcs_src_diff_line_cache_rs
===
RCS file: patches/patch-helix-vcs_src_diff_line_cache_rs
diff -N patches/patch-helix-vcs_src_diff_line_cache_rs
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-helix-vcs_src_diff_line_cache_rs 15 Sep 2023 18:52:16 -
@@ -0,0 +1,60 @@
+Backport upstream compatibility fix for rust >= 1.71
+https://github.com/helix-editor/helix/pull/7227/commits/269f637847140ddb9537efde4968bd92c91c9e1e
+Index: helix-vcs/src/diff/line_cache.rs
+--- helix-vcs/src/diff/line_cache.rs.orig
helix-vcs/src/diff/line_cache.rs
+@@ -20,8 +20,8 @@ use super::{MAX_DIFF_BYTES, MAX_DIFF_LINES};
+ /// A cache that stores the `lines` of a rope as a vector.
+ /// It allows safely reusing the allocation of the vec when updating the rope
+ pub(crate) struct InternedRopeLines {
+-diff_base: Rope,
+-doc: Rope,
++diff_base: Box,
++doc: Box,
+ num_tokens_diff_base: u32,
+ interned: InternedInput>,
+ }
+@@ -34,8 +34,8 @@ impl InternedRopeLines {
+ after: Vec::with_capacity(doc.len_lines()),
+ interner: Interner::new(diff_base.len_lines() + doc.len_lines()),
+ },
+-diff_base,
+-doc,
++diff_base: Box::new(diff_base),
++doc: Box::new(doc),
+ // will be populated by update_diff_base_impl
+ num_tokens_diff_base: 0,
+ };
+@@ -44,19 +44,19 @@ impl InternedRopeLines {
+ }
+
+ pub fn doc() -> Rope {
+-self.doc.clone()
++Rope::clone(&*self.doc)
+ }
+
+ pub fn diff_base() -> Rope {
+-self.diff_base.clone()
++Rope::clone(&*self.diff_base)
+ }
+
+ /// Updates the `diff_base` and optionally the document if `doc` is not None
+ pub fn update_diff_base( self, diff_base: Rope, doc: Option) {
+ self.interned.clear();
+-self.diff_base = diff_base;
++self.diff_base = Box::new(diff_base);
+ if let Some(doc) = doc {
+-self.doc = doc
++self.doc = Box::new(doc)
+ }
+ if !self.is_too_large() {
+ self.update_diff_base_impl();
+@@ -74,7 +74,7 @@ impl InternedRopeLines {
+ .interner
+ .erase_tokens_after(self.num_tokens_diff_base.into());
+
+-self.doc = doc;
++self.doc = Box::new(doc);
+ if self.is_too_large() {
+ self.interned.after.clear();
+ } else {
Re: [revision] fix missing libdep for net/transmission
I don’t think icewm is in scope for this change :-)
—
Antoine
> On 15 Sep 2023, at 19:48, Josh Grosse wrote:
>
> On Fri, Sep 15, 2023 at 07:31:00PM +0200, Antoine Jacoutot wrote:
>>> On Fri, Sep 15, 2023 at 12:22:59PM -0400, Josh Grosse wrote:
>>> During bulk build, naddy@ took note of a missing libdep
>>> in net/transmission's Makefile. The build failed to
>>> find libdeflate due to the bulk build's junk removal.
>>>
>>> This patch adds the explicit libdep. Builds and runs on amd64.
>>
>> Have you run port-lib-depends-check?
>> Because if you add an LDEP you need the corresponding WANTLIB (deflate in
>> this
>> case).
>
> Revised diff attached. Thank you for catching my error!
>
>>
>>> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
>>> index 335908e903f..e2cf1338446 100644
>>> --- a/net/transmission/Makefile
>>> +++ b/net/transmission/Makefile
>>> @@ -10,9 +10,9 @@ PKGNAME-qt=transmission-qt-${VER}
>>> CATEGORIES=net
>>> HOMEPAGE=https://transmissionbt.com/
>>> MAINTAINER=Josh Grosse
>>> -REVISION-gtk=0
>>> -REVISION-main=0
>>> -REVISION-qt=0
>>> +REVISION-gtk=1
>>> +REVISION-main=1
>>> +REVISION-qt=1
>>>
>>> # GPLv2+
>>> PERMIT_PACKAGE=Yes
>>> @@ -46,7 +46,8 @@ WANTLIB-qt +=Qt6Widgets
>>> MODULES +=devel/cmake \
>>>textproc/intltool
>>>
>>> -LIB_DEPENDS-common +=net/curl \
>>> +LIB_DEPENDS-common +=archivers/libdeflate \
>>> +net/curl \
>>>net/libpsl \
>>>net/miniupnp/libnatpmp \
>>>net/miniupnp/miniupnpc>=1.9
>>
>>
>> --
>> Antoine
>>
>
Re: [revision] fix missing libdep for net/transmission
On Fri, Sep 15, 2023 at 07:31:00PM +0200, Antoine Jacoutot wrote:
> On Fri, Sep 15, 2023 at 12:22:59PM -0400, Josh Grosse wrote:
> > During bulk build, naddy@ took note of a missing libdep
> > in net/transmission's Makefile. The build failed to
> > find libdeflate due to the bulk build's junk removal.
> >
> > This patch adds the explicit libdep. Builds and runs on amd64.
>
> Have you run port-lib-depends-check?
> Because if you add an LDEP you need the corresponding WANTLIB (deflate in this
> case).
Revised diff attached. Thank you for catching my error!
>
> > diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> > index 335908e903f..e2cf1338446 100644
> > --- a/net/transmission/Makefile
> > +++ b/net/transmission/Makefile
> > @@ -10,9 +10,9 @@ PKGNAME-qt= transmission-qt-${VER}
> > CATEGORIES=net
> > HOMEPAGE= https://transmissionbt.com/
> > MAINTAINER=Josh Grosse
> > -REVISION-gtk= 0
> > -REVISION-main= 0
> > -REVISION-qt= 0
> > +REVISION-gtk= 1
> > +REVISION-main= 1
> > +REVISION-qt= 1
> >
> > # GPLv2+
> > PERMIT_PACKAGE=Yes
> > @@ -46,7 +46,8 @@ WANTLIB-qt += Qt6Widgets
> > MODULES += devel/cmake \
> > textproc/intltool
> >
> > -LIB_DEPENDS-common += net/curl \
> > +LIB_DEPENDS-common += archivers/libdeflate \
> > + net/curl \
> > net/libpsl \
> > net/miniupnp/libnatpmp \
> > net/miniupnp/miniupnpc>=1.9
>
>
> --
> Antoine
>
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 335908e903f..ce94928b0ad 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -10,9 +10,9 @@ PKGNAME-qt= transmission-qt-${VER}
CATEGORIES=net
HOMEPAGE= https://transmissionbt.com/
MAINTAINER=Josh Grosse
-REVISION-gtk= 0
-REVISION-main= 0
-REVISION-qt= 0
+REVISION-gtk= 1
+REVISION-main= 1
+REVISION-qt= 1
# GPLv2+
PERMIT_PACKAGE=Yes
@@ -31,7 +31,8 @@ FLAVOR?=
.include
-WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl
ssl
+WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl deflate
+WANTLIB-common += m miniupnpc natpmp psl ssl
WANTLIB-main = ${WANTLIB-common}
@@ -46,7 +47,8 @@ WANTLIB-qt += Qt6Widgets
MODULES += devel/cmake \
textproc/intltool
-LIB_DEPENDS-common += net/curl \
+LIB_DEPENDS-common += archivers/libdeflate \
+ net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index acfc9f06d54..194ff976136 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,7 +1,7 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 3.4.2
+V= 3.4.1
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
diff --git a/x11/icewm/distinfo b/x11/icewm/distinfo
index ef2f7d1cca7..bd4c1271441 100644
--- a/x11/icewm/distinfo
+++ b/x11/icewm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-3.4.2.tar.lz) = tkxLPlh+IB7kvkjna16UupH8cTkoEnV9h3601EEWceI=
-SIZE (icewm-3.4.2.tar.lz) = 1828756
+SHA256 (icewm-3.4.1.tar.lz) = mZiONdDtO4ftIx5+ikS7KmfLNkUzcrLpEVlqkU1MJzs=
+SIZE (icewm-3.4.1.tar.lz) = 1828032
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/15 11:47:17 Modified files: net/bro: Makefile Log message: Unbreak build; reported by naddy@ Not sure how I was able to build this in the first place.
Re: [revision] fix missing libdep for net/transmission
On Fri, Sep 15, 2023 at 12:22:59PM -0400, Josh Grosse wrote:
> During bulk build, naddy@ took note of a missing libdep
> in net/transmission's Makefile. The build failed to
> find libdeflate due to the bulk build's junk removal.
>
> This patch adds the explicit libdep. Builds and runs on amd64.
Have you run port-lib-depends-check?
Because if you add an LDEP you need the corresponding WANTLIB (deflate in this
case).
> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index 335908e903f..e2cf1338446 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -10,9 +10,9 @@ PKGNAME-qt= transmission-qt-${VER}
> CATEGORIES= net
> HOMEPAGE=https://transmissionbt.com/
> MAINTAINER= Josh Grosse
> -REVISION-gtk=0
> -REVISION-main= 0
> -REVISION-qt= 0
> +REVISION-gtk=1
> +REVISION-main= 1
> +REVISION-qt= 1
>
> # GPLv2+
> PERMIT_PACKAGE= Yes
> @@ -46,7 +46,8 @@ WANTLIB-qt += Qt6Widgets
> MODULES += devel/cmake \
> textproc/intltool
>
> -LIB_DEPENDS-common +=net/curl \
> +LIB_DEPENDS-common +=archivers/libdeflate \
> + net/curl \
> net/libpsl \
> net/miniupnp/libnatpmp \
> net/miniupnp/miniupnpc>=1.9
--
Antoine
[revision] fix missing libdep for net/transmission
During bulk build, naddy@ took note of a missing libdep
in net/transmission's Makefile. The build failed to
find libdeflate due to the bulk build's junk removal.
This patch adds the explicit libdep. Builds and runs on amd64.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 335908e903f..e2cf1338446 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -10,9 +10,9 @@ PKGNAME-qt= transmission-qt-${VER}
CATEGORIES=net
HOMEPAGE= https://transmissionbt.com/
MAINTAINER=Josh Grosse
-REVISION-gtk= 0
-REVISION-main= 0
-REVISION-qt= 0
+REVISION-gtk= 1
+REVISION-main= 1
+REVISION-qt= 1
# GPLv2+
PERMIT_PACKAGE=Yes
@@ -46,7 +46,8 @@ WANTLIB-qt += Qt6Widgets
MODULES += devel/cmake \
textproc/intltool
-LIB_DEPENDS-common += net/curl \
+LIB_DEPENDS-common += archivers/libdeflate \
+ net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/09/15 09:17:31 Modified files: net/guacamole : Makefile.inc net/guacamole/client: distinfo net/guacamole/server: distinfo Log message: update to guacamole-1.5.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/09/15 09:13:18 Modified files: net/py-solaredge-modbus: Makefile Log message: bump, pymodbus -> py3-pymodbus
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/09/15 09:12:20 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: quirk for pymodbus -> py3-pymodbus
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/09/15 09:12:12 Modified files: net/py-modbus : Makefile net/py-modbus/pkg: PLIST Log message: fix PKGNAME, was added with no py- prefix
[NEW] games/vcmi
Hi, Attached is a port of VCMI-1.3.1, an open source Heroes of Might and Magic III engine. Played some campaigns and scenarios. OK to import? vcmi.tar.gz Description: application/gzip
[maintainer update] x11/copyq
I updated copyq to 7.1.0, built without problem, works fine for me.
Changelog:
# Changed
- Image editor (if set) will now open instead of built-in text editor
when selecting Edit action on image items containing no text.
- Encryption now uses larger/safer keys (#2385).
# Fixed
- Fixes saving and opening empty encrypted tabs.
- Fixes minimal size of dialogs (#2299).
- Fixes importing commands with regular expressions containing slash
characters in scripts.
- Fixes font weight with Qt 6.
- Fixes closing the app with Qt 6.
- Fixes the build and calling some script functions with Qt 6.5.
- X11: Fixes crash when entering search with some keyboard layouts (#2171).
--
kikadf
Index: x11/copyq/Makefile
===
RCS file: /cvs/ports/x11/copyq/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- x11/copyq/Makefile 15 May 2023 12:21:54 - 1.4
+++ x11/copyq/Makefile 10 Sep 2023 16:28:58 -
@@ -1,7 +1,7 @@
COMMENT = Qt5 based clipboard manager
GH_ACCOUNT = hluk
GH_PROJECT = CopyQ
-GH_TAGNAME = v7.0.0
+GH_TAGNAME = v7.1.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = x11
Index: x11/copyq/distinfo
===
RCS file: /cvs/ports/x11/copyq/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- x11/copyq/distinfo 15 May 2023 12:21:54 - 1.3
+++ x11/copyq/distinfo 10 Sep 2023 16:28:58 -
@@ -1,2 +1,2 @@
-SHA256 (CopyQ-7.0.0.tar.gz) = WJi6ICX46fYaS0cy6FrfOxZT+tILXB8bDIeae3LNTUg=
-SIZE (CopyQ-7.0.0.tar.gz) = 3323354
+SHA256 (CopyQ-7.1.0.tar.gz) = zgJlsKhjUP2nv6Gp1LdNeUpAd1UbKBhgEmg1Z9b9gVg=
+SIZE (CopyQ-7.1.0.tar.gz) = 3351093
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/15 07:05:41 Modified files: x11/icewm : Makefile distinfo Log message: Update to icewm-3.4.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/15 06:50:53 Modified files: inputmethods/ibus-typing-booster: Makefile distinfo inputmethods/ibus-typing-booster/pkg: PLIST Log message: Update to ibus-typing-booster-2.24.1.
Re: [Maintainer Update]www/p5-HTML-Selector-XPath: Update to 0.28
--- Original Message --- Le vendredi 15 septembre 2023 à 12:25, wen heping a écrit : > Hi, ports@: > > Here is a simple patch for www/p5-HTML-Selector-XPath > update to 0.28. It build and run well on amd64-current system. > > One port, www/p5-Web-Scraper, depends on it. It build and > pass all tests too. Committed, thanks ! > > > Cheers ! > wen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2023/09/15 06:40:55 Modified files: www/p5-HTML-Selector-XPath: Makefile distinfo Log message: Update to p5-HTML-Selector-XPath-0.28 from wen heping.
[Maintainer Update]www/p5-HTML-Selector-XPath: Update to 0.28
Hi, ports@: Here is a simple patch for www/p5-HTML-Selector-XPath update to 0.28. It build and run well on amd64-current system. One port, www/p5-Web-Scraper, depends on it. It build and pass all tests too. Cheers ! wenIndex: Makefile === RCS file: /cvs/ports/www/p5-HTML-Selector-XPath/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile16 Jul 2023 23:58:51 - 1.1.1.1 +++ Makefile15 Sep 2023 06:54:16 - @@ -1,6 +1,6 @@ COMMENT = CSS Selector to XPath compiler -DISTNAME = HTML-Selector-XPath-0.26 +DISTNAME = HTML-Selector-XPath-0.28 CATEGORIES = www Index: distinfo === RCS file: /cvs/ports/www/p5-HTML-Selector-XPath/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo16 Jul 2023 23:58:51 - 1.1.1.1 +++ distinfo15 Sep 2023 06:54:16 - @@ -1,2 +1,2 @@ -SHA256 (HTML-Selector-XPath-0.26.tar.gz) = PfgKgShNHjddnR9v7BbpbDGywwlFG0uoLl/R2yOsHyQ= -SIZE (HTML-Selector-XPath-0.26.tar.gz) = 32482 +SHA256 (HTML-Selector-XPath-0.28.tar.gz) = QycX8D7Szz1kETDP09ShU/Ca1PhW2gB4E3kv4LLljQ8= +SIZE (HTML-Selector-XPath-0.28.tar.gz) = 33565
devel/p5-MCE: Update to 1.889
Hi, ports@: Here is a patch for devel/p5-MCE to update to 1.889. It build well and pass tests on amd64-current system. Only one port depends on it: devel/p5-Test-Perl-Critic, it build well and pass all tests with this patch too. Cheers ! wenIndex: Makefile === RCS file: /cvs/ports/devel/p5-MCE/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile10 Aug 2022 12:02:33 - 1.9 +++ Makefile15 Sep 2023 10:20:23 - @@ -1,6 +1,6 @@ COMMENT = engine for Perl providing parallel processing capabilities -DISTNAME = MCE-1.879 +DISTNAME = MCE-1.889 CPAN_AUTHOR = MARIOROY CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/p5-MCE/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo10 Aug 2022 12:02:33 - 1.7 +++ distinfo15 Sep 2023 10:20:23 - @@ -1,2 +1,2 @@ -SHA256 (MCE-1.879.tar.gz) = nEzzmDi1wRNEh5mvRRs9ZLVODeOdY1U21+hei9xYiNw= -SIZE (MCE-1.879.tar.gz) = 224587 +SHA256 (MCE-1.889.tar.gz) = 22FT5HTQRvwlMFC/U8VAAthM1Mp30hwrnfVv7rgJu+0= +SIZE (MCE-1.889.tar.gz) = 230624
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/09/15 02:02:34 Modified files: lang/wasi-libc : Makefile lang/wasi-libc/pkg: PLIST lang/wasi-sdk/compiler-rt: Makefile lang/wasi-sdk/libcxx: Makefile lang/wasi-sdk/libcxxabi: Makefile Log message: include stdarg.h and stddef.h in the wasi-libc sysroot to unbreak wasi-sdk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2023/09/15 01:34:32 Modified files: meta/tor-browser: Tag: OPENBSD_7_3 Makefile www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo Log message: Tor Browser: update to 12.5.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2023/09/15 01:14:00 Modified files: emulators/vbam : Makefile distinfo emulators/vbam/patches: patch-CMakeLists_txt Log message: Update vbam to 2.1.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/09/15 01:08:40 Modified files: fonts/atkinson-hyperlegible: Makefile fonts/atkinson-hyperlegible/pkg: PLIST Log message: Switch from MASTER_SITES0 to new SITES* with suffix. While here, use module variables in a way more consistent with other font ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/15 01:08:05 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.50.17.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/09/15 01:07:36 Modified files: lang/wasi-libc : Makefile distinfo lang/wasi-libc/patches: patch-Makefile Log message: unbreak wasi-libc by providing stdarg.h and stddef.h from llvm wasi-libc requires these compiler headers and we don't ship them anymore with llvm so let's provide them with a separate distfile and make wasi-libc include them from there
Re: UPDATE: net/swirc 3.4.5
On Thu, Sep 14, 2023 at 10:29:38PM +0200, Markus Uhlin wrote: > Today I released net/swirc 3.4.5 with the following changes: Committed, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2023/09/15 01:00:13 Modified files: net/swirc : Makefile distinfo Log message: Update swirc to 3.4.5. >From maintainer Markus Uhlin, thanks!
Re: enable -fstack-clash-protection in llvm ports
Le Thu, Sep 14, 2023 at 05:53:53PM +0200, Mark Kettenis a écrit : > > From: Theo de Raadt > > Date: Thu, 14 Sep 2023 01:02:14 -0600 (MDT) > > > > I do not think this should be enabled. > > Our stacks work differently. > > We don't put shit near the bottom of the main stack, because we > > reserve the space. > > For pthread stacks, we allocate them randomly also so you cannot > > determistically trash a specific object. > > This change also make very small stacks (meaning pthreads) potentially > > reach beyond the bottom in a weird new way. > > We simply don't need to cpu and pte's for this. > > But if the stack space is used we'll have to spend the CPU time to > fault the pages in and allocate the PTEs anyway. Only stupid code > allocates large amounts of stack space and doesn't use it! > > Now with -fstack-clash-protection, there will be a few additional > loads and the access pattern will be slightly different and there will > be slightly different. But if firefox enables this the performance > impact must be really, really small. > > As far as I understand, the proposed change would only make the option > available, but it would still be turned off by default. So only ports > that explicitly turn this option on would be affected. i have no desire to die on this hill, so i've had upstream mozilla drop the -fstack-clash-protection option from CFLAGS when on OpenBSD. Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2023/09/15 00:51:53 Modified files: lang/binaryen : Makefile distinfo Log message: Update binaryen to 116.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/15 00:44:11 Modified files: sysutils/google-cloud-sdk: Makefile distinfo Log message: Update to google-cloud-sdk-446.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/09/15 00:40:09 Modified files: geo/gdal : Makefile distinfo Log message: geo/gdal: update to 3.7.2. see https://github.com/OSGeo/gdal/blob/v3.7.2/NEWS.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/09/15 00:32:42 Modified files: fonts/ja-kanjistrokeorders-ttf: Makefile distinfo fonts/ja-kanjistrokeorders-ttf/pkg: PLIST Log message: update fonts/ja-kanjistrokeorders-ttf to 4.004 ok sthen, ok + fix double DISTFILES phessler
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/09/15 00:08:17 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.73.0.
