From 46d3ef283291fc2ef93efd601e7740dbe49d791c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:17:12 +0200 Subject: [PATCH 01/20] xsetmode: removed, upstream retired. Replaced by: xinput --set-mode "device name" ABSOLUTE --- srcpkgs/xsetmode/template | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 srcpkgs/xsetmode/template diff --git a/srcpkgs/xsetmode/template b/srcpkgs/xsetmode/template deleted file mode 100644 index 01bfa7e6e8df..000000000000 --- a/srcpkgs/xsetmode/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'xsetmode' -pkgname=xsetmode -version=1.0.0 -revision=5 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libX11-devel libXi-devel" -short_desc="Switch mode of XInput devices" -maintainer="Orphaned " -license="MIT" -homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa - -post_install() { - vlicense COPYING -} From e8c0ef1177a986e16974393b8f961b4cb5da4938 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:18:06 +0200 Subject: [PATCH 02/20] xsetpointer: removed, upstream retired. Doesn't work with xorg-server 1.4 (Sept. 2007) and later. --- srcpkgs/xsetpointer/template | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 srcpkgs/xsetpointer/template diff --git a/srcpkgs/xsetpointer/template b/srcpkgs/xsetpointer/template deleted file mode 100644 index 19d882cca94a..000000000000 --- a/srcpkgs/xsetpointer/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template build file for 'xsetpointer'. -pkgname=xsetpointer -version=1.0.1 -revision=4 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libXi-devel" -short_desc="Set an X Input device as the main pointer" -homepage="http://xorg.freedesktop.org" -license="MIT" -maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571 - -post_install() { - vlicense COPYING -} From d24c6edda944d9b5ff8db2da36fb1926c3c670f0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:21:05 +0200 Subject: [PATCH 03/20] libXevie: removed, upstream retired. The server side of XEvIE was removed in xorg-server 1.6 (Feb. 2009). GNOME's at-spi2-core used libXevie starting in August 2003, but that code was disabled by default in 2015 for the 2.20.0 release, and then removed altogether in the 2.26.0 release in 2017. --- common/shlibs | 1 - srcpkgs/libXevie-devel | 1 - srcpkgs/libXevie/template | 29 ----------------------------- 3 files changed, 31 deletions(-) delete mode 120000 srcpkgs/libXevie-devel delete mode 100644 srcpkgs/libXevie/template diff --git a/common/shlibs b/common/shlibs index 005700403d0d..e55083cc0d8a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -836,7 +836,6 @@ libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 libshumate-1.0.so.1 libshumate-1.0.0_1 libvpx.so.6 libvpx6-1.8.0_1 libvpx.so.7 libvpx7-1.11.0_1 -libXevie.so.1 libXevie-1.0.2_1 libatspi.so.0 at-spi2-core-1.91.91_1 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1 libvte-2.91.so.0 vte3-0.68.0_1 diff --git a/srcpkgs/libXevie-devel b/srcpkgs/libXevie-devel deleted file mode 120000 index 6db64925021f..000000000000 --- a/srcpkgs/libXevie-devel +++ /dev/null @@ -1 +0,0 @@ -libXevie \ No newline at end of file diff --git a/srcpkgs/libXevie/template b/srcpkgs/libXevie/template deleted file mode 100644 index 29b0a7340840..000000000000 --- a/srcpkgs/libXevie/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'libXevie' -pkgname=libXevie -version=1.0.3 -revision=8 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="xorgproto libX11-devel libXext-devel" -short_desc="X Event Interceptor Library" -maintainer="Orphaned " -license="MIT" -homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73 - -post_install() { - vlicense COPYING -} - -libXevie-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/share - } -} From b7cc7690d8403aa3b1ff7b6dbdc8601bb36f7917 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:24:19 +0200 Subject: [PATCH 04/20] libXfontcache: removed, retired upstream. The server side of the FontCache extension was disabled by default in X11R6.8.0 (Sep. 2004) and was removed in xorg-server 1.6 (Feb. 2009). --- common/shlibs | 1 - srcpkgs/libXfontcache-devel | 1 - srcpkgs/libXfontcache/template | 29 ----------------------------- 3 files changed, 31 deletions(-) delete mode 120000 srcpkgs/libXfontcache-devel delete mode 100644 srcpkgs/libXfontcache/template diff --git a/common/shlibs b/common/shlibs index e55083cc0d8a..bd38bd396d20 100644 --- a/common/shlibs +++ b/common/shlibs @@ -303,7 +303,6 @@ libXcursor.so.1 libXcursor-1.1.9_1 libXxf86dga.so.1 libXxf86dga-1.0.2_1 libXxf86misc.so.1 libXxf86misc-1.0.1_1 libXp.so.6 libXp-1.0.0_1 -libXfontcache.so.1 libXfontcache-1.0.4_1 libXv.so.1 libXv-1.0.4_1 libXvMC.so.1 libXvMC-1.0.4_1 libXvMCW.so.1 libXvMC-1.0.4_1 diff --git a/srcpkgs/libXfontcache-devel b/srcpkgs/libXfontcache-devel deleted file mode 120000 index 515a1a9705e4..000000000000 --- a/srcpkgs/libXfontcache-devel +++ /dev/null @@ -1 +0,0 @@ -libXfontcache \ No newline at end of file diff --git a/srcpkgs/libXfontcache/template b/srcpkgs/libXfontcache/template deleted file mode 100644 index 58cfcce12cf7..000000000000 --- a/srcpkgs/libXfontcache/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template build file for 'libXfontcache'. -pkgname=libXfontcache -version=1.0.5 -revision=2 -build_style=gnu-configure -configure_args="--enable-malloc0returnsnull" -hostmakedepends="pkg-config" -makedepends="xorgproto libXext-devel" -short_desc="X-TrueType font cache extension client library" -homepage="http://xorg.freedesktop.org" -license="MIT" -maintainer="Orphaned " -distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce - -post_install() { - vlicense COPYING -} - -libXfontcache-devel_package() { - depends="xorgproto ${sourcepkg}>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so - vmove usr/share - } -} From cce6bc37f2afd083b78bd5f64bd0344893002c92 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:26:00 +0200 Subject: [PATCH 05/20] libXxf86misc: removed, upstream retired. The server side of the XFree86-Misc extension was removed in xorg-server 1.6 (Feb. 2009). --- common/shlibs | 1 - srcpkgs/libXxf86misc-devel | 1 - srcpkgs/libXxf86misc/template | 29 ----------------------------- 3 files changed, 31 deletions(-) delete mode 120000 srcpkgs/libXxf86misc-devel delete mode 100644 srcpkgs/libXxf86misc/template diff --git a/common/shlibs b/common/shlibs index bd38bd396d20..16bac9228706 100644 --- a/common/shlibs +++ b/common/shlibs @@ -301,7 +301,6 @@ libXaw7.so.7 libXaw-1.0.5_1 libXft.so.2 libXft-2.1.13_1 libXcursor.so.1 libXcursor-1.1.9_1 libXxf86dga.so.1 libXxf86dga-1.0.2_1 -libXxf86misc.so.1 libXxf86misc-1.0.1_1 libXp.so.6 libXp-1.0.0_1 libXv.so.1 libXv-1.0.4_1 libXvMC.so.1 libXvMC-1.0.4_1 diff --git a/srcpkgs/libXxf86misc-devel b/srcpkgs/libXxf86misc-devel deleted file mode 120000 index 19541ac9080b..000000000000 --- a/srcpkgs/libXxf86misc-devel +++ /dev/null @@ -1 +0,0 @@ -libXxf86misc \ No newline at end of file diff --git a/srcpkgs/libXxf86misc/template b/srcpkgs/libXxf86misc/template deleted file mode 100644 index d30982b777c1..000000000000 --- a/srcpkgs/libXxf86misc/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'libXxf86misc' -pkgname=libXxf86misc -version=1.0.4 -revision=1 -build_style=gnu-configure -configure_args="--enable-malloc0returnsnull" -hostmakedepends="pkg-config" -makedepends="xorgproto libX11-devel libXext-devel" -short_desc="Library for the XFree86-Misc X extension" -homepage="http://xorg.freedesktop.org" -license="MIT" -maintainer="Orphaned " -distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" -checksum=a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380 - -post_install() { - vlicense COPYING -} - -libXxf86misc-devel_package() { - depends="xorgproto libX11-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/share - } -} From ed2f657d822c1de122c3a563f83a468897ac9d89 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:28:41 +0200 Subject: [PATCH 06/20] qt6-base: remove libXevie-devel. This is mentioned nowhere in the source code, what is it good for? --- srcpkgs/qt6-base/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index 26c3274641e5..c6d790e64226 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -26,7 +26,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel libmariadbclient-devel postgresql-libs-devel libatomic-devel unixodbc-devel cups-devel libproxy-devel brotli-devel sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel - libXevie-devel xcb-util-cursor-devel" + xcb-util-cursor-devel" short_desc="Cross-platform application and UI framework (QT6)" maintainer="John " license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" From c1c5d67d81806b53626951413f2ab55b8cb17f03 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:29:14 +0200 Subject: [PATCH 07/20] xset: rebuild without libXxf86misc-devel libXfontcache-devel. --- srcpkgs/xset/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template index 9cfd80589a76..27395536b4c3 100644 --- a/srcpkgs/xset/template +++ b/srcpkgs/xset/template @@ -1,11 +1,11 @@ # Template file for 'xset' pkgname=xset version=1.2.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-xf86misc" hostmakedepends="pkg-config" -makedepends="libXmu-devel libXext-devel libXxf86misc-devel libXfontcache-devel" +makedepends="libXmu-devel libXext-devel" short_desc="X11 user preferences utility" maintainer="Frank Steinborn " license="MIT" From eca36d372b52deb2b406eedd77860f8ff252d434 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:30:22 +0200 Subject: [PATCH 08/20] light-locker: rebuild without libXxf86vm-devel. --- srcpkgs/light-locker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template index d50c71480a33..6daca02ba357 100644 --- a/srcpkgs/light-locker/template +++ b/srcpkgs/light-locker/template @@ -1,11 +1,11 @@ # Template file for 'light-locker' pkgname=light-locker version=1.9.0 -revision=2 +revision=3 build_style=meson hostmakedepends="pkg-config intltool glib-devel" makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel - libXxf86misc-devel libXxf86vm-devel elogind-devel" + libXxf86vm-devel elogind-devel" depends="lightdm" short_desc="Simple session-locker for lightdm" maintainer="Emanuel Serpa " From bb58633af498c3f75a06f86f606688013aaa7e78 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:30:51 +0200 Subject: [PATCH 09/20] cinnamon-screensaver: rebuild without libXxf86vm-devel. --- srcpkgs/cinnamon-screensaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index 36e3fc2edd85..2c29d7744e89 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,12 +1,12 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver version=5.4.2 -revision=2 +revision=3 build_style=meson build_helper=gir hostmakedepends="gettext-devel glib-devel gobject-introspection pkg-config python3-devel" -makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel +makedepends="cinnamon-desktop-devel dbus-glib-devel xdotool-devel gtk+3-devel libglib-devel dbus-devel libXinerama-devel libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel" depends="cinnamon-translations hicolor-icon-theme python3-gobject From 78b15ebbabccaf98993990570c17971973db95b8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:31:15 +0200 Subject: [PATCH 10/20] mate-settings-daemon: rebuild without libXxf86vm-devel. --- srcpkgs/mate-settings-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template index 87b825cbe013..7b2d60a8138b 100644 --- a/srcpkgs/mate-settings-daemon/template +++ b/srcpkgs/mate-settings-daemon/template @@ -1,11 +1,11 @@ # Template file for 'mate-settings-daemon' pkgname=mate-settings-daemon version=1.26.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse" hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit" -makedepends="dbus-glib-devel libXt-devel libXxf86misc-devel libcanberra-devel +makedepends="dbus-glib-devel libXt-devel libcanberra-devel libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel polkit-devel" short_desc="MATE Settings daemon (pulseaudio)" From b7eeb8fefbbf28f7e9cefd1eeefb913e6a14fdab Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:31:34 +0200 Subject: [PATCH 11/20] xdpyinfo: rebuild without libXxf86vm-devel. --- srcpkgs/xdpyinfo/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template index 71bf9a858dc9..6232e3860ff2 100644 --- a/srcpkgs/xdpyinfo/template +++ b/srcpkgs/xdpyinfo/template @@ -1,12 +1,12 @@ # Template file for 'xdpyinfo' pkgname=xdpyinfo version=1.3.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-xf86misc" hostmakedepends="pkg-config" -makedepends="libXext-devel libXtst-devel libXxf86vm-devel - libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel" +makedepends="libXext-devel libXtst-devel + libXrender-devel libXcomposite-devel libXinerama-devel" short_desc="Display information utility for X" maintainer="Orphaned " license="MIT" From 00cf8fc3acd5cced2c40977af41a94195dd5e85c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:31:49 +0200 Subject: [PATCH 12/20] mate-control-center: rebuild without libXxf86vm-devel. --- srcpkgs/mate-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template index 697e1dff2492..bcd986ab0c8f 100644 --- a/srcpkgs/mate-control-center/template +++ b/srcpkgs/mate-control-center/template @@ -1,12 +1,12 @@ # Template file for 'mate-control-center' pkgname=mate-control-center version=1.26.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb" hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel intltool itstool pkg-config" makedepends="dbus-glib-devel desktop-file-utils libXScrnSaver-devel libXt-devel - libXxf86misc-devel libcanberra-devel libgtop-devel libmarco-devel + libcanberra-devel libgtop-devel libmarco-devel libmatekbd-devel librsvg-devel mate-desktop-devel mate-menus-devel mate-settings-daemon-devel polkit-devel" depends="marco mate-icon-theme mate-settings-daemon" From 2fb41cc3c991138d7e9d19f49e1b050e586373ae Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:32:03 +0200 Subject: [PATCH 13/20] cinnamon-control-center: rebuild without libXxf86vm-devel. --- srcpkgs/cinnamon-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index db1e4ea6d7ba..d7c330972a1a 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -1,14 +1,14 @@ # Template file for 'cinnamon-control-center' pkgname=cinnamon-control-center version=5.4.7 -revision=2 +revision=3 build_style=meson build_helper=gir hostmakedepends="gettext-devel glib-devel gobject-introspection intltool libtool pkg-config libxslt" makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel - libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel + libSM-devel libcanberra-devel libgnomekbd-devel libnotify-devel libwacom-devel libnma-devel polkit-devel pulseaudio-devel tzdata upower-devel" depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4 From 87eb3ce97df4b8f96fd51b513f573eb4044ad28d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:32:18 +0200 Subject: [PATCH 14/20] xsecurelock: rebuild without libXxf86vm-devel. --- srcpkgs/xsecurelock/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template index 3494b298ad64..e32f1d71cdd3 100644 --- a/srcpkgs/xsecurelock/template +++ b/srcpkgs/xsecurelock/template @@ -1,7 +1,7 @@ # Template file for 'xsecurelock' pkgname=xsecurelock version=1.8.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-pam-service-name=system-local-login --with-xscreensaver=/usr/libexec/xscreensaver @@ -10,8 +10,7 @@ configure_args="--with-pam-service-name=system-local-login --with-htpasswd=/usr/bin/htpasswd" hostmakedepends="pkg-config automake" makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel - libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel - libXxf86misc-devel pam-devel" + libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel pam-devel" short_desc="X11 screen locker designed with the primary goal of security" maintainer="Sean R. Lang " license="Apache-2.0" From dfa73156ae7631ca7d8819f62f71fff66fa05557 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 7 May 2023 14:32:46 +0200 Subject: [PATCH 15/20] gnome-control-center: rebuild without libXxf86vm-devel. --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 849763d23c1e..3c8a1fe43e96 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,7 +1,7 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center version=43.2 -revision=2 +revision=3 build_style=meson build_helper="gir" hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config @@ -9,7 +9,7 @@ hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config makedepends="ModemManager-devel accountsservice-devel alsa-plugins colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel - libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel + libSM-devel libgnomekbd-devel libgtop-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel pulseaudio-devel samba-devel tzdata upower-devel vala-devel libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel From 70cb6417401460a6ae7c7be1c5453d3328374a6f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2023 00:05:38 +0200 Subject: [PATCH 16/20] libXfont: remove, obsoleted by libXfont2. --- common/shlibs | 1 - srcpkgs/libXfont-devel | 1 - srcpkgs/libXfont/template | 28 ---------------------------- 3 files changed, 30 deletions(-) delete mode 120000 srcpkgs/libXfont-devel delete mode 100644 srcpkgs/libXfont/template diff --git a/common/shlibs b/common/shlibs index 16bac9228706..494e99b89550 100644 --- a/common/shlibs +++ b/common/shlibs @@ -240,7 +240,6 @@ libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1 liblvm2cmd.so.2.02 device-mapper-2.02.54_1 libprop.so.0 proplib-0.1_1 libfontenc.so.1 libfontenc-1.0.4_1 -libXfont.so.1 libXfont-1.4.0_1 libx86.so.1 libx86-1.1_1 libxcb-render.so.0 libxcb-1.2_1 libxcb-glx.so.0 libxcb-1.2_1 diff --git a/srcpkgs/libXfont-devel b/srcpkgs/libXfont-devel deleted file mode 120000 index 73e43fe94757..000000000000 --- a/srcpkgs/libXfont-devel +++ /dev/null @@ -1 +0,0 @@ -libXfont \ No newline at end of file diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template deleted file mode 100644 index bc1d63c92419..000000000000 --- a/srcpkgs/libXfont/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template build file for 'libXfont'. -pkgname=libXfont -version=1.5.4 -revision=2 -hostmakedepends="pkg-config" -makedepends="xorgproto xtrans freetype-devel libfontenc-devel" -build_style=gnu-configure -short_desc="X font Library" -maintainer="Orphaned " -homepage="http://xorg.freedesktop.org/" -license="MIT" -distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" -checksum=1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242 - -post_install() { - vlicense COPYING -} - -libXfont-devel_package() { - depends="${makedepends} ${sourcepkg}-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } -} From 2fe19583387493fb7f5da4a37b0ddc3d133d4998 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2023 00:06:06 +0200 Subject: [PATCH 17/20] xorg-server: build without libXfont-devel. --- srcpkgs/xorg-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index d7514f2735bf..3ae74c71b005 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=21.1.8 -revision=1 +revision=2 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb @@ -10,7 +10,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false) -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true" hostmakedepends="pkg-config xkbcomp flex" -makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel +makedepends="MesaLib-devel libXaw-devel libXfont2-devel libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel libxkbui-devel libxshmfence-devel pixman-devel xcb-util-image-devel From b64babee0e17683c3ab7e01a11ab85279b313a49 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2023 00:08:54 +0200 Subject: [PATCH 18/20] bdftopcf: build without libXfont-devel. --- srcpkgs/bdftopcf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template index d172987b7976..7e24036b03ed 100644 --- a/srcpkgs/bdftopcf/template +++ b/srcpkgs/bdftopcf/template @@ -1,10 +1,10 @@ # Template build file for 'bdftopcf'. pkgname=bdftopcf version=1.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libXfont-devel" +makedepends="xorgproto" short_desc="BDF to PCF font converter for X11" homepage="http://xorg.freedesktop.org" license="MIT" From 07b03ce94c2e54bb1362c1e76c99e8cd66a2152e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Jun 2023 14:08:00 +0200 Subject: [PATCH 19/20] font-bitstream-speedo: removed, upstream retired. --- srcpkgs/font-bitstream-speedo/template | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 srcpkgs/font-bitstream-speedo/template diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template deleted file mode 100644 index 387e883defb2..000000000000 --- a/srcpkgs/font-bitstream-speedo/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'font-bitstream-speedo' -pkgname=font-bitstream-speedo -version=1.0.2 -revision=5 -build_style=gnu-configure -hostmakedepends="pkg-config bdftopcf mkfontscale" -depends="font-util xbps-triggers" -short_desc="Standard Speedo Bitstream PCF fonts" -maintainer="Orphaned " -license="MIT" -homepage="http://xorg.freedesktop.org/" -distfiles="${XORG_SITE}/font/${pkgname}-${version}.tar.gz" -checksum=aeea5f130480a3f05149bde13d240e668d8fb4b32c02b18914fcccd1182abe72 - -font_dirs="/usr/share/fonts/X11/Speedo" - -post_install() { - rm -f ${DESTDIR}/${font_dirs}/fonts.* - vlicense COPYING -} From f685232a9d9c210301448d999cc8bed5e3bd1ef7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 16 Jun 2023 14:10:12 +0200 Subject: [PATCH 20/20] removed-packages: add retired X.org packages. --- srcpkgs/removed-packages/template | 40 ++++++++++++++++++------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 20fce6e997ee..2e2535fa1cc3 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20230506 +version=0.1.20230516 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -109,6 +109,7 @@ replaces=" flickcurl-devel<=1.26_4 flickcurl-doc<=1.26_4 flickcurl<=1.26_4 + font-bitstream-speedo<=1.0.2_5 fontmatrix<=0.6.0.20171228_2 freshplayerplugin<=0.3.9_9 fuse-usmb<=20130204_7 @@ -253,8 +254,8 @@ replaces=" icecat-i18n-zh-CN<=78.6.1_1 icecat-i18n-zh-TW<=78.6.1_1 icecat<=78.6.1_1 - ilmbase<=2.4.2_2 ilmbase-devel<=2.4.2_2 + ilmbase<=2.4.2_2 ioquake3-rpi<=20130506_2 isl16<=0.16_2 js<=1.8.5_11 @@ -266,34 +267,37 @@ replaces=" keepassx<=0.4.4_2 key-mon<=1.17_5 laditools<=1.1.0_3 + libXevie<=1.0.3_8 + libXfontcache<=1.0.5_2 + libXxf86misc<=1.0.4_1 libantimicrox-devel<=3.1.3_1 libantimicrox<=3.1.3_1 libapp<=20140527_2 - libbitcoin-blockchain<=3.6.0_10 libbitcoin-blockchain-devel<=3.6.0_10 - libbitcoin-client<=3.6.0_10 + libbitcoin-blockchain<=3.6.0_10 libbitcoin-client-devel<=3.6.0_10 - libbitcoin-consensus<=3.6.0_1 + libbitcoin-client<=3.6.0_10 libbitcoin-consensus-devel<=3.6.0_1 - libbitcoin-database<=3.6.0_10 + libbitcoin-consensus<=3.6.0_1 libbitcoin-database-devel<=3.6.0_10 - libbitcoin-explorer<=3.6.0_10 + libbitcoin-database<=3.6.0_10 libbitcoin-explorer-devel<=3.6.0_10 - libbitcoin-network<=3.6.0_10 + libbitcoin-explorer<=3.6.0_10 libbitcoin-network-devel<=3.6.0_10 - libbitcoin-node<=3.6.0_10 + libbitcoin-network<=3.6.0_10 libbitcoin-node-devel<=3.6.0_10 - libbitcoin-protocol<=3.6.0_10 + libbitcoin-node<=3.6.0_10 libbitcoin-protocol-devel<=3.6.0_10 - libbitcoin-server<=3.6.0_10 + libbitcoin-protocol<=3.6.0_10 libbitcoin-server-devel<=3.6.0_10 - libbitcoin-system<=3.6.0_10 + libbitcoin-server<=3.6.0_10 libbitcoin-system-devel<=3.6.0_10 + libbitcoin-system<=3.6.0_10 libco-devel<=20_1 libco<=20_1 - libechonest-qt5<=2.3.1_2 - libechonest-qt5-devel<=2.3.1_2 libdbusmenu-qt<=0.9.2_4 + libechonest-qt5-devel<=2.3.1_2 + libechonest-qt5<=2.3.1_2 libfcitx-qt-devel<=4.2.9.8_1 libfcitx-qt<=4.2.9.8_1 libgksu<=2.0.12_5 @@ -327,9 +331,9 @@ replaces=" libunique1-devel<=1.1.6_12 libunique1<=1.1.6_12 libunique<=3.0.2_11 - libvpx<=1.7.0_4 - libvpx5<=1.7.0_4 libvpx5-devel<=1.7.0_4 + libvpx5<=1.7.0_4 + libvpx<=1.7.0_4 libwebkit2gtk50-devel<=2.38.3_1 libwebkit2gtk50<=2.38.3_1 libwnck2-devel<=2.30.7_8 @@ -361,8 +365,8 @@ replaces=" mozjs91-devel<=91.7.1_3 mozjs91<=91.7.1_3 mp3gain<=1.6.2_2 - mpir<=3.0.0_1 mpir-devel<=3.0.0_1 + mpir<=3.0.0_1 mutagen<=1.43.0_3 nautilus-sendto<=3.8.6_2 ncdns<=0.0.2_12 @@ -574,6 +578,8 @@ replaces=" xnoise-devel<=0.2.21_4 xnoise<=0.2.21_4 xnp2<=0.86_2 + xsetmode<=1.0.0_5 + xsetpointer<=1.0.1_4 yabause-gtk<=0.9.15_2 yt-play<=20140117_2 ytop<=0.6.2_1