CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/04/17 23:27:47 Modified files: databases/redis: Tag: OPENBSD_7_3 Makefile distinfo Log message: MFC: (CVE-2023-28856) Authenticated users can use the HINCRBYFLOAT command to create an invalid hash field that will crash Redis on access
Re: update devel/rgbds 0.6.1
Nam Nguyen writes:
> here is an update to devel/rgbds.
>
> This diff:
> - updates to 0.6.1 released on Dec 3, 2022.
> - adds devel/bison and shells/bash to BUILD_DEPENDS
> (bash appears in many of the shell scripts and bison appears in
> src/check_bison_ver.sh.).
> - pledge is reapplied to the new C and C++ files. Use err instead of
> errx. Notably, gfx/main.cpp now uses fputs to print to stderr then
> calls exit(1) instead of errx, which is for C only.
> - workaround in Makefile patch from [1] for vasprintf bug in openbsd
> headers when POSIX_C_SOURCE=200809L is defined. This was discussed by
> bentley@ in [1] and rsadowski@ in [2]. I propose having this as a
> temporary workaround until openbsd's llvm headers can be fixed with a
> more optimal solution[3].
> [1] https://github.com/gbdev/rgbds/issues/
> [2] https://marc.info/?l=openbsd-tech=161833545600505=2
> [3] https://marc.info/?l=openbsd-bugs=157758838031146=2
Please find a fresh diff inline that additionally regens WANTLIB.
>
>
> Testing:
> https://gbdev.io/gb-asm-tutorial/part1/hello_world.html
>
> I followed this hello world tutorial and loaded the rom in
> emulators/sameboy. It successfully printed.
>
> Feedback and tests are welcome. OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/rgbds/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile11 Mar 2022 18:53:10 - 1.10
+++ Makefile18 Apr 2023 04:45:09 -
@@ -2,7 +2,7 @@ FIX_EXTRACT_PERMISSIONS = Yes
COMMENT = Game Boy development system
-V =0.4.2
+V =0.6.1
DISTNAME = rgbds-$V
CATEGORIES = devel
@@ -15,12 +15,15 @@ MAINTAINER =Anthony J. Bentley https://github.com/gbdev/rgbds/releases/download/v$V/
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
+
+BUILD_DEPENDS =devel/bison \
+ shells/bash
LIB_DEPENDS = graphics/png
Index: distinfo
===
RCS file: /cvs/ports/devel/rgbds/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo13 Dec 2020 14:24:29 - 1.8
+++ distinfo18 Apr 2023 04:45:09 -
@@ -1,2 +1,2 @@
-SHA256 (rgbds-0.4.2.tar.gz) = C6xG8NPPq/hoPGIUW58BpgfHAyle8peKPlSPEG9Q+sE=
-SIZE (rgbds-0.4.2.tar.gz) = 208023
+SHA256 (rgbds-0.6.1.tar.gz) = hyAYUJxsvC2elHoabVCf2dxWoBCCf2CMX0+kbeL6GGo=
+SIZE (rgbds-0.6.1.tar.gz) = 8040703
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 18 Apr 2023 04:45:09 -
@@ -0,0 +1,20 @@
+workaround for vasprintf bug in openbsd headers when
+POSIX_C_SOURCE=200809L is defined
+
+see:
+https://github.com/gbdev/rgbds/issues/
+https://marc.info/?l=openbsd-tech=161833545600505=2
+https://marc.info/?l=openbsd-bugs=157758838031146=2
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -42,7 +42,7 @@ CXXFLAGS ?= -O3 -flto -DNDEBUG
+ REALCFLAGS:= ${CFLAGS} ${WARNFLAGS} -std=gnu11 -I include \
+ -D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE
+ REALCXXFLAGS := ${CXXFLAGS} ${WARNFLAGS} -std=c++17 -I include \
+- -D_POSIX_C_SOURCE=200809L -fno-exceptions -fno-rtti
++ -fno-exceptions -fno-rtti
+ # Overridable LDFLAGS
+ LDFLAGS ?=
+ # Non-overridable LDFLAGS
Index: patches/patch-src_asm_main_c
===
RCS file: /cvs/ports/devel/rgbds/patches/patch-src_asm_main_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_asm_main_c
--- patches/patch-src_asm_main_c11 Mar 2022 18:53:10 - 1.6
+++ patches/patch-src_asm_main_c18 Apr 2023 04:45:09 -
@@ -1,22 +1,21 @@
Index: src/asm/main.c
--- src/asm/main.c.orig
+++ src/asm/main.c
-@@ -34,6 +34,8 @@
- #include "helpers.h"
- #include "version.h"
+@@ -49,6 +49,8 @@
+ char const *__asan_default_options(void) { return "detect_leaks=0"; }
+ #endif
+int pledge(const char *, const char *);
+
// Old Bison versions (confirmed for 2.3) do not forward-declare `yyparse` in
the generated header
// Unfortunately, macOS still ships 2.3, which is from 2008...
int yyparse(void);
-@@ -307,6 +309,9 @@ int main(int argc, char *argv[])
- cldefines = malloc(cldefines_bufsize);
- if (!cldefines)
- fatalerror("No memory for command line defines\n");
-+
+@@ -148,6 +150,8 @@ static void print_usage(void)
+
+ int main(int argc, char *argv[])
+ {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ fatalerror("pledge");
+ time_t now = time(NULL);
+ char const *sourceDateEpoch = getenv("SOURCE_DATE_EPOCH");
- #if defined(YYDEBUG) && YYDEBUG
- yydebug = 1;
Index: patches/patch-src_fix_main_c
update devel/rgbds 0.6.1
here is an update to devel/rgbds.
This diff:
- updates to 0.6.1 released on Dec 3, 2022.
- adds devel/bison and shells/bash to BUILD_DEPENDS
(bash appears in many of the shell scripts and bison appears in
src/check_bison_ver.sh.).
- pledge is reapplied to the new C and C++ files. Use err instead of
errx. Notably, gfx/main.cpp now uses fputs to print to stderr then
calls exit(1) instead of errx, which is for C only.
- workaround in Makefile patch from [1] for vasprintf bug in openbsd
headers when POSIX_C_SOURCE=200809L is defined. This was discussed by
bentley@ in [1] and rsadowski@ in [2]. I propose having this as a
temporary workaround until openbsd's llvm headers can be fixed with a
more optimal solution[3].
[1] https://github.com/gbdev/rgbds/issues/
[2] https://marc.info/?l=openbsd-tech=161833545600505=2
[3] https://marc.info/?l=openbsd-bugs=157758838031146=2
Testing:
https://gbdev.io/gb-asm-tutorial/part1/hello_world.html
I followed this hello world tutorial and loaded the rom in
emulators/sameboy. It successfully printed.
Feedback and tests are welcome. OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/rgbds/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile11 Mar 2022 18:53:10 - 1.10
+++ Makefile18 Apr 2023 04:18:29 -
@@ -2,7 +2,7 @@ FIX_EXTRACT_PERMISSIONS = Yes
COMMENT = Game Boy development system
-V =0.4.2
+V =0.6.1
DISTNAME = rgbds-$V
CATEGORIES = devel
@@ -21,6 +21,9 @@ MASTER_SITES =https://github.com/gbdev/
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
+
+BUILD_DEPENDS =devel/bison \
+ shells/bash
LIB_DEPENDS = graphics/png
Index: distinfo
===
RCS file: /cvs/ports/devel/rgbds/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo13 Dec 2020 14:24:29 - 1.8
+++ distinfo18 Apr 2023 04:18:29 -
@@ -1,2 +1,2 @@
-SHA256 (rgbds-0.4.2.tar.gz) = C6xG8NPPq/hoPGIUW58BpgfHAyle8peKPlSPEG9Q+sE=
-SIZE (rgbds-0.4.2.tar.gz) = 208023
+SHA256 (rgbds-0.6.1.tar.gz) = hyAYUJxsvC2elHoabVCf2dxWoBCCf2CMX0+kbeL6GGo=
+SIZE (rgbds-0.6.1.tar.gz) = 8040703
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 18 Apr 2023 04:18:29 -
@@ -0,0 +1,20 @@
+workaround for vasprintf bug in openbsd headers when
+POSIX_C_SOURCE=200809L is defined
+
+see:
+https://github.com/gbdev/rgbds/issues/
+https://marc.info/?l=openbsd-tech=161833545600505=2
+https://marc.info/?l=openbsd-bugs=157758838031146=2
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -42,7 +42,7 @@ CXXFLAGS ?= -O3 -flto -DNDEBUG
+ REALCFLAGS:= ${CFLAGS} ${WARNFLAGS} -std=gnu11 -I include \
+ -D_POSIX_C_SOURCE=200809L -D_ISOC11_SOURCE
+ REALCXXFLAGS := ${CXXFLAGS} ${WARNFLAGS} -std=c++17 -I include \
+- -D_POSIX_C_SOURCE=200809L -fno-exceptions -fno-rtti
++ -fno-exceptions -fno-rtti
+ # Overridable LDFLAGS
+ LDFLAGS ?=
+ # Non-overridable LDFLAGS
Index: patches/patch-src_asm_main_c
===
RCS file: /cvs/ports/devel/rgbds/patches/patch-src_asm_main_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_asm_main_c
--- patches/patch-src_asm_main_c11 Mar 2022 18:53:10 - 1.6
+++ patches/patch-src_asm_main_c18 Apr 2023 04:18:29 -
@@ -1,22 +1,21 @@
Index: src/asm/main.c
--- src/asm/main.c.orig
+++ src/asm/main.c
-@@ -34,6 +34,8 @@
- #include "helpers.h"
- #include "version.h"
+@@ -49,6 +49,8 @@
+ char const *__asan_default_options(void) { return "detect_leaks=0"; }
+ #endif
+int pledge(const char *, const char *);
+
// Old Bison versions (confirmed for 2.3) do not forward-declare `yyparse` in
the generated header
// Unfortunately, macOS still ships 2.3, which is from 2008...
int yyparse(void);
-@@ -307,6 +309,9 @@ int main(int argc, char *argv[])
- cldefines = malloc(cldefines_bufsize);
- if (!cldefines)
- fatalerror("No memory for command line defines\n");
-+
+@@ -148,6 +150,8 @@ static void print_usage(void)
+
+ int main(int argc, char *argv[])
+ {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ fatalerror("pledge");
+ time_t now = time(NULL);
+ char const *sourceDateEpoch = getenv("SOURCE_DATE_EPOCH");
- #if defined(YYDEBUG) && YYDEBUG
- yydebug = 1;
Index: patches/patch-src_fix_main_c
===
RCS file: /cvs/ports/devel/rgbds/patches/patch-src_fix_main_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2023/04/17 17:50:19 Modified files: databases/redis: Makefile distinfo Log message: Update to redis-6.2.12 This fixes: (CVE-2023-28856) Authenticated users can use the HINCRBYFLOAT command to create an invalid hash field that will crash Redis on access
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/04/17 17:18:24 ports/security/p5-Crypt-OpenSSL-EC/patches Update of /cvs/ports/security/p5-Crypt-OpenSSL-EC/patches In directory cvs.openbsd.org:/tmp/cvs-serv70052/patches Log Message: Directory /cvs/ports/security/p5-Crypt-OpenSSL-EC/patches added to the repository
[NEW] sysutils/jfrog-cli
Here is a port of JFrog CLI. """ JFrog CLI is a compact and smart client that provides a simple interface that automates access to Artifactory and Mission Control through their respective REST APIs. By using the JFrog CLI, you can greatly simplify your automation scripts making them more readable and easier to maintain. Several features of the JFrog CLI makes your scripts more efficient and reliable: * Multi-threaded upload and download of artifacts make builds run faster * Checksum optimization reduces redundant file transfers * Wildcards and regular expressions give you an easy way to collect all the artifacts you wish to upload or download. * "Dry run" gives you a preview of file transfer operations before you actually run them https://www.jfrog.com/confluence/display/CLI/JFrog+CLI """ jfrog-cli-2.36.1.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/04/17 14:29:40 Modified files: net/libdnet: Makefile Log message: note on (all?) tests failing without root, better TDEP on self
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/04/17 14:21:23 Modified files: net/libdnet: Makefile net/libdnet/pkg: PLIST-main PLIST-python Log message: regen plist (just @markers)
Re: Remove dependencies to pulseaudio
On Mon, Apr 17, 2023 at 08:21:50PM +0100, Stuart Henderson wrote: > On 2023/04/17 20:30, Johannes Thyssen Tishman wrote: > > On Mon, Apr 17, 2023 at 05:49:02PM +0100, Stuart Henderson wrote: > > >We don't have the resources to port everything to sndio (which means > > >ongoing work in many cases, not just a one-off). pulseaudio itself uses > > >sndio as a backend so those ports using it *are* using sndio albeit > > >indirectly. > > > > I understand. What is the ongoing work if not what I'm trying to do here > > though? I would like to help. > > Keep any patches up to date with changes/reorganisation in the upstream > projects; upstreams may be a bit reluctant to take this on themselves > (in some cases even if this sort of patch gets committed upstream, > they easily rot unless OpenBSD is regularly tested). I understand. I've seen this happen with projects that allegedly support OpenBSD but have outdated documentation and dependencies. Too bad. Anyways, thank you very much for the explanation and your time Stuart. Have a good day/night! Kind regards, -- Johannes Thyssen Tishman https://thyssentishman.com
Help with new port: Solvespace
Hi ports, lately I've been looking for a way to do CAD in OpenBSD and even though I've found useful ports (e.g. OpenSCAD) I believe that OpenBSD still lacks a more "capable" CAD program. FreeCAD is a great option, however for the little experience I have porting software to OpenBSD it's still quite a big challenge that I'd like to take on in the future. Since solvespace is a more lightweight alternative I decided to give it a try. Solvespace was already ported in the past[1][2], but I believe it was never imported to the tree. Using these older ports and with some modifications of mine, I've gotten pretty far in the compilation. However the compilation errors out with messages like the following (please see the full build log attached): ld: error: undefined symbol: Glib::ustring::ustring(...) >>> referenced by guigtk.cpp ld: error: undefined symbol: Gtk::FileChooser::set_filename(...) >>> referenced by guigtk.cpp It seems to be something related to GTK and GLIB, however at the beginning of the compilation it seems that all dependencies are found, so I don't understand what the problem is. One of the patches supplied in the older ports patches the file mentioned in the errors (guigtk.cpp), however I don't understand the reasons behind it and if it is something related to the issue I'm having here (Note: not using the patch yields the same errors as well). After many hours of searching the internet and tweaking the port I decided to ask here for some support. I'm new to compiling software, so I don't really know how to interpret these error messages. Apologies in advance if this is something obvious. Anyways, any feedback/guidance would be very appreciated. Thank you. Kind regards, Johannes [1] https://marc.info/?l=openbsd-ports=155699631023769=2 [2] https://marc.info/?l=openbsd-ports=155853889511494=2 -- Johannes Thyssen Tishman https://thyssentishman.com ===> solvespace-3.1 depends on: cmake-* -> cmake-3.26.3v0 ===> solvespace-3.1 depends on: ninja-* -> ninja-1.11.1 ===> solvespace-3.1 depends on: gcc->=8,<9 -> gcc-8.4.0p15 ===> solvespace-3.1 depends on: g++->=8,<9 -> g++-8.4.0p15 ===> solvespace-3.1 depends on: xz->=5.4.0 -> xz-5.4.2 ===> solvespace-3.1 depends on: atk2mm-* -> atk2mm-2.28.3p0 ===> solvespace-3.1 depends on: glib2-* -> glib2-2.74.6 ===> solvespace-3.1 depends on: json-c-* -> json-c-0.16 ===> solvespace-3.1 depends on: libsigc++-* -> libsigc++-2.12.0 ===> solvespace-3.1 depends on: pango-* -> pango-1.50.14 ===> solvespace-3.1 depends on: pangomm-* -> pangomm-2.46.3 ===> solvespace-3.1 depends on: cairo-* -> cairo-1.17.8 ===> solvespace-3.1 depends on: cairomm-* -> cairomm-1.14.4 ===> solvespace-3.1 depends on: gdk-pixbuf-* -> gdk-pixbuf-2.42.10 ===> solvespace-3.1 depends on: gtk+3-* -> gtk+3-3.24.37 ===> solvespace-3.1 depends on: gtk3mm-* -> gtk3mm-3.24.7 ===> solvespace-3.1 depends on: gcc-libs->=8,<9 -> gcc-libs-8.4.0p15 ===> Verifying specs: estdc++>=19 ===> found estdc++.19.0 ===> Checking files for solvespace-3.1 `/usr/ports/distfiles/solvespace-3.1.tar.xz' is up to date. `/usr/ports/distfiles/add_find_cairo-6b9e7b2.patch' is up to date. >> (SHA256) solvespace-3.1.tar.xz: OK >> (SHA256) add_find_cairo-6b9e7b2.patch: OK ===> Extracting for solvespace-3.1 ===> Patching for solvespace-3.1 ===> Applying distribution patches for solvespace-3.1 ===> Applying distribution patch add_find_cairo-6b9e7b2.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -- |From 6b9e7b2eec23350b68430567274307273107b7f4 Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= |Date: Wed, 21 Sep 2022 16:17:32 +0200 |Subject: [PATCH] CMake: Add FindCairo.cmake to fix build on FreeBSD | |--- | CMakeLists.txt| 2 +- | cmake/FindCairo.cmake | 75 +++ | 2 files changed, 76 insertions(+), 1 deletion(-) | create mode 100644 cmake/FindCairo.cmake | |diff --git a/CMakeLists.txt b/CMakeLists.txt |index f82e08576..5a012553f 100644 |--- a/CMakeLists.txt |+++ b/CMakeLists.txt -- Patching file CMakeLists.txt using Plan A... Hunk #1 succeeded at 269 (offset -8 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake |new file mode 100644 |index 0..d0130ad52 |--- /dev/null |+++ b/cmake/FindCairo.cmake -- (Creating file cmake/FindCairo.cmake...) Patching file cmake/FindCairo.cmake using Plan A... Empty context always matches. Hunk #1 succeeded at 1. done ===> Applying OpenBSD patch patch-CMakeLists_txt Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: CMakeLists.txt |--- CMakeLists.txt.orig |+++ CMakeLists.txt -- Patching file CMakeLists.txt using Plan A... Hunk #1 succeeded at 20. Hunk #2 succeeded at 34. Hunk #3 succeeded at 47.
Re: Remove dependencies to pulseaudio
On 2023/04/17 20:30, Johannes Thyssen Tishman wrote: > On Mon, Apr 17, 2023 at 05:49:02PM +0100, Stuart Henderson wrote: > >We don't have the resources to port everything to sndio (which means > >ongoing work in many cases, not just a one-off). pulseaudio itself uses > >sndio as a backend so those ports using it *are* using sndio albeit > >indirectly. > > I understand. What is the ongoing work if not what I'm trying to do here > though? I would like to help. Keep any patches up to date with changes/reorganisation in the upstream projects; upstreams may be a bit reluctant to take this on themselves (in some cases even if this sort of patch gets committed upstream, they easily rot unless OpenBSD is regularly tested).
Re: [NEW] lang/gleam
... and here's v0.28.3 NB: I don't intend to necessarily update the port every five days, and I'll take "no" for an answer, but as long as that's not happening, I'll keep proposing the most recent version for inclusion. On 4/12/23 19:24, Volker Schlecht wrote: Ping with an update to 0.28.2. It's a young language and it shows in the update frequency... but lots of fun IMHO. On 4/6/23 17:25, Volker Schlecht wrote: Following up on my previous proposal to add lang/gleam, here's an updated tarball for gleam, nits removed and updated to version 0.28.1 Built and tested on amd64. gleam-0.28.3.tar.gz Description: application/gzip
Re: [proposal] math/rstudio - depend on net/curl as default download method
Ping - patch reattached.
* adds a RUN_DEPENDS on net/curl
That's already a transitory dependency via math/R, so in practice no new
dependency
* adds a patch for RStudio to default to curl as default download
Required for RStudio to use curl/libcurl to pull packages from CRAN.
Index: Makefile
===
RCS file: /cvs/ports/math/rstudio/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 3 Aug 2022 15:13:25 - 1.11
+++ Makefile 17 Feb 2023 21:46:55 -
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = ${LP64_ARCHS}
V = 1.3.959
COMMENT = Integrated Development Environment (IDE) for R
PKGNAME = rstudio-${V}
-REVISION = 7
+REVISION = 8
CATEGORIES = math x11
HOMEPAGE = https://www.rstudio.com/
@@ -62,8 +62,9 @@ LIB_DEPENDS = devel/boost \
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
- x11/gtk+3,-guic
-
+ x11/gtk+3,-guic \
+ net/curl
+
CONFIGURE_ARGS = -DBoost_INCLUDE_DIR="${LOCALBASE}/include" \
-DQT_QMAKE_EXECUTABLE="${LOCALBASE}/bin/qmake-qt5" \
-DQt5WebEngine_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5WebEngine" \
Index: patches/patch-src_cpp_session_modules_SessionPackages_R
===
RCS file: patches/patch-src_cpp_session_modules_SessionPackages_R
diff -N patches/patch-src_cpp_session_modules_SessionPackages_R
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cpp_session_modules_SessionPackages_R 17 Feb 2023 21:46:55 -
@@ -0,0 +1,16 @@
+Index: src/cpp/session/modules/SessionPackages.R
+--- src/cpp/session/modules/SessionPackages.R.orig
src/cpp/session/modules/SessionPackages.R
+@@ -1252,7 +1252,11 @@ if (identical(as.character(Sys.info()["sysname"]), "Da
+else if (identical(sysName, "Darwin")) {
+ posixMethod("curl")
+}
+-
++
++ else if (identical(sysName, "OpenBSD")) {
++ posixMethod("curl")
++ }
++
+else if (identical(sysName, "Linux")) {
+ method <- posixMethod("wget")
+ if (!nzchar(method))
Re: Remove dependencies to pulseaudio
On Mon, Apr 17, 2023 at 05:49:02PM +0100, Stuart Henderson wrote:
>We don't have the resources to port everything to sndio (which means
>ongoing work in many cases, not just a one-off). pulseaudio itself uses
>sndio as a backend so those ports using it *are* using sndio albeit
>indirectly.
I understand. What is the ongoing work if not what I'm trying to do here
though? I would like to help.
>As you have seen, inter-library dependencies can mean that various
>programs record linkage to a library which is used by another library.
>Just making a separate flavour of that library is not enough, you also
>need similar work with ports *using* that library (and because the
>"pulse" and "no-pulse" flavours can't be installed simultaneously this
>ends up with problems in bulk builds). As a result there are very few
>libraries in ports which use flavours (and those which exist, like the
>LDAP flavours of apr and apr-util, are difficult to work with).
I see. Thank you very much for the quick response Stuart.
>--
> Sent from a phone, apologies for poor formatting.
>
>On 17 April 2023 14:56:22 Johannes Thyssen Tishman
> wrote:
>
>Hi everyone,
>
>Some time ago I noticed that pulseaudio was being pulled as a
>dependency
>
>of the qutebrowser. Now, it is my understanding that in OpenBSD
>programs
>
>such as pulseaudio, pipewire, alsa etc. are redundant since we have
>
>sndio, so why do we include pulseaudio? I suppose some programs might
>
>need it of course, but most programs I've seen that are built with
>
>support for pulseaudio list it as an optional dependency. Additionally
>
>pulseaudio pulls other dependencies (e.g. consolekit and polkit) that
>
>again (and please correct me if I'm wrong) are redundant software in
>
>OpenBSD.
>
>I found out that the two packages that were pulling pulseaudio for
>
>qutebrowser are the following:
>
>py-qt5 -> qtmultimedia
>
>py-qt5 -> qtspeech -> speech-dispatcher -> espeak -> pcaudiolib
>
>However, these two packages can be compiled without support for
>
>pulseaudio. Now, a quick look at reverse dependencies with
>
>show-reverse-deps(1) shows that quite a lot of packages depend on them.
>
>For this reason I suggest adding a flavor to the packages:
>
>--- /usr/ports/audio/pcaudiolib/Makefile Sun Nov 13 12:56:15 2022
>
>+++ Makefile Mon Apr 17 13:32:03 2023
>
>@@ -11,19 +11,24 @@ CATEGORIES= audio devel
>
> # GPLv3
>
> PERMIT_PACKAGE= Yes
>
>
>
>-WANTLIB += FLAC Xau Xdmcp dbus-1 execinfo iconv intl m mp3lame
>
>-WANTLIB += mpg123 ogg opus pthread pulse pulse-simple sndfile
>
>-WANTLIB += vorbis vorbisenc xcb
>
>-
>
>-LIB_DEPENDS= audio/pulseaudio
>
>-
>
> AUTOCONF_VERSION= 2.69
>
> AUTOMAKE_VERSION= 1.16
>
> AUTORECONF= ./autogen.sh
>
>
>
> CONFIGURE_STYLE= autoreconf
>
>
>
>+FLAVORS= pulse
>
>+FLAVOR?=
>
>+
>
> CONFIGURE_ARGS= --without-oss
>
>+
>
>+.if ${FLAVOR:Mpulse}
>
>+CONFIGURE_ARGS+= --with-pulseaudio
>
>+WANTLIB+= FLAC Xau Xdmcp dbus-1 execinfo iconv intl m mp3lame
>
>+WANTLIB+= mpg123 ogg opus pthread pulse pulse-simple sndfile
>
>+WANTLIB+= vorbis vorbisenc xcb
>
>+LIB_DEPENDS+= audio/pulseaudio
>
>+.endif
>
>
>
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
>
>--- /usr/ports/x11/qt5/qtmultimedia/Makefile Sun Apr 16 20:39:11 2023
>
>+++ Makefile Mon Apr 17 14:26:12 2023
>
>@@ -8,11 +8,11 @@ SHARED_LIBS += Qt5MultimediaWidgets 3.0 # 5.9
>
> SHARED_LIBS += Qt5MultimediaGstTools 0.0 # 5.13
>
> SHARED_LIBS += Qt5MultimediaQuick0.0 # 5.13
>
>
>
>-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
>
>-WANTLIB += Qt5Qml Qt5Quick Qt5Widgets glib-2.0 gobject-2.0 gstapp-1.0
>
>-WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstphotography-1.0
>
>-WANTLIB += gstreamer-1.0 gstvideo-1.0 intl m openal pulse
>pulse-mainloop-glib
>
>-WANTLIB += Qt5QmlModels gstallocators-1.0 gstgl-1.0
>
>+WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network
>Qt5OpenGL
>
>+WANTLIB-main += Qt5Qml Qt5QmlModels Qt5Quick Qt5Widgets glib-2.0
>gobject-2.0
>
>+WANTLIB-main += gstallocators-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
>
>+WANTLIB-main += gstgl-1.0 gstpbutils-1.0 gstphotography-1.0
>gstreamer-1.0
>
>+WANTLIB-main += gstvideo-1.0 intl m openal
>
>
>
> BUILD_DEPENDS = multimedia/gstreamer1/mm
>
>
>
>@@ -21,7 +21,6 @@ RUN_DEPENDS-main = multimedia/gstreamer1/mm
>
> RUN_DEPENDS-examples =
>x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION}
>
>
>
> LIB_DEPENDS = audio/openal \
>
>- audio/pulseaudio \
>
> multimedia/gstreamer1/core \
>
> multimedia/gstreamer1/plugins-base \
>
> multimedia/gstreamer1/plugins-bad \
>
>@@ -33,11 +32,19 @@ LIB_DEPENDS = audio/openal \
>
> # do not build
Re: [Maintainer Update] lang/erlang/erlang.port.mk
Ping On 4/8/23 09:48, Volker Schlecht wrote: On 4/2/23 20:12, Omar Polo wrote: [...] I'm also re-attaching lang/lfe. Both are ok op@ to be committed/imported :-) (I'd like for someone else with more experience with the infrastructure to review the erlang.port.mk changes) Pinging one day early. * erlang.port.mk -- Remove reference to erlang/21 -- Add mechanism to include additional erlang/elixir modules into the build, analogous to rust, go, haskell etc. -- It works for lang/lfe, doesn't cause fallout for anything else -- please see op@'s request for additional reviews above * lfe.tar.gz -- A Lisp on the Erlang BEAM -- Port proposed by Renato Aguiar -- Makes use of the change proposed for erlang.port.mk * lfe-maint-vs.tar.gz -- Same, but sets me as maintainer. I'd be happy to maintain the port, but don't want to pre-empt anyone else here.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2023/04/17 12:22:45 Modified files: infrastructure/mk: arch-defines.mk Log message: bump the system version for aarch64, since binaries are now built with BTI
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 11:50:32 Modified files: x11/xfce4/tumbler: Makefile distinfo Log message: x11/xfce4/tumbler: update to 4.18.1. see https://mail.xfce.org/pipermail/xfce-announce/2023-April/001267.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 11:48:17 Modified files: x11/xfce4/xfconf: Makefile distinfo Log message: x11/xfce4/xfconf: update to 4.18.1. see https://mail.xfce.org/pipermail/xfce-announce/2023-April/001266.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2023/04/17 11:36:58 Modified files: www/nginx : Makefile distinfo Added files: www/nginx/patches: patch-lua-nginx-module_src_ngx_http_lua_headers_in_c patch-lua-nginx-module_src_ngx_http_lua_headers_out_c Removed files: www/nginx/patches: patch-naxsi_naxsi_src_naxsi_net_h Log message: Update to nginx-1.24.0 1.24.0 is the latest stable release. Overview on changes can be found at http://nginx.org/en/CHANGES-1.24. Switched pcre to pcre2 now that naxsi HEAD supports this. Updated headers-more-nginx-module to a newer version because nginx>=1.23.0 changed handling of multiple headers. Added 2 patches for lua-nginx-module because of the header change. "ok for me" sthen@, OK robert@
Re: Remove dependencies to pulseaudio
We don't have the resources to port everything to sndio (which means
ongoing work in many cases, not just a one-off). pulseaudio itself uses
sndio as a backend so those ports using it *are* using sndio albeit indirectly.
As you have seen, inter-library dependencies can mean that various programs
record linkage to a library which is used by another library. Just making a
separate flavour of that library is not enough, you also need similar work
with ports *using* that library (and because the "pulse" and "no-pulse"
flavours can't be installed simultaneously this ends up with problems in
bulk builds). As a result there are very few libraries in ports which use
flavours (and those which exist, like the LDAP flavours of apr and
apr-util, are difficult to work with).
--
Sent from a phone, apologies for poor formatting.
On 17 April 2023 14:56:22 Johannes Thyssen Tishman
wrote:
Hi everyone,
Some time ago I noticed that pulseaudio was being pulled as a dependency
of the qutebrowser. Now, it is my understanding that in OpenBSD programs
such as pulseaudio, pipewire, alsa etc. are redundant since we have
sndio, so why do we include pulseaudio? I suppose some programs might
need it of course, but most programs I've seen that are built with
support for pulseaudio list it as an optional dependency. Additionally
pulseaudio pulls other dependencies (e.g. consolekit and polkit) that
again (and please correct me if I'm wrong) are redundant software in
OpenBSD.
I found out that the two packages that were pulling pulseaudio for
qutebrowser are the following:
py-qt5 -> qtmultimedia
py-qt5 -> qtspeech -> speech-dispatcher -> espeak -> pcaudiolib
However, these two packages can be compiled without support for
pulseaudio. Now, a quick look at reverse dependencies with
show-reverse-deps(1) shows that quite a lot of packages depend on them.
For this reason I suggest adding a flavor to the packages:
--- /usr/ports/audio/pcaudiolib/Makefile Sun Nov 13 12:56:15 2022
+++ Makefile Mon Apr 17 13:32:03 2023
@@ -11,19 +11,24 @@ CATEGORIES= audio devel
# GPLv3
PERMIT_PACKAGE= Yes
-WANTLIB += FLAC Xau Xdmcp dbus-1 execinfo iconv intl m mp3lame
-WANTLIB += mpg123 ogg opus pthread pulse pulse-simple sndfile
-WANTLIB += vorbis vorbisenc xcb
-
-LIB_DEPENDS= audio/pulseaudio
-
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
AUTORECONF= ./autogen.sh
CONFIGURE_STYLE= autoreconf
+FLAVORS= pulse
+FLAVOR?=
+
CONFIGURE_ARGS= --without-oss
+
+.if ${FLAVOR:Mpulse}
+CONFIGURE_ARGS+= --with-pulseaudio
+WANTLIB+= FLAC Xau Xdmcp dbus-1 execinfo iconv intl m mp3lame
+WANTLIB+= mpg123 ogg opus pthread pulse pulse-simple sndfile
+WANTLIB+= vorbis vorbisenc xcb
+LIB_DEPENDS+= audio/pulseaudio
+.endif
DEBUG_PACKAGES= ${BUILD_PACKAGES}
--- /usr/ports/x11/qt5/qtmultimedia/Makefile Sun Apr 16 20:39:11 2023
+++ Makefile Mon Apr 17 14:26:12 2023
@@ -8,11 +8,11 @@ SHARED_LIBS += Qt5MultimediaWidgets 3.0 # 5.9
SHARED_LIBS += Qt5MultimediaGstTools 0.0 # 5.13
SHARED_LIBS += Qt5MultimediaQuick0.0 # 5.13
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
-WANTLIB += Qt5Qml Qt5Quick Qt5Widgets glib-2.0 gobject-2.0 gstapp-1.0
-WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstphotography-1.0
-WANTLIB += gstreamer-1.0 gstvideo-1.0 intl m openal pulse pulse-mainloop-glib
-WANTLIB += Qt5QmlModels gstallocators-1.0 gstgl-1.0
+WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
+WANTLIB-main += Qt5Qml Qt5QmlModels Qt5Quick Qt5Widgets glib-2.0 gobject-2.0
+WANTLIB-main += gstallocators-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
+WANTLIB-main += gstgl-1.0 gstpbutils-1.0 gstphotography-1.0 gstreamer-1.0
+WANTLIB-main += gstvideo-1.0 intl m openal
BUILD_DEPENDS = multimedia/gstreamer1/mm
@@ -21,7 +21,6 @@ RUN_DEPENDS-main = multimedia/gstreamer1/mm
RUN_DEPENDS-examples =
x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION}
LIB_DEPENDS = audio/openal \
- audio/pulseaudio \
multimedia/gstreamer1/core \
multimedia/gstreamer1/plugins-base \
multimedia/gstreamer1/plugins-bad \
@@ -33,11 +32,19 @@ LIB_DEPENDS = audio/openal \
# do not build documentation by default, to avoid circular dependency
# via qtdeclarative-docindex
-FLAVORS = debug
+FLAVORS = debug pulse
FLAVOR ?= bootstrap no_examples
PSEUDO_FLAVORS = bootstrap no_examples
MODQMAKE_ARGS = GST_VERSION=1.0
MODQMAKE_RECURSIVE = No
+
+CONFIGURE_ARGS = -no-pulseaudio
+
+.if ${FLAVOR:Mpulse}
+CONFIGURE_ARGS-= -no-pulseaudio
+WANTLIB+= pulse pulse-mainloop-glib
+LIB_DEPENDS+= audio/pulseaudio
+.endif
.include
With these two pataches I was able to compile the two packages without
pulseaudio. However the when compiling the consumers of pcaudiolib
(without pulseaudio) e.g espeak, make complained with the following:
===> Verifying specs: c++ c++abi pthread c execinfo iconv m ogg pcaudio
pulse pulse-simple vorbis
Missing library for pcaudio>=0.0
Missing library for pulse>=0.0
Missing library for pulse-simple>=0.0
Fatal error
***
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 09:29:24 Modified files: www/mozilla-firefox: Tag: OPENBSD_7_3 Makefile distinfo Log message: www/mozilla-firefox: MFC update to 112.0.1. see https://www.mozilla.org/en-US/firefox/112.0.1/releasenotes/ Fixed a bug where cookie dates appear to be set in the far future after updating Firefox. This may have caused cookies to be unintentionally purged. (#1827669).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 09:23:23 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: www/mozilla-firefox: update to 112.0.1. see https://www.mozilla.org/en-US/firefox/112.0.1/releasenotes/ Fixed a bug where cookie dates appear to be set in the far future after updating Firefox. This may have caused cookies to be unintentionally purged. (#1827669).
Remove dependencies to pulseaudio
Hi everyone,
Some time ago I noticed that pulseaudio was being pulled as a dependency
of the qutebrowser. Now, it is my understanding that in OpenBSD programs
such as pulseaudio, pipewire, alsa etc. are redundant since we have
sndio, so why do we include pulseaudio? I suppose some programs might
need it of course, but most programs I've seen that are built with
support for pulseaudio list it as an optional dependency. Additionally
pulseaudio pulls other dependencies (e.g. consolekit and polkit) that
again (and please correct me if I'm wrong) are redundant software in
OpenBSD.
I found out that the two packages that were pulling pulseaudio for
qutebrowser are the following:
py-qt5 -> qtmultimedia
py-qt5 -> qtspeech -> speech-dispatcher -> espeak -> pcaudiolib
However, these two packages can be compiled without support for
pulseaudio. Now, a quick look at reverse dependencies with
show-reverse-deps(1) shows that quite a lot of packages depend on them.
For this reason I suggest adding a flavor to the packages:
--- /usr/ports/audio/pcaudiolib/MakefileSun Nov 13 12:56:15 2022
+++ MakefileMon Apr 17 13:32:03 2023
@@ -11,19 +11,24 @@ CATEGORIES= audio devel
# GPLv3
PERMIT_PACKAGE=Yes
-WANTLIB += FLAC Xau Xdmcp dbus-1 execinfo iconv intl m mp3lame
-WANTLIB += mpg123 ogg opus pthread pulse pulse-simple sndfile
-WANTLIB += vorbis vorbisenc xcb
-
-LIB_DEPENDS= audio/pulseaudio
-
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
AUTORECONF=./autogen.sh
CONFIGURE_STYLE= autoreconf
+FLAVORS= pulse
+FLAVOR?=
+
CONFIGURE_ARGS=--without-oss
+
+.if ${FLAVOR:Mpulse}
+CONFIGURE_ARGS+= --with-pulseaudio
+WANTLIB+= FLAC Xau Xdmcp dbus-1 execinfo iconv intl m mp3lame
+WANTLIB+= mpg123 ogg opus pthread pulse pulse-simple sndfile
+WANTLIB+= vorbis vorbisenc xcb
+LIB_DEPENDS+= audio/pulseaudio
+.endif
DEBUG_PACKAGES=${BUILD_PACKAGES}
--- /usr/ports/x11/qt5/qtmultimedia/MakefileSun Apr 16 20:39:11 2023
+++ MakefileMon Apr 17 14:26:12 2023
@@ -8,11 +8,11 @@ SHARED_LIBS += Qt5MultimediaWidgets 3.0 # 5.9
SHARED_LIBS += Qt5MultimediaGstTools 0.0 # 5.13
SHARED_LIBS += Qt5MultimediaQuick0.0 # 5.13
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
-WANTLIB += Qt5Qml Qt5Quick Qt5Widgets glib-2.0 gobject-2.0 gstapp-1.0
-WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstphotography-1.0
-WANTLIB += gstreamer-1.0 gstvideo-1.0 intl m openal pulse pulse-mainloop-glib
-WANTLIB += Qt5QmlModels gstallocators-1.0 gstgl-1.0
+WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
+WANTLIB-main += Qt5Qml Qt5QmlModels Qt5Quick Qt5Widgets glib-2.0 gobject-2.0
+WANTLIB-main += gstallocators-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
+WANTLIB-main += gstgl-1.0 gstpbutils-1.0 gstphotography-1.0 gstreamer-1.0
+WANTLIB-main += gstvideo-1.0 intl m openal
BUILD_DEPENDS =multimedia/gstreamer1/mm
@@ -21,7 +21,6 @@ RUN_DEPENDS-main =multimedia/gstreamer1/mm
RUN_DEPENDS-examples =
x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION}
LIB_DEPENDS = audio/openal \
- audio/pulseaudio \
multimedia/gstreamer1/core \
multimedia/gstreamer1/plugins-base \
multimedia/gstreamer1/plugins-bad \
@@ -33,11 +32,19 @@ LIB_DEPENDS = audio/openal \
# do not build documentation by default, to avoid circular dependency
# via qtdeclarative-docindex
-FLAVORS = debug
+FLAVORS = debug pulse
FLAVOR ?= bootstrap no_examples
PSEUDO_FLAVORS = bootstrap no_examples
MODQMAKE_ARGS =GST_VERSION=1.0
MODQMAKE_RECURSIVE = No
+
+CONFIGURE_ARGS = -no-pulseaudio
+
+.if ${FLAVOR:Mpulse}
+CONFIGURE_ARGS-= -no-pulseaudio
+WANTLIB+= pulse pulse-mainloop-glib
+LIB_DEPENDS+= audio/pulseaudio
+.endif
.include
With these two pataches I was able to compile the two packages without
pulseaudio. However the when compiling the consumers of pcaudiolib
(without pulseaudio) e.g espeak, make complained with the following:
===> Verifying specs: c++ c++abi pthread c execinfo iconv m ogg pcaudio
pulse pulse-simple vorbis
Missing library for pcaudio>=0.0
Missing library for pulse>=0.0
Missing library for pulse-simple>=0.0
Fatal error
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2385
'/usr/ports/pobj/espeak-1.51/.runwantlibs-': @case X${_DEPENDS_CACHE} in
X)...) *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2155
'/var/db/pkg/espeak-1.51/+CONTENTS': @cd /usr/ports/audio/espeak &&
SUBPACKA...) *** Error 2 in /usr/ports/audio/espeak
(/usr/ports/infrastructure/mk/bsd.port.mk:2600 'install':
@lock=espeak-1.51; export _LOCKS_HELD=" es...)
I understand that this is due to the declared WANTLIB's in the Makefile,
but why are these pulse specific libraries in the
UPDATE fonts/vlgothic-20220612
ok?
Index: Makefile
===
RCS file: /cvs/ports/fonts/vlgothic/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile11 Mar 2022 19:00:28 - 1.5
+++ Makefile17 Apr 2023 12:25:32 -
@@ -1,6 +1,6 @@
COMMENT = Japanese gothic TrueType fonts from Vine Linux
-V =20200720
+V =20220612
DISTNAME = VLGothic-$V
PKGNAME = vlgothic-$V
@@ -11,7 +11,7 @@ HOMEPAGE =http://vlgothic.dicey.org/
#BSD
PERMIT_PACKAGE=Yes
-MASTER_SITES = ${MASTER_SITE_OSDN_JP:=vlgothic/73361/}
+MASTER_SITES = ${MASTER_SITE_OSDN_JP:=vlgothic/77450/}
EXTRACT_SUFX = .tar.bz2
NO_BUILD = Yes
Index: distinfo
===
RCS file: /cvs/ports/fonts/vlgothic/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 May 2021 11:30:58 - 1.2
+++ distinfo17 Apr 2023 12:25:32 -
@@ -1,2 +1,2 @@
-SHA256 (VLGothic-20200720.tar.bz2) =
yl+Tlkfhf3V4nhYtcSdPxjf/TEHNKMHU6Ufd9n/f6Q0=
-SIZE (VLGothic-20200720.tar.bz2) = 4948096
+SHA256 (VLGothic-20220612.tar.bz2) =
JwOUprBMHKzQaZsxP8a4DZGl4G9H/aByRz9VrJlHZdo=
+SIZE (VLGothic-20220612.tar.bz2) = 4955343
--
SASANO Takayoshi (JG1UAA)
Re: [new] math/p5-graph-easy{-svg}
One last try for this port... ping On Tue, Apr 11, 2023 at 12:27:14PM +0200, Johannes Thyssen Tishman wrote: > Hi all, > > now that 7.3 has been released I'd like to revive this thread and see if > anyone is interested in this port. I'd appreciate any feedback in case > the port need more work. > > Thank you! > > -- > Johannes Thyssen Tishman > https://thyssentishman.com > -- Johannes Thyssen Tishman https://thyssentishman.com
Re: UPDATE www/nginx-1.24.0
On Mon, Apr 17, 2023 at 11:00:38AM +0100, Stuart Henderson wrote: > On 2023/04/16 20:28, Bjorn Ketelaars wrote: > > Diff below updates nginx to 1.24.0, which is the latest stable release. > > Overview on changes can be found at http://nginx.org/en/CHANGES-1.24. > > > > Switched pcre to pcre2 now to naxsi HEAD supports this. Updated > > headers-more-nginx-module to a newer version because nginx >1.23.0 > > changed handling of multiple headers. Added 2 patches for > > lua-nginx-module because of the header change. > > > > Lightly run test, with a simple config, on am64. > > > > Comments/OK? > > Works here with my usual config (not using the subpackaged modules, > but various proxies etc). ok for me, nice to see another devel/pcre > user get replaced with pcre2. Some third-party modules, such as lua, may require pcre, version 1. -- Sergey A. Osokin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/04/17 05:53:45 Modified files: net/openvpn: Makefile distinfo net/openvpn/patches: patch-src_openvpn_tun_c Log message: Update to openvpn-2.6.3 ChangeLog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn26
Re: CVS: cvs.openbsd.org: ports
bent...@openbsd.org writes: > CVSROOT: /cvs > Module name: ports > Changes by: bent...@cvs.openbsd.org 2023/04/17 05:43:05 > > Modified files: > emulators/mgba : Makefile > emulators/mgba/patches: patch-src_platform_sdl_main_c > > Log message: > Expand pledge to add "flock", needed for mesa's shader cache. > > This is the third time this pledge call has been expanded due to > underlying changes in the graphics stack, indicating the program > would benefit from a privsep design with a dedicated GPU process. The steady-state pledge promise is now: "stdio rpath wpath cpath fattr flock sendfd prot_exec drm audio"
Re: [new] sysutils/awscliv2, devel/py-awscrt
On Sun, Apr 16, 2023 at 10:20:54AM -0600, Joel Knight wrote: > On Sat, Apr 15, 2023 at 6:47 AM Stuart Henderson wrote: > > > > On 2023/04/15 13:45, Antoine Jacoutot wrote: > > > > > > Hi. > > > > > > A few things: > > Thanks, both, for the review. New tarball attached. > > py-awscrt: > > - Put a comment on USE_NOEXECONLY > - Switched MODPY_SETUPTOOLS -> MODPY_PYBUILD > - Added FLAVOR* > - Updated plist > - Removed ONLY_FOR_ARCHS > - Two new patch files included which allow building on arm64 It still picks up ar from the llvm port: -- CMAKE_AR found: /usr/local/bin/llvm-ar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/04/17 05:47:43 Modified files: emulators/mgba : Tag: OPENBSD_7_3 Makefile emulators/mgba/patches: Tag: OPENBSD_7_3 patch-src_platform_sdl_main_c Log message: Expand pledge to add "flock", needed for mesa's shader cache. This is the third time this pledge call has been expanded due to underlying changes in the graphics stack, indicating the program would benefit from a privsep design with a dedicated GPU process.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/04/17 05:43:05 Modified files: emulators/mgba : Makefile emulators/mgba/patches: patch-src_platform_sdl_main_c Log message: Expand pledge to add "flock", needed for mesa's shader cache. This is the third time this pledge call has been expanded due to underlying changes in the graphics stack, indicating the program would benefit from a privsep design with a dedicated GPU process.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 05:30:30 Modified files: graphics/ffmpegthumbnailer: Makefile distinfo graphics/ffmpegthumbnailer/patches: patch-CMakeLists_txt Log message: graphics/ffmpegthumbnailer: update to 2.2.2 (well actually git head) includes updates to use FFmpeg 4 API and bugfixes on top. Bump major. from Brad, ok Victor Kukshiev (MAINTAINER)
Re: UPDATE www/nginx-1.24.0
ok
On 16/04/23 20:28 +0200, Bjorn Ketelaars wrote:
> Diff below updates nginx to 1.24.0, which is the latest stable release.
> Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.
>
> Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
> headers-more-nginx-module to a newer version because nginx >1.23.0
> changed handling of multiple headers. Added 2 patches for
> lua-nginx-module because of the header change.
>
> Lightly run test, with a simple config, on am64.
>
> Comments/OK?
>
>
> diff --git Makefile Makefile
> index cc6eed8f6ff..fb79699f981 100644
> --- Makefile
> +++ Makefile
> @@ -15,7 +15,7 @@ COMMENT-passenger= nginx passenger (ruby/python/nodejs)
> integration module
> COMMENT-rtmp=nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
>
> -VERSION= 1.22.0
> +VERSION= 1.24.0
> DISTNAME=nginx-${VERSION}
> CATEGORIES= www
>
> @@ -36,8 +36,6 @@ PKGNAME-passenger= nginx-passenger-${VERSION}
> PKGNAME-rtmp=nginx-rtmp-${VERSION}
> PKGNAME-securelink= nginx-securelink-${VERSION}
>
> -REVISION-main= 0
> -
> ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
>
> MASTER_SITES=https://nginx.org/download/
> @@ -48,9 +46,9 @@ MASTER_SITES1=
> https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
>
> _GH_MODS=\
> - openresty headers-more-nginx-module v0.33 \
> + openresty headers-more-nginx-module v0.34 \
> openresty lua-nginx-modulev0.10.11 \
> - nbs-system naxsi 1.3 \
> + nbs-system naxsi
> d714f1636ea49a9a9f4f06dba14aee003e970834 \
> kvspb nginx-auth-ldap
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> arutnginx-rtmp-module v${VERSION-rtmp} \
> simpl ngx_devel_kit v0.3.0 \
> @@ -81,7 +79,7 @@ COMPILER = base-clang ports-gcc base-gcc
>
> .include
>
> -WANTLIB-main=c z pcre ssl crypto
> +WANTLIB-main=c crypto pcre2-8 ssl z
> WANTLIB-mailproxy=
> WANTLIB-stream=
> WANTLIB-image_filter=gd
> @@ -96,7 +94,7 @@ WANTLIB-perl= c m perl
> WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
> WANTLIB-securelink= crypto
>
> -LIB_DEPENDS-main=devel/pcre
> +LIB_DEPENDS-main=devel/pcre2
> LIB_DEPENDS-xslt=textproc/libxml \
> textproc/libxslt
> LIB_DEPENDS-image_filter=graphics/gd
> @@ -182,7 +180,6 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
> --with-stream=dynamic \
> --with-stream_ssl_module \
> --with-stream_ssl_preread_module \
> - --without-pcre2 \
> --add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
> --add-dynamic-module=${WRKSRC}/ngx_devel_kit \
>
> --add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
> diff --git distinfo distinfo
> index 92e4cc852ed..f508a39a69d 100644
> --- distinfo
> +++ distinfo
> @@ -1,18 +1,18 @@
> -SHA256 (headers-more-nginx-module-v0.33.tar.gz) =
> o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
> +SHA256 (headers-more-nginx-module-v0.34.tar.gz) =
> DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
> SHA256 (lua-nginx-module-v0.10.11.tar.gz) =
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> -SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> +SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) =
> 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
> SHA256 (nginx-1.20.1-chroot.patch) =
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> -SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
> +SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
> SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
> aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
> SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) =
> h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> SHA256
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> -SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> +SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> -SIZE (naxsi-1.3.tar.gz) = 235626
> +SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
> SIZE (nginx-1.20.1-chroot.patch) = 8783
> -SIZE (nginx-1.22.0.tar.gz) = 1073322
> +SIZE (nginx-1.24.0.tar.gz) = 1112471
> SIZE
Re: UPDATE www/nginx-1.24.0
On 2023/04/16 20:28, Bjorn Ketelaars wrote:
> Diff below updates nginx to 1.24.0, which is the latest stable release.
> Overview on changes can be found at http://nginx.org/en/CHANGES-1.24.
>
> Switched pcre to pcre2 now to naxsi HEAD supports this. Updated
> headers-more-nginx-module to a newer version because nginx >1.23.0
> changed handling of multiple headers. Added 2 patches for
> lua-nginx-module because of the header change.
>
> Lightly run test, with a simple config, on am64.
>
> Comments/OK?
Works here with my usual config (not using the subpackaged modules,
but various proxies etc). ok for me, nice to see another devel/pcre
user get replaced with pcre2.
>
> diff --git Makefile Makefile
> index cc6eed8f6ff..fb79699f981 100644
> --- Makefile
> +++ Makefile
> @@ -15,7 +15,7 @@ COMMENT-passenger= nginx passenger (ruby/python/nodejs)
> integration module
> COMMENT-rtmp=nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
>
> -VERSION= 1.22.0
> +VERSION= 1.24.0
> DISTNAME=nginx-${VERSION}
> CATEGORIES= www
>
> @@ -36,8 +36,6 @@ PKGNAME-passenger= nginx-passenger-${VERSION}
> PKGNAME-rtmp=nginx-rtmp-${VERSION}
> PKGNAME-securelink= nginx-securelink-${VERSION}
>
> -REVISION-main= 0
> -
> ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
>
> MASTER_SITES=https://nginx.org/download/
> @@ -48,9 +46,9 @@ MASTER_SITES1=
> https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
>
> _GH_MODS=\
> - openresty headers-more-nginx-module v0.33 \
> + openresty headers-more-nginx-module v0.34 \
> openresty lua-nginx-modulev0.10.11 \
> - nbs-system naxsi 1.3 \
> + nbs-system naxsi
> d714f1636ea49a9a9f4f06dba14aee003e970834 \
> kvspb nginx-auth-ldap
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> arutnginx-rtmp-module v${VERSION-rtmp} \
> simpl ngx_devel_kit v0.3.0 \
> @@ -81,7 +79,7 @@ COMPILER = base-clang ports-gcc base-gcc
>
> .include
>
> -WANTLIB-main=c z pcre ssl crypto
> +WANTLIB-main=c crypto pcre2-8 ssl z
> WANTLIB-mailproxy=
> WANTLIB-stream=
> WANTLIB-image_filter=gd
> @@ -96,7 +94,7 @@ WANTLIB-perl= c m perl
> WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
> WANTLIB-securelink= crypto
>
> -LIB_DEPENDS-main=devel/pcre
> +LIB_DEPENDS-main=devel/pcre2
> LIB_DEPENDS-xslt=textproc/libxml \
> textproc/libxslt
> LIB_DEPENDS-image_filter=graphics/gd
> @@ -182,7 +180,6 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
> --with-stream=dynamic \
> --with-stream_ssl_module \
> --with-stream_ssl_preread_module \
> - --without-pcre2 \
> --add-dynamic-module=${WRKSRC}/naxsi/naxsi_src/ \
> --add-dynamic-module=${WRKSRC}/ngx_devel_kit \
>
> --add-dynamic-module=${WRKSRC}/headers-more-nginx-module \
> diff --git distinfo distinfo
> index 92e4cc852ed..f508a39a69d 100644
> --- distinfo
> +++ distinfo
> @@ -1,18 +1,18 @@
> -SHA256 (headers-more-nginx-module-v0.33.tar.gz) =
> o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
> +SHA256 (headers-more-nginx-module-v0.34.tar.gz) =
> DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
> SHA256 (lua-nginx-module-v0.10.11.tar.gz) =
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> -SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> +SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) =
> 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
> SHA256 (nginx-1.20.1-chroot.patch) =
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> -SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
> +SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0=
> SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
> aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
> SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) =
> h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> SHA256
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> -SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> +SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> -SIZE (naxsi-1.3.tar.gz) = 235626
> +SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
>
Re: unbreak/update databases/influxdb
On 2023/04/17 07:40, Landry Breuil wrote: > Some golang stuff do syscalls the right way, some dont, from my > understanding depending on the version of x/sys it uses..looking at > https://github.com/VictoriaMetrics/VictoriaMetrics/blob/v1.85.0/go.mod#L36 > i'm afraid the 1.85.0 version of victoriametrics shipped with 7.3 might > have an 'old' x/sys dependency, but one would have to try to figure it > out :) As far as most archs are concerned, golang.org/x/sys v0.1.0 and up use libc functions instead of syscall() for its own use, so the biggest problem for x/sys is with older 'dated' v0.0.0-202x (iirc this changed in 202208something for most archs, but not until December for mips64). However x/sys/unix also has tables listing syscall numbers which is outdated even in git head. Some other modules use these tables with syscall() and still run into problems (in particular noticed with modernc.org/sqlite). mmap is the biggest problem - just updating the numbers in x/sys/unix isn't enough though; the parameters changed too. Search ports@ archives for gotosocial for more info.
Re: neovim and treesitter updates
Hi Edd, Le 2023-04-16 20:49, Edd Barrett a écrit : On Sat, Apr 15, 2023 at 08:33:56PM +0100, Edd Barrett wrote: Diffs attached. Sorry, I kludged the neovim diff. Since this version of neovim uses a non-release version of luv, we don't get the bundled luacompat53 from the luv tarball and we have to fetch it ourself. Note that there is no build step for luacompat53. The luv build just plucks files from the luacompat53 sources... Updated neovim diff below. The treesitter diff from my last mail is still good. Thanks for this fix, I had errors with your previous version due to the lack of luacompat-53 package to build libluv. Build and tests OK for neovim-0.9.0 on current/amd64 with this version. Build are also OK with the latest version of tree-sitter-0.28.0 port. No issue with it using tree-sitter plugin for neovim. Laurent
Re: neovim and treesitter updates
On Sun, Apr 16, 2023 at 09:49:29PM +0100, Edd Barrett wrote: Hello Edd, > Sorry, I kludged the neovim diff. This one (and your update to the tree-sitter diff) works well for me, and I think is ready to go in. Laurie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2023/04/17 01:49:05 Modified files: x11/pekwm : Makefile distinfo x11/pekwm/patches: patch-CMakeLists_txt patch-src_pekwm_wm_cc x11/pekwm/pkg : PLIST Added files: x11/pekwm/patches: patch-src_CfgParserSource_cc patch-src_Util_cc patch-src_pekwm_cc Log message: update x11/pekwm to 0.3.0 Diff from MAINTAINER Timo Myyrä, with tweaks by me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 01:26:27 Modified files: www/mozilla: mozilla.port.mk Log message: www/mozilla: only add devel/yasm BDEP if building www/seamonkey those days modern mozillas only use nasm (and rust, wasi, node...)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 00:55:38 Modified files: print/weasyprint: Makefile distinfo print/weasyprint/pkg: PLIST Log message: print/weasyprint: update to 58.1 see https://doc.courtbouillon.org/weasyprint/stable/changelog.html#version-58-1 for relevant changes since 57.0, adds support for pdf forms.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 00:48:09 Modified files: print/py-pydyf : Makefile distinfo Log message: print/py-pydyf: update to 0.6.0. see https://github.com/CourtBouillon/pydyf/releases/tag/v0.6.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 00:44:36 Modified files: devel/py-buildbot: Makefile.inc devel/py-buildbot/buildbot: distinfo devel/py-buildbot/console-view: distinfo devel/py-buildbot/grid-view: distinfo devel/py-buildbot/pkg: distinfo devel/py-buildbot/waterfall-view: distinfo devel/py-buildbot/www: distinfo devel/py-buildslave: Makefile distinfo devel/py-buildslave/pkg: PLIST Log message: devel/py-buildbot: update to 3.8.0. see https://github.com/buildbot/buildbot/releases/tag/v3.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/04/17 00:43:04 Modified files: security/rust-openssl-tests: Makefile crates.inc distinfo security/rust-openssl-tests/pkg: PLIST Log message: Update to rust-openssl-tests 20230417
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/17 00:25:37 Modified files: x11/xfce4/xfce4-genmon: Makefile distinfo Log message: x11/xfce4/xfce4-genmon: update to 4.2.0. The backend settings have been migrated from rc files to xfconf. Individual plugin settings will not be automatically migrated to xfconf and each plugin will need to be manually re-configured. A script has been developed that can offer assistance for the migration: https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/raw/master/scripts/migrate_to_xfconf.sh
Re: batch update for fcitx and related pkgs
On Fri, Apr 14, 2023 at 01:13:59AM +, Yifei Zhan wrote: > > > Bringing the fcitx family and opencc up to date, mostly routine translation > updates and bugfixes, no major change. > > Tested on amd64 with gedit/kate/xterm, no issue so far. Any testing, > especially > in the area of the relatively untested hangul/m17n/kkc package is welcomed :) > > (also cc lux who might be interested) Thank you for your diff! A WANTLIB seem to be missing for fcitx 5.0.23: $ make port-lib-depends-check fcitx-5.0.23(inputmethods/fcitx): Missing: z.7 (/usr/local/lib/fcitx5/libemoji.so) (system lib) WANTLIB += z The rest of diffs looks ok. I specifically tested fcitx-m17n with konsole, typed 'Han4yu3 Pin1yin1' to get 'Hànyǔ Pīnyīn'. If there is no objection, I'd like to commit it in a couple of days, thanks. > converters/opencc 1.1.3 -> 1.1.6 > - Language mapping updates > - Bumped major > > inputmethods/xcb-imdkit 1.0.3 -> 1.0.5 > - Bumped major > > inputmethods/fcitx-chinese-addons 5.0.12 -> 5.0.17 > - Language model update > > inputmethods/libime 1.0.11 -> 1.0.17 > inputmethods/fcitx-lua 5.0.5 -> 5.0.10 > inputmethods/fcitx 5.0.15 -> 5.0.23 > inputmethods/fcitx-config-qt 5.0.12 -> 5.0.17 > inputmethods/fcitx-table-extra 5.0.9 -> 5.0.13 > inputmethods/fcitx-qt 5.0.9 -> 5.0.17 > inputmethods/fcitx-gtk 5.0.13 -> 5.0.23 > inputmethods/fcitx-anthy 5.0.10 -> 5.0.14 > inputmethods/fcitx-unikey 5.0.9 -> 5.0.13 > inputmethods/fcitx-hangul 5.0.8 -> 5.0.11 > inputmethods/fcitx-m17n 5.0.8 -> 5.0.11 > inputmethods/fcitx-chewing 5.0.10 -> 5.0.14 > inputmethods/fcitx-kkc 5.0.8 -> 5.0.12 > - Mostly Translations/Icons updates and/or minor bugfixes > > > diff --git a/converters/opencc/Makefile b/converters/opencc/Makefile > index cbae9dbd7..2a4e9768e 100644 > --- a/converters/opencc/Makefile > +++ b/converters/opencc/Makefile > @@ -1,14 +1,13 @@ > COMMENT =convert between traditional and simplified Chinese > > -V = 1.1.3 > +V = 1.1.6 > DISTNAME = opencc-$V > -REVISION = 0 > > GH_ACCOUNT = BYVoid > GH_PROJECT = OpenCC > GH_TAGNAME = ver.$V > > -SHARED_LIBS += opencc0.0 # 1.0 > +SHARED_LIBS += opencc1.0 # 2.0 > > CATEGORIES = converters textproc > > diff --git a/converters/opencc/distinfo b/converters/opencc/distinfo > index f95f2d103..67305bef1 100644 > --- a/converters/opencc/distinfo > +++ b/converters/opencc/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (opencc-1.1.3.tar.gz) = mamviDswTxHzsPbfMNn7QWHxW4SIA/n/nGWpbVnOh38= > -SIZE (opencc-1.1.3.tar.gz) = 2805430 > +SHA256 (opencc-1.1.6.tar.gz) = Fpv/QHH/6BTcFt99GA/2YQ20GPSBbpwM4Cz4dL3wWN8= > +SIZE (opencc-1.1.6.tar.gz) = 3325614 > diff --git a/inputmethods/fcitx-anthy/Makefile > b/inputmethods/fcitx-anthy/Makefile > index 09ddbebc0..9fa6d09c2 100644 > --- a/inputmethods/fcitx-anthy/Makefile > +++ b/inputmethods/fcitx-anthy/Makefile > @@ -1,8 +1,7 @@ > COMMENT =anthy wrapper for fcitx5 > > -V = 5.0.10 > +V = 5.0.14 > PKGNAME =fcitx-anthy-$V > -REVISION = 0 > > GH_ACCOUNT =fcitx > GH_PROJECT =fcitx5-anthy > diff --git a/inputmethods/fcitx-anthy/distinfo > b/inputmethods/fcitx-anthy/distinfo > index 99d49f898..0a6d87d8a 100644 > --- a/inputmethods/fcitx-anthy/distinfo > +++ b/inputmethods/fcitx-anthy/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (fcitx5-anthy-5.0.10.tar.gz) = > CnZnkwwvwu+pkQYNco+QAkeRhe4Ya5HHdFMjEx9lz1g= > -SIZE (fcitx5-anthy-5.0.10.tar.gz) = 99003 > +SHA256 (fcitx5-anthy-5.0.14.tar.gz) = > rOCKrrZFLkxDbW7vq0SHdUMIaLcm6U2nauLC+16w0yQ= > +SIZE (fcitx5-anthy-5.0.14.tar.gz) = 104560 > diff --git a/inputmethods/fcitx-anthy/pkg/PLIST > b/inputmethods/fcitx-anthy/pkg/PLIST > index e7b8d9b9b..2990771f8 100644 > --- a/inputmethods/fcitx-anthy/pkg/PLIST > +++ b/inputmethods/fcitx-anthy/pkg/PLIST > @@ -1,7 +1,4 @@ > -lib/fcitx5/ > @so lib/fcitx5/anthy.so > -share/fcitx5/ > -share/fcitx5/addon/ > share/fcitx5/addon/anthy.conf > share/fcitx5/anthy/ > share/fcitx5/anthy/101kana.sty > @@ -22,18 +19,16 @@ share/fcitx5/anthy/vje-delta.sty > share/fcitx5/anthy/wnn.sty > share/fcitx5/inputmethod/ > share/fcitx5/inputmethod/anthy.conf > -share/icons/ > -share/icons/hicolor/ > -share/icons/hicolor/22x22/ > -share/icons/hicolor/22x22/status/ > +share/icons/hicolor/16x16/apps/fcitx-anthy.png > +share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-anthy.png > +share/icons/hicolor/22x22/apps/fcitx-anthy.png > +share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-anthy.png > share/icons/hicolor/22x22/status/fcitx-anthy-symbol.png > share/icons/hicolor/22x22/status/org.fcitx.Fcitx5.fcitx-anthy-symbol.png > -share/icons/hicolor/48x48/ > -share/icons/hicolor/48x48/status/ > -share/icons/hicolor/48x48/status/fcitx-anthy.png > -share/icons/hicolor/48x48/status/org.fcitx.Fcitx5.fcitx-anthy.png > -share/icons/hicolor/scalable/ > -share/icons/hicolor/scalable/status/ >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2023/04/16 23:59:56 Modified files: x11/tpadnav: Makefile distinfo Log message: update to tpadnav-2.0
