January 2022 - crux-commits

ports/opt (3.7): libxml2: updated to use cmake
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 0611838e18c3bd07cc304489784b1b29122513e3 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Jan 10 15:19:23 2022 +0100 libxml2: updated to use cmake diff --git a/libxml2/.footprint b/libxml2/.footprint index e39766ad8..d338e8155 100644 --- a/libxml2/.footprint +++ b/libxml2/.footprint @@ -55,22 +55,25 @@ drwxr-xr-x root/root usr/include/libxml2/libxml/ -rw-r--r-- root/root usr/include/libxml2/libxml/xpointer.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ -drwxr-xr-x root/root usr/lib/cmake/libxml2/ --rw-r--r-- root/root usr/lib/cmake/libxml2/libxml2-config.cmake --rw-r--r-- root/root usr/lib/libxml2.a --rwxr-xr-x root/root usr/lib/libxml2.la -lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.9.12 -lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.9.12 --rwxr-xr-x root/root usr/lib/libxml2.so.2.9.12 +drwxr-xr-x root/root usr/lib/cmake/libxml2-2.9.10/ +-rw-r--r-- root/root usr/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake +-rw-r--r-- root/root usr/lib/cmake/libxml2-2.9.10/libxml2-config.cmake +-rw-r--r-- root/root usr/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake +-rw-r--r-- root/root usr/lib/cmake/libxml2-2.9.10/libxml2-export.cmake +lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.9.10 +-rwxr-xr-x root/root usr/lib/libxml2.so.2.9.10 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc +drwxr-xr-x root/root usr/lib/python3.10/ +drwxr-xr-x root/root usr/lib/python3.10/site-packages/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/drv_libxml2.py +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libxml2.py +lrwxrwxrwx root/root usr/lib/python3.10/site-packages/libxml2mod.so -> libxml2mod.so.2.9.10 +-rwxr-xr-x root/root usr/lib/python3.10/site-packages/libxml2mod.so.2.9.10 -rw-r--r-- root/root usr/lib/xml2Conf.sh drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/aclocal/ --rw-r--r-- root/root usr/share/aclocal/libxml.m4 drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/xml2-config.1.gz -rw-r--r-- root/root usr/share/man/man1/xmlcatalog.1.gz -rw-r--r-- root/root usr/share/man/man1/xmllint.1.gz drwxr-xr-x root/root usr/share/man/man3/ diff --git a/libxml2/.signature b/libxml2/.signature index 0c78bfabd..03eae5e83 100644 --- a/libxml2/.signature +++ b/libxml2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RJc+K3Rrt9HLdWsyab34aZCc7uoEhirNvZ89eDTsnXWNL9B+puCgNxBUy3iO51BPVBYXKZuW+CkNKJEzMI7wwc= -SHA256 (Pkgfile) = 4421efa583af34c304d2e214eb925d6bf2078a05dddae24d039c63cc2a08187d -SHA256 (.footprint) = 29ccabd581599135786b7565c96ecd8dc3da849900dbb3bff545f8b825d21d4f +RWSE3ohX2g5d/cU80DCyxHtdsJtK4PNuJo29LXPp/qEHKw0YuNNIRV04OuFut+Yo22pXzPT/TfCzxeUb0PRb/Cn1dfe77g6ZVwk= +SHA256 (Pkgfile) = 31762a0701178add5b45b5a1496adf3653639441cc575a44cc745ba6861179f7 +SHA256 (.footprint) = c91c8d956a6b202273e18020e464c33b7ee0359e9dabfce65bf14b963d09fcf1 SHA256 (libxml2-v2.9.12.tar.bz2) = bb5ea084617e2bc706cd1f0c9b36328950c9d802a16ff52795e5f13bae900ca8 diff --git a/libxml2/Pkgfile b/libxml2/Pkgfile index 27c08580a..c0df0d324 100644 --- a/libxml2/Pkgfile +++ b/libxml2/Pkgfile @@ -5,14 +5,17 @@ name=libxml2 version=2.9.12 -release=1 +release=2 source=(https://gitlab.gnome.org/GNOME/libxml2/-/archive/v$version/libxml2-… build() { - cd $name-v$version - autoreconf -vfi - ./configure --prefix=/usr --without-python - make - make DESTDIR=$PKG install - rm -r $PKG/usr/share/{doc,gtk-doc} + cmake -S $name-v$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -Wno-dev + cmake --build build + DESTDIR=$PKG cmake --install build + rm -r $PKG/usr/share/doc }

1 0

ports/opt (3.7): libedit: moved to core
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 1c8640a39d44c1f7793dd0c252eb0f586162fcb8 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Jan 10 15:18:17 2022 +0100 libedit: moved to core diff --git a/libedit/.footprint b/libedit/.footprint deleted file mode 100644 index 2ee4003d4..000000000 --- a/libedit/.footprint +++ /dev/null @@ -1,61 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/editline/ --rw-r--r-- root/root usr/include/editline/readline.h --rw-r--r-- root/root usr/include/histedit.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libedit.a --rwxr-xr-x root/root usr/lib/libedit.la -lrwxrwxrwx root/root usr/lib/libedit.so -> libedit.so.0.0.68 -lrwxrwxrwx root/root usr/lib/libedit.so.0 -> libedit.so.0.0.68 --rwxr-xr-x root/root usr/lib/libedit.so.0.0.68 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libedit.pc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man3/ --rw-r--r-- root/root usr/share/man/man3/editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_deletestr.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_end.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_get.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_getc.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_gets.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_init.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_init_fd.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_insertstr.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_line.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_parse.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_push.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_reset.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_resize.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_set.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_source.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wdeletestr.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wget.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wgetc.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wgets.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_winsertstr.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wline.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wparse.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wpush.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/el_wset.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/history_end.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/history_init.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/history_w.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/history_wend.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/history_winit.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_end.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_init.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_line.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_reset.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_str.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_wend.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_winit.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_wline.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_wreset.3.gz -> editline.3.gz -lrwxrwxrwx root/root usr/share/man/man3/tok_wstr.3.gz -> editline.3.gz -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/editrc.5.gz -drwxr-xr-x root/root usr/share/man/man7/ --rw-r--r-- root/root usr/share/man/man7/editline.7.gz diff --git a/libedit/.signature b/libedit/.signature deleted file mode 100644 index 1d957a22e..000000000 --- a/libedit/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YRHvjn/Xl73q+TLewRtMPAUdLy2g890yVYDZgQEjEQhS4KKHMnfKgboN+zoHfFIVbpgSFs1vdo1nS8VBWG8jgg= -SHA256 (Pkgfile) = 6623fb54d60fcbbbac60115c6b9b91d24f13276bfb26c4f61283b98fc774a17b -SHA256 (.footprint) = 567601600f862cba359197d9104e976032e5fe5c44dc890f55420cdf8de64cfa -SHA256 (libedit-20210910-3.1.tar.gz) = 6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5 diff --git a/libedit/Pkgfile b/libedit/Pkgfile deleted file mode 100644 index ee87c2cb8..000000000 --- a/libedit/Pkgfile +++ /dev/null @@ -1,20 +0,0 @@ -# Description: Command line editor library providing generic line editing, history, and tokenization functions -# URL: https://thrysoee.dk/editline/ -# Maintainer: Danny Rawlins, crux at romster dot me - -name=libedit -version=20210910_3.1 -release=1 -source=(https://thrysoee.dk/editline/$name-${version/_/-}.tar.gz) - -build() { - cd $name-${version/_/-} - - ./configure --prefix=/usr - - make - make DESTDIR=$PKG install - - rm $PKG/usr/share/man/man3/history.3 # conflicts with readline - ln -s editline.3 $PKG/usr/share/man/man3/el.3 -}

1 0

ports/opt (3.7): libuv: moved to core
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit af25998acbe22f1d8d8540701ec4941c2c55780f Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 9 03:21:21 2022 +0100 libuv: moved to core diff --git a/libuv/.footprint b/libuv/.footprint deleted file mode 100644 index 8e9cd216e..000000000 --- a/libuv/.footprint +++ /dev/null @@ -1,17 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/uv.h -drwxr-xr-x root/root usr/include/uv/ --rw-r--r-- root/root usr/include/uv/errno.h --rw-r--r-- root/root usr/include/uv/linux.h --rw-r--r-- root/root usr/include/uv/threadpool.h --rw-r--r-- root/root usr/include/uv/unix.h --rw-r--r-- root/root usr/include/uv/version.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libuv.a --rwxr-xr-x root/root usr/lib/libuv.la -lrwxrwxrwx root/root usr/lib/libuv.so -> libuv.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libuv.so.1 -> libuv.so.1.0.0 --rwxr-xr-x root/root usr/lib/libuv.so.1.0.0 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libuv.pc diff --git a/libuv/.signature b/libuv/.signature deleted file mode 100644 index 89c4918a6..000000000 --- a/libuv/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dHcTnhjVfYrTX+9XM/0efBPb6I+rwImQoNx2evgT7+MqqB0+FmprKje2RN13Wk9fZ9ZnxjFkb1q3rE5+l1ixwU= -SHA256 (Pkgfile) = 827b2e3919f453521129997503b2e1adcdb9f5585886e9aed75213472d4a8e85 -SHA256 (.footprint) = 78e764acb0a80912745e882ad9b3319a7225e9a8cc4b01863985d7d9487ab4c9 -SHA256 (libuv-v1.43.0.tar.gz) = 90d72bb7ae18de2519d0cac70eb89c319351146b90cd3f91303a492707e693a4 diff --git a/libuv/Pkgfile b/libuv/Pkgfile deleted file mode 100644 index b988b60fa..000000000 --- a/libuv/Pkgfile +++ /dev/null @@ -1,16 +0,0 @@ -# Description: Support library with a focus on asynchronous I/O -# URL: https://libuv.org/ -# Maintainer: CRUX System Team, core-ports at crux dot nu - -name=libuv -version=1.43.0 -release=1 -source=(https://dist.libuv.org/dist/v$version/$name-v$version.tar.gz) - -build() { - cd $name-v$version - ./autogen.sh - ./configure --prefix=/usr - make - make DESTDIR=$PKG install -}

1 0

ports/opt (3.7): lzlib: moved to core
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit fb33b1705dcdc30f491957f7f95bdfb4ebb9d8e1 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Jan 9 03:21:09 2022 +0100 lzlib: moved to core diff --git a/lzlib/.footprint b/lzlib/.footprint deleted file mode 100644 index 699fbc09d..000000000 --- a/lzlib/.footprint +++ /dev/null @@ -1,6 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/lzlib.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/liblz.a -drwxr-xr-x root/root usr/share/ diff --git a/lzlib/.signature b/lzlib/.signature deleted file mode 100644 index 34087c984..000000000 --- a/lzlib/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Sl3HkmZs1k6L2yvhupInJE2GNP0vNy9WsUPMUFq74+Zp0slUiwH09bsjcyt8DSdmyIQ3Yb8JlCYxsJpN4v9VAQ= -SHA256 (Pkgfile) = 20d5aa378652ad9604e6ae1279b5b1a4580773e2f15ea5464a21125f37376fed -SHA256 (.footprint) = 719c4e9b014844782ecbec87d62101a8710a2bc057cfc9f666d9b26bdee6df2d -SHA256 (lzlib-1.12.tar.gz) = 8e5d84242eb52cf1dcc98e58bd9ba8ef1aefa501431abdd0273a22bf4ce337b1 diff --git a/lzlib/Pkgfile b/lzlib/Pkgfile deleted file mode 100644 index 6e3941ef4..000000000 --- a/lzlib/Pkgfile +++ /dev/null @@ -1,16 +0,0 @@ -# Description: Data compression library -# URL: http://lzip.nongnu.org/lzlib.html -# Maintainer: Tim Biermann, tbier at posteo dot de - -name=lzlib -version=1.12 -release=1 -source=(http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/usr CFLAGS="$CFLAGS" - make - make DESTDIR=$PKG install - rm -r $PKG/usr/share/info -}

1 0

ports/opt (3.7): python3-packaging: removed old patch
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit f8378a3d4a3988b0d4465d442a0d9ddecebc5df2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 8 15:39:22 2022 +0100 python3-packaging: removed old patch diff --git a/python3-packaging/487.patch b/python3-packaging/487.patch deleted file mode 100644 index 372fed555..000000000 --- a/python3-packaging/487.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7547b3eb11c1df040b04d72fb27ac5156b2f2c42 Mon Sep 17 00:00:00 2001 -From: Rebecca Turner <rturner(a)starry.com> -Date: Tue, 9 Nov 2021 11:48:44 -0500 -Subject: [PATCH] Fix marker parsing with pyparsing 3.0.5 - -Closes #486 - -Context in pyparsing: https://github.com/pyparsing/pyparsing/issues/110#issuecomment-963167729 ---- - packaging/requirements.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/packaging/requirements.py b/packaging/requirements.py -index 53f9a3aa..d7d7dd42 100644 ---- a/packaging/requirements.py -+++ b/packaging/requirements.py -@@ -67,9 +67,7 @@ class InvalidRequirement(ValueError): - VERSION_SPEC.setParseAction(lambda s, l, t: t[1]) - - MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker") --MARKER_EXPR.setParseAction( -- lambda s, l, t: Marker(s[t._original_start : t._original_end]) --) -+MARKER_EXPR.addParseAction(lambda s, l, t: Marker(t[0])) - MARKER_SEPARATOR = SEMICOLON - MARKER = MARKER_SEPARATOR + MARKER_EXPR -

1 0

ports/opt (3.7): pulseaudio: removed old patch
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 4e4e0ea6f8cda6809aef3612a4a857522e591f3c Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 8 15:36:57 2022 +0100 pulseaudio: removed old patch diff --git a/pulseaudio/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch b/pulseaudio/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch deleted file mode 100644 index a6554178d..000000000 --- a/pulseaudio/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 58052e0e04ee1b5fdb1027ebc19717e7766825ec Mon Sep 17 00:00:00 2001 -From: "Igor V. Kovalenko" <igor.v.kovalenko(a)gmail.com> -Date: Mon, 21 Jun 2021 02:32:41 +0300 -Subject: [PATCH] build-sys: meson: require GIO dependency for RTP-GStreamer - -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/584> ---- - meson.build | 6 ++++-- - src/modules/meson.build | 2 +- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index fdd8bf655..61660b981 100644 ---- a/meson.build -+++ b/meson.build -@@ -614,8 +614,9 @@ if dbus_dep.found() - cdata.set('HAVE_DBUS', 1) - endif - --gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings')) --if gio_dep.found() -+gio_dep = dependency('gio-2.0', version : '>= 2.26.0') -+if get_option('gsettings').enabled() -+ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)') - cdata.set('HAVE_GSETTINGS', 1) - endif - -@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer')) - - have_gstreamer = false - if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found() -+ assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)') - have_gstreamer = true - endif - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 9c498a4e1..e7db573b6 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -161,7 +161,7 @@ if dbus_dep.found() and fftw_dep.found() - ] - endif - --if gio_dep.found() -+if get_option('gsettings').enabled() and gio_dep.found() - subdir('gsettings') - all_modules += [ - [ 'module-gsettings', --- -GitLab - diff --git a/pulseaudio/pulseaudio-14.99.2-require-bluez-dependency.patch b/pulseaudio/pulseaudio-14.99.2-require-bluez-dependency.patch deleted file mode 100644 index 5983a05ea..000000000 --- a/pulseaudio/pulseaudio-14.99.2-require-bluez-dependency.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c817dfb5a438055c98449a4a2f34eb4ec341ccde Mon Sep 17 00:00:00 2001 -From: "Igor V. Kovalenko" <igor.v.kovalenko(a)gmail.com> -Date: Fri, 18 Jun 2021 20:48:12 +0300 -Subject: [PATCH] build-sys: meson: Require bluez dependency if bluez5 feature - is enabled - -Build breaks if bluez5 and bluez5-native-headset are both enabled -but bluez headers are not available. - -Fix this by changing `bluez5` to Meson feature requiring `bluez` dependency. - -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/583> ---- - meson.build | 10 ++++++---- - meson_options.txt | 2 +- - src/modules/bluetooth/meson.build | 2 +- - src/modules/meson.build | 2 +- - 4 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index 61660b981..92ceef706 100644 ---- a/meson.build -+++ b/meson.build -@@ -706,7 +706,9 @@ endif - - sbc_dep = dependency('sbc', version : '>= 1.0', required : false) - --if get_option('bluez5') -+bluez_dep = dependency('bluez', required : get_option('bluez5')) -+ -+if bluez_dep.found() - assert(dbus_dep.found(), 'BlueZ requires D-Bus support') - assert(sbc_dep.found(), 'BlueZ requires SBC support') - cdata.set('HAVE_SBC', 1) -@@ -914,9 +916,9 @@ summary = [ - 'Enable Async DNS: @0@'.format(asyncns_dep.found()), - 'Enable LIRC: @0@'.format(lirc_dep.found()), - 'Enable D-Bus: @0@'.format(dbus_dep.found()), -- ' Enable BlueZ 5: @0@'.format(get_option('bluez5')), -- ' Enable native headsets: @0@'.format(get_option('bluez5-native-headset')), -- ' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')), -+ ' Enable BlueZ 5: @0@'.format(cdata.has('HAVE_BLUEZ_5')), -+ ' Enable native headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')), -+ ' Enable ofono headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')), - ' Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer), - 'Enable udev: @0@'.format(udev_dep.found()), - ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')), -diff --git a/meson_options.txt b/meson_options.txt -index cdb3c6787..bb41a42a7 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -85,7 +85,7 @@ option('avahi', - type : 'feature', value : 'auto', - description : 'Optional Avahi support') - option('bluez5', -- type : 'boolean', value : 'true', -+ type : 'feature', value : 'auto', - description : 'Optional BlueZ 5 support') - option('bluez5-gstreamer', - type : 'feature', value: 'auto', -diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build -index 99263bb5a..ca77ee6aa 100644 ---- a/src/modules/bluetooth/meson.build -+++ b/src/modules/bluetooth/meson.build -@@ -35,7 +35,7 @@ libbluez5_util = shared_library('bluez5-util', - c_args : [pa_c_args, server_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -diff --git a/src/modules/meson.build b/src/modules/meson.build -index e7db573b6..be72c3b9b 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -118,7 +118,7 @@ if avahi_dep.found() - ] - endif - --if get_option('bluez5') -+if cdata.has('HAVE_BLUEZ_5') - subdir('bluetooth') - all_modules += [ - [ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ], --- -GitLab -

1 0

ports/opt (3.7): portdbc: removed old patch
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 0a42c5eaba23fd4f67353011acf66f91b0f82b51 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 8 15:36:46 2022 +0100 portdbc: removed old patch diff --git a/portdbc/fixups.patch b/portdbc/fixups.patch deleted file mode 100644 index c554eb6e2..000000000 --- a/portdbc/fixups.patch +++ /dev/null @@ -1,23 +0,0 @@ -Binary files portdbc-1.1-orig/portdbc and portdbc-1.1/portdbc differ -diff -rupN portdbc-1.1-orig/portdbc.c portdbc-1.1/portdbc.c ---- portdbc-1.1-orig/portdbc.c 2011-07-13 18:04:19.000000000 +0200 -+++ portdbc-1.1/portdbc.c 2017-07-09 17:41:44.244318646 +0200 -@@ -44,6 +44,9 @@ int printHttpFile(char *url) - /* send all data to this function */ - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, writeCallback); - -+ /* 302 http -> https */ -+ curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1L); -+ - /* get it! */ - curl_easy_perform(curl_handle); - -@@ -254,7 +257,7 @@ int main(int argc, char** argv) - xmlNode *r_node = NULL; - - char *url = NULL; -- char *portdb_url = "http://crux.nu/portdb/"; -+ char *portdb_url = "https://crux.nu/portdb/"; - char *tmpfile = "/tmp/.portdbc.xml"; - - // use HOME directory when available

1 0

ports/opt (3.7): vorbis-tools: removed old patches
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 6e4c78c9807b6385f30316c975782d299d8bcea6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 8 15:35:48 2022 +0100 vorbis-tools: removed old patches diff --git a/vorbis-tools/vcut-fix-segfault.diff b/vorbis-tools/vcut-fix-segfault.diff deleted file mode 100644 index 0afd0d14d..000000000 --- a/vorbis-tools/vcut-fix-segfault.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- - vcut/vcut.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/vcut/vcut.c -+++ b/vcut/vcut.c -@@ -178,7 +178,7 @@ static int submit_headers_to_stream(vcut - for(i=0;i<4;i++) - { - ogg_packet p; -- if(i < 4) /* a header packet */ -+ if(i < 3) /* a header packet */ - { - p.bytes = vs->headers[i].length; - p.packet = vs->headers[i].packet; diff --git a/vorbis-tools/vorbis-tools-CVE-2015-6749.patch b/vorbis-tools/vorbis-tools-CVE-2015-6749.patch deleted file mode 100644 index 78e3c810e..000000000 --- a/vorbis-tools/vorbis-tools-CVE-2015-6749.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 -From: Mark Harris <mark.hsj(a)gmail.com> -Date: Sun, 30 Aug 2015 05:54:46 -0700 -Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input - -Fixes #2212 ---- - oggenc/audio.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..4921fb9 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = - int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - { - int aifc; /* AIFC or AIFF? */ -- unsigned int len; -- unsigned char *buffer; -+ unsigned int len, readlen; -+ unsigned char buffer[22]; - unsigned char buf2[8]; - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); -@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; /* Weird common chunk */ - } - -- buffer = alloca(len); -- -- if(fread(buffer,1,len,in) < len) -+ readlen = len < sizeof(buffer) ? len : sizeof(buffer); -+ if(fread(buffer,1,readlen,in) < readlen || -+ (len > readlen && !seek_forward(in, len-readlen))) - { - fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); - return 0; --- -2.5.0 - diff --git a/vorbis-tools/vorbis-tools-oggenc-CVE-2014-9639.patch b/vorbis-tools/vorbis-tools-oggenc-CVE-2014-9639.patch deleted file mode 100644 index 71480d594..000000000 --- a/vorbis-tools/vorbis-tools-oggenc-CVE-2014-9639.patch +++ /dev/null @@ -1,72 +0,0 @@ -Fix CVE-2014-9638 (bnc#914439) - CVE-2014-9639 (bnc#914441) - ---- - oggenc/audio.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -13,6 +13,7 @@ - #include <config.h> - #endif - -+#include <limits.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); - int i; -+ long channels; - - if(buf[11]=='C') - aifc=1; -@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, - return 0; - } - -- format.channels = READ_U16_BE(buffer); -+ format.channels = channels = READ_U16_BE(buffer); - format.totalframes = READ_U32_BE(buffer+2); - format.samplesize = READ_U16_BE(buffer+6); - format.rate = (int)read_IEEE80(buffer+8); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); -+ return 0; -+ } -+ - aiff->bigendian = 1; - - if(aifc) -@@ -412,6 +420,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, - wav_fmt format; - wavfile *wav = malloc(sizeof(wavfile)); - int i; -+ long channels; - - /* Ok. At this point, we know we have a WAV file. Now we have to detect - * whether we support the subtype, and we have to find the actual data -@@ -449,12 +458,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, - } - - format.format = READ_U16_LE(buf); -- format.channels = READ_U16_LE(buf+2); -+ format.channels = channels = READ_U16_LE(buf+2); - format.samplerate = READ_U32_LE(buf+4); - format.bytespersec = READ_U32_LE(buf+8); - format.align = READ_U16_LE(buf+12); - format.samplesize = READ_U16_LE(buf+14); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); -+ return 0; -+ } -+ - if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ - { - if(len<40) diff --git a/vorbis-tools/vorbis-tools-r19117-CVE-2014-9640.patch b/vorbis-tools/vorbis-tools-r19117-CVE-2014-9640.patch deleted file mode 100644 index 30a6c6b68..000000000 --- a/vorbis-tools/vorbis-tools-r19117-CVE-2014-9640.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- - oggenc/oggenc.c | 4 ++-- - oggenc/skeleton.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/oggenc/oggenc.c -+++ b/oggenc/oggenc.c -@@ -97,6 +97,8 @@ int main(int argc, char **argv) - .3,-1, - 0,0,0.f, - 0, 0, 0, 0, 0}; -+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -+ N_("RAW file reader")}; - - int i; - -@@ -239,8 +241,6 @@ int main(int argc, char **argv) - - if(opt.rawmode) - { -- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -- N_("RAW file reader")}; - - enc_opts.rate=opt.raw_samplerate; - enc_opts.channels=opt.raw_channels; ---- a/oggenc/skeleton.h -+++ b/oggenc/skeleton.h -@@ -41,7 +41,7 @@ typedef struct { - ogg_int64_t granule_rate_d; /* granule rate denominator */ - ogg_int64_t start_granule; /* start granule value */ - ogg_uint32_t preroll; /* preroll */ -- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ -+ unsigned char granule_shift; /* 1 byte value holding the granule shift */ - char *message_header_fields; /* holds all the message header fields */ - /* current total size of the message header fields, for realloc purpose, initially zero */ - ogg_uint32_t current_header_size;

1 0

ports/opt (3.7): polkit: removed old patch
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 5f5fa8e08ef88f9eeacde687730826d12d33bba4 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 8 15:34:18 2022 +0100 polkit: removed old patch diff --git a/polkit/84.patch b/polkit/84.patch deleted file mode 100644 index 66ed8c435..000000000 --- a/polkit/84.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 0b59685e8f3729852a175777bceeccbe34870460 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <smcv(a)debian.org> -Date: Thu, 3 Jun 2021 17:11:46 +0100 -Subject: [PATCH 1/8] meson_post_install: Use geteuid instead of getpass - -Signed-off-by: Simon McVittie <smcv(a)debian.org> ---- - meson_post_install.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/meson_post_install.py b/meson_post_install.py -index 0a0fccf..a87b711 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -1,6 +1,5 @@ - #!/usr/bin/env python3 - --import getpass - import os - import pwd - import sys -@@ -24,7 +23,7 @@ dst_dirs = [ - for dst in dst_dirs: - if not os.path.exists(dst): - os.makedirs(dst, mode=0o700) -- if getpass.getuser() == "root": -+ if os.geteuid() == 0: - os.chown(dst, polkitd_uid, -1) - - # polkit-agent-helper-1 need to be setuid root because it's used to -@@ -32,5 +31,5 @@ for dst in dst_dirs: - # and/or other users. - dst = os.path.join(pkglibdir, 'polkit-agent-helper-1') - os.chmod(dst, 0o4755) --if getpass.getuser() == "root": -+if os.geteuid() == 0: - os.chown(dst, 0, -1) - -diff --git a/meson_post_install.py b/meson_post_install.py -index a87b711..ef69bb2 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -11,7 +11,10 @@ pkgdatadir = os.path.join(prefix, sys.argv[2]) - pkglibdir = os.path.join(prefix, sys.argv[3]) - pkgsysconfdir = os.path.join(prefix, sys.argv[4]) - --polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid -+try: -+ polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid -+except KeyError: -+ polkitd_uid = None - - os.chmod(os.path.join(bindir, 'pkexec'), 0o4775) - -@@ -23,7 +26,7 @@ dst_dirs = [ - for dst in dst_dirs: - if not os.path.exists(dst): - os.makedirs(dst, mode=0o700) -- if os.geteuid() == 0: -+ if os.geteuid() == 0 and polkitd_uid is not None: - os.chown(dst, polkitd_uid, -1) - - # polkit-agent-helper-1 need to be setuid root because it's used to - -diff --git a/meson_post_install.py b/meson_post_install.py -index ef69bb2..de42531 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -10,9 +10,10 @@ bindir = os.path.join(prefix, sys.argv[1]) - pkgdatadir = os.path.join(prefix, sys.argv[2]) - pkglibdir = os.path.join(prefix, sys.argv[3]) - pkgsysconfdir = os.path.join(prefix, sys.argv[4]) -+polkitd_user = sys.argv[5] - - try: -- polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid -+ polkitd_uid = pwd.getpwnam(polkitd_user).pw_uid - except KeyError: - polkitd_uid = None - -@@ -28,6 +29,12 @@ for dst in dst_dirs: - os.makedirs(dst, mode=0o700) - if os.geteuid() == 0 and polkitd_uid is not None: - os.chown(dst, polkitd_uid, -1) -+ else: -+ print( -+ 'Owner of {} needs to be set to {} after installation'.format( -+ dst, polkitd_user, -+ ) -+ ) - - # polkit-agent-helper-1 need to be setuid root because it's used to - # authenticate not only the invoking user, but possibly also root -@@ -36,3 +43,7 @@ dst = os.path.join(pkglibdir, 'polkit-agent-helper-1') - os.chmod(dst, 0o4755) - if os.geteuid() == 0: - os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner of {} needs to be set to root after installation'.format(dst) -+ ) - -diff --git a/meson_post_install.py b/meson_post_install.py -index de42531..94ffa57 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -17,7 +17,7 @@ try: - except KeyError: - polkitd_uid = None - --os.chmod(os.path.join(bindir, 'pkexec'), 0o4775) -+os.chmod(os.path.join(bindir, 'pkexec'), 0o4755) - - dst_dirs = [ - os.path.join(pkgsysconfdir, 'rules.d'), - -diff --git a/meson_post_install.py b/meson_post_install.py -index 94ffa57..85cd0ea 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -17,7 +17,18 @@ try: - except KeyError: - polkitd_uid = None - --os.chmod(os.path.join(bindir, 'pkexec'), 0o4755) -+dst = os.path.join(bindir, 'pkexec') -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) -+ os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) - - dst_dirs = [ - os.path.join(pkgsysconfdir, 'rules.d'), -@@ -40,10 +51,14 @@ for dst in dst_dirs: - # authenticate not only the invoking user, but possibly also root - # and/or other users. - dst = os.path.join(pkglibdir, 'polkit-agent-helper-1') --os.chmod(dst, 0o4755) -+ - if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) - os.chown(dst, 0, -1) - else: - print( -- 'Owner of {} needs to be set to root after installation'.format(dst) -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) - ) - -diff --git a/meson_post_install.py b/meson_post_install.py -index 85cd0ea..0ab7469 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -4,12 +4,22 @@ import os - import pwd - import sys - -+destdir = os.environ.get('DESTDIR') - prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] - --bindir = os.path.join(prefix, sys.argv[1]) --pkgdatadir = os.path.join(prefix, sys.argv[2]) --pkglibdir = os.path.join(prefix, sys.argv[3]) --pkgsysconfdir = os.path.join(prefix, sys.argv[4]) -+def destdir_path(p): -+ if os.path.isabs(p): -+ if destdir is None: -+ return p -+ else: -+ return os.path.join(destdir, os.path.relpath(p, '/')) -+ else: -+ return os.path.join(prefix, p) -+ -+bindir = destdir_path(sys.argv[1]) -+pkgdatadir = destdir_path(sys.argv[2]) -+pkglibdir = destdir_path(sys.argv[3]) -+pkgsysconfdir = destdir_path(sys.argv[4]) - polkitd_user = sys.argv[5] - - try: -

1 0

ports/opt (3.7): libwnck-gtk3: updated meson syntax
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit bc118daf7529a9bb44b485c29f1199e6d0b5f7b2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 8 14:55:29 2022 +0100 libwnck-gtk3: updated meson syntax diff --git a/libwnck-gtk3/.signature b/libwnck-gtk3/.signature index f01e443a3..ee8cd1e1e 100644 --- a/libwnck-gtk3/.signature +++ b/libwnck-gtk3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RdBFgGv2V77bd55zgTTOt6pz5lPg0V+1Z6X5+Lp1m0wC/7bVuzve405cT4nNr6OO1/GK7faQGKDAx+RYw6JhAo= -SHA256 (Pkgfile) = 31b61c131ab3482ad29277e57e28a267d51b3b3b9ac0ed6fec5ba35211c97209 +RWSE3ohX2g5d/U6v3KSp70irUbWuz7VIkdt9e6WrXTILOTJmR9FOoKB6GUSvxN2HI76m3/PU4G4CjJj35fUqlMi/om8EcDEKJgs= +SHA256 (Pkgfile) = 34382c8b5c1ed54bfc7732e459de1512bba66dfd520a7f7e2fe637a5391dae0e SHA256 (.footprint) = c5722e6e8dbcf98499e734083408729356f889a53ab0d3c53da0ba2aada96b66 SHA256 (libwnck-3.36.0.tar.xz) = bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f diff --git a/libwnck-gtk3/Pkgfile b/libwnck-gtk3/Pkgfile index d1704bc57..569c5598f 100644 --- a/libwnck-gtk3/Pkgfile +++ b/libwnck-gtk3/Pkgfile @@ -9,7 +9,12 @@ release=1 source=(https://ftp.gnome.org/pub/gnome/sources/libwnck/${version%.*}/libwn… build() { - meson build libwnck-$version --prefix=/usr + meson build libwnck-$version \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true ninja -C build -j ${JOBS:-1} DESTDIR=$PKG meson install -C build diff --git a/libwnck-gtk3/startup-notfication.patch b/libwnck-gtk3/startup-notfication.patch deleted file mode 100644 index 289cef0f3..000000000 --- a/libwnck-gtk3/startup-notfication.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/meson.build b/meson.build -index 6e35c00f77aef272a20c3d473ce50bed0206a08c..28799d8bec46aef4d1b05b44ef557cd387f48a64 100644 ---- a/meson.build -+++ b/meson.build -@@ -43,7 +43,7 @@ pkg_deps = [ - {'name': 'glib-2.0', 'version': '>= 2.32' }, - {'name': 'gobject-2.0', 'version': '>= 2.13.0' }, - {'name': 'gtk+-3.0', 'version': '>= 3.22.0' }, -- {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification').enabled() }, -+ {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification')}, - {'name': X11_PACKAGE }, - {'name': XRES_PACKAGE, 'required': false}, - ] -@@ -54,7 +54,7 @@ foreach p: pkg_deps - dep = dependency(pkg, version: p.get('version', []), required: required) - LIBWNCK_DEPS += dep - -- if not required and dep.found() -+ if dep.found() - conf.set('HAVE_' + pkg.to_upper().underscorify(), 1) - endif - endforeach

1 0