From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Remove retired X.org packages
Date: Mon, 08 May 2023 00:11:19 +0200 [thread overview]
Message-ID: <20230507221119.zPlDq7lcW_U0bB34045gwuy2s8cw6FlJnB6Ot-921Sg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43787@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages xorgcleanup
https://github.com/void-linux/void-packages/pull/43787
Remove retired X.org packages
As explained in https://lore.kernel.org/distributions/1ea25603-171c-062e-bc02-bcdfc3acd01a@oracle.com/T/#u these are all upstream dead.
libXevie was pulled into the qt6-base template by @Johnnynator in b145fa9992a483d1bc44b8ab71a3f220f9f8ab2d, but I can't figure out why. Please double-check.
A patch file from https://github.com/void-linux/void-packages/pull/43787.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xorgcleanup-43787.patch --]
[-- Type: text/x-diff, Size: 26022 bytes --]
From ad11ca123c8d4d5699f3a63096a241160da4b9de Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:17:12 +0200
Subject: [PATCH 01/19] 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 <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
-
-post_install() {
- vlicense COPYING
-}
From 9a110254e3ee0c88448e4568eaba48693c5cc27b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:18:06 +0200
Subject: [PATCH 02/19] 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 <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571
-
-post_install() {
- vlicense COPYING
-}
From f7c57a37a109e1049eb189981371c058d6a1cf9f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:19:58 +0200
Subject: [PATCH 03/19] font-bitstream-speedo: removed, upstream retired.
Support for the Speedo font format was disabled by
default in X11R6.8 (Sept. 2004), and removed in libXfont 1.4.0 (Feb. 2009).
---
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 d47bf80bc071..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 <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/${pkgname}-${version}.tar.bz2"
-checksum=0708fe0046947b88c082b55844af8a861741dcdf087f0624bdf23fb773d76763
-
-font_dirs="/usr/share/fonts/X11/Speedo"
-
-post_install() {
- rm -f ${DESTDIR}/${font_dirs}/fonts.*
- vlicense COPYING
-}
From 04fd054f68939f4821cd83e853456343a58313a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:21:05 +0200
Subject: [PATCH 04/19] 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 89f7e53081f8..edc7084f2e1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -836,7 +836,6 @@ libshumate-1.0.so.1 libshumate-1.0.0_1
libvpx.so.5 libvpx5-1.7.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 <orphan@voidlinux.org>"
-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 523f698d0d03595df2f08758ee9ebc6156d479d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:24:19 +0200
Subject: [PATCH 05/19] 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 edc7084f2e1b..af82ba892e5c 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 <orphan@voidlinux.org>"
-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 a9e99f1f14940f4941b2e80bbf999db11e35618f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:26:00 +0200
Subject: [PATCH 06/19] 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 af82ba892e5c..0465861cf945 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 <orphan@voidlinux.org>"
-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 b3253a1d7bf9e1652bfda376a56c8269818e7a10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:28:41 +0200
Subject: [PATCH 07/19] 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 dfde60bdb438..278903d4bf64 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 libXcursor-devel"
+ libXcursor-devel"
short_desc="Cross-platform application and UI framework (QT6)"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
From fe511554fe5d37d96c608ce776b548fa0722ca37 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:29:14 +0200
Subject: [PATCH 08/19] 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 <steinex@nognu.de>"
license="MIT"
From fef937cbad25a901674ee23969f19510402093cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:30:22 +0200
Subject: [PATCH 09/19] 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 <emanuel@openmailbox.org>"
From 27df91f43087e568e92efa3f0b06f47f5a771fd6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:30:51 +0200
Subject: [PATCH 10/19] 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 69e9d59d7eb397e0cfadcfbe9c8f489aaeda7800 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:15 +0200
Subject: [PATCH 11/19] 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 43606ffbdc3c..f6a71f185073 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.0
-revision=2
+revision=3
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 fed0a488e8fffcc8ad9e89d968ece588d3f84a78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:34 +0200
Subject: [PATCH 12/19] xdpyinfo: rebuild without libXxf86vm-devel.
---
srcpkgs/xdpyinfo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 2b51598a40f9..900bd703a077 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,11 +1,11 @@
# Template file for 'xdpyinfo'
pkgname=xdpyinfo
version=1.3.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel libXtst-devel libXxf86vm-devel
- libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
+ libXrender-devel libXcomposite-devel libXinerama-devel"
short_desc="Display information utility for X"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From 73c3254e14e95a50979c429e9718fef84589b567 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:31:49 +0200
Subject: [PATCH 13/19] 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 4f83fd8e1a84..ebb4058264ae 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.0
-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 5b2c6ab61376ed38692f34610a87a7141e6a06bd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:03 +0200
Subject: [PATCH 14/19] 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 be16666cd24990aa4008d6b6da382c062961d64b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:18 +0200
Subject: [PATCH 15/19] 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 <srlang@ncsu.edu>"
license="Apache-2.0"
From b4f0e6d796207346d5d357204f8bfbf8d1e0bbb5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 May 2023 14:32:46 +0200
Subject: [PATCH 16/19] 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 b0dd23308f7829c06bdeed0467b23389408be88d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:05:38 +0200
Subject: [PATCH 17/19] 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 0465861cf945..01a01c11af8e 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 <orphan@voidlinux.org>"
-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 cbd2b5141180fa4a9cd1afb2caf0fdf15bd0f063 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:06:06 +0200
Subject: [PATCH 18/19] 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 6fbf2275cd140c029146a6c1b6d9d393e5b961b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 00:08:54 +0200
Subject: [PATCH 19/19] 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"
next prev parent reply other threads:[~2023-05-07 22:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-07 12:37 [PR PATCH] " leahneukirchen
2023-05-07 13:47 ` Johnnynator
2023-05-07 14:52 ` mhmdanas
2023-05-07 22:11 ` leahneukirchen [this message]
2023-05-08 12:57 ` mhmdanas
2023-06-16 12:11 ` [PR PATCH] [Updated] " leahneukirchen
2023-06-16 14:35 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230507221119.zPlDq7lcW_U0bB34045gwuy2s8cw6FlJnB6Ot-921Sg@z \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).