CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2021/12/31 15:07:06 Added files: games/warzone2100/pkg: README Log message: Add missing README file
Re: Update sysutils/opam to 2.1.2
1) I get a bunch of failures like this when running "make test". we probably have to neuter "-- strip-trailing-cr" usage? var-optiondiff: unknown option -- strip-trailing-cr usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label] file1 file2 diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2 diff [-abditw] [-I pattern] -D string file1 file2 diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2 diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label] [-S name] [-X file] [-x pattern] dir1 dir2 [FAIL] 2) Running portcheck resulted in: C++ libraries in WANTLIB with default COMPILER (most ports need 'COMPILER=base-clang ports-gcc' or 'COMPILER=base-clang ports-gcc base-gcc') On Fri, Dec 31, 2021 at 2:36 AM Christopher Zimmermann wrote: > > Hi, > > this update of opam changes to the build-utils shipped with opam and > drops dependencies on our ports utils. This makes ports dune version > independent of opam. OK? > > Christopher > > Index: Makefile > === > RCS file: /cvs/ports/sysutils/opam/Makefile,v > retrieving revision 1.23 > diff -u -p -r1.23 Makefile > --- Makefile10 Dec 2021 04:11:00 - 1.23 > +++ Makefile31 Dec 2021 07:34:49 - > @@ -4,10 +4,9 @@ COMMENT = OCaml source-based package ma > > CATEGORIES = sysutils devel > > -V =2.0.8 > +V =2.1.2 > PKGNAME = opam-${V} > DISTNAME =opam-full-${V} > -REVISION = 1 > > MASTER_SITES = > https://github.com/ocaml/opam/releases/download/${V}/ > > @@ -21,11 +20,7 @@ PERMIT_PACKAGE = Yes > WANTLIB = ${COMPILER_LIBCXX} c m > > BUILD_DEPENDS = lang/ocaml \ > - sysutils/findlib \ > - devel/dune \ > - devel/ocaml-cppo \ > - archivers/bzip2 \ > - net/curl > + archivers/bzip2 > > RUN_DEPENDS = archivers/unzip \ > archivers/bzip2 \ > @@ -38,7 +33,8 @@ USE_GMAKE = Yes > > CONFIGURE_ENV += CFLAGS="${CFLAGS}" \ > LDFLAGS="${LDFLAGS}" > -CONFIGURE_STYLE = gnu > +CONFIGURE_STYLE = gnu autoconf no-autoheader > +AUTOCONF_VERSION = 2.69 > > ALL_TARGET = lib-ext all > INSTALL_TARGET = install > Index: distinfo > === > RCS file: /cvs/ports/sysutils/opam/distinfo,v > retrieving revision 1.8 > diff -u -p -r1.8 distinfo > --- distinfo23 Feb 2021 05:25:04 - 1.8 > +++ distinfo31 Dec 2021 07:34:49 - > @@ -1,2 +1,2 @@ > -SHA256 (opam-full-2.0.8.tar.gz) = > e50pIz2WM+9QunZt8uORErFc0Fwcb+34C8tUjevN2b0= > -SIZE (opam-full-2.0.8.tar.gz) = 8006252 > +SHA256 (opam-full-2.1.2.tar.gz) = > 3h4+//1ZQuAQHvg9zerVSMxlqT4TmGrstKJkoFlFft4= > +SIZE (opam-full-2.1.2.tar.gz) = 9442446 > Index: patches/patch-Makefile_config_in > === > RCS file: patches/patch-Makefile_config_in > diff -N patches/patch-Makefile_config_in > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-Makefile_config_in31 Dec 2021 07:34:49 - > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +don't use system wide installed ocaml packages > + > +Index: Makefile.config.in > +--- Makefile.config.in.orig > Makefile.config.in > +@@ -17,7 +17,6 @@ OCAMLFIND = @OCAMLFIND@ > + OCAML = @OCAML@ > + OCAMLC = @OCAMLC@ > + OCAMLOPT = @OCAMLOPT@ > +-DUNE = @DUNE@ > + DUNE_SECONDARY = @DUNE_SECONDARY@ > + LN_S = @LN_S@ > + > Index: patches/patch-configure_ac > === > RCS file: patches/patch-configure_ac > diff -N patches/patch-configure_ac > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-configure_ac 31 Dec 2021 07:34:49 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +don't use system wide installed ocaml packages > + > +Index: configure.ac > +--- configure.ac.orig > configure.ac > +@@ -255,8 +255,6 @@ AS_IF([test "x${enable_certificate_check}" = "xno"], [ > + > + AC_CHECK_PROGS(FETCH,[curl wget],no) > + > +-AC_CHECK_TOOL(DUNE,dune) > +-AC_CHECK_TOOL(CPPO,cppo) > + AC_CHECK_TOOL(PATCH,patch) > + AC_CHECK_TOOL(BUNZIP2,bunzip2) > + > Index: pkg/PLIST > === > RCS file: /cvs/ports/sysutils/opam/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -r1.2 PLIST > --- pkg/PLIST 22 May 2020 19:31:20 - 1.2 > +++ pkg/PLIST 31 Dec 2021 07:34:49 - > @@ -25,6 +25,8 @@ > @man man/man1/opam-installer.1 > @man man/man1/opam-lint.1 > @man man/man1/opam-list.1 > +@man man/man1/opam-lock.1 > +@man man/man1/opam-option.1 > @man man/man1/opam-pin.1
Re: New: graphics/libyuv 0.0.1807
On Fri, Dec 31, 2021 at 09:19:34AM +, Stuart Henderson wrote: On 2021/12/31 06:51, Andrew Krasavin wrote: Hello. This is another dependency for our telegram-desktop port (more accurately, for tg_owt port). It seems more correct to get the shared library as a separate port, that's why we refused to use the bundled version. Keep in mind that Google supplies libyuv primarily as part of Chromium and maintains build correctness only for the static library. Unfortunately, it seems that these are not just words. For example, one can observe this: Given what you've said about libyuv, I think this approach could be problematic and that it makes more sense to use the bundled copy. As well as avoiding the problems you've mentioned, it reduces the risk of it interfering with build of the chromium-based ports (chromium/iridium/electron/qtwebengine) which won't expect a system copy of this library/headers. Thank you for your reply. Yes, google's approach to libyuv development creates some inconveniences, but it looks like we've managed to solve them, and in a rather "cheap" way. I described the nuances of the libyuv port not to show "how hard it was" (it wasn't hard), but to make the reasons for my decisions clear. Using a bundled version is definitely easier. However, it can cause delayed problems typical for static builds. I like the idea of having a port with normal versioning and keeping track of it, rather than relying on a bunch of bundles with undefined and/or unknown versions. Having tests in my port also seems to me to be an advantage over bundled versions. The question about Chromium/Electron/etc is interesting and needs research. At first glance, there should be no problem, since 1) chromium and others, if I'm not confused, use static rather than dynamic linking for libyuv and don't rely on header files and/or library in the system at all; the paths to libyuv header files are hardcoded. 2) Some popular linux distributions that have chromium in their repositories also have a package with libyuv. I haven't looked at all their build scripts, but, for example, PKGBUILD for archlinux definitely doesn't contain any libyuv-related hacks and workarounds. 3) Openh264 and usrsctp have recently been added to the ports tree, which are also used in chromium and come as bundles within it. (libyuv in distros: https://repology.org/project/libyuv/versions) -- Wbr, Andrew Krasavin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/12/31 11:08:53 Modified files: net/kea: Makefile distinfo Log message: update to kea-2.0.1
Re: UPDATE net/prosody 0.11.11 from MAINTAINER
Am Wed, 29 Dec 2021 02:54:36 + schrieb Lucas : > Hi ports, > > Prosody 0.11.11 release on 20-Dec. The release includes: > > ## Fixes and improvements > > * net.server_epoll: Prioritize network events over timers to > improve performance under heavy load > * mod_pep: Add some memory usage limits > * mod_pep: Prevent creation of services for non-existent users > * mod_pep: Free resources on user deletion (needed a restart > previously) > > ## Minor changes > > * mod_pep: Free resources on reload > * mod_c2s: Indicate stream secure state in error text when no > stream features to offer > * MUC: Fix logic for access to affiliation lists > * net.server_epoll: Improvements to shutdown procedure > [#1670](https://issues.prosody.im/1670) > * net.server_epoll: Fix potential issue with rescheduling of timers > * prosodyctl: Fix to ensure LuaFileSystem is loaded when needed > * util.startup: Fix handling of unknown command line flags (e.g. > `-h`) > * Fix version number reported as 'unknown' on *BSD > > Given the last point, one of the hunks for makefile can be dropped as > it was merged upstream. > > I tested it in -current amd64 given the amount of changes LibreSSL > suffered during this cycle and it works fine. David, in Cc, arrived to > the same patch and is a happy consumer on -stable amd64. So far no issues on my amd64 production machine. Thank you! -- greetings, Florian Viehweger
[update] devel/{intellij,pycharm} to 2021.3.1
Hello, Here are some small updates to pycharm and intellij. Builds and runs fine unless someone wants to tell me otherwise Changelogs: https://youtrack.jetbrains.com/articles/IDEA-A-89/IntelliJ-IDEA-2021.3.1-(213.6461.79-build)-Release-Notes https://confluence.jetbrains.com/display/PYH/PyCharm+2021.3.1+Release+Notes Lucas diff 358770744b84460c08f7fa451a3c95a0618586ad /usr/ports blob - 8e30a29efbd45f65b578c3274650877092ac8629 file + devel/intellij/Makefile --- devel/intellij/Makefile +++ devel/intellij/Makefile @@ -2,7 +2,7 @@ COMMENT= IntelliJ IDEA Java IDE -V= 2021.3 +V= 2021.3.1 DISTNAME= ideaIC-${V}-no-jbr PKGNAME= intellij-${V} CATEGORIES=devel @@ -25,7 +25,7 @@ RUN_DEPENDS= devel/desktop-file-utils \ NO_TEST= Yes -WRKDIST= ${WRKDIR}/idea-IC-213.5744.223 +WRKDIST= ${WRKDIR}/idea-IC-213.6461.79 IJ=${PREFIX}/intellij # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do blob - 5a536891cced01a586be407606bf7e90d47d34af file + devel/intellij/distinfo --- devel/intellij/distinfo +++ devel/intellij/distinfo @@ -1,2 +1,2 @@ -SHA256 (ideaIC-2021.3-no-jbr.tar.gz) = 23VAQHpxfwbAOqr238nbXL4sB13gz8TubAF3WreMWU4= -SIZE (ideaIC-2021.3-no-jbr.tar.gz) = 629835415 +SHA256 (ideaIC-2021.3.1-no-jbr.tar.gz) = tj+rNj94dyhQyH9HbnAKOOfmvqSAzo+zHArOxP4z3xI= +SIZE (ideaIC-2021.3.1-no-jbr.tar.gz) = 636967985 blob - b5d869f9ba724a3c3435b013e20f2b76550ed8f8 file + devel/intellij/pkg/PLIST --- devel/intellij/pkg/PLIST +++ devel/intellij/pkg/PLIST @@ -100,7 +100,7 @@ intellij/lib/asm-tree-7.1.jar intellij/lib/asm-util-7.1.jar intellij/lib/async-profiler.jar intellij/lib/bootstrap.jar -intellij/lib/build-marker-IC-213.5744.223 +intellij/lib/build-marker-IC-213.6461.79 intellij/lib/byte-buddy-agent.jar intellij/lib/cds/ intellij/lib/cds/classesLogAgent.jar @@ -401,15 +401,15 @@ intellij/plugins/cwm-plugin-projector/lib/cwm-plugin-p intellij/plugins/cwm-plugin-projector/lib/projector/ intellij/plugins/cwm-plugin-projector/lib/projector/Java-WebSocket-1.4.0.jar intellij/plugins/cwm-plugin-projector/lib/projector/kotlinx-serialization-protobuf-jvm-1.3.0.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-agent-initialization-f1e52565.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-awt-1f1cc5e8.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-f1e52565.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-f1e52565.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-1f1cc5e8.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-core-f1e52565.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-f1e52565.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-f1e52565.jar -intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-f1e52565.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-awt-30f65afc.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-1731046c.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-common-jvm-1731046c.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-ij-common-1731046c.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-30f65afc.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-server-core-1731046c.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-agent-1731046c.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-loading-1731046c.jar +intellij/plugins/cwm-plugin-projector/lib/projector/projector-util-logging-jvm-1731046c.jar intellij/plugins/cwm-plugin/jre-build.txt intellij/plugins/cwm-plugin/lib/ intellij/plugins/cwm-plugin/lib/bouncy-castle-pgp.jar diff 358770744b84460c08f7fa451a3c95a0618586ad /usr/ports blob - fd832632bc9c337d6feca649efdc2d6ce4e562bb file + devel/pycharm/Makefile --- devel/pycharm/Makefile +++ devel/pycharm/Makefile @@ -2,7 +2,7 @@ COMMENT= Python IDE based on IntelliJ IDEA -V= 2021.3 +V= 2021.3.1 DISTNAME= pycharm-community-${V} PKGNAME= pycharm-${V} CATEGORIES=devel blob - 528c20bbb9bf0ef2954b622300de32bce33ebfb2 file + devel/pycharm/distinfo --- devel/pycharm/distinfo +++ devel/pycharm/distinfo @@ -1,2 +1,2 @@ -SHA256 (pycharm-community-2021.3-no-jbr.tar.gz) = ciRYYd+K2Wdqsk/WdxartbyGl03awWigRS7ORn6KsSk= -SIZE (pycharm-community-2021.3-no-jbr.tar.gz) = 331975435 +SHA256 (pycharm-community-2021.3.1-no-jbr.tar.gz) = wRxr3D/4uAMq3baMophmtX4Bdt6as8n3EHPJ0z7LPUg= +SIZE (pycharm-community-2021.3.1-no-jbr.tar.gz) = 338990714 blob - 2da2f39160fe64fec439c4ec7ca86173665498f0 file + devel/pycharm/pkg/PLIST --- devel/pycharm/pkg/PLIST +++ devel/pycharm/pkg/PLIST @@ -36,7
Re: fix lang/libv8 (was: Re: amd64 build failures 2021-12-30)
Stefan Hagen wrote: > Christian Weisgerber wrote: > > Here's a reminder that these ports still fail to build since the > > LLVM 13 update: > > > > devel/qbs > > lang/libv8 > > I don't know what causes the segfault, but setting snapshot=off > works around it. > > > misc/posixtestsuite > > > > Old logs: > > http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/ Again with revision bump. Index: lang/libv8/Makefile === RCS file: /home/cvs/ports/lang/libv8/Makefile,v retrieving revision 1.23 diff -u -p -u -p -r1.23 Makefile --- lang/libv8/Makefile 9 Jun 2021 19:50:08 - 1.23 +++ lang/libv8/Makefile 31 Dec 2021 15:04:53 - @@ -12,7 +12,7 @@ COMMENT= V8 JavaScript for clients and s V8_VERSION=3.16.14.11 EPOCH= 0 -REVISION= 3 +REVISION= 4 V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/} V8_RELEASE=release @@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR SUBST_VARS+= V8_ARCH MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \ - DEFAULT_ARCHES=${V8_ARCH} + DEFAULT_ARCHES=${V8_ARCH} snapshot=off MAKE_ENV+= V=1 \ CXX="${CXX}" \
fix misc/posixtestsuite (was: Re: amd64 build failures 2021-12-30)
Christian Weisgerber wrote: > Here's a reminder that these ports still fail to build since the > LLVM 13 update: > > devel/qbs > lang/libv8 > misc/posixtestsuite Here -Werror is set and some variables now throw an -Wunused-but-set error. This happens frequently in this testsuite. Shall we switch it off? > Old logs: > http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/ Index: misc/posixtestsuite/Makefile === RCS file: /home/cvs/ports/misc/posixtestsuite/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- misc/posixtestsuite/Makefile12 Jul 2019 20:47:53 - 1.6 +++ misc/posixtestsuite/Makefile31 Dec 2021 14:56:41 - @@ -3,7 +3,7 @@ COMMENT = open POSIX test suite DISTNAME = posixtestsuite-1.5.2 -REVISION = 3 +REVISION = 4 CATEGORIES = misc Index: misc/posixtestsuite/patches/patch-Makefile === RCS file: /home/cvs/ports/misc/posixtestsuite/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-Makefile --- misc/posixtestsuite/patches/patch-Makefile 8 May 2018 22:14:19 - 1.2 +++ misc/posixtestsuite/patches/patch-Makefile 31 Dec 2021 14:16:18 - @@ -22,7 +22,7 @@ Index: Makefile $(MAKE) all | column -t -s: -CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L -+CFLAGS = -g -O2 -Wall -Werror -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 ++CFLAGS = -g -O2 -Wall -Werror -Wno-unused-but-set-variable -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 # add -std=c99, -std=gnu99 if compiler supports it (gcc-2.95.3 does not). check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2021/12/31 07:28:31 Modified files: games/warzone2100: Makefile distinfo games/warzone2100/patches: patch-3rdparty_glm_core_type_half_inl patch-configure_ac patch-icons_Makefile_in patch-lib_exceptionhandler_exceptionhandler_cpp patch-lib_netplay_netplay_cpp patch-src_Makefile_in games/warzone2100/pkg: PLIST Added files: games/warzone2100/patches: patch-doc_CMakeLists_txt patch-icons_CMakeLists_txt patch-src_CMakeLists_txt Log message: Update to warzone2100 4.2.4. tweaks/ok sdk@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2021/12/31 06:29:42 Modified files: games/supertux : Makefile Log message: Missing BUILD_DEPENDS on glm, found by aja@
fix lang/libv8 (was: Re: amd64 build failures 2021-12-30)
Christian Weisgerber wrote: > Here's a reminder that these ports still fail to build since the > LLVM 13 update: > > devel/qbs > lang/libv8 I don't know what causes the segfault, but setting snapshot=off works around it. > misc/posixtestsuite > > Old logs: > http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/ Index: lang/libv8/Makefile === RCS file: /home/cvs/ports/lang/libv8/Makefile,v retrieving revision 1.23 diff -u -p -u -p -r1.23 Makefile --- lang/libv8/Makefile 9 Jun 2021 19:50:08 - 1.23 +++ lang/libv8/Makefile 31 Dec 2021 13:12:51 - @@ -48,7 +48,7 @@ SUBST_VARS+= WRKDIR SUBST_VARS+= V8_ARCH MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \ - DEFAULT_ARCHES=${V8_ARCH} + DEFAULT_ARCHES=${V8_ARCH} snapshot=off MAKE_ENV+= V=1 \ CXX="${CXX}" \
Re: CVS: cvs.openbsd.org: ports
On Thu, Dec 30, 2021 at 01:37:33PM -0700, Pascal Stumpf wrote: > CVSROOT: /cvs > Module name: ports > Changes by: pas...@cvs.openbsd.org 2021/12/30 13:37:33 > > Modified files: > games/supertux : Makefile distinfo > games/supertux/patches: patch-CMakeLists_txt > patch-src_supertux_main_cpp > games/supertux/pkg: PLIST > Removed files: > games/supertux/patches: patch-src_video_texture_manager_cpp > > Log message: > Update to SuperTux 0.6.3. Does not build: ===> Configuring for supertux-0.6.3 /usr/bin/perl /exopi-cvs/ports/infrastructure/bin/pkg_subst -DMODCMAKE_BUILD_SUFFIX=-release.cmake -DARCH=amd64 -DBASE_PKGPATH=games/supertux -DFLAVOR_EXT= -DFULLPKGNAME=supertux-0.6.3 -DHOMEPAGE=https://www.supertux.org/ -DLOCALBASE=/usr/ local -DLOCALSTATEDIR=/var -DMACHINE_ARCH=amd64 -DMAINTAINER=Pascal\ Stumpf\ \ -DPREFIX=/usr/local -DRCDIR=/etc/rc.d -DSYSCONFDIR=/etc -DTRUEPREFIX=/usr/local -DX11BASE=/usr/X11R6 -DPKGSTEM=supertux -i -B /exopi-obj/pobj /supertux-0.6.3 /exopi-obj/pobj/supertux-0.6.3/SuperTux-v0.6.3-Source/src/supertux/main.cpp -- The C compiler identification is Clang 13.0.0 -- The CXX compiler identification is Clang 13.0.0 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /exopi-obj/pobj/supertux-0.6.3/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /exopi-obj/pobj/supertux-0.6.3/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Found Boost: /usr/local/include (found version "1.76.0") found components: filesystem system date_time locale CMake Error at CMakeLists.txt:196 (message): glm library missing -- Configuring incomplete, errors occurred! -- Antoine
amd64 build failures 2021-12-30
Here's a reminder that these ports still fail to build since the LLVM 13 update: devel/qbs lang/libv8 misc/posixtestsuite Old logs: http://build-failures.rhaalovely.net/amd64-clang/2021-12-06/ -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/31 05:35:16 Modified files: x11/gnome/libadwaita: Makefile distinfo x11/gnome/libadwaita/pkg: PLIST Log message: Update to libadwaita-1.0.0.
Re: wip/help wanted: fcitx5{,-gtk}
Yifei Zhan writes: > Thanks Stefan and Omar for looking into this! Now these ports are in > a much better shape :) > > On 21/12/30 08:27PM, Omar Polo wrote: >> but why disable uthash? it builds fine with that enabled, it just needs >> CFLAGS += -I${LOCALBASE}/include, so I'm adding it to BUILD_DEPENDS. > > I missed that because I didn't know uthash is already included. Thanks > for the heads-up! > >> regarding fcitx5 itself, why disable enchant? I've added >> textproc/enchant2 as LDEP and it builds fine. > > I was in the build-hack-rebuild loop so I disabled it to increase my > compile speed. I tested fcitx with enchant enabled and it works fine, so > let's leave it enabled. np :) >> These entries from the PLIST are suspicious: >> >> etc/ >> etc/xdg/ >> etc/xdg/autostart/ >> etc/xdg/autostart/org.fcitx.Fcitx5.desktop >> >> They should end up in ${PREFIX}/share/examples/xdg/... and then >> @sample'd as happens for other ports. cmake/kf5/qt is not really my >> area, but throwing a -DCMAKE_INSTALL_SYSCONFDIR in CONFIGURE_ARGS fixed >> the plist, not really sure why it's not happening by default... A grep >> confirms that there are some other instances of that in the port tree >> already (devel/ccache, net/icinga, net/mosquitto, ...) so maybe it's not >> completely wrong. > > I'm not totally sure about this as well, but your tweaks look good to > me. > >> I can't understand how it's supposed to be used, I ran fcitx5 and it >> switched from my custom dvorak to the us layout, fcitx5-configtool says >> that I'm "currently running Fcitx with GUI, but fcitx5-config-qt >> couldn't be found" and then opens up Emacs on the ~/.config/fcitx5/conf >> directory. I guess I should edit that file to customize it? >> Unfortunately there's no documentation in the package, I'll dig in >> HOMEPAGE later > > > You can edit that file to enable and setup IME plugins you want, but > it's more common to use fcitx5-config-qt for that. A typical workflow > would look like this: > > 1. install fcitx5 fcitx5-gtk fcitx5-qt fcitx5-config-qt fcitx5-$IME_Plugin >which $IME_Plugin to use depends on which language you want to type. >(e.g. fcitx5-anthy for Japanese) i suppose all of these fcitx5-* packages are yet to be submitted ^^" > 2. setup session environment variables in ~/.xsession, and start fcitx > when logging in > > export XMODIFIERS=@im=fcitx > export GTK_IM_MODULE=fcitx > export QT_IM_MODULE=fcitx > /usr/local/bin/fcitx5 Oh, I should have guessed that, it's similar to fcitx4. Maybe we can adopt the same wording as in fcitx' DESCR? ... Usage requires setting the following in the environment: export XMODIFIERS="@im=fcitx" (and similar for the gtk and qt module) > 3. re-login, then enable and maybe tweak your IME plugin in > fcitx5-config-qt, after which fcitx will be functional. > > here attached is a further tweaked version based on Omar's: > > - revised license markers > - set conflict marker against fcitx-* (fcitx4) Since fcitx5 is meant to be the successor for fcitx4 which is no longer developed, it may make sense to replace fcitx4 with 5 instead of keeping both in the port tree? I'm not using either, so I'm probably missing something here. > also attached, is a WIP port of fcitx5-gtk, it handles input within GTK3 > based applications, it works fine and lib deps check is happy. However > I'm not sure the state of GTK on OpenBSD and how this should be imported. forgot to attach the tarball? ;) > Should supports for GTK2/GTK4 also be packaged? or they are obsolete/not > ready yet? If they are to be packaged, should subpackages be used? > > [2. application/x-gzip; fcitx5.tweaked.tar.gz]... > > [3. application/x-gzip; xcb-imdkit.tweaked.tar.gz]... Cheers, Omar Polo
Re: UPDATE: net/nextcloudclient-3.4.1
On 12/31/21 00:58, Joel Carnat wrote: On 12/22/21 01:03, Adriano Barbosa wrote: Hi. Update for net/nextcloudclient v3.4.1 Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.4.1 Thank you for testing. Hi, Building on OpenBSD 7.0/amd64, I get the attached errors. I'm using -STABLE for system and ports. Only net/nextcloudclient has been updated via cvs. Shall I update some more package and test the building again? Regards, Joel C. Woops. After a sleep night, I remembered that the package had to be uninstalled for the compilation process to succeed. Everything works ok. Sorry for the noise.
Re: [maintainer update] gzdoom-4.7.1
Timo Myyrä writes: > Ping... > > Timo committed, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2021/12/31 03:57:57 Modified files: games/gzdoom : Makefile distinfo games/gzdoom/patches: patch-src_CMakeLists_txt games/gzdoom/pkg: PLIST Removed files: games/gzdoom/patches: patch-libraries_glslang_glslang_Include_PoolAlloc_h patch-libraries_wildmidi_wildmidi_wildmidi_lib_h patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp patch-libraries_zmusic_zmusic_mididefs_h patch-libraries_zmusic_zmusic_zmusic_h patch-src_scripting_vm_vmframe_cpp Log message: update gzdoom to 4.7.1 diff from Timo Myyrä with minor tweaks by me. OK solene@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2021/12/31 03:56:46 Modified files: audio : Makefile Log message: +zmusic
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: o...@cvs.openbsd.org2021/12/31 03:56:16 Log message: import zmusic-1.1.3, needed for gzdoom updated GZDoom's music system as a standalone library for easier reuse by other projects. port from Timo Myyrä with some small tweaks by me. Thanks Timo! OK solene@ Status: Vendor Tag: op Release Tags: op_20211231 N ports/audio/zmusic/Makefile N ports/audio/zmusic/distinfo N ports/audio/zmusic/pkg/DESCR N ports/audio/zmusic/pkg/PLIST N ports/audio/zmusic/patches/patch-CMakeLists_txt No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/12/31 03:35:00 Modified files: www/goaccess : Makefile distinfo Log message: update to goaccess-1.5.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/12/31 02:58:11 Modified files: mail/mutt : Makefile distinfo Log message: update to mutt-2.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/12/31 02:57:05 Modified files: textproc/py-pygments: Makefile distinfo textproc/py-pygments/pkg: PLIST Log message: update to py3-pygments-2.11.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/12/31 02:53:12 Modified files: lang/sbcl : Makefile distinfo lang/sbcl/pkg : PLIST Log message: Update to sbcl-2.1.11 ok gkoehler@ op@ maintainer timeout
(update) icewm-2.9.3
Hi, Here's an little bump for icewm, works fine here on amd64. timo diff 662d3c88e627c51affd7cc20a8a157055592792b /usr/ports blob - 6e7a702e37a8d0fccb933cde45689e72d847e279 file + x11/icewm/Makefile --- x11/icewm/Makefile +++ x11/icewm/Makefile @@ -3,7 +3,7 @@ # unconditionally uses machine/apmvar.h and related structures/defines ONLY_FOR_ARCHS=${APM_ARCHS} -V= 2.8.0 +V= 2.9.3 COMMENT= small and fast window manager DISTNAME= icewm-${V} EXTRACT_SUFX= .tar.lz blob - f7d25af8f69ad0be4ca5407b4a99b7c4dbc593d0 file + x11/icewm/distinfo --- x11/icewm/distinfo +++ x11/icewm/distinfo @@ -1,2 +1,2 @@ -SHA256 (icewm-2.8.0.tar.lz) = ErfM5nuVsJ80hz9GlI5/HO+e3YhoITngVLeboWXFPkk= -SIZE (icewm-2.8.0.tar.lz) = 1745937 +SHA256 (icewm-2.9.3.tar.lz) = DA26xolQYLsHlJH9e6z+tVyJlvRccu4qCvqPjGrCx6g= +SIZE (icewm-2.9.3.tar.lz) = 1760889 blob - f65368be2fd27864867da150e47eabdf7235f234 file + x11/icewm/pkg/PLIST --- x11/icewm/pkg/PLIST +++ x11/icewm/pkg/PLIST @@ -66,6 +66,7 @@ share/icewm/icons/app_16x16.xpm share/icewm/icons/app_32x32.xpm share/icewm/icons/bomb_16x16.xpm share/icewm/icons/bomb_32x32.xpm +share/icewm/icons/cancel-logout_16x16.xpm share/icewm/icons/communicator-abook_16x16.xpm share/icewm/icons/communicator-abook_32x32.xpm share/icewm/icons/communicator-browser_16x16.xpm @@ -139,6 +140,15 @@ share/icewm/icons/suspend_16x16.xpm share/icewm/icons/suspend_32x32.xpm share/icewm/icons/themes_16x16.xpm share/icewm/icons/themes_32x32.xpm +share/icewm/icons/tilebottom_48x48.png +share/icewm/icons/tilebottomleft_48x48.png +share/icewm/icons/tilebottomright_48x48.png +share/icewm/icons/tilecenter_48x48.png +share/icewm/icons/tileleft_48x48.png +share/icewm/icons/tileright_48x48.png +share/icewm/icons/tiletop_48x48.png +share/icewm/icons/tiletopleft_48x48.png +share/icewm/icons/tiletopright_48x48.png share/icewm/icons/vim_16x16.xpm share/icewm/icons/vim_32x32.xpm share/icewm/icons/vim_48x48.xpm
Re: New: graphics/libyuv 0.0.1807
On Fri, Dec 31, 2021 at 09:19:34AM +, Stuart Henderson wrote: > On 2021/12/31 06:51, Andrew Krasavin wrote: > > Hello. > > > > This is another dependency for our telegram-desktop port (more > > accurately, for tg_owt port). It seems more correct to get the shared > > library as a separate port, that's why we refused to use the bundled > > version. > > > > Keep in mind that Google supplies libyuv primarily as part of > > Chromium and maintains build correctness only for the static library. > > Unfortunately, it seems that these are not just words. For example, > > one can observe this: > > Given what you've said about libyuv, I think this approach could be > problematic and that it makes more sense to use the bundled copy. We can always use the bundle and if libyuv means too many problems, we certainly will. We've split it out because it was doable without much effort. I've deemed it worthwile because we can reduce the tg_owt/tdesktop monolith by a noticable chunk, hopefully providing a port that will be usable by other ports as well. FWIW, FreeBSD also has a libyuv port, but it also seems unused at the moment and their telegram ports still use the bundled version. > As well as avoiding the problems you've mentioned, it reduces the > risk of it interfering with build of the chromium-based ports > (chromium/iridium/electron/qtwebengine) which won't expect a system copy > of this library/headers. chromium picking it up also occured to me but I haven't looked into that yet. Maybe robert knows more about this? I'm happy to beat this into shape if it can actually benefit the browsers.
Re: [maintainer update] gzdoom-4.7.1
Timo Myyrä [2021-12-19, 10:58 +0200]: > Omar Polo [2021-12-15, 20:44 +0100]: > >> Timo Myyrä writes: >> >>> Hi, >>> >>> A bit delayed update to gzdoom. The upstream have made chopped the music >>> part as standalone library which I sent to ports@ earlier (audio/zmusic) >>> which is needed by this update. >>> >>> Quickly tested on doom1 which appeared to be working. >>> >>>[...] >>> >>> CONFIGURE_ARGS += -DNO_GTK=ON >>> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO >>> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so" >>> +CONFIGURE_ARGS += -DDYN_OPENAL=NO >>> +# Sync with audio/fluidsynth >>> +CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0" >> >> this bit (and the relative patch to the CMakeList.txt) is no more needed >> since the audio is moved to zmusic, and I can't find other instances of >> FLUIDSYNTHLIB1, so they can be dropped >> > > ah, good point. A grepped the sources but did not notice the > FLUIDSYNTHLIB1 was added by local patch so I kept that. > >>> [...] >>> - if ( UNIX ) >>> - include(CheckSymbolExists) >>> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS ) >>> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h" >>> HAVE_FTS ) >> >> this is still needed otherwise it doesn't find fts_set (there's >> virtually the same patch on zmusic too) >> > > Good catch. > >>> [...] >> >> It breaks the build if graphics/glslang is installed. gzdoom uses its >> own bundled version of the vulkan sdk but the compiler ends up including >> the system header instead of the bundled one. There are different >> solution for this: >> >> 1. cherry-pick this diff >> >> https://github.com/alexey-lysiuk/gzdoom/commit/5c9fb205d9231abbd8a3bf744850db02c0754057 >> >> (see https://github.com/coelckers/gzdoom/issues/1382) >> >> 2. add `CONFIGURE_ARGS += -DHAVE_VULKAN=OFF' to completely disable >>vulkan, or >> >> 3. use the same trick sdk@ used for net/tdlib-purple: >> >> CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include" >> >> > > Yeah, I think we can go with the third option. > >> 1) is probably overkill for us, 2) is what I initially did but 3) is >> probably the more pragmatic solution. I went with the third option in >> the diff below, but either is fine I guess. >> >> I'm also re-attaching the tweaked audio/zmusic tarball for convenience >> (which is ok op@ to import if someone wants to). see >> https://marc.info/?l=openbsd-ports=163916682506561=2 >> >> Tested on amdgpu with the shareware IWAD file mentioned in README and >> works fine! >> >> Thanks, >> >> Omar Polo > > Ok from me for these fixes. > > Timo > >> >> Index: Makefile >> === >> RCS file: /home/cvs/ports/games/gzdoom/Makefile,v >> retrieving revision 1.13 >> diff -u -p -r1.13 Makefile >> --- Makefile 25 Oct 2021 07:19:59 - 1.13 >> +++ Makefile 15 Dec 2021 19:59:09 - >> @@ -8,12 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64 >> >> COMMENT = OpenGL engine for idTech 1 games like >> doom,hexen,heretic... >> >> -V = 4.3.3 >> +V = 4.7.1 >> GH_ACCOUNT =coelckers >> GH_PROJECT =gzdoom >> GH_TAGNAME =g${V} >> DISTNAME = gzdoom-${V} >> -REVISION = 1 >> >> CATEGORIES= games >> >> @@ -24,21 +23,21 @@ MAINTAINER = Timo Myyra > # GPLv3 >> PERMIT_PACKAGE =Yes >> >> -WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123 >> -WANTLIB += openal sndfile z >> +WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m >> +WANTLIB += openal z zmusic >> >> +# C++17 >> COMPILER = base-clang ports-gcc >> >> MODULES = devel/cmake >> >> CONFIGURE_ARGS += -DNO_GTK=ON >> -CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO >> -CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so" >> +CONFIGURE_ARGS += -DDYN_OPENAL=NO >> CONFIGURE_ARGS += -DHAVE_STDINT_H=1 >> +CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. >> -I${LOCALBASE}/include" >> >> -LIB_DEPENDS = audio/libsndfile \ >> -audio/mpg123 \ >> -audio/openal \ >> +LIB_DEPENDS = audio/openal \ >> +audio/zmusic \ >> archivers/bzip2 \ >> graphics/jpeg \ >> devel/sdl2 >> Index: distinfo >> === >> RCS file: /home/cvs/ports/games/gzdoom/distinfo,v >> retrieving revision 1.5 >> diff -u -p -r1.5 distinfo >> --- distinfo 9 Mar 2020 12:18:50 - 1.5 >> +++ distinfo 15 Dec 2021 18:03:21 - >> @@ -1,2 +1,2 @@ >> -SHA256 (gzdoom-4.3.3.tar.gz) = j+a/WQcdxgPmEenoIs2KaTTMSB0KKhmNkhr4gSZmG2A= >> -SIZE (gzdoom-4.3.3.tar.gz) = 13704956 >> +SHA256 (gzdoom-4.7.1.tar.gz) =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2021/12/31 02:29:56 Modified files: games/openmw : Makefile Log message: Remove commented-out WANTLIB entries.
Re: New: graphics/libyuv 0.0.1807
On 2021/12/31 06:51, Andrew Krasavin wrote: > Hello. > > This is another dependency for our telegram-desktop port (more > accurately, for tg_owt port). It seems more correct to get the shared > library as a separate port, that's why we refused to use the bundled > version. > > Keep in mind that Google supplies libyuv primarily as part of > Chromium and maintains build correctness only for the static library. > Unfortunately, it seems that these are not just words. For example, > one can observe this: Given what you've said about libyuv, I think this approach could be problematic and that it makes more sense to use the bundled copy. As well as avoiding the problems you've mentioned, it reduces the risk of it interfering with build of the chromium-based ports (chromium/iridium/electron/qtwebengine) which won't expect a system copy of this library/headers.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/12/31 01:54:49 Modified files: mail/roundcubemail: Tag: OPENBSD_7_0 Makefile distinfo mail/roundcubemail/pkg: Tag: OPENBSD_7_0 PLIST Log message: update to roundcubemail-1.4.13
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/12/31 01:54:19 Modified files: mail/roundcubemail: Makefile distinfo mail/roundcubemail/pkg: PLIST Log message: update to roundcubemail-1.5.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/12/31 01:31:52 Modified files: sysutils : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: sysutils/direvent: Makefile distinfo sysutils/direvent/pkg: DESCR PLIST Log message: Remove direvent; it crashes in many different ways at runtime and the newest release isn't better.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2021/12/31 01:17:52 Removed files: www/chromium/patches: patch-base_compiler_specific_h Log message: remove obsolete patch