From cc61499a7eb6cb92a7b05cd307acc6f60899bd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 30 Mar 2024 18:24:41 +0700 Subject: [PATCH 1/3] compiz: s/intltool/gettext/ --- srcpkgs/compiz-bcop/template | 2 +- srcpkgs/compiz-core/template | 5 +++-- srcpkgs/compizconfig-python/template | 2 +- srcpkgs/libcompizconfig/template | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/compiz-bcop/template b/srcpkgs/compiz-bcop/template index 7cc20653931de9..4d089f802eafeb 100644 --- a/srcpkgs/compiz-bcop/template +++ b/srcpkgs/compiz-bcop/template @@ -3,7 +3,7 @@ pkgname=compiz-bcop version=0.8.18 revision=2 build_style=gnu-configure -hostmakedepends="automake intltool libtool pkg-config libxslt" +hostmakedepends="automake gettext libtool pkg-config libxslt" makedepends="libxslt-devel" depends="libxslt-devel" short_desc="Compiz Reloaded bcop module" diff --git a/srcpkgs/compiz-core/template b/srcpkgs/compiz-core/template index a0f0333b730610..0cb64b1b219b1b 100644 --- a/srcpkgs/compiz-core/template +++ b/srcpkgs/compiz-core/template @@ -4,7 +4,7 @@ version=0.8.18 revision=3 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="automake gettext-devel intltool libtool pkg-config libxslt" +hostmakedepends="automake gettext-devel libtool pkg-config libxslt" makedepends="fuse-devel gettext-devel glib-devel glu-devel inotify-tools-devel libSM-devel libXcomposite-devel libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel librsvg-devel libxml++-devel @@ -17,7 +17,8 @@ distfiles="https://github.com/compiz-reloaded/compiz/archive/v${version}.tar.gz" checksum=bb5af1f646c610ebbc686a5cef9bbcaab13f9d14e18f1463c1e96df4c4a9b80a pre_configure() { - NOCONFIGURE=1 ./autogen.sh + sed -i /INTLTOOL/d configure.ac + autoreconf -fi } post_install() { diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template index 32f6c379c88b12..9f790d0d663b72 100644 --- a/srcpkgs/compizconfig-python/template +++ b/srcpkgs/compizconfig-python/template @@ -4,7 +4,7 @@ version=0.8.18 revision=7 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="automake intltool libtool pkg-config glib-devel gettext-devel +hostmakedepends="automake libtool pkg-config glib-devel gettext-devel python3-Cython which" makedepends="libSM-devel libcompizconfig-devel libxml++-devel protobuf-devel python3-devel startup-notification-devel libXdamage-devel" diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index d9801a31173659..da3cd77e0d23a3 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -4,7 +4,7 @@ version=0.8.18 revision=14 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="automake intltool libtool pkg-config protobuf" +hostmakedepends="automake gettext libtool pkg-config protobuf" makedepends="MesaLib-devel compiz-core-devel libSM-devel libxml++-devel protobuf-devel startup-notification-devel" short_desc="Compiz Reloaded configuration system library" From b46e491a2e14e726d54f573c6394712f7518effa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 30 Mar 2024 18:25:00 +0700 Subject: [PATCH 2/3] intltool: mass replaced with gettext --- srcpkgs/d-feet/template | 2 +- srcpkgs/dbus/template | 2 +- srcpkgs/elogind/template | 4 ++-- srcpkgs/fcitx-hangul/template | 2 +- srcpkgs/fprintd/template | 4 ++-- srcpkgs/gnome-color-manager/template | 2 +- srcpkgs/gnome-dictionary/template | 2 +- srcpkgs/gnome-latex/template | 2 +- srcpkgs/gnome-mplayer/template | 2 +- srcpkgs/ibus/template | 2 +- srcpkgs/libcanberra/template | 9 ++------- srcpkgs/libosinfo/template | 5 ++--- srcpkgs/libpinyin/template | 2 +- srcpkgs/libtorrent-rasterbar/template | 3 ++- srcpkgs/network-manager-applet/template | 2 +- 15 files changed, 20 insertions(+), 25 deletions(-) diff --git a/srcpkgs/d-feet/template b/srcpkgs/d-feet/template index 4ea8ad148c2ac2..37e65367988b41 100644 --- a/srcpkgs/d-feet/template +++ b/srcpkgs/d-feet/template @@ -3,7 +3,7 @@ pkgname=d-feet version=0.3.16 revision=4 build_style=meson -hostmakedepends="pkg-config intltool itstool python3-pycodestyle" +hostmakedepends="pkg-config gettext itstool python3-pycodestyle" makedepends="gtk+3-devel gobject-introspection" depends="gtk+3 libwnck python3-gobject" checkdepends="xvfb-run dbus $depends" diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 783f94aef7b99d..6c665f496237b3 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -8,7 +8,7 @@ configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus --disable-asserts --disable-systemd --disable-user-session --with-system-socket=/run/dbus/system_bus_socket --disable-doxygen-docs --with-system-pid-file=/run/dbus/pid --with-console-auth-dir=/run/console" -hostmakedepends="gperf intltool pkg-config xmlto" +hostmakedepends="gperf gettext pkg-config xmlto" makedepends="expat-devel libX11-devel libcap-devel" short_desc="Message bus system" maintainer="Orphaned " diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 111f2b259d8f40..3275f48acc8238 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -8,9 +8,9 @@ configure_args="-Dcgroup-controller=elogind -Ddefault-hierarchy=legacy -Dkexec-path=/usr/bin/kexec -Dman=true -Dpolkit=true -Dreboot-path=/usr/bin/reboot -Drootlibdir=/usr/lib -Drootlibexecdir=/usr/libexec/elogind" -hostmakedepends="docbook-xsl gettext-devel glib-devel gperf intltool libxslt +hostmakedepends="docbook-xsl glib-devel gperf gettext libxslt m4 pkg-config python3-Jinja2 shadow" -makedepends="acl-devel eudev-libudev-devel gettext-devel libcap-devel +makedepends="acl-devel eudev-libudev-devel libcap-devel libglib-devel libseccomp-devel pam-devel" depends="dbus" short_desc="Standalone logind fork" diff --git a/srcpkgs/fcitx-hangul/template b/srcpkgs/fcitx-hangul/template index d1b50e2d62374d..10e8b6cc1a678a 100644 --- a/srcpkgs/fcitx-hangul/template +++ b/srcpkgs/fcitx-hangul/template @@ -3,7 +3,7 @@ pkgname=fcitx-hangul version=0.3.1 revision=2 build_style=cmake -hostmakedepends="intltool pkg-config libfcitx" +hostmakedepends="pkg-config libfcitx gettext" makedepends="libhangul-devel fcitx-devel" depends="fcitx>=4.2.9 fcitx5-hangul-icons" short_desc="Hangul (Korean) support for fcitx" diff --git a/srcpkgs/fprintd/template b/srcpkgs/fprintd/template index 4b3a61daf423cd..12022594d0e428 100644 --- a/srcpkgs/fprintd/template +++ b/srcpkgs/fprintd/template @@ -6,10 +6,10 @@ build_style=meson configure_args="--sysconfdir=/etc/fprintd -Dman=true -Dgtk_doc=false -Dsystemd=false -Dpam_modules_dir=/usr/lib/security" conf_files="/etc/fprintd/fprintd.conf" -hostmakedepends="meson dbus-glib-devel gettext-devel glib-devel intltool +hostmakedepends="dbus-glib-devel gettext glib-devel pkg-config perl python3-cairo python3-pypamtest python3-dbus python3-dbusmock libxslt libfprint polkit" -makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel pam-devel +makedepends="dbus-devel dbus-glib-devel glib-devel pam-devel libfprint-devel polkit-devel cairo-devel elogind-devel pam_wrapper" short_desc="Daemon that provides fingerprint scanning functionality" maintainer="Enno Boland " diff --git a/srcpkgs/gnome-color-manager/template b/srcpkgs/gnome-color-manager/template index 59688c5c9629aa..8e07b54be1e814 100644 --- a/srcpkgs/gnome-color-manager/template +++ b/srcpkgs/gnome-color-manager/template @@ -3,7 +3,7 @@ pkgname=gnome-color-manager version=3.36.0 revision=1 build_style=meson -hostmakedepends="gettext pkg-config intltool itstool libglib-devel glib-devel" +hostmakedepends="gettext pkg-config itstool libglib-devel glib-devel" makedepends="colord-devel gtk+3-devel clutter-gtk-devel libcanberra-devel gnome-desktop-devel libexif-devel shared-color-targets" diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index 15de25089c2193..f52f17af6c9589 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -3,7 +3,7 @@ pkgname=gnome-dictionary version=40.0 revision=1 build_style=meson -hostmakedepends="pkg-config intltool itstool glib-devel" +hostmakedepends="pkg-config gettext itstool glib-devel" makedepends="gtk+3-devel gsettings-desktop-schemas-devel" depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" short_desc="Look up words in dictionary sources" diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template index 745695af284139..9784d71e54a246 100644 --- a/srcpkgs/gnome-latex/template +++ b/srcpkgs/gnome-latex/template @@ -6,7 +6,7 @@ build_helper="gir" build_style=gnu-configure configure_args="--disable-appstream-util --disable-dconf-migration $(vopt_enable gir introspection)" -hostmakedepends="glib-devel intltool itstool pkg-config vala yelp +hostmakedepends="glib-devel gettext itstool pkg-config vala $(vopt_if gir gobject-introspection) gtk-doc" makedepends="gsettings-desktop-schemas-devel gspell-devel libgedit-gtksourceview-devel gtk+3-devel libgee-devel libglib-devel tepl-devel" diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template index e5546815de729b..eadb6aeb1b7e77 100644 --- a/srcpkgs/gnome-mplayer/template +++ b/srcpkgs/gnome-mplayer/template @@ -4,7 +4,7 @@ version=1.0.9 revision=6 build_style=gnu-configure configure_args="--disable-schemas-install" -hostmakedepends="pkg-config intltool glib-devel" +hostmakedepends="pkg-config gettext glib-devel" # XXX missing libgpod makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel libXScrnSaver-devel alsa-lib-devel pulseaudio-devel diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index 917bce0d584637..2e745043d6ae96 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -10,7 +10,7 @@ configure_args="--enable-ui --enable-gtk3 --enable-gtk4 --with-python=/usr/bin/python3 --disable-python2 $(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict) --enable-introspection --enable-vala $(vopt_enable ibus_setup setup)" -hostmakedepends="pkg-config libtool gettext-devel intltool +hostmakedepends="pkg-config libtool gettext-devel dconf python3-setuptools glib-devel vala automake gtk-doc $(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')" makedepends="dconf-devel gtk+-devel gtk+3-devel gtk4-devel hicolor-icon-theme diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index a282f71b82dec5..46e4ecc18bb8e5 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -5,9 +5,8 @@ revision=12 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 gtk-doc" -makedepends=" - gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel +hostmakedepends="gettext pkg-config gtk-doc" +makedepends="gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel gstreamer1-devel alsa-lib-devel tdb-devel pulseaudio-devel eudev-libudev-devel vala-devel" short_desc="XDG Sound Theme and Name Specification library implementation" @@ -17,10 +16,6 @@ homepage="http://0pointer.de/lennart/projects/libcanberra/" distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-${version}.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/libcanberra-${version}.tar.xz" checksum=c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 -pre_configure() { - autoreconf -if -} - libcanberra-utils_package() { replaces="${sourcepkg}<0.30_6" short_desc+=" - utilities" diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template index fcb0add4aa536a..472cd482a9ad3c 100644 --- a/srcpkgs/libosinfo/template +++ b/srcpkgs/libosinfo/template @@ -6,9 +6,8 @@ build_style=meson build_helper="gir" configure_args="$(vopt_feature gir enable-introspection) $(vopt_feature vala enable-vala) $(vopt_bool gtk_doc enable-gtk-doc)" -hostmakedepends="glib-devel intltool pkg-config wget hwids - $(vopt_if gtk_doc gtk-doc) - $(vopt_if vala vala)" +hostmakedepends="glib-devel gettext pkg-config wget hwids perl + $(vopt_if gtk_doc gtk-doc) $(vopt_if vala vala)" makedepends="libxslt-devel libglib-devel libsoup3-devel" depends="osinfo-db hwids" short_desc="GObject based library API for managing info about operating systems" diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template index db04ef0264e187..4521f5f60965e6 100644 --- a/srcpkgs/libpinyin/template +++ b/srcpkgs/libpinyin/template @@ -4,7 +4,7 @@ version=2.8.1 revision=1 build_style=gnu-configure configure_args="--enable-libzhuyin" -hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake" +hostmakedepends="gettext libtool pkg-config autoconf-archive autoconf automake" makedepends="db-devel libglib-devel" depends="libpinyin-common>=${version}_${revision}" short_desc="Support library for PinYin" diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 9f7ec72c92b5aa..ce3782646fd825 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -6,7 +6,7 @@ revision=5 build_style=cmake configure_args="-Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON -Dbuild_tests=ON" -hostmakedepends="pkg-config intltool libtool python3-devel python3-setuptools" +hostmakedepends="pkg-config gettext python3-devel python3-setuptools" makedepends="openssl-devel boost-devel geoip-devel python3-devel" short_desc="C++ bittorrent library by Rasterbar Software" maintainer="Orphaned " @@ -17,6 +17,7 @@ checksum=fef2b6817de4e6d960e019c27f21daf27bc2468a81d9e028a19d45d61456fa72 CXXFLAGS="-std=c++14" +make_check=ci-skip # TODO: The test_resume failed in CI for i686 but passed with xbps-uunshare pre_configure() { diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index e4fdca38833b21..9fe2f5a790d9d1 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -4,7 +4,7 @@ version=1.36.0 revision=1 build_style=meson configure_args="-Dselinux=false" -hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config" +hostmakedepends="dbus-glib-devel glib-devel gettext pkg-config" makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel libayatana-appindicator-devel libapparmor-devel libdbusmenu-gtk3-devel libgudev-devel libnotify-devel libnma-devel libsecret-devel From bde90675af8d7419304ae722a52c25c512d9e0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 30 Mar 2024 18:25:35 +0700 Subject: [PATCH 3/3] genius: drop autotools requirements --- srcpkgs/genius/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template index c59cd23074d30e..9c77e2cacc0e34 100644 --- a/srcpkgs/genius/template +++ b/srcpkgs/genius/template @@ -4,9 +4,8 @@ version=1.0.27 revision=1 build_style=gnu-configure build_helper=qemu -configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes - GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache" -hostmakedepends="intltool pkg-config glib-devel automake libtool bison flex +configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes" +hostmakedepends="intltool pkg-config glib-devel bison flex gtk-update-icon-cache" makedepends="gtksourceview4-devel mpfr-devel readline-devel ncurses-devel gtk+3-devel libglib-devel vte3-devel" @@ -20,10 +19,10 @@ distfiles="${GNOME_SITE}/genius/${version%.*}/genius-${version}.tar.xz" checksum=0243b7c36b5f9e930c62778acd52deb188deeca704a5e195337018435d9e7bb5 post_patch() { - vsed -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' -i configure.ac + vsed -e '/PKG_CONFIG/s/ncurses/ncursesw/' -i configure + vsed -e '/DATADIRNAME=/s/=.*/=share/' -i configure if [ "$CROSS_BUILD" ]; then - vsed -e "/cd \\\$(top_builddir)/s:\\\$(top_builddir)/src/genius:/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &:" -i lib/Makefile.am + vsed -e "/cd [\$].top_builddir./s:[\$].top_builddir./src/genius:/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &:" \ + -i lib/Makefile.am lib/Makefile.in fi - autoreconf -fi - vsed -e '/DATADIRNAME=/s/=.*/=share/' -i configure }