From f4d0e20921ee6f81e5c27de01053cc0c5c3be10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Mon, 1 Aug 2022 18:05:28 +0100 Subject: [PATCH 01/33] autoconf: update to 2.71. --- .../patches/fix-perl-5.22-autoscan.patch | 27 ------------------- srcpkgs/autoconf/template | 6 ++--- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/autoconf/patches/fix-perl-5.22-autoscan.patch diff --git a/srcpkgs/autoconf/patches/fix-perl-5.22-autoscan.patch b/srcpkgs/autoconf/patches/fix-perl-5.22-autoscan.patch deleted file mode 100644 index 3054d22a5cf4..000000000000 --- a/srcpkgs/autoconf/patches/fix-perl-5.22-autoscan.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Tue, 29 Jan 2013 13:46:48 -0800 -Subject: [PATCH] autoscan: port to perl 5.17 - -* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a -feature that is deprecated in Perl 5.17. Reported by Ray Lauff in -. ---- - bin/autoscan.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/bin/autoscan.in -+++ b/bin/autoscan.in -@@ -358,7 +358,7 @@ sub scan_sh_file ($) - { - # Strip out comments and variable references. - s/#.*//; -- s/\${[^\}]*}//g; -+ s/\$\{[^\}]*}//g; - s/@[^@]*@//g; - - # Tokens in the code. --- -2.1.0 - - diff --git a/srcpkgs/autoconf/template b/srcpkgs/autoconf/template index 260e8c753f07..72ff5aceb16e 100644 --- a/srcpkgs/autoconf/template +++ b/srcpkgs/autoconf/template @@ -1,7 +1,7 @@ # Template file for 'autoconf' pkgname=autoconf -version=2.69 -revision=9 +version=2.71 +revision=1 build_style=gnu-configure hostmakedepends="perl m4 help2man" depends="virtual?awk m4 perl" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://www.gnu.org/software/autoconf" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 +checksum=f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 pre_check() { # Disable failing test by adding From 292cf33ec729e035722dde4f3d24f4f89e5a81be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Mon, 1 Aug 2022 18:11:18 +0100 Subject: [PATCH 02/33] autoconf-archive: update to 2022.02.11. --- srcpkgs/autoconf-archive/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/autoconf-archive/template b/srcpkgs/autoconf-archive/template index 1edf5d96f775..fe34f02787dd 100644 --- a/srcpkgs/autoconf-archive/template +++ b/srcpkgs/autoconf-archive/template @@ -1,7 +1,7 @@ # Template file for 'autoconf-archive' pkgname=autoconf-archive -version=2019.01.06 -revision=2 +version=2022.02.11 +revision=1 build_style=gnu-configure hostmakedepends="texinfo" depends="autoconf" @@ -10,4 +10,4 @@ maintainer="Steve Prybylski " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/autoconf-archive/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f +checksum=78a61b611e2eeb55a89e0398e0ce387bcaf57fe2dd53c6fe427130f777ad1e8c From 012a0a600ed6ecab9d9c8145d51e11bb7e33f0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:52:51 +0100 Subject: [PATCH 03/33] clutter: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/clutter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 461e2fe07978..d49446154207 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -8,7 +8,7 @@ configure_args="$(vopt_enable gir introspection) --enable-evdev --enable-evdev-i --enable-wayland-backend --enable-egl-backend --enable-wayland-compositor --enable-gdk-backend" hostmakedepends="automake libtool pkg-config intltool glib-devel - gettext-devel" + gettext-devel gtk-doc" makedepends="atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel libgudev-devel libxkbcommon-devel cogl-devel libinput-devel libevdev-devel eudev-libudev-devel gtk+3-devel" From 36fc5e87efedbd70925391710c1e0f5cedc6411d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:53:48 +0100 Subject: [PATCH 04/33] cogl: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/cogl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template index 43c282b85e84..987bdc4ba112 100644 --- a/srcpkgs/cogl/template +++ b/srcpkgs/cogl/template @@ -9,7 +9,7 @@ configure_args="--enable-cairo=yes --enable-cogl-pango=yes --enable-wayland-egl-platform --enable-wayland-egl-server $(vopt_enable gir introspection)" hostmakedepends="automake libtool gettext gettext-devel pkg-config intltool - glib-devel gobject-introspection" + glib-devel gobject-introspection gtk-doc" makedepends="libXcomposite-devel libXrandr-devel MesaLib-devel pango-devel gdk-pixbuf-devel gst-plugins-base1-devel wayland-devel libXdamage-devel" short_desc="Library for using 3D graphics hardware for rendering" From 26e8a20d16d73e69f7bd8983a19a436e6c56aa24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:54:46 +0100 Subject: [PATCH 05/33] gupnp-dlna: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/gupnp-dlna/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template index d88090126ee3..7f3a62ebd782 100644 --- a/srcpkgs/gupnp-dlna/template +++ b/srcpkgs/gupnp-dlna/template @@ -5,7 +5,7 @@ revision=3 build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="automake libtool pkg-config $(vopt_if vala vala)" +hostmakedepends="automake libtool pkg-config $(vopt_if vala vala) gtk-doc" makedepends="gst-plugins-base1-devel libxml2-devel $(vopt_if vala vala)" short_desc="GUPnP DLNA" maintainer="Orphaned " From da09a73fbfce4847aa3b1bbdf28b00e8ab75f126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:55:16 +0100 Subject: [PATCH 06/33] gupnp-igd: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/gupnp-igd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template index 314a36472b85..17a80d67b9a0 100644 --- a/srcpkgs/gupnp-igd/template +++ b/srcpkgs/gupnp-igd/template @@ -5,7 +5,7 @@ revision=3 build_style=gnu-configure build_helper="gir" configure_args="--disable-python --disable-static $(vopt_enable gir introspection)" -hostmakedepends="automake pkg-config glib-devel libtool gobject-introspection" +hostmakedepends="automake pkg-config glib-devel libtool gobject-introspection gtk-doc" makedepends="libglib-devel libxml2-devel libsoup-devel gssdp-devel gupnp-devel" short_desc="Library to handle UPnP IGD port mapping" maintainer="Orphaned " From 5ea7059fba635eb2c4999daaf5657f6fc254a5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:56:13 +0100 Subject: [PATCH 07/33] libcanberra: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libcanberra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index de049b68e088..89467130e825 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -5,7 +5,7 @@ revision=11 build_style=gnu-configure configure_args="--enable-alsa --enable-null --disable-lynx --enable-gstreamer --disable-oss --with-builtin=dso" -hostmakedepends="automake libtool gettext-devel pkg-config intltool" +hostmakedepends="automake libtool gettext-devel pkg-config intltool gtk-doc" makedepends=" gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel gstreamer1-devel alsa-lib-devel tdb-devel pulseaudio-devel From ad9f2604498a0c8cc094c533531127acfcf49f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:56:48 +0100 Subject: [PATCH 08/33] libdbusmenu-glib: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libdbusmenu-glib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template index 9945baa250d8..eddfaa109cf0 100644 --- a/srcpkgs/libdbusmenu-glib/template +++ b/srcpkgs/libdbusmenu-glib/template @@ -8,7 +8,7 @@ build_helper="gir" configure_args="--disable-dumper --disable-static --disable-tests $(vopt_enable gir vala) $(vopt_enable gir introspection) HAVE_VALGRIND_FALSE=''" hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config - $(vopt_if gir 'gobject-introspection vala-devel')" + $(vopt_if gir 'gobject-introspection vala-devel') gtk-doc" makedepends="gtk+3-devel" short_desc="Library for passing menus over DBus" maintainer="Steve Prybylski " From 91da35697f620d8bcf4aa25746ee2865d19cc869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:57:01 +0100 Subject: [PATCH 09/33] libfm: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libfm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template index be9425847037..a66bc51b5ed2 100644 --- a/srcpkgs/libfm/template +++ b/srcpkgs/libfm/template @@ -8,7 +8,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-udisks --disable-static --with-gtk=3" hostmakedepends="automake gettext-devel glib-devel intltool libtool - pkg-config vala-devel" + pkg-config vala-devel gtk-doc" makedepends="dbus-glib-devel gtk+3-devel libexif-devel menu-cache-devel" depends="libfm-extra>=${version}" short_desc="Core library of PCManFM file manager" From 33cee944126b3da52c0bd3cd6dc4e07d6197c73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:57:16 +0100 Subject: [PATCH 10/33] libglade: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libglade/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template index f9bbef8cfbe3..e72c1b898939 100644 --- a/srcpkgs/libglade/template +++ b/srcpkgs/libglade/template @@ -4,7 +4,7 @@ version=2.6.4 revision=12 build_style=gnu-configure configure_args="--disable-static --without-xml-catalog" -hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel" +hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel gtk-doc" makedepends="libxml2-devel gtk+-devel xmlcatmgr" depends="xmlcatmgr" short_desc="Runtime interpreter for GLADE GUI files" From 01a2846e422ccb844360803c2d98c24d02b06a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:57:33 +0100 Subject: [PATCH 11/33] libgpod: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libgpod/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template index 8e547f1f9ebd..2fe5fa4da108 100644 --- a/srcpkgs/libgpod/template +++ b/srcpkgs/libgpod/template @@ -4,7 +4,7 @@ version=0.8.3 revision=4 build_style=gnu-configure configure_args="--with-udev-dir=/usr/lib/udev --enable-udev" -hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool" +hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool gtk-doc" makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel" short_desc="Shared library to access the contents of an iPod" maintainer="Orphaned " From 3c8cd6a74c45e537b385a993d061e0289ac7f848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:57:52 +0100 Subject: [PATCH 12/33] libgsf: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libgsf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template index 132ac53261b5..ace7277211ab 100644 --- a/srcpkgs/libgsf/template +++ b/srcpkgs/libgsf/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --enable-introspection" -hostmakedepends="automake libtool gettext-devel glib-devel intltool pkg-config" +hostmakedepends="automake libtool gettext-devel glib-devel intltool pkg-config gtk-doc" makedepends="gdk-pixbuf-devel libxml2-devel" checkdepends="perl-XML-Parser unzip" short_desc="Structured File Library" From 73efb5c42bf1e8de2e1e6d480a6cc889eb999901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:58:11 +0100 Subject: [PATCH 13/33] libidn2: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libidn2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template index e7f490959388..3777a1baebcd 100644 --- a/srcpkgs/libidn2/template +++ b/srcpkgs/libidn2/template @@ -3,7 +3,7 @@ pkgname=libidn2 version=2.3.2 revision=1 build_style=gnu-configure -hostmakedepends="automake gettext-devel libtool pkg-config" +hostmakedepends="automake gettext-devel libtool pkg-config gtk-doc" makedepends="libunistring-devel" short_desc="Internationalized string handling library" maintainer="Enno Boland " From f793ae0c55abc63055d7b052424fb04a8866f6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:58:34 +0100 Subject: [PATCH 14/33] libu2f: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libu2f-host/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index c2cd5b754dca..b912493060db 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -5,7 +5,7 @@ revision=5 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes" -hostmakedepends="automake gengetopt libtool pkg-config" +hostmakedepends="automake gengetopt libtool pkg-config gtk-doc" makedepends="hidapi-devel json-c-devel openssl-devel" depends="libfido2" short_desc="C library and tool that implements the host-side of the U2F protocol" From b630a0526701c2086cf204d3a8cd5193b84275cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:58:59 +0100 Subject: [PATCH 15/33] libunique1: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/libunique1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template index f73931b0c72b..0ac287925885 100644 --- a/srcpkgs/libunique1/template +++ b/srcpkgs/libunique1/template @@ -6,7 +6,7 @@ wrksrc="libunique-${version}" build_style=gnu-configure build_helper="gir" configure_args="--disable-static --disable-dbus" -hostmakedepends="libtool automake pkg-config glib-devel" +hostmakedepends="libtool automake pkg-config glib-devel gtk-doc" makedepends="libSM-devel gtk+-devel" short_desc="Library for writing single instance applications (GTK+2)" maintainer="Orphaned " From 24f4c2a47680f9ba0459390161f0d017ecbd4dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:59:13 +0100 Subject: [PATCH 16/33] mash: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/mash/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template index 722ee0dd981e..26e7c8777186 100644 --- a/srcpkgs/mash/template +++ b/srcpkgs/mash/template @@ -6,7 +6,7 @@ build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="automake glib-devel intltool libtool pkg-config - $(vopt_if gir gobject-introspection)" + $(vopt_if gir gobject-introspection) gtk-doc" makedepends="clutter-devel" depends="clutter>=1.18" short_desc="Small library for using 3D models within a Clutter scene" From c86145fa3f9c516a49195bdd1d1d25ce26d74545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:59:27 +0100 Subject: [PATCH 17/33] rest: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/rest/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template index 94314aa9d7b1..aa4299c8ffd3 100644 --- a/srcpkgs/rest/template +++ b/srcpkgs/rest/template @@ -6,7 +6,7 @@ build_style=gnu-configure build_helper="gir" configure_args="$(vopt_enable gir introspection) --disable-static --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" -hostmakedepends="automake perl m4 libtool pkg-config glib-devel" +hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc" makedepends="libglib-devel libsoup-gnome-devel libxml2-devel" depends="ca-certificates" short_desc="RESTful library" From 2b477da586f7afcee36704ae300d177a7eb0c9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 00:59:45 +0100 Subject: [PATCH 18/33] ykneomgr: add gtk-doc to hostmakedepends https://www.mail-archive.com/bug-autoconf@gnu.org/msg04872.html --- srcpkgs/ykneomgr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ykneomgr/template b/srcpkgs/ykneomgr/template index 5278e36965d3..d0e4c82f3307 100644 --- a/srcpkgs/ykneomgr/template +++ b/srcpkgs/ykneomgr/template @@ -4,7 +4,7 @@ version=0.1.8 revision=4 wrksrc="libykneomgr-${version}" build_style=gnu-configure -hostmakedepends="automake libtool pkg-config gengetopt help2man" +hostmakedepends="automake libtool pkg-config gengetopt help2man gtk-doc" makedepends="pcsclite-devel libzip-devel zlib-devel" short_desc="Yubikey NEO Manager" maintainer="Orphaned " From e29767709b99ade3e816b719651b3c642f09ea12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 01:08:25 +0100 Subject: [PATCH 19/33] hunspell: add gettext-devel-tools as hostmakedepends Make it build with autoconf-2.7.1 --- srcpkgs/hunspell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template index 929f4b1893e7..7f8a27cf54a9 100644 --- a/srcpkgs/hunspell/template +++ b/srcpkgs/hunspell/template @@ -4,7 +4,7 @@ version=1.7.0 revision=3 build_style=gnu-configure configure_args="--with-ui" -hostmakedepends="automake bison libtool pkg-config" +hostmakedepends="automake bison libtool pkg-config gettext-devel-tools" makedepends="ncurses-devel" short_desc="Spell checker and morphological analyzer" maintainer="Orphaned " From dcb5d29753d8ad9e407cefdb8aa80bc5b343a66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 15:53:42 +0100 Subject: [PATCH 20/33] libsasl: remove unneeded patch --- .../cyrus-sasl-2.1.27-autotools_fixes.patch | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-autotools_fixes.patch diff --git a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-autotools_fixes.patch b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-autotools_fixes.patch deleted file mode 100644 index 5c751bbc8d8f..000000000000 --- a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-autotools_fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -Source: https://git.alpinelinux.org/aports/tree/main/cyrus-sasl/cyrus-sasl-2.1.27-autotools_fixes.patch -Upstream: No -Reason: FTBFS - ---- cyrus-sasl-2.1.27/configure.ac -+++ cyrus-sasl-2.1.27/configure.ac -@@ -44,6 +44,8 @@ - - AC_PREREQ(2.63) - -+AC_CONFIG_MACRO_DIR([config]) -+ - dnl - dnl REMINDER: When changing the version number here, please also update - dnl the values in win32/include/config.h and include/sasl.h as well. ---- cyrus-sasl-2.1.27/Makefile.am -+++ cyrus-sasl-2.1.27/Makefile.am -@@ -44,6 +44,8 @@ - # - ################################################################ - -+ACLOCAL_AMFLAGS = -I config -+ - if SASLAUTHD - SAD = saslauthd - else ---- cyrus-sasl-2.1.27/saslauthd/Makefile.am -+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am -@@ -1,4 +1,6 @@ - AUTOMAKE_OPTIONS = 1.7 -+ACLOCAL_AMFLAGS = -I ../config -+ - sbin_PROGRAMS = saslauthd testsaslauthd - EXTRA_PROGRAMS = saslcache - From a70bac629fcf0b57c9fa58548167be33e91274c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 9 Aug 2022 23:00:54 +0100 Subject: [PATCH 21/33] lxsession: template work with autoconf-2.7.1 --- srcpkgs/lxsession/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/lxsession/template b/srcpkgs/lxsession/template index 8fe456a1d43e..19dbde4a9435 100644 --- a/srcpkgs/lxsession/template +++ b/srcpkgs/lxsession/template @@ -17,5 +17,4 @@ replaces="lxpolkit>=0" pre_build() { rm *.stamp - autoreconf -fi } From 15cf88a401db4d57c121e77210fc41560f3ed2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Wed, 10 Aug 2022 23:58:19 +0100 Subject: [PATCH 22/33] ltrace: update to 0.7.3.20160924. --- srcpkgs/ltrace/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ltrace/template b/srcpkgs/ltrace/template index a26e64e3c797..a5e108430ff9 100644 --- a/srcpkgs/ltrace/template +++ b/srcpkgs/ltrace/template @@ -25,5 +25,7 @@ pre_configure() { sed -i 's/#ifndef __mips__/#if 0/' proc.c fi - autoreconf -fi + mkdir -p config + autoreconf -fiv + } From 5246ed65383f22617204b0a46ed9b55a307be812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 00:26:12 +0100 Subject: [PATCH 23/33] watchman: patch fixes build --- srcpkgs/watchman/patches/fix_autogen.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/watchman/patches/fix_autogen.patch diff --git a/srcpkgs/watchman/patches/fix_autogen.patch b/srcpkgs/watchman/patches/fix_autogen.patch new file mode 100644 index 000000000000..c9333f644fb3 --- /dev/null +++ b/srcpkgs/watchman/patches/fix_autogen.patch @@ -0,0 +1,13 @@ +From: https://github.com/facebook/watchman/issues/937#issuecomment-904717182 + +--- a/autogen.sh ++++ b/autogen.sh +@@ -21,7 +21,7 @@ automake --add-missing --foreign + # should be the case provided pkg-config is installed AND the above commands + # have been run to prep the source tree with local set-up. + CHECK_PKG_CONFIG_M4='m4_ifdef([PKG_CHECK_MODULES], [errprint([ok])])' +-if [ "x$(autoconf <(echo "$CHECK_PKG_CONFIG_M4") 2>&1)" != "xok" ] ; then ++if [ "x$(autoconf --warnings=none <(echo "$CHECK_PKG_CONFIG_M4") 2>&1)" != "xok" ] ; then + echo 'pkg-config appears to be missing (not available to autoconf tools)' + echo 'please install the pkg-config package for your system.' + exit 1 From d7ca9773933ff305eee3994a7a46a020be5bcd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 11:14:05 +0100 Subject: [PATCH 24/33] libstrp: fix template building --- srcpkgs/libsrtp/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/libsrtp/template b/srcpkgs/libsrtp/template index 9748ca264b16..a1b62b74218f 100644 --- a/srcpkgs/libsrtp/template +++ b/srcpkgs/libsrtp/template @@ -19,10 +19,6 @@ post_install() { vlicense LICENSE } -pre_configure() { - autoreconf -fi -} - libsrtp-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" From 2bd71ef9c867bc737572d1e494e4bd2f58217f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 11:32:04 +0100 Subject: [PATCH 25/33] iverilog: fix build with autoconf 2.71 --- ...e-scripts-to-work-with-autoconf-2.70.patch | 307 ++++++++++++++++++ 1 file changed, 307 insertions(+) create mode 100644 srcpkgs/iverilog/patches/0001-Fix-configure-scripts-to-work-with-autoconf-2.70.patch diff --git a/srcpkgs/iverilog/patches/0001-Fix-configure-scripts-to-work-with-autoconf-2.70.patch b/srcpkgs/iverilog/patches/0001-Fix-configure-scripts-to-work-with-autoconf-2.70.patch new file mode 100644 index 000000000000..b35a6da65935 --- /dev/null +++ b/srcpkgs/iverilog/patches/0001-Fix-configure-scripts-to-work-with-autoconf-2.70.patch @@ -0,0 +1,307 @@ +From 4b3e1099e5517333dd690ba948bce1236466a395 Mon Sep 17 00:00:00 2001 +From: Martin Whitaker +Date: Fri, 1 Jan 2021 18:42:01 +0000 +Subject: Fix configure scripts to work with autoconf 2.70. + +Numerous deprecated features have now become obsolete. Mostly done by +running autoupdate, but that left a few fixes to be done manually. + +This includes the latest version of AX_PROG_CC_FOR_BUILD from +https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html +--- + INSTALL | 5 ++-- + Makefile.in | 2 +- + README.txt | 2 +- + aclocal.m4 | 57 ++++++++++++++++++++++-------------- + configure.in => configure.ac | 45 +++++++++++++--------------- + 5 files changed, 59 insertions(+), 52 deletions(-) + rename configure.in => configure.ac (87%) + +diff --git a/INSTALL b/INSTALL +index a2c8722c..95b40376 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -19,8 +19,8 @@ diffs or instructions to the address given in the `README' so they can + be considered for the next release. If at some point `config.cache' + contains results you don't want to keep, you may remove or edit it. + +- The file `configure.in' is used to create `configure' by a program +-called `autoconf'. You only need `configure.in' if you want to change ++ The file `configure.ac' is used to create `configure' by a program ++called `autoconf'. You only need `configure.ac' if you want to change + it or regenerate `configure' using a newer version of `autoconf'. + + The simplest way to compile this package is: +@@ -178,4 +178,3 @@ operates. + script, and exit. + + `configure' also accepts some other, not widely useful, options. +- +diff --git a/Makefile.in b/Makefile.in +index 97459337..90ecadeb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -202,7 +202,7 @@ stamp-_pli_types-h: $(srcdir)/_pli_types.h.in config.status + ./config.status _pli_types.h + _pli_types.h: stamp-_pli_types-h + +-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 ++$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 + cd $(srcdir) && autoconf + + config.status: $(srcdir)/configure +diff --git a/README.txt b/README.txt +index 26533ebc..d04dab88 100644 +--- a/README.txt ++++ b/README.txt +@@ -72,7 +72,7 @@ If you are building from git, you will also need software to generate + the configure scripts. + + - autoconf 2.53 or later +- This generates configure scripts from configure.in. The 2.53 ++ This generates configure scripts from configure.ac. The 2.53 + or later versions are known to work, autoconf 2.13 is + reported to *not* work. + +diff --git a/aclocal.m4 b/aclocal.m4 +index 1b2dd6a1..5fcc7cbf 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -6,7 +6,7 @@ + # different builds. Remember to change the default suffix string to some + # value appropriate for the current version. + AC_DEFUN([AX_ENABLE_SUFFIX], +-[AC_ARG_ENABLE([suffix],[AC_HELP_STRING([--enable-suffix], ++[AC_ARG_ENABLE([suffix],[AS_HELP_STRING([--enable-suffix], + [Use/set the installation command suffix])], + [true],[enable_suffix=no]) + if test X$enable_suffix = Xyes; then +@@ -250,7 +250,7 @@ echo "timestamp for $_config_header" > `AS_DIRNAME(["$_config_header"])`/[]$_sta + ]) #_AC_AM_CONFIG_HEADER_HOOK + + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html ++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html + # =========================================================================== + # + # SYNOPSIS +@@ -283,31 +283,35 @@ echo "timestamp for $_config_header" > `AS_DIRNAME(["$_config_header"])`/[]$_sta + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 8 ++#serial 18 + + AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) + AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_CPP])dnl +-AC_REQUIRE([AC_EXEEXT])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl + + dnl Use the standard macros, but make them use other variable names + dnl + pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl ++pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl + pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl + pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl + pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl + pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl ++pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl + pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl + pushdef([ac_cv_objext], ac_cv_build_objext)dnl + pushdef([ac_exeext], ac_build_exeext)dnl + pushdef([ac_objext], ac_build_objext)dnl + pushdef([CC], CC_FOR_BUILD)dnl + pushdef([CPP], CPP_FOR_BUILD)dnl ++pushdef([GCC], GCC_FOR_BUILD)dnl + pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl + pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl ++pushdef([EXEEXT], BUILD_EXEEXT)dnl + pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl ++pushdef([OBJEXT], BUILD_OBJEXT)dnl + pushdef([host], build)dnl + pushdef([host_alias], build_alias)dnl + pushdef([host_cpu], build_cpu)dnl +@@ -318,27 +322,29 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl + pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl + pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl + pushdef([ac_cv_host_os], ac_cv_build_os)dnl +-pushdef([ac_cpp], ac_build_cpp)dnl +-pushdef([ac_compile], ac_build_compile)dnl +-pushdef([ac_link], ac_build_link)dnl ++pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl ++pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl ++pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl ++pushdef([cross_compiling], cross_compiling_build)dnl + +-save_cross_compiling=$cross_compiling +-save_ac_tool_prefix=$ac_tool_prefix +-cross_compiling=no +-ac_tool_prefix= ++cross_compiling_build=no + ++ac_build_tool_prefix= ++AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], ++ [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) ++ ++AC_LANG_PUSH([C]) + AC_PROG_CC ++_AC_COMPILER_EXEEXT ++_AC_COMPILER_OBJEXT + AC_PROG_CPP +-AC_EXEEXT +- +-ac_tool_prefix=$save_ac_tool_prefix +-cross_compiling=$save_cross_compiling + + dnl Restore the old definitions + dnl +-popdef([ac_link])dnl +-popdef([ac_compile])dnl +-popdef([ac_cpp])dnl ++popdef([cross_compiling])dnl ++popdef([am_cv_prog_cc_c_o])dnl ++popdef([am_cv_CC_dependencies_compiler_type])dnl ++popdef([ac_tool_prefix])dnl + popdef([ac_cv_host_os])dnl + popdef([ac_cv_host_vendor])dnl + popdef([ac_cv_host_cpu])dnl +@@ -349,29 +355,36 @@ popdef([host_vendor])dnl + popdef([host_cpu])dnl + popdef([host_alias])dnl + popdef([host])dnl ++popdef([OBJEXT])dnl + popdef([LDFLAGS])dnl ++popdef([EXEEXT])dnl + popdef([CPPFLAGS])dnl + popdef([CFLAGS])dnl ++popdef([GCC])dnl + popdef([CPP])dnl + popdef([CC])dnl + popdef([ac_objext])dnl + popdef([ac_exeext])dnl + popdef([ac_cv_objext])dnl + popdef([ac_cv_exeext])dnl ++popdef([ac_cv_c_compiler_gnu])dnl + popdef([ac_cv_prog_cc_g])dnl + popdef([ac_cv_prog_cc_cross])dnl + popdef([ac_cv_prog_cc_works])dnl ++popdef([ac_cv_prog_cc_c89])dnl + popdef([ac_cv_prog_gcc])dnl + popdef([ac_cv_prog_CPP])dnl + ++dnl restore global variables ac_ext, ac_cpp, ac_compile, ++dnl ac_link, ac_compiler_gnu (dependant on the current ++dnl language after popping): ++AC_LANG_POP([C]) ++ + dnl Finally, set Makefile variables + dnl +-BUILD_EXEEXT=$ac_build_exeext +-BUILD_OBJEXT=$ac_build_objext + AC_SUBST(BUILD_EXEEXT)dnl + AC_SUBST(BUILD_OBJEXT)dnl + AC_SUBST([CFLAGS_FOR_BUILD])dnl + AC_SUBST([CPPFLAGS_FOR_BUILD])dnl + AC_SUBST([LDFLAGS_FOR_BUILD])dnl + ]) +- +diff --git a/configure.in b/configure.ac +similarity index 87% +rename from configure.in +rename to configure.ac +index 83e0fe50..8913fb74 100644 +--- a/configure.in ++++ b/configure.ac +@@ -1,21 +1,19 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(netlist.h) +-AC_CONFIG_HEADER(config.h) +-AC_CONFIG_HEADER(_pli_types.h) +-AC_CONFIG_HEADER(vhdlpp/vhdlpp_config.h) +-AC_CONFIG_HEADER(vvp/config.h) +-AC_CONFIG_HEADER(vpi/vpi_config.h) +-AC_CONFIG_HEADER(libveriuser/config.h) +-AC_CONFIG_HEADER(tgt-vvp/vvp_config.h) +-AC_CONFIG_HEADER(tgt-vhdl/vhdl_config.h) +-AC_CONFIG_HEADER(tgt-pcb/pcb_config.h) ++AC_INIT ++AC_CONFIG_SRCDIR([netlist.h]) ++AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_HEADERS([_pli_types.h]) ++AC_CONFIG_HEADERS([vhdlpp/vhdlpp_config.h]) ++AC_CONFIG_HEADERS([vvp/config.h]) ++AC_CONFIG_HEADERS([vpi/vpi_config.h]) ++AC_CONFIG_HEADERS([libveriuser/config.h]) ++AC_CONFIG_HEADERS([tgt-vvp/vvp_config.h]) ++AC_CONFIG_HEADERS([tgt-vhdl/vhdl_config.h]) ++AC_CONFIG_HEADERS([tgt-pcb/pcb_config.h]) + + AC_CANONICAL_HOST + dnl Checks for programs. + AC_PROG_CC +-# AC_PROG_CC_C99 is only available in autoconf version 2.60 and later. +-AC_PREREQ([2.60]) +-AC_PROG_CC_C99 + AC_PROG_CXX + AC_PROG_RANLIB + AC_CHECK_TOOL(LD, ld, false) +@@ -92,7 +90,7 @@ fi + + AC_LANG(C++) + +-AC_ARG_WITH([m32], [AC_HELP_STRING([--with-m32], [Compile 32-bit on x86_64])], ++AC_ARG_WITH([m32], [AS_HELP_STRING([--with-m32],[Compile 32-bit on x86_64])], + [ with_m32=yes ],[ with_m32=no ]) + + AS_IF( [test "x$with_m32" = xyes], +@@ -170,8 +168,7 @@ AC_FUNC_ALLOCA + AC_FUNC_FSEEKO + + # valgrind checks +-AC_ARG_WITH([valgrind], [AC_HELP_STRING([--with-valgrind], +- [Add valgrind hooks])], ++AC_ARG_WITH([valgrind], [AS_HELP_STRING([--with-valgrind],[Add valgrind hooks])], + [], [check_valgrind=yes]) + + AS_IF([test "x$check_valgrind" = xyes], +@@ -182,14 +179,11 @@ AS_IF([test "x$check_valgrind" = xyes], + [AC_MSG_ERROR([Could not find ])])]) + + AC_MSG_CHECKING(for sys/times) +-AC_TRY_LINK( +-#include ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include + #include +-,{clock_t a = times(0)/sysconf(_SC_CLK_TCK);}, +-do_times=yes +-AC_DEFINE([HAVE_TIMES], [1], [The times system call is available in the host operating system.]), +-do_times=no +-) ++]], [[{clock_t a = times(0)/sysconf(_SC_CLK_TCK);}]])],[do_times=yes ++AC_DEFINE(HAVE_TIMES, 1, The times system call is available in the host operating system.)],[do_times=no ++]) + AC_MSG_RESULT($do_times) + + # -- +@@ -262,7 +256,7 @@ AC_CHECK_FUNCS(fopen64) + # The following math functions may be defined in the math library so look + # in the default libraries first and then look in -lm for them. On some + # systems we may need to use the compiler in C99 mode to get a definition. +-# We requested C99 mode earlier with AC_PROG_CC_C99. ++# Modern versions of autoconf will enable C99 if it is available. + AC_SEARCH_LIBS([lround], [m], [AC_DEFINE([HAVE_LROUND], [1])]) + AC_SEARCH_LIBS([llround], [m], [AC_DEFINE([HAVE_LLROUND], [1])]) + AC_SEARCH_LIBS([nan], [m], [AC_DEFINE([HAVE_NAN], [1])]) +@@ -337,4 +331,5 @@ AC_MSG_ERROR(cannot configure white space in libdir: $libdir) + fi + AC_MSG_RESULT(ok) + AX_PROG_CC_FOR_BUILD +-AC_OUTPUT(Makefile ivlpp/Makefile vhdlpp/Makefile vvp/Makefile vpi/Makefile driver/Makefile driver-vpi/Makefile cadpli/Makefile libveriuser/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-vvp/Makefile tgt-vhdl/Makefile tgt-fpga/Makefile tgt-verilog/Makefile tgt-pal/Makefile tgt-vlog95/Makefile tgt-pcb/Makefile tgt-blif/Makefile tgt-sizer/Makefile) ++AC_CONFIG_FILES([Makefile ivlpp/Makefile vhdlpp/Makefile vvp/Makefile vpi/Makefile driver/Makefile driver-vpi/Makefile cadpli/Makefile libveriuser/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-vvp/Makefile tgt-vhdl/Makefile tgt-fpga/Makefile tgt-verilog/Makefile tgt-pal/Makefile tgt-vlog95/Makefile tgt-pcb/Makefile tgt-blif/Makefile tgt-sizer/Makefile]) ++AC_OUTPUT +-- +2.20.1 + From 518ae79aeca5e89bfe74e547dba21f8c9e80886d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 11:51:37 +0100 Subject: [PATCH 26/33] tigervnc: missing dependency --- srcpkgs/tigervnc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 432505d58882..3e1d161859ed 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -6,7 +6,7 @@ _xorg_version=1.20.0 build_style=cmake hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans" makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel - xorgproto libxkbfile-devel libXrandr-devel libXfont2-devel gnutls-devel libdrm-devel" + xorgproto libxkbfile-devel libXrandr-devel libXfont2-devel gnutls-devel libdrm-devel libxshmfence-devel" depends="perl xauth xkeyboard-config" short_desc="High performance, multi-platform VNC client and server" maintainer="Evan Deaubl " From 6a9a1cb5b20ff9779f6f0e61f2019da9e25bfbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 11:59:04 +0100 Subject: [PATCH 27/33] hplip: add dependency --- srcpkgs/hplip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 339d08b463d8..cde79c1cee18 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -27,7 +27,7 @@ make_dirs="/var/lib/hp 0755 root root" hostmakedepends="pkg-config automake libtool python3" makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel - avahi-libs-devel" + avahi-libs-devel zlib-devel" depends="python3-gobject python3-dbus desktop-file-utils foomatic-db foomatic-db-engine python3-distro" short_desc="HP Linux Imaging and Printing" From 9350229c0c5d698cb4fe51f7cf0f7c5104ec6be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 12:38:46 +0100 Subject: [PATCH 28/33] openldap: fix template building --- srcpkgs/openldap/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template index a0d96aaca218..e98495d066c8 100644 --- a/srcpkgs/openldap/template +++ b/srcpkgs/openldap/template @@ -31,7 +31,6 @@ pre_configure() { sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif} sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in - aclocal; autoconf; autoheader; libtoolize -f } post_install() { ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd From 0d75c9f914547d3febb4b57de28711e3a9f6d7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 12:41:32 +0100 Subject: [PATCH 29/33] geany: fix template building --- srcpkgs/geany/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template index be726f7817a4..bf308e43e011 100644 --- a/srcpkgs/geany/template +++ b/srcpkgs/geany/template @@ -17,9 +17,9 @@ distfiles="https://download.${pkgname}.org/${pkgname}-${version}.tar.bz2" checksum=abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546 python_version=3 -pre_configure() { - autoreconf -fi -} +# pre_configure() { +# autoreconf -fi +# } geany-devel_package() { depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" From 6e30a8546a1a5389e119c5bdeefa81739e4a3f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 13:02:34 +0100 Subject: [PATCH 30/33] seahorse-nautilus: fix building --- srcpkgs/seahorse-nautilus/patches/new-gnupg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch index 7cdbdbf84d1f..01d944a3cac9 100644 --- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch +++ b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch @@ -7,7 +7,7 @@ Index: seahorse-nautilus-3.10.1/configure.ac if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.1 2.2" ++ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3" AC_PATH_PROGS(GNUPG, [gpg gpg2], no) ok="no" if test "$GNUPG" != "no"; then From 7f70f480bdcdb50805181d976743ad6cb0b616f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 15:02:50 +0100 Subject: [PATCH 31/33] pilot-link: add patch autoconf2.71 --- .../pilot-link/patches/autoconf-2.71.patch | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 srcpkgs/pilot-link/patches/autoconf-2.71.patch diff --git a/srcpkgs/pilot-link/patches/autoconf-2.71.patch b/srcpkgs/pilot-link/patches/autoconf-2.71.patch new file mode 100644 index 000000000000..d01f34c6dc6b --- /dev/null +++ b/srcpkgs/pilot-link/patches/autoconf-2.71.patch @@ -0,0 +1,162 @@ +From d2c7d22bdfb28144ccdea99ae8298605a619ead6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= +Date: Thu, 11 Aug 2022 14:58:50 +0100 +Subject: [PATCH 1/1] autoconf2.71 + +--- + configure.ac | 77 +++++++++------------------------------------------- + 1 file changed, 13 insertions(+), 64 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc19311..727a4a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,8 +16,8 @@ dnl ****************************** + dnl Limit to a specific ac version + dnl ****************************** + AC_PREREQ(2.53) +-AM_CONFIG_HEADER(config.h) +-AM_CONFIG_HEADER(include/pi-md5.h) ++AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_HEADERS([include/pi-md5.h]) + + dnl ****************************** + dnl Pilot Link Version +@@ -62,14 +62,6 @@ AC_SUBST(PISYNC_AGE) + + dnl Eat -Werror so configure will run properly, if the user provided it + enable_werror=no +-save_CFLAGS="$CFLAGS" +-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` +-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` +-if test "x$CFLAGS" != "x$save_CFLAGS"; then +- dnl -Werror was set; treat it as implicit --enable-werror below +- enable_werror="yes" +-fi +- + + dnl Check host type + AC_CANONICAL_HOST +@@ -89,14 +81,6 @@ AM_PROG_LIBTOOL + AC_PROG_YACC + + +-dnl ****************************** +-dnl Defaults for GCC +-dnl ****************************** +-if test "x$GCC" = "xyes"; then +- CFLAGS=${CFLAGS:-"-g2 -Wall"} +-fi +- +- + dnl ****************************** + dnl Platform-specific things + dnl ****************************** +@@ -351,7 +335,7 @@ AC_ARG_WITH(bluez, + AC_HELP_STRING([--with-bluez], + [Enable use of BlueZ]), + [use_bluez="$withval"]) +-if test "$use_bluez" != "no" ; then ++AS_IF([test "$use_bluez" != "no"], [ + PKG_CHECK_MODULES([BLUEZ],[bluez],[ + have_bluez=yes + use_bluez=yes +@@ -367,7 +351,7 @@ if test "$use_bluez" != "no" ; then + have_bluez=no + ]) + ]) +-fi ++]) + + if test "$use_bluez" = "yes" ; then + AC_DEFINE([HAVE_BLUEZ],[1],[Define if we build with BlueZ]) +@@ -387,20 +371,11 @@ AC_ARG_WITH(included-popt, + [with_included_popt="auto"] + ) + +-if test "x$enable_conduits" != "xno"; then +- if test "x$with_included_popt" != "xyes"; then +- dnl Determine if system popt is good enough +- save_LIBS="$LIBS" +- AC_CHECK_HEADER(popt.h, +- AC_CHECK_DECL(POPT_BIT_SET, +- AC_CHECK_LIB(popt, poptStrippedArgv,, +- [with_included_popt="yes"]), +- [with_included_popt="yes"], +- [#include ]), +- [with_included_popt="yes"] +- ) +- LIBS="$save_LIBS" +- fi ++AS_IF([test "x$enable_conduits" != "xno"], [ ++ AS_IF([test "x$with_included_popt" != "xyes"], [ ++ PKG_CHECK_MODULES([POPT], [popt]) ++ POPT_INCLUDES="${POPT_CFLAGS}" ++ ]) + + AC_MSG_CHECKING(whether to use included popt) + if test "x$with_included_popt" = "xyes"; then +@@ -413,14 +388,13 @@ if test "x$enable_conduits" != "xno"; then + msg_popt="yes (system)" + POPT_LIBS="-lpopt" + fi +-else ++], [ + with_included_popt="no" + msg_popt="none" + POPT_LIBS= + POPT_INCLUDES= +-fi ++]) + AM_CONDITIONAL(INCLUDED_POPT, test "x$with_included_popt" = "xyes") +-AC_SUBST(POPT_LIBS) + AC_SUBST(POPT_INCLUDES) + + +@@ -667,31 +641,6 @@ if test "x$with_efence" != "xno"; then + fi + + +-dnl ************************************* +-dnl Runtime debugging +-dnl ************************************* +-set_debug=yes +-AC_ARG_ENABLE(debug, +- [ --disable-debug Shunt runtime debugging], +- [set_debug=no]) +- +-if test "${enable_debug+set}" = set; then +- if test "$enable_debug" = yes; then +- CFLAGS="-g $CFLAGS" +- set_debug=yes +- fi +-fi +- +-echo -n "Runtime debugging is " +-if test "$set_debug" = "yes"; then +- echo "enabled" +- AC_DEFINE(PI_DEBUG, 1, [Define if we have debugging enabled]) +-else +- echo "disabled" +- CFLAGS=`echo "$CFLAGS" | sed -e "s/-g //"` +-fi +- +- + dnl ************************************* + dnl Profiling information + dnl ************************************* +@@ -740,9 +689,9 @@ AC_ARG_ENABLE(compile-warnings, + + if test "$GCC" = "yes" -a "$set_compile_warnings" != "no"; then + CFLAGS="$CFLAGS \ +- -std=gnu99 -g -Wshadow -Wall -W -Waggregate-return -Wcast-align \ ++ -std=gnu99 -Wshadow -Wall -W -Waggregate-return -Wcast-align \ + -Wcast-qual -Wnested-externs -Wpointer-arith -Wundef -Winline \ +- -Wbad-function-cast -pedantic -O0" ++ -Wbad-function-cast -pedantic" + + fi + +-- +2.37.1 + From 2100f0376af633c79bdbe73d762bbcef9944c067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 16:47:26 +0100 Subject: [PATCH 32/33] openjdk7-bootstrap: autoconf2.7.1 patch --- .../patches/autoconf2.7.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 srcpkgs/openjdk7-bootstrap/patches/autoconf2.7.patch diff --git a/srcpkgs/openjdk7-bootstrap/patches/autoconf2.7.patch b/srcpkgs/openjdk7-bootstrap/patches/autoconf2.7.patch new file mode 100644 index 000000000000..1dc4f34ee001 --- /dev/null +++ b/srcpkgs/openjdk7-bootstrap/patches/autoconf2.7.patch @@ -0,0 +1,43 @@ +From 55d55c0e4998cfe621c8584518c0d7e300dfce3b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= +Date: Thu, 11 Aug 2022 15:45:13 +0100 +Subject: [PATCH 1/1] autoconf-2.7.1 + +--- + autogen.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 8537f67..18078e2 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -11,7 +11,7 @@ for AUTOCONF in autoconf autoconf259; do + AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + # echo ${AUTOCONF_VERSION} + case ${AUTOCONF_VERSION} in +- 2.59* | 2.6[0-9]* ) ++ 2.59* | 2.6[0-9]* | 2.7[0-9]* ) + HAVE_AUTOCONF=true + break; + ;; +@@ -28,7 +28,7 @@ for AUTOHEADER in autoheader autoheader259; do + AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + # echo ${AUTOHEADER_VERSION} + case ${AUTOHEADER_VERSION} in +- 2.59* | 2.6[0-9]* ) ++ 2.59* | 2.6[0-9]* | 2.7[0-9]* ) + HAVE_AUTOHEADER=true + break; + ;; +@@ -45,7 +45,7 @@ for AUTORECONF in autoreconf; do + AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + # echo ${AUTORECONF_VERSION} + case ${AUTORECONF_VERSION} in +- 2.59* | 2.6[0-9]* ) ++ 2.59* | 2.6[0-9]* | 2.7[0-9]* ) + HAVE_AUTORECONF=true + break; + ;; +-- +2.37.1 + From 4d21f9a55b2f6aa971efa8b221fb506cf6186b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 11 Aug 2022 17:02:26 +0100 Subject: [PATCH 33/33] gloobus-preview: template for autoconf 2.7.1 --- srcpkgs/gloobus-preview/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template index 96b57be75226..01034ba1e15d 100644 --- a/srcpkgs/gloobus-preview/template +++ b/srcpkgs/gloobus-preview/template @@ -23,5 +23,6 @@ if [ -z "$CROSS_BUILD" ]; then fi pre_configure() { - autoreconf -fi + sed -i '/ACX_PTHREAD()/d' configure.ac + autoreconf -fiv }