UPDATE: blender
Backport a patch to allow Blender 3.3 to build with OpenColorIO 2.3.
Index: Makefile
===
RCS file: /cvs/ports/graphics/blender/Makefile,v
retrieving revision 1.121
diff -u -p -u -p -r1.121 Makefile
--- Makefile23 Mar 2024 13:34:46 - 1.121
+++ Makefile24 Mar 2024 04:23:31 -
@@ -8,7 +8,7 @@ DPB_PROPERTIES = parallel
COMMENT = 3D creation software
DISTNAME = blender-3.3.16
-
+REVISION = 0
CATEGORIES = graphics
HOMEPAGE = https://www.blender.org/
Index: patches/patch-intern_opencolorio_ocio_impl_glsl_cc
===
RCS file: patches/patch-intern_opencolorio_ocio_impl_glsl_cc
diff -N patches/patch-intern_opencolorio_ocio_impl_glsl_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-intern_opencolorio_ocio_impl_glsl_cc 24 Mar 2024 04:23:31
-
@@ -0,0 +1,41 @@
+Build: support OpenColorIO 2.3
+Ref #113157
+https://projects.blender.org/blender/blender/pulls/113163
+
+Index: intern/opencolorio/ocio_impl_glsl.cc
+--- intern/opencolorio/ocio_impl_glsl.cc.orig
intern/opencolorio/ocio_impl_glsl.cc
+@@ -319,8 +319,15 @@ static bool addGPULut1D2D(OCIO_GPUTextures ,
+ unsigned int height = 0;
+ GpuShaderCreator::TextureType channel =
GpuShaderCreator::TEXTURE_RGB_CHANNEL;
+ Interpolation interpolation = INTERP_LINEAR;
++#if OCIO_VERSION_HEX >= 0x0203
++ /* Always use 2D textures in OpenColorIO 2.3, simpler and same performance.
*/
++ GpuShaderDesc::TextureDimensions dimensions = GpuShaderDesc::TEXTURE_2D;
+ shader_desc->getTexture(
++ index, texture_name, sampler_name, width, height, channel, dimensions,
interpolation);
++#else
++ shader_desc->getTexture(
+ index, texture_name, sampler_name, width, height, channel,
interpolation);
++#endif
+
+ const float *values;
+ shader_desc->getTextureValues(index, values);
+@@ -333,13 +340,16 @@ static bool addGPULut1D2D(OCIO_GPUTextures ,
+
GPU_R16F;
+
+ OCIO_GPULutTexture lut;
++#if OCIO_VERSION_HEX < 0x0203
+ /* There does not appear to be an explicit way to check if a texture is 1D
or 2D.
+* It depends on more than height. So check instead by looking at the
source. */
+ std::string sampler1D_name = std::string("sampler1D ") + sampler_name;
+ if (strstr(shader_desc->getShaderText(), sampler1D_name.c_str()) !=
nullptr) {
+ lut.texture = GPU_texture_create_1d(texture_name, width, 1, format,
values);
+ }
+- else {
++ else
++#endif
++ {
+ lut.texture = GPU_texture_create_2d(texture_name, width, height, 1,
format, values);
+ }
+ if (lut.texture == nullptr) {
Re: powerpc64 bulk build report
On Fri, 22 Mar 2024 12:03:42 +
Stuart Henderson wrote:
> summarising these:
Thanks for taking a look. I rarely make bulks on powerpc64, because
they tend to hang or panic the powerpc64 kernel, which forces me to
reboot. This bulk had 2 forced reboots.
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/databases/mdbtools.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/security/py-keyring,python3.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/databases/postgresql-odbc.log
>
> Some DPB oddities here. Various "Dependency check failed" and a
> "/usr/sbin/pkg_add -aI -Drepair postgresql-client-16.2 stub_name" /
> "Can't find stub_name" in postgresql-odbc.
"Dependency check failed" might happen after pkg_add failed to add a
dependency. These errors don't get my attention, because they don't
force me to reboot. The failure of security/py-keyring,python3 is
most odd, because dpb had packaged py3-keyring-23.6.0p2, then failed
a 2nd build of the same port (as if dpb forgot the existing package).
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/arm-none-eabi/gcc,aarch64.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/riscv-elf/gcc.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/xtensa-esp32s2-elf/gcc-bootstrap.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/xtensa-esp32s3-elf/gcc-bootstrap.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/xtensa-lx106-elf/gcc-bootstrap.log
>
> ppc64-specific patches are broken/missing.
patch-gcc_tree-vect-loop_c from lang/gcc/{8,11} might fix the vec_step
problem in all these gcc ports (including riscv32 below). I will put
BROKEN-powerpc64 on these until I or another powerpc64 user finds time
to fix them.
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/bullet.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/riscv32-esp-elf/gcc-bootstrap.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/emulators/mednafen.log
>
> compile error in ppc64-specific code.
>
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/objfw.log
>
> relocation problems
The relocations in lookup-asm-powerpc64-elf.S look correct to me, but
lld might not be able to do them. It might be easier (for me) to
patch the .S than to fix lld.
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/devel/py-thrift,python3.log
>
> doesn't produce compiled extension on ppc64.
py-thrift has invalid C code on all big-endian platforms, so it can't
build its C extension. Back in February 2023, I wrote a potential fix
at https://github.com/apache/thrift/pull/2754 but I got stuck, unable
to post to their bug tracker. I put my diff in one of my ports trees,
but never shared the ports diff.
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/editors/emacs,no_x11.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/sysutils/borgmatic.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/textproc/apertium-dicts/eo-fr.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/textproc/apertium-dicts/br-fr.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/textproc/apertium-dicts/eo-en.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/textproc/apertium-dicts/hbs-slv.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/math/lean.log
>
> segfault during build
Nobody can use gdb to debug these segfaults, because ports/devel/gdb
segfaults at runtime. I learned that gdb uses C++ exceptions, and all
such exceptions segfault on powerpc64. I began trying to fix it in
base llvm/libunwind, but the fix is not ready.
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/lang/gambit.log
>
> ICE
>
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/lang/racket-minimal.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/math/gbc.log
> > http://build-failures.rhaalovely.net/powerpc64/2024-03-18/security/distorm3.log
>
> various errors
racket and distorm3 fail the same way on powerpc, but gbc's failure is
unique to powerpc64. In gbc, the output of "./fbc ... >libmath.h" is
wrong, only 2 bytes. I want to debug ./fbc with gdb, but that must
wait until I have a working gdb.
--gkoehler
UPDATE: utfcpp 4.0.5
Here is an update to utfcpp 4.0.5.
Upstream has placed the headers into a subdir as the port was doing on
its own but utilizing a different directory name, so use the same name.
Version 4
This is a major release that includes the following new features:
- Utf16 strings codepoint iteration and appending: #91 (special thanks to
@ceztko)
- Support for u8string (thanks to @XCI9)
- find_invalid and is_valid for C-style strings
Index: Makefile
===
RCS file: /cvs/ports/devel/utfcpp/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile7 Nov 2023 14:19:27 - 1.6
+++ Makefile23 Mar 2024 23:56:22 -
@@ -1,30 +1,21 @@
COMMENT = simple, portable library for handling UTF-8 strings
-VERSION = 2.3.4
-DISTNAME = utf8_v${VERSION:S/./_/g}
-PKGNAME = utfcpp-${VERSION}
-REVISION = 1
-
+GH_ACCOUNT = nemtrif
+GH_PROJECT = utfcpp
+GH_TAGNAME = v4.0.5
CATEGORIES = devel
-HOMEPAGE = https://utfcpp.sourceforge.net/
-
MAINTAINER = Sergey Bronnikov
-# BSD
+# Boost
PERMIT_PACKAGE = Yes
-SITES =${SITE_SOURCEFORGE:=utfcpp/}
-EXTRACT_SUFX = .zip
-
-NO_TEST = Yes
-
-WRKDIST = ${WRKDIR}
NO_BUILD = Yes
+NO_TEST = Yes
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/utfcpp/utf8
- ${INSTALL_DATA} ${WRKDIR}/source/*.* ${PREFIX}/include/utfcpp
- ${INSTALL_DATA} ${WRKDIR}/source/utf8/*.* ${PREFIX}/include/utfcpp/utf8
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/utf8cpp/utf8
+ ${INSTALL_DATA} ${WRKSRC}/source/*.h ${PREFIX}/include/utf8cpp
+ ${INSTALL_DATA} ${WRKSRC}/source/utf8/*.h ${PREFIX}/include/utf8cpp/utf8
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/utfcpp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo12 Aug 2016 09:20:01 - 1.1.1.1
+++ distinfo23 Mar 2024 23:56:22 -
@@ -1,2 +1,2 @@
-SHA256 (utf8_v2_3_4.zip) = M3POuyXYjGYqK5YMTVhdr5rns5YDHs14bnuzGxXQEO8=
-SIZE (utf8_v2_3_4.zip) = 22422
+SHA256 (utfcpp-4.0.5.tar.gz) = /8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8=
+SIZE (utfcpp-4.0.5.tar.gz) = 34139
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/utfcpp/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 18:53:33 - 1.3
+++ pkg/PLIST 23 Mar 2024 23:56:22 -
@@ -1,6 +1,9 @@
-include/utfcpp/
-include/utfcpp/utf8/
-include/utfcpp/utf8.h
-include/utfcpp/utf8/checked.h
-include/utfcpp/utf8/core.h
-include/utfcpp/utf8/unchecked.h
+include/utf8cpp/
+include/utf8cpp/utf8/
+include/utf8cpp/utf8.h
+include/utf8cpp/utf8/checked.h
+include/utf8cpp/utf8/core.h
+include/utf8cpp/utf8/cpp11.h
+include/utf8cpp/utf8/cpp17.h
+include/utf8cpp/utf8/cpp20.h
+include/utf8cpp/utf8/unchecked.h
And port adjustments.
Index: geo/osrm-backend/Makefile
===
RCS file: /cvs/ports/geo/osrm-backend/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- geo/osrm-backend/Makefile 17 Nov 2023 10:57:36 - 1.14
+++ geo/osrm-backend/Makefile 23 Mar 2024 22:23:02 -
@@ -7,6 +7,7 @@ COMMENT = high-performance road network
GH_ACCOUNT = Project-OSRM
GH_PROJECT = osrm-backend
GH_COMMIT =31e31a63d062fb804f5f4695ed3036ca7a269ead
+REVISION = 0
DISTNAME = osrm-backend-5.27.1pl0
CATEGORIES = geo
@@ -29,7 +30,7 @@ MODULES = devel/cmake \
lang/lua
MODLUA_VERSION = 5.3
BUILD_DEPENDS =devel/protozero \
- devel/utfcpp \
+ devel/utfcpp>=4.0.5 \
geo/libosmium
LIB_DEPENDS = archivers/bzip2 \
devel/boost \
@@ -38,7 +39,7 @@ LIB_DEPENDS = archivers/bzip2 \
CONFIGURE_ARGS = -DOSMIUM_INCLUDE_DIR=${LOCALBASE}/include/osmium \
-DENABLE_CCACHE=Off
-CXXFLAGS +=-I${LOCALBASE}/include/utfcpp
+CXXFLAGS +=-I${LOCALBASE}/include/utf8cpp
# Requires network access, and http access to sample osrm data is 403'd
NO_TEST = Yes
Index: productivity/ledger/Makefile
===
RCS file: /cvs/ports/productivity/ledger/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- productivity/ledger/Makefile3 May 2023 11:00:46 - 1.35
+++ productivity/ledger/Makefile23 Mar 2024 22:23:02 -
@@ -3,6 +3,7 @@ COMMENT = command line double-entry acc
GH_TAGNAME =
UPDATE: libosmium
Remove unused run time dependency on utfcpp. https://github.com/osmcode/libosmium/commit/68c981313572e960e96d417f42a086d8a2213bff Index: Makefile === RCS file: /cvs/ports/geo/libosmium/Makefile,v retrieving revision 1.9 diff -u -p -u -p -r1.9 Makefile --- Makefile24 Nov 2023 08:50:40 - 1.9 +++ Makefile23 Mar 2024 22:12:10 - @@ -3,6 +3,7 @@ COMMENT = fast, flexible library for wor GH_ACCOUNT = osmcode GH_PROJECT = libosmium GH_TAGNAME = v2.20.0 +REVISION = 0 CATEGORIES = geo @@ -20,9 +21,5 @@ BUILD_DEPENDS = devel/boost \ devel/sparsehash \ geo/gdal \ geo/geos - -# include/osmium/io/detail/opl_parser_functions.hpp -# #include -RUN_DEPENDS = devel/utfcpp .include
Re: security/gpgme -qt6
On Thu Mar 14, 2024 at 09:58:52PM +, Stuart Henderson via ports wrote:
> This needs something more, the qt-headers package needs to be knocked out
> unless one of the qt versions is built.
$ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all doas pkg_add -Dunsigned -u
gpgme+gpgme-qt-1.23.2->gpgme-1.23.2p0+gpgme-qt-1.23.2p0+gpgme-qt-headers-1.23.2:
internal conflict between gpgme-1.23.2p0 and gpgme-qt-1.23.2p0
Unfortunately, you're right. Do you have any idea how we can solve this puzzle?
(One comment below)
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 14 March 2024 20:09:15 "Rafael Sadowski via ports"
> wrote:
>
> > Based on the fantastic work of jca@, below is a diff to add -qt6 flavor
> > support in gpgme. I have added the cmake qt6 tweak that we can see in
> > -qt5.
> >
> > The diff needs a simple MODQT_ENV_SETUP tweak in qt6 and qt5. (Diff in a
> > different mail)
> >
> >
> > Looking for OKs after the look.
> >
> > Rafael
> >
> > diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
> > index 67bbcb43657..9ebd69008d9 100644
> > --- a/security/gpgme/Makefile
> > +++ b/security/gpgme/Makefile
> > @@ -1,16 +1,26 @@
> > COMMENT-main = GnuPG Made Easy
> > +COMMENT-qt-headers = Qt headers for GPGme
> > COMMENT-qt =Qt bindings for GPGme
> > +COMMENT-qt6 = Qt6 bindings for GPGme
> >
> > VERSION = 1.23.2
> > +REVISION-main =0
> > +REVISION-qt = 0
> > +
> > DISTNAME = gpgme-${VERSION}
> > PKGNAME-main = gpgme-${VERSION}
> > +PKGNAME-qt-headers = gpgme-qt-headers-${VERSION}
> > PKGNAME-qt =gpgme-qt-${VERSION}
> > +PKGNAME-qt6 = gpgme-qt6-${VERSION}
> > +
> > +PKG_ARCH-qt-headers = *
> >
> > CATEGORIES =security devel
> >
> > SHARED_LIBS += gpgme24.2 # 43.0
> > SHARED_LIBS += gpgmepp 3.3 # 26.0
> > SHARED_LIBS += qgpgme 3.2 # 20.0
> > +SHARED_LIBS += qgpgmeqt60.0 # 20.0
> >
> > HOMEPAGE = https://www.gnupg.org/software/gpgme/
> >
> > @@ -20,44 +30,80 @@ EXTRACT_SUFX = .tar.bz2
> > # GPLv2 - LGPLv2.1
> > PERMIT_PACKAGE= Yes
> >
> > -WANTLIB = assuan gpg-error iconv intl
> > -WANTLIB-main = ${WANTLIB} c m
> > -WANTLIB-qt = ${COMPILER_LIBCXX} ${WANTLIB} Qt5Core double-conversion
> > -WANTLIB-qt += execinfo glib-2.0 gpgme gthread-2.0 icudata icui18n
> > icuuc
> > -WANTLIB-qt += m pcre2-8 pcre2-16 z zstd
> > +WANTLIB-main = ${COMPILER_LIBCXX} assuan c gpg-error iconv intl m
> > +WANTLIB-qt-headers =
> > +WANTLIB-qt += ${COMPILER_LIBCXX} Qt5Core assuan double-conversion
> > +WANTLIB-qt += execinfo glib-2.0 gpg-error gpgme gpgmepp gthread-2.0
> > +WANTLIB-qt += iconv icudata icui18n icuuc intl m pcre2-16 pcre2-8
> > +WANTLIB-qt += z zstd
> > +WANTLIB-qt6 += ${COMPILER_LIBCXX} Qt6Core assuan b2 double-conversion
> > +WANTLIB-qt6 += execinfo glib-2.0 gpg-error gpgme gpgmepp gthread-2.0
> > +WANTLIB-qt6 += iconv icudata icui18n icuuc intl m pcre2-16 pcre2-8
> > +WANTLIB-qt6 += z zstd
> >
> > COMPILER = base-clang ports-gcc
> >
> > -MULTI_PACKAGES = -main -qt
> > -PSEUDO_FLAVORS = no_qt
> > -FLAVOR ?=
> > +MULTI_PACKAGES = -main -qt-headers -qt -qt6
> > +# XXX we forcefully set either no_qt or no_qt6,
> > +# is "bootstrap" doing anything useful?
> > +PSEUDO_FLAVORS = no_qt no_qt6 bootstrap qt6
> > +FLAVOR ?= no_qt6 bootstrap
> > +
> > +.if ${FLAVOR:Mqt6}
> > +# Cannot build both qt5 and qt6 at the same time
> > +# FLAVOR="qt6 no_qt6" makes no sense
> > +FLAVOR := no_qt ${FLAVOR:Nno_qt6}
> > +.elif !${FLAVOR:Mno_qt*} && !${FLAVOR:Mqt6}
> > +# XXX will portcheck STFU?!?
> > +FLAVOR += no_qt6
> > +.endif
> >
> > -# don't depend on Qt5 on arches where it's known to fail
> > +# don't depend on Qt on arches where it's known to fail
> > +# XXX needs MODQT_NOT_FOR_ARCHS?
> > NOT_FOR_ARCHS-qt = alpha mips64 sh
> > +NOT_FOR_ARCHS-qt6 =alpha mips64 sh
> >
> > CONFIGURE_STYLE = gnu
> >
> > BUILD_DEPENDS = security/gnupg>=2.2.23p1
> > RUN_DEPENDS = security/gnupg>=2.2.23p1
> > -LIB_DEPENDS-main = ${LIB_DEPENDS:N*qt*} \
> > - devel/gettext,-runtime \
> > +LIB_DEPENDS-main = devel/gettext,-runtime \
> > security/libgpg-error>=1.4 \
> > security/libassuan
> > +LIB_DEPENDS-qt-headers =
> > +RUN_DEPENDS-qt-headers =
> > +# XXX WIP: not accurate enough, should handle REVISION
> > +LIB_DEPENDS-qt += ${MODQT5_LIB_DEPENDS} \
> > + gpgme-=${VERSION}:${BUILD_PKGPATH},-main
> > +RUN_DEPENDS-qt =
> > gpgme-qt-headers-=${VERSION}:${BUILD_PKGPATH},-qt-headers
That doesn't help but ...
gpgme-=${VERSION}p${REVISION-main}:${BUILD_PKGPATH},-main
> > +LIB_DEPENDS-qt6 += ${MODQT6_LIB_DEPENDS} \
> > + gpgme-=${VERSION}:${BUILD_PKGPATH},-main
> > +RUN_DEPENDS-qt6 =
> > gpgme-qt-headers-=${VERSION}:${BUILD_PKGPATH},-qt-headers
> >
> > CONFIGURE_ENV
Re: [new] gurk-rs - a cli signal client
Stefan Hagen wrote (2024-03-23 10:11 CET): > Rafael Sadowski wrote (2024-03-23 10:02 CET): > > On Fri Feb 10, 2023 at 07:28:52PM +0100, Stefan Hagen wrote: > > > > What is the status here? I see 0.4.2 upstream. > > 0.4.2 is in openbsd-wip, feel free to try. It's buggy as hell > and crashes frequently. > > I'll resubmit it to ports@ once it works better. I've updated gurk-rs on openbsd-wip to version 0.4.3. It seems to start more reliable now. I could exchange a few messages. Once a message got deleted, further messages could not be sent from gurk.
Re: fix "PLIST.orig already exists"
On Sat Mar 23, 2024 at 04:11:04PM +0100, Peter Hessler wrote:
> this error is worthless and a waste of time, stop generating it:
> /usr/ports/www/yt-dlp/pkg/PLIST changed but
> /usr/ports/www/yt-dlp/pkg/PLIST.orig exists
>
> OK?
+1
>
> Index: infrastructure/bin/update-plist
> ===
> RCS file: /cvs/openbsd/ports/infrastructure/bin/update-plist,v
> diff -u -p -u -p -r1.214 update-plist
> --- infrastructure/bin/update-plist 14 May 2023 09:18:05 - 1.214
> +++ infrastructure/bin/update-plist 23 Mar 2024 15:07:59 -
> @@ -1392,7 +1392,6 @@ $self->write_new_files;
>
> # and now, we figure out where to move the new files
> my @towrite = ();
> -my $cantmove = 0;
>
> my $exitcode = 0;
>
> @@ -1412,22 +1411,13 @@ for my $p (@{$self->{lists}}) {
> } else {
> print "$k changed";
> push(@towrite, $k);
> - if (-f "$k$orig") {
> - print " but $k$orig exists\n";
> - $cantmove = 1;
> - } else {
> - print "\n";
> - }
> + print "\n";
> }
> } else {
> print "$k is new\n";
> push(@towrite, $k);
> }
> }
> -}
> -
> -if ($cantmove) {
> - exit(2);
> }
>
> if ($self->{state}->not) {
>
>
> --
> Facts are stubborn, but statistics are more pliable.
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2024/03/23 12:51:16 Modified files: sysutils/kopia : Makefile distinfo modules.inc Log message: Update to v0.16.0 Changelog at https://github.com/kopia/kopia/releases/tag/v0.16.0
Re: fix "PLIST.orig already exists"
On 2024/03/23 16:11:04 +0100, Peter Hessler wrote:
> this error is worthless and a waste of time, stop generating it:
> /usr/ports/www/yt-dlp/pkg/PLIST changed but
> /usr/ports/www/yt-dlp/pkg/PLIST.orig exists
>
> OK?
oh yes please, it's annoying for no reason IMHO.
one small nit:
> --- infrastructure/bin/update-plist 14 May 2023 09:18:05 - 1.214
> +++ infrastructure/bin/update-plist 23 Mar 2024 15:07:59 -
> @@ -1392,7 +1392,6 @@ $self->write_new_files;
>
> # and now, we figure out where to move the new files
> my @towrite = ();
> -my $cantmove = 0;
>
> my $exitcode = 0;
>
> @@ -1412,22 +1411,13 @@ for my $p (@{$self->{lists}}) {
> } else {
> print "$k changed";
could add the \n here (or use `say')
> push(@towrite, $k);
> - if (-f "$k$orig") {
> - print " but $k$orig exists\n";
> - $cantmove = 1;
> - } else {
> - print "\n";
> - }
> + print "\n";
instead of printing \n here now.
> }
> } else {
> print "$k is new\n";
> push(@towrite, $k);
> }
> }
> -}
> -
> -if ($cantmove) {
> - exit(2);
> }
>
> if ($self->{state}->not) {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 12:18:53 Modified files: mail/neomutt : Makefile distinfo Log message: update to neomutt-20240323
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 12:08:31 Modified files: emulators/qemu : Makefile distinfo Log message: update to qemu-8.2.2, from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/23 10:58:45 Modified files: www/firefox-esr: Tag: OPENBSD_7_4 Makefile distinfo Log message: www/firefox-esr: MFC update to 115.9.1. see https://www.mozilla.org/en-US/firefox/115.9.1esr/releasenotes/ fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-16/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/23 10:58:42 Modified files: www/firefox-esr: Makefile distinfo www/firefox-esr-i18n: Makefile.inc distinfo Log message: www/firefox-esr: update to 115.9.1. see https://www.mozilla.org/en-US/firefox/115.9.1esr/releasenotes/ fixes https://www.mozilla.org/en-US/security/advisories/mfsa2024-16/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2024/03/23 10:54:17 Modified files: geo/qgis : Makefile distinfo Removed files: geo/qgis/patches: patch-src_core_proj_qgscoordinatereferencesystemutils_cpp Log message: geo/qgis: update to 3.36.1 remove patch merged upstream
fix "PLIST.orig already exists"
this error is worthless and a waste of time, stop generating it:
/usr/ports/www/yt-dlp/pkg/PLIST changed but
/usr/ports/www/yt-dlp/pkg/PLIST.orig exists
OK?
Index: infrastructure/bin/update-plist
===
RCS file: /cvs/openbsd/ports/infrastructure/bin/update-plist,v
diff -u -p -u -p -r1.214 update-plist
--- infrastructure/bin/update-plist 14 May 2023 09:18:05 - 1.214
+++ infrastructure/bin/update-plist 23 Mar 2024 15:07:59 -
@@ -1392,7 +1392,6 @@ $self->write_new_files;
# and now, we figure out where to move the new files
my @towrite = ();
-my $cantmove = 0;
my $exitcode = 0;
@@ -1412,22 +1411,13 @@ for my $p (@{$self->{lists}}) {
} else {
print "$k changed";
push(@towrite, $k);
- if (-f "$k$orig") {
- print " but $k$orig exists\n";
- $cantmove = 1;
- } else {
- print "\n";
- }
+ print "\n";
}
} else {
print "$k is new\n";
push(@towrite, $k);
}
}
-}
-
-if ($cantmove) {
- exit(2);
}
if ($self->{state}->not) {
--
Facts are stubborn, but statistics are more pliable.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: phess...@cvs.openbsd.org2024/03/23 08:44:06 Modified files: www/yt-dlp : Makefile distinfo www/yt-dlp/pkg : PLIST Added files: www/yt-dlp/patches: patch-pyproject_toml Removed files: www/yt-dlp/patches: patch-setup_py Log message: Update to 2024.03.10 OK mestre@ (MAINTAINER), sthen@
Re: [UPDATE] www/yt-dlp
On 2024/03/23 15:17, Peter Hessler wrote: > Here's an update to the most recent release, OK? yep > -MODPY_PYBUILD = setuptools > +MODPY_PYBUILD = hatchling well spotted :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2024/03/23 08:24:08 Modified files: meta/tor-browser: Tag: OPENBSD_7_4 Makefile www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo Log message: Tor Browser: update to 13.0.13
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2024/03/23 08:23:27 Modified files: meta/tor-browser: Makefile www/tor-browser: Makefile.inc www/tor-browser/browser: Makefile distinfo Log message: Tor Browser: update to 13.0.13
[UPDATE] www/yt-dlp
Here's an update to the most recent release, OK?
$ make test
...
== 216 failed, 5310 passed, 862 skipped in 1207.44s (0:20:07) ==
Index: www/yt-dlp/Makefile
===
RCS file: /cvs/openbsd/ports/www/yt-dlp/Makefile,v
diff -u -p -u -p -r1.33 Makefile
--- www/yt-dlp/Makefile 8 Jan 2024 19:19:54 - 1.33
+++ www/yt-dlp/Makefile 23 Mar 2024 08:28:09 -
@@ -1,6 +1,6 @@
COMMENT = CLI program to download videos from YouTube and other sites
-VERSION = 2023.12.30
+VERSION = 2024.03.10
MODPY_EGG_VERSION =${VERSION:S/.0/./g}
DISTNAME = yt-dlp-${VERSION}
@@ -19,7 +19,7 @@ SITES = https://github.com/yt-dlp/yt-dl
MODULES = lang/python
-MODPY_PYBUILD =setuptools
+MODPY_PYBUILD =hatchling
TEST_DEPENDS +=devel/flake8
Index: www/yt-dlp/distinfo
===
RCS file: /cvs/openbsd/ports/www/yt-dlp/distinfo,v
diff -u -p -u -p -r1.29 distinfo
--- www/yt-dlp/distinfo 8 Jan 2024 19:19:54 - 1.29
+++ www/yt-dlp/distinfo 20 Mar 2024 18:14:05 -
@@ -1,2 +1,2 @@
-SHA256 (yt-dlp-2023.12.30.tar.gz) =
VAj+XRLNHEMO4QNGdw49YLqtXGOji0HIlnAF5JVngKc=
-SIZE (yt-dlp-2023.12.30.tar.gz) = 5402838
+SHA256 (yt-dlp-2024.03.10.tar.gz) =
Hbjq3p6GBUO2VfX5c+JnJ6wswgh03G/tmj54pKBe6Yk=
+SIZE (yt-dlp-2024.03.10.tar.gz) = 5515436
Index: www/yt-dlp/patches/patch-pyproject_toml
===
RCS file: www/yt-dlp/patches/patch-pyproject_toml
diff -N www/yt-dlp/patches/patch-pyproject_toml
--- /dev/null 1 Jan 1970 00:00:00 -
+++ www/yt-dlp/patches/patch-pyproject_toml 23 Mar 2024 09:31:45 -
@@ -0,0 +1,12 @@
+Index: pyproject.toml
+--- pyproject.toml.orig
pyproject.toml
+@@ -113,7 +113,7 @@ artifacts = ["/yt_dlp/extractor/lazy_extractors.py"]
+ "completions/zsh/_yt-dlp" = "share/zsh/site-functions/_yt-dlp"
+ "completions/fish/yt-dlp.fish" = "share/fish/vendor_completions.d/yt-dlp.fish"
+ "README.txt" = "share/doc/yt_dlp/README.txt"
+-"yt-dlp.1" = "share/man/man1/yt-dlp.1"
++"yt-dlp.1" = "man/man1/yt-dlp.1"
+
+ [tool.hatch.version]
+ path = "yt_dlp/version.py"
Index: www/yt-dlp/patches/patch-setup_py
===
RCS file: www/yt-dlp/patches/patch-setup_py
diff -N www/yt-dlp/patches/patch-setup_py
--- www/yt-dlp/patches/patch-setup_py 17 Nov 2023 20:33:02 - 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: setup.py
setup.py.orig
-+++ setup.py
-@@ -85,7 +85,7 @@ def build_params():
- ('share/zsh/site-functions', ['completions/zsh/_yt-dlp']),
- ('share/fish/vendor_completions.d', ['completions/fish/yt-dlp.fish']),
- ('share/doc/yt_dlp', ['README.txt']),
--('share/man/man1', ['yt-dlp.1'])
-+('man/man1', ['yt-dlp.1'])
- ]
- data_files = []
- for dirname, files in files_spec:
Index: www/yt-dlp/pkg/PLIST
===
RCS file: /cvs/openbsd/ports/www/yt-dlp/pkg/PLIST,v
diff -u -p -u -p -r1.28 PLIST
--- www/yt-dlp/pkg/PLIST8 Jan 2024 19:19:54 - 1.28
+++ www/yt-dlp/pkg/PLIST23 Mar 2024 09:34:11 -
@@ -1,13 +1,13 @@
bin/yt-dlp
lib/python${MODPY_VERSION}/site-packages/yt_dlp/
lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/AUTHORS
-lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/licenses/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/yt_dlp-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE
lib/python${MODPY_VERSION}/site-packages/yt_dlp/YoutubeDL.py
lib/python${MODPY_VERSION}/site-packages/yt_dlp/__init__.py
lib/python${MODPY_VERSION}/site-packages/yt_dlp/__main__.py
@@ -22,8 +22,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yt_dlp/${MODPY_PYCACHE}aes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yt_dlp/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yt_dlp/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
Re: sysuitls/u-boot: split off 32-bit ARM Allwinner SoCs
On 2024/03/23 13:08, Stuart Henderson wrote: > On 2024/03/23 09:14, Jonathan Gray wrote: > > On Fri, Mar 22, 2024 at 03:56:35PM +0100, Mark Kettenis wrote: > > > The diff below splits off the 32-bit ARM Allwinner SoCs and updates > > > them to U-Boot 2024.01. I've tested this on a few of my armv7 boards > > > and I'm pretty confident it doesn't break any of them. > > Splitting definitely makes sense to me. .. the new u-boot/sunxi/pkg/PLIST needs one addition (can go anywhere, but at the top is traditional) : @conflict u-boot-arm-<2021.10p9 otherwise OK
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:35:52 Modified files: audio/cmus : Makefile audio/cmus/patches: patch-ip_ffmpeg_c Log message: cmus: allow building with newer FFmpeg, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:34:46 Modified files: graphics/blender: Makefile distinfo Log message: update to blender-3.3.16, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:33:51 Modified files: multimedia/aom : Makefile distinfo Log message: update to aom-3.8.2, from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:33:20 Modified files: mail/cyrus-imapd: Makefile distinfo mail/cyrus-imapd/pkg: PLIST Log message: Update to cyrus-imapd-3.8.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:33:05 Modified files: devel/meson: Makefile distinfo meson.port.mk devel/meson/patches: patch-mesonbuild_build_py Log message: Update to meson-1.4.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:31:06 Modified files: www/lighttpd : Makefile distinfo Log message: update to lighttpd-1.4.75, from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:29:50 Modified files: graphics/jasper: Makefile distinfo Log message: update to jasper-4.2.1, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:29:45 Modified files: multimedia/svt-av1: Makefile distinfo Log message: update to svt-av1-2.0.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:29:40 Modified files: devel/spidermonkey115: Makefile distinfo Log message: Update to spidermonkey115-115.9.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:27:36 Modified files: sysutils/nomad : Makefile distinfo Log message: Update to nomad-1.7.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:26:40 Modified files: security/suricata: Makefile security/suricata/pkg: PLIST Log message: add various @sample to suricata's PLIST that were missed in the 7.0.2 update
Re: [update] productivity/timewarrior to 1.7.1
On 2024/03/20 09:39, Nils Reuße wrote:
> This update brings time warrior to the latest 1.7.1. It builds and runs fine
> in my arm64-VM.
: -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
\o/
> Maybe someone knows a better way how to handle this, comments are very
> welcome :)
this was enough:
do-test:
${MODCMAKE_BUILD_TARGET} -t test
thanks, committed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:20:57 Modified files: productivity/timewarrior: Makefile distinfo productivity/timewarrior/pkg: PLIST Log message: update to timewarrior-1.7.1, from Nils ReuÃe with tweaks to running tests
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:20:50 Modified files: x11/yaru : Makefile distinfo x11/yaru/pkg : PLIST Log message: Update to yaru-24.04.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:15:02 Modified files: multimedia/pipewire/pipewire: Makefile distinfo multimedia/pipewire/pipewire/patches: patch-meson_build patch-src_daemon_pipewire_conf_in patch-src_modules_module-netjack2-manager_c patch-src_modules_module-rtp-sap_c patch-src_pipewire_mem_c patch-src_pipewire_private_h multimedia/pipewire/pipewire/pkg: PLIST-main Log message: Update to pipewire-1.0.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:13:04 Modified files: x11/libgedit-gtksourceview: Makefile distinfo x11/libgedit-gtksourceview/pkg: PLIST Log message: Update to libgedit-gtksourceview-299.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 07:10:57 Modified files: audio/musique : Makefile audio/qsynth : Makefile multimedia/shotcut: Makefile net/qbittorrent: Makefile.inc net/transmission: Makefile net/wireshark : Makefile productivity/novprog: Makefile security/qdigidoc4: Makefile security/qtkeychain: Makefile security/web-eid-app: Makefile x11/qt6: qt6.port.mk x11/qt6/qttools: Makefile x11/qt6ct : Makefile x11/tipp10 : Makefile Log message: Add qt6tools as a build dependency for all qt6 ports Almost all Qt6 ports cannot be built without it, so make it as default like in Qt5. All ports that have explicitly set it have been adjusted. lgtm, OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:10:16 Modified files: x11/gnome/libcloudproviders: Makefile distinfo Log message: Update to libcloudproviders-0.3.6.
Re: sysuitls/u-boot: split off 32-bit ARM Allwinner SoCs
On 2024/03/23 09:14, Jonathan Gray wrote: > On Fri, Mar 22, 2024 at 03:56:35PM +0100, Mark Kettenis wrote: > > The diff below splits off the 32-bit ARM Allwinner SoCs and updates > > them to U-Boot 2024.01. I've tested this on a few of my armv7 boards > > and I'm pretty confident it doesn't break any of them. Splitting definitely makes sense to me. > > Theo, this has consequences for the armv7 miniroots as the "cubie" > > variant includes firmwares that move from u-boot-arm to u-boot-sunxi. > > There are a few possibilities to handle this: > > > > * You (and other folks building releases) install the new packages by hand. > > > > * We add some ports magic such that updating the u-boot-arm package > > will also install the new u-boot-sunxi package. Stuart told me how > > to do that somewhat recently. > > > > * We drop the "cubie" miniroot. > > > > I'm somewhat leaning towards the last option myself. Very few people > > own a cubieboard so it isn't really helping people. In fact I'm very > > much inclined to move armv7 to a single miniroot image in the long > > run. > > > > Thoughts? > > I agree it can go. The cubie miniroot is specifically for the > Allwinner A20 based Cubieboard 2 (changed from A10 Cubieboard in 2016). I'd be happier with last or first options, and it's sounding like last makes the most sense. It is possible to get the new package installed automatically but adds a little complexity that doesn't seem needed/useful.
Re: [update] math/libqalculate to 5.0.0
On 2024/03/22 20:16, Justin Berthault wrote: > On Fri, Mar 22, 2024 at 04:48:22PM +, Stuart Henderson wrote: > > https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs > > > > -- > > Sent from a phone, apologies for poor formatting. > > > > Thanks, > > if I read the doc clearly I have to bump major number as some functions > outputs are changed (Change handling a vectors in multiple function arguments > (of non-vector type) - return vector instead of matrix). yep, also functions were removed. committed, thanks. > > diff /usr/ports > commit - 3d38b802a2e4af485e1466d5790b916554636325 > path + /usr/ports > blob - 9a8ba2d811286f5de923d3aee75a698afd80f1d2 > file + math/libqalculate/Makefile > --- math/libqalculate/Makefile > +++ math/libqalculate/Makefile > @@ -1,11 +1,11 @@ > COMMENT =applied math library and CLI calculator > CATEGORIES = math devel > > -V = 4.9.0 > +V = 5.0.0 > DISTNAME = libqalculate-$V > HOMEPAGE = https://qalculate.github.io/ > > -SHARED_LIBS += qalculate6.1 # 42.1 > +SHARED_LIBS += qalculate7.0 # 43.0 > > # GPLv2+ > PERMIT_PACKAGE = Yes > blob - b9f6faa6fcee747a3d2b7d9624cde90f400d8aab > file + math/libqalculate/distinfo > --- math/libqalculate/distinfo > +++ math/libqalculate/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (libqalculate-4.9.0.tar.gz) = > YTDtKPf7hoi8zt5PN0m3915KAAuAgIQHlJadIdHBvw8= > -SIZE (libqalculate-4.9.0.tar.gz) = 2639589 > +SHA256 (libqalculate-5.0.0.tar.gz) = > WRWY3tvL2AEZ3gUlWYc1MAMLNRC8orB1jwiM+32vsu4= > +SIZE (libqalculate-5.0.0.tar.gz) = 2674322 > > -- > ~Justin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 07:03:43 Modified files: math/libqalculate: Makefile distinfo Log message: update to libqalculate-5.0.0, from Justin Berthault
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:03:35 Modified files: x11/gnome/gom : Makefile distinfo x11/gnome/gom/pkg: PLIST Log message: Update to gom-0.5.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 07:03:14 Modified files: x11/gnome/gucharmap: Makefile distinfo Log message: Update to gucharmap-15.1.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:57:31 Modified files: sysutils/cloud-sql-proxy: Makefile distinfo Log message: Update to cloud-sql-proxy-2.10.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:57:19 Modified files: print/epson-inkjet-printer-escpr: Makefile distinfo print/epson-inkjet-printer-escpr/pkg: PLIST Log message: Update to epson-inkjet-printer-escpr-1.8.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:53:38 Modified files: x11/gnome/libpanel: Makefile distinfo x11/gnome/libpanel/pkg: PLIST Log message: Update to libpanel-1.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:47:37 Modified files: www/libwpe : Makefile distinfo Log message: Update to libwpe-1.16.0.
Re: x11/qt6/qt6.port.mk: BUILD_DEPENDS on x11/qt6/qttools
On 2024/03/23 09:29, Rafael Sadowski wrote:
> On Sat Feb 17, 2024 at 09:08:19AM +, Stuart Henderson wrote:
> > You'll need to actually add it to BUILD_DEPENDS e.g.
> >
> > .if ${MODQT6_DEPS:L} == "yes"
> > BUILD_DEPENDS += ${MODQT6_BUILD_DEPENDS}
> > LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
> > .endif
>
> That's what I did, isn't it?
huh weird, I don't know why I didn't see that!
> > But then you'll also need to knock out the dep in qttools itself and
> > anything that qttools depends on.
>
> Good point. Please find below a complete diff. Only BUILD_DEPENDS
> changes so no bump is necessary.
lgtm, OK
> diff --git a/audio/musique/Makefile b/audio/musique/Makefile
> index 7e63efc4c67..b4a0f67a711 100644
> --- a/audio/musique/Makefile
> +++ b/audio/musique/Makefile
> @@ -17,8 +17,6 @@ EXTRACT_SUFX = .tar.bz2
> MODULES =devel/qmake \
> x11/qt6
>
> -BUILD_DEPENDS = x11/qt6/qttools
> -
> LIB_DEPENDS =audio/taglib \
> multimedia/mpv \
> x11/qt6/qtdeclarative
> diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
> index 00766a9adf5..bfa38cacf86 100644
> --- a/audio/qsynth/Makefile
> +++ b/audio/qsynth/Makefile
> @@ -20,7 +20,6 @@ WANTLIB += Qt6Widgets c fluidsynth m
> MODULES =x11/qt6 \
> devel/cmake
>
> -BUILD_DEPENDS += x11/qt6/qttools
> LIB_DEPENDS += audio/fluidsynth>=2.3.2 \
> x11/qt6/qtsvg
>
> diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
> index 0ce5b519583..de63df90f95 100644
> --- a/multimedia/shotcut/Makefile
> +++ b/multimedia/shotcut/Makefile
> @@ -24,7 +24,6 @@ MODULES = devel/cmake \
>
> BUILD_DEPENDS = audio/jack \
> devel/sdl2 \
> - x11/qt6/qttools \
> x11/qt6/qtwebsockets
>
> RUN_DEPENDS =audio/jack \
> diff --git a/net/qbittorrent/Makefile.inc b/net/qbittorrent/Makefile.inc
> index 67b3097f932..b26ebf2532e 100644
> --- a/net/qbittorrent/Makefile.inc
> +++ b/net/qbittorrent/Makefile.inc
> @@ -20,8 +20,7 @@ SITES ?=${SITE_SOURCEFORGE:=qbittorrent/}
> MODULES += devel/cmake \
> x11/qt6
>
> -BUILD_DEPENDS += devel/boost \
> - x11/qt6/qttools
> +BUILD_DEPENDS += devel/boost
>
> LIB_DEPENDS += net/libtorrent-rasterbar>=2
>
> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index b2b5f3ff3dd..d1996e02adc 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -84,7 +84,6 @@ CONFIGURE_ARGS += -DENABLE_GTK=OFF
> .if ${BUILD_PACKAGES:M-qt}
> MODULES += x11/qt6
> # XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
> -BUILD_DEPENDS += x11/qt6/qttools
> CONFIGURE_ARGS +=-DENABLE_QT=ON \
> -DUSE_QT_VERSION=6
> .else
> diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
> index ffb31fbb344..366ec190800 100644
> --- a/net/wireshark/Makefile
> +++ b/net/wireshark/Makefile
> @@ -71,8 +71,7 @@ BUILD_DEPENDS +=devel/bison \
> textproc/libxml \
> textproc/libxslt \
> devel/xdg-utils \
> - textproc/asciidoctor \
> - x11/qt6/qttools
> + textproc/asciidoctor
> RUN_DEPENDS =devel/desktop-file-utils \
> devel/xdg-utils \
> misc/shared-mime-info \
> diff --git a/productivity/novprog/Makefile b/productivity/novprog/Makefile
> index b6a94476ac3..c1f818ed671 100644
> --- a/productivity/novprog/Makefile
> +++ b/productivity/novprog/Makefile
> @@ -22,8 +22,6 @@ SITES = https://gottcode.org/novprog/
> MODULES =devel/cmake \
> x11/qt6
>
> -BUILD_DEPENDS = x11/qt6/qttools
> -
> RUN_DEPENDS =devel/desktop-file-utils \
> x11/gtk+4,-guic
>
> diff --git a/security/qdigidoc4/Makefile b/security/qdigidoc4/Makefile
> index 8283d35061b..fb21e531b12 100644
> --- a/security/qdigidoc4/Makefile
> +++ b/security/qdigidoc4/Makefile
> @@ -38,8 +38,7 @@ WANTLIB += c crypto digidocpp flatbuffers lber
> ldap m pcsclite ssl z
> MODULES =devel/cmake \
> x11/qt6
>
> -BUILD_DEPENDS = devel/gettext,-tools \
> - x11/qt6/qttools
> +BUILD_DEPENDS = devel/gettext,-tools
>
> LIB_DEPENDS =devel/flatbuffers \
> databases/openldap,-main \
> diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
> index d20b6feffdf..790f30b6752 100644
> --- a/security/qtkeychain/Makefile
> +++ b/security/qtkeychain/Makefile
> @@ -34,7 +34,6 @@ FULLPKGNAME = qtkeychain-qt6-${GH_TAGNAME}
> MODULES += lang/clang x11/qt6
> MODCLANG_LANGS +=c++
> WANTLIB += Qt6Core
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 06:35:27 Modified files: lang/python: Makefile.inc lang/python/3.10: Makefile lang/python/3.10/pkg: PLIST-main lang/python/3.11: Makefile Added files: lang/python/3.10/files: EXTERNALLY-MANAGED lang/python/3.11/files: EXTERNALLY-MANAGED Log message: Include an EXTERNALLY-MANAGED file in the Python packages, which triggers a warning if users attempt to install modules system-wide outside the ports/packages system. ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:35:07 Modified files: x11/gtk3mm : Makefile distinfo Log message: Update to gtk3mm-3.24.9.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:35:00 Modified files: x11/gnome/user-docs: Makefile distinfo x11/gnome/user-docs/pkg: PLIST Log message: Update to gnome-user-docs-45.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 06:32:22 Modified files: lang/python/3.10: Makefile lang/python/3.10/files: CHANGES.OpenBSD lang/python/3.11: Makefile lang/python/3.11/files: CHANGES.OpenBSD Added files: lang/python/3.10/patches: patch-Lib_ctypes_util_py lang/python/3.11/patches: patch-Lib_ctypes_util_py Log message: Modify Python ctypes' find_library to pass "libc.so" to dlopen() rather than attempting to resolve a version number by parsing ldconfig -r output, which results in loading an incorrect version in some cases. ok kmos@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:26:28 Modified files: x11/gnome/usage: Makefile distinfo x11/gnome/usage/pkg: PLIST Log message: Update to gnome-usage-45.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:24:11 Modified files: x11/gnome/tweaks: Makefile distinfo Log message: Update to gnome-tweaks-45.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:23:05 Modified files: x11/gnome/online-accounts: Makefile distinfo Log message: Update to gnome-online-accounts-3.48.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:22:09 Modified files: meta/gnome : Makefile Log message: Welcome GNOME 45.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:21:48 Modified files: x11/gnome/shell: Makefile distinfo Log message: Update to gnome-shell-45.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:18:38 Modified files: net/telepathy/folks: Makefile distinfo Log message: Update to folks-0.15.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:12:38 Modified files: x11/gnome/at-spi2-core: Makefile distinfo x11/gnome/at-spi2-core/pkg: PLIST Log message: Update to at-spi2-core-2.50.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:11:17 Modified files: x11/gnome/mutter: Makefile distinfo Log message: Update to mutter-45.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:10:22 Modified files: x11/gnome/librsvg: Makefile distinfo distinfo.old Log message: Update to librsvg-2.57.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:08:04 Modified files: security/gnutls: Makefile Log message: Add comment.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 06:06:37 Modified files: sysutils/kubectl: Makefile distinfo Log message: Update kubectl-1.29.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:03:25 Modified files: x11/gnome/libgweather4: Makefile distinfo x11/gnome/libgweather4/patches: patch-libgweather_weather-metar_c Log message: Update to libgweather4-4.4.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 06:00:05 Modified files: x11/gnome/ghex : Makefile distinfo Log message: Update to ghex-45.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:57:47 Modified files: x11/gnome/eog : Makefile distinfo Log message: Update to eog-45.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:54:36 Modified files: textproc/libxml: Makefile distinfo Log message: Update to libxml-2.12.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:52:44 Modified files: textproc/enchant2: Makefile distinfo Log message: Update to enchant2-2.6.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:52:05 Modified files: sysutils/terragrunt: Makefile distinfo modules.inc Log message: Update to terragrunt-0.55.19.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:48:54 Modified files: sysutils/terraform: Makefile distinfo modules.inc Log message: Update to terraform-1.7.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:46:38 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-469.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:29:53 Modified files: sysutils/govmomi: Makefile distinfo Log message: Update to govc-0.36.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:28:26 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.76.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:27:20 Modified files: sysutils/consul-template: Makefile distinfo Log message: Update to consul-template-0.37.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:27:09 Modified files: security/gnutls: Makefile distinfo security/gnutls/pkg: PLIST Added files: security/gnutls/patches: patch-lib_compress_c Log message: SECURITY update to gnutls-3.8.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:22:13 Modified files: productivity/libphonenumber: Makefile distinfo Log message: Update to libphonenumber-8.13.32.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:08:30 Modified files: print/libpaper : Makefile distinfo print/libpaper/pkg: PLIST Log message: Update to libpaper-2.2.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:07:46 Modified files: print/a2ps : Makefile distinfo print/a2ps/pkg : PLIST Removed files: print/a2ps/patches: patch-src_a2ps-lpr-wrapper Log message: Update to a2ps-4.15.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:04:50 Modified files: net/py-s3transfer: Makefile distinfo Log message: Update to py3-s3transfer-0.10.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:02:57 Modified files: multimedia/py-chromecast: Makefile distinfo Log message: Update to py3-chromecast-14.0.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:02:40 Modified files: lang/vala : Makefile distinfo Log message: Update to vala-0.56.16.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 05:01:40 Modified files: graphics/gthumb: Makefile distinfo Log message: Update to gthumb-3.12.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:58:03 Modified files: net/bro: Makefile Log message: Ignore 6.2.0 release.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:52:40 Modified files: devel/libpeas2 : Makefile distinfo Log message: Update to libpeas2-2.0.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:52:28 Modified files: devel/harfbuzz : Makefile distinfo Log message: Update to harfbuzz-8.3.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:48:59 Modified files: devel/glib2mm : Makefile distinfo Log message: Update to glib2mm-2.66.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:48:48 Modified files: astro/calcmysky: Makefile distinfo Log message: Update to calcmysky-0.3.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:37:38 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.32.69.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:37:16 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.34.69.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/23 04:37:07 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.34.69.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 04:24:57 Modified files: net/arouteserver: Makefile distinfo Log message: update to arouteserver-1.21.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/23 04:24:52 Modified files: mail/dcc : Makefile distinfo mail/dcc/pkg : PLIST Log message: update to dcc-2.3.169
Re: UPDATE: net/nextcloudclient-3.12.2
On Thu Mar 21, 2024 at 10:21:50AM -0400, Adriano Barbosa wrote:
> Hi.
> Update for net/nextcloudclient v3.12.2
> Changelog:
> https://github.com/nextcloud/desktop/releases/v3.12.2
>
> Obrigado!
> --
> Adriano
>
Committed, Obrigado
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
> retrieving revision 1.59
> diff -u -p -r1.59 Makefile
> --- Makefile 8 Mar 2024 07:48:02 - 1.59
> +++ Makefile 21 Mar 2024 14:18:15 -
> @@ -2,7 +2,7 @@ USE_WXNEEDED =Yes
>
> COMMENT =desktop sync client for Nextcloud
>
> -V = 3.12.1
> +V = 3.12.2
> DISTNAME = nextcloudclient-${V}
>
> GH_ACCOUNT = nextcloud
> @@ -13,8 +13,8 @@ CATEGORIES =net
>
> HOMEPAGE = https://nextcloud.com
>
> -SHARED_LIBS += nextcloudsync 17.0 # 3.12.1
> -SHARED_LIBS += nextcloud_csync 8.1 # 3.12.1
> +SHARED_LIBS += nextcloudsync 18.0 # 3.12.2
> +SHARED_LIBS += nextcloud_csync 8.2 # 3.12.2
> SHARED_LIBS += nextcloudsync_vfs_suffix 2.0 # 3.10.2
>
> MAINTAINER = Adriano Barbosa
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
> retrieving revision 1.48
> diff -u -p -r1.48 distinfo
> --- distinfo 8 Mar 2024 07:48:02 - 1.48
> +++ distinfo 21 Mar 2024 14:18:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloudclient-3.12.1.tar.gz) =
> oeEXuh6slnxXx7ZsdvHnIAOJZ06eyf/fFhvFJBhISPY=
> -SIZE (nextcloudclient-3.12.1.tar.gz) = 13640266
> +SHA256 (nextcloudclient-3.12.2.tar.gz) =
> 9XbLcJ2qfctZY7zuJPLTFUKp9Jo0LtukBiWk3oBslb8=
> +SIZE (nextcloudclient-3.12.2.tar.gz) = 13645095
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/net/nextcloudclient/patches/patch-CMakeLists_txt,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 24 Feb 2024 10:28:33 - 1.13
> +++ patches/patch-CMakeLists_txt 21 Mar 2024 14:18:15 -
> @@ -1,7 +1,7 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -59,7 +59,7 @@ if (NOT DEFINED PACKAGE)
> +@@ -68,7 +68,7 @@ if (NOT DEFINED PACKAGE)
> set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
> endif()
>
> @@ -10,7 +10,7 @@ Index: CMakeLists.txt
>
> include(ECMCoverageOption)
>
> -@@ -302,4 +302,4 @@ elseif(BUILD_CLIENT)
> +@@ -311,4 +311,4 @@ elseif(BUILD_CLIENT)
> configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
> endif()
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2024/03/23 03:23:05 Modified files: net/nextcloudclient: Makefile distinfo net/nextcloudclient/patches: patch-CMakeLists_txt Log message: Update nextcloudclient to 3.12.2 Changelog: https://github.com/nextcloud/desktop/releases/v3.12.2 Update diff as usual from Adriano (maintainer) Obrigado
Re: [new] gurk-rs - a cli signal client
Rafael Sadowski wrote (2024-03-23 10:02 CET): > On Fri Feb 10, 2023 at 07:28:52PM +0100, Stefan Hagen wrote: > > What is the status here? I see 0.4.2 upstream. 0.4.2 is in openbsd-wip, feel free to try. It's buggy as hell and crashes frequently. I'll resubmit it to ports@ once it works better.
Re: [new] gurk-rs - a cli signal client
On Fri Feb 10, 2023 at 07:28:52PM +0100, Stefan Hagen wrote: > Hello, > > here is a command line signal client. It's lacking a lot of features, > but basic text send/receive functionality is there. > > The contact sync doesn't work for me. But I can see and message in > conversations initiated after gurk-rs is linked. > > I hope the situation will improve. But this client is much better than > having no client at all. > > Some hints: > - this is rust, so build with "MAKE_JOBS=8 make", or something. > - F1 shows the key bindings and they're not configurable > - gurk -v(vv) starts verbose mode writes to gurk.log > > I have OK kn@ already. > > One more? > > Best regards, > Stefan What is the status here? I see 0.4.2 upstream.
Re: x11/qt6/qt6.port.mk: BUILD_DEPENDS on x11/qt6/qttools
On Sat Feb 17, 2024 at 09:08:19AM +, Stuart Henderson wrote:
> You'll need to actually add it to BUILD_DEPENDS e.g.
>
> .if ${MODQT6_DEPS:L} == "yes"
> BUILD_DEPENDS += ${MODQT6_BUILD_DEPENDS}
> LIB_DEPENDS += ${MODQT6_LIB_DEPENDS}
> .endif
That's what I did, isn't it?
>
> But then you'll also need to knock out the dep in qttools itself and
> anything that qttools depends on.
Good point. Please find below a complete diff. Only BUILD_DEPENDS
changes so no bump is necessary.
diff --git a/audio/musique/Makefile b/audio/musique/Makefile
index 7e63efc4c67..b4a0f67a711 100644
--- a/audio/musique/Makefile
+++ b/audio/musique/Makefile
@@ -17,8 +17,6 @@ EXTRACT_SUFX =.tar.bz2
MODULES = devel/qmake \
x11/qt6
-BUILD_DEPENDS =x11/qt6/qttools
-
LIB_DEPENDS = audio/taglib \
multimedia/mpv \
x11/qt6/qtdeclarative
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 00766a9adf5..bfa38cacf86 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -20,7 +20,6 @@ WANTLIB += Qt6Widgets c fluidsynth m
MODULES = x11/qt6 \
devel/cmake
-BUILD_DEPENDS += x11/qt6/qttools
LIB_DEPENDS += audio/fluidsynth>=2.3.2 \
x11/qt6/qtsvg
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 0ce5b519583..de63df90f95 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -24,7 +24,6 @@ MODULES = devel/cmake \
BUILD_DEPENDS =audio/jack \
devel/sdl2 \
- x11/qt6/qttools \
x11/qt6/qtwebsockets
RUN_DEPENDS = audio/jack \
diff --git a/net/qbittorrent/Makefile.inc b/net/qbittorrent/Makefile.inc
index 67b3097f932..b26ebf2532e 100644
--- a/net/qbittorrent/Makefile.inc
+++ b/net/qbittorrent/Makefile.inc
@@ -20,8 +20,7 @@ SITES ?= ${SITE_SOURCEFORGE:=qbittorrent/}
MODULES += devel/cmake \
x11/qt6
-BUILD_DEPENDS += devel/boost \
- x11/qt6/qttools
+BUILD_DEPENDS += devel/boost
LIB_DEPENDS += net/libtorrent-rasterbar>=2
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index b2b5f3ff3dd..d1996e02adc 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -84,7 +84,6 @@ CONFIGURE_ARGS += -DENABLE_GTK=OFF
.if ${BUILD_PACKAGES:M-qt}
MODULES += x11/qt6
# XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
-BUILD_DEPENDS += x11/qt6/qttools
CONFIGURE_ARGS += -DENABLE_QT=ON \
-DUSE_QT_VERSION=6
.else
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index ffb31fbb344..366ec190800 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -71,8 +71,7 @@ BUILD_DEPENDS += devel/bison \
textproc/libxml \
textproc/libxslt \
devel/xdg-utils \
- textproc/asciidoctor \
- x11/qt6/qttools
+ textproc/asciidoctor
RUN_DEPENDS = devel/desktop-file-utils \
devel/xdg-utils \
misc/shared-mime-info \
diff --git a/productivity/novprog/Makefile b/productivity/novprog/Makefile
index b6a94476ac3..c1f818ed671 100644
--- a/productivity/novprog/Makefile
+++ b/productivity/novprog/Makefile
@@ -22,8 +22,6 @@ SITES = https://gottcode.org/novprog/
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS =x11/qt6/qttools
-
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
diff --git a/security/qdigidoc4/Makefile b/security/qdigidoc4/Makefile
index 8283d35061b..fb21e531b12 100644
--- a/security/qdigidoc4/Makefile
+++ b/security/qdigidoc4/Makefile
@@ -38,8 +38,7 @@ WANTLIB +=c crypto digidocpp flatbuffers lber
ldap m pcsclite ssl z
MODULES = devel/cmake \
x11/qt6
-BUILD_DEPENDS =devel/gettext,-tools \
- x11/qt6/qttools
+BUILD_DEPENDS =devel/gettext,-tools
LIB_DEPENDS = devel/flatbuffers \
databases/openldap,-main \
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index d20b6feffdf..790f30b6752 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -34,7 +34,6 @@ FULLPKGNAME = qtkeychain-qt6-${GH_TAGNAME}
MODULES += lang/clang x11/qt6
MODCLANG_LANGS += c++
WANTLIB += Qt6Core Qt6DBus
-BUILD_DEPENDS += x11/qt6/qttools
LIB_DEPENDS += ${MODCLANG_LIB_DEPENDS}
LIBNAME = Qt6Keychain
QT = qt6
diff --git a/security/web-eid-app/Makefile b/security/web-eid-app/Makefile
index 52d87835a61..ccac3132ae0 100644
---
UPDATE: QEMU 8.2.2
Here is an update to QEMU 8.2.2.
Changelog
https://marc.info/?l=qemu-devel=170957702716755=2
Index: Makefile
===
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.237
diff -u -p -u -p -r1.237 Makefile
--- Makefile5 Mar 2024 20:23:10 - 1.237
+++ Makefile19 Mar 2024 18:44:06 -
@@ -6,7 +6,7 @@ USE_NOBTCFI=Yes
COMMENT-main= multi system emulator
COMMENT-ga=QEMU guest agent
-VERSION= 8.2.1
+VERSION= 8.2.2
DISTNAME= qemu-${VERSION}
CATEGORIES=emulators
SITES= https://download.qemu.org/
Index: distinfo
===
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 distinfo
--- distinfo26 Feb 2024 13:30:18 - 1.71
+++ distinfo19 Mar 2024 18:44:06 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-8.2.1.tar.xz) = hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4=
-SIZE (qemu-8.2.1.tar.xz) = 129848448
+SHA256 (qemu-8.2.2.tar.xz) = hHNGwbgsGlSyw49u29hVSe3rF0MLfU09oSYg4pYrxPM=
+SIZE (qemu-8.2.2.tar.xz) = 129398020
UPDATE: minizip 4.0.5
Here is an update to minizip-ng 4.0.5.
4.0.5
What's Changed
- Add empty directories to zip file. #756
- Use hexadecimal prefix for MZ_VERSION_BUILD. #758
- Fix bz2 library name by @rezso in #761
- Use correct version needed to extract for BZIP2. #763
- Remove left over signing code from v3.
Index: Makefile
===
RCS file: /home/cvs/ports/archivers/minizip/Makefile,v
diff -u -p -u -p -r1.11 Makefile
--- Makefile26 Jan 2024 08:58:34 - 1.11
+++ Makefile11 Mar 2024 07:51:00 -
@@ -2,11 +2,11 @@ COMMENT = zip manipulation library
GH_ACCOUNT = zlib-ng
GH_PROJECT = minizip-ng
-GH_TAGNAME = 4.0.4
+GH_TAGNAME = 4.0.5
PKGNAME = minizip-${GH_TAGNAME}
-SHARED_LIBS += minizip 2.0 # 4
+SHARED_LIBS += minizip 3.0 # 4
CATEGORIES = archivers
Index: distinfo
===
RCS file: /home/cvs/ports/archivers/minizip/distinfo,v
diff -u -p -u -p -r1.7 distinfo
--- distinfo26 Jan 2024 08:58:34 - 1.7
+++ distinfo11 Mar 2024 07:47:33 -
@@ -1,2 +1,2 @@
-SHA256 (minizip-ng-4.0.4.tar.gz) = lVgA/jn52DD8uE5gdGlS9qSOQQk+x6IzxjrWEbX8/p8=
-SIZE (minizip-ng-4.0.4.tar.gz) = 770202
+SHA256 (minizip-ng-4.0.5.tar.gz) = m7Y2R0uKQmkoDTKsp95FAfXCTMZCybQiW07Xsyf07nM=
+SIZE (minizip-ng-4.0.5.tar.gz) = 770078
