summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-02-06 21:45:37 +0000
committer Eric Hameleers <alien@slackware.com>2024-02-06 23:44:07 +0100
commitb1547e7faa21be05a580c79f09b665962cc00ac3 (patch)
tree5349aa164a21e4154520b74f0e21758dc1840e37 /source/x
parent4ad114cc614c1278b52b287602360f518d8b4611 (diff)
downloadcurrent-b1547e7faa21be05a580c79f09b665962cc00ac3.tar.gz
current-b1547e7faa21be05a580c79f09b665962cc00ac3.tar.xz
Tue Feb 6 21:45:37 UTC 202420240206214537
a/kernel-firmware-20240203_b4b04a5-noarch-1.txz: Upgraded. ap/inxi-3.3.32_1-noarch-1.txz: Upgraded. d/ccache-4.9.1-x86_64-1.txz: Upgraded. d/cmake-3.28.3-x86_64-1.txz: Upgraded. l/jasper-4.2.0-x86_64-1.txz: Upgraded. x/libpciaccess-0.18-x86_64-1.txz: Upgraded. x/xdg-utils-1.2.1-noarch-1.txz: Upgraded. xfce/garcon-4.18.2-x86_64-1.txz: Upgraded. xfce/libxfce4ui-4.18.5-x86_64-1.txz: Upgraded. xfce/libxfce4util-4.18.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x')
-rw-r--r--source/x/x11/configure/libpciaccess17
-rw-r--r--source/x/x11/make/libpciaccess5
-rw-r--r--source/x/xdg-utils/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch24
-rwxr-xr-xsource/x/xdg-utils/fetch-xdg-utils.sh2
-rwxr-xr-xsource/x/xdg-utils/xdg-utils.SlackBuild11
-rw-r--r--source/x/xdg-utils/xdg-utils.url4
6 files changed, 28 insertions, 35 deletions
diff --git a/source/x/x11/configure/libpciaccess b/source/x/x11/configure/libpciaccess
new file mode 100644
index 000000000..cd149401c
--- /dev/null
+++ b/source/x/x11/configure/libpciaccess
@@ -0,0 +1,17 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ .. || exit 1
diff --git a/source/x/x11/make/libpciaccess b/source/x/x11/make/libpciaccess
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/libpciaccess
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/xdg-utils/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch b/source/x/xdg-utils/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch
deleted file mode 100644
index 08a650c16..000000000
--- a/source/x/xdg-utils/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 30 Jan 2024 11:24:41 +0100
-Subject: xdg-icon-resource: unbreak syntax by removing stray grave accent
-
----
- scripts/xdg-icon-resource.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/xdg-icon-resource.in b/scripts/xdg-icon-resource.in
-index 0bfa26b..47ba6d6 100644
---- a/scripts/xdg-icon-resource.in
-+++ b/scripts/xdg-icon-resource.in
-@@ -306,7 +306,7 @@ fi
- need_kde_icon_path()
- {
- local path
-- path="$(xdg_realpath "$1")" 2> /dev/null` # Normalize path
-+ path="$(xdg_realpath "$1")" 2> /dev/null # Normalize path
- DEBUG 2 "need_kde_icon_path $path"
- if [ -z "$path" ] ; then
- DEBUG 2 "need_kde_icon_path RETURN 1 (not needed, no xdg icon dir)"
---
-cgit v1.2.3
diff --git a/source/x/xdg-utils/fetch-xdg-utils.sh b/source/x/xdg-utils/fetch-xdg-utils.sh
index 3a73abcb6..3995c718e 100755
--- a/source/x/xdg-utils/fetch-xdg-utils.sh
+++ b/source/x/xdg-utils/fetch-xdg-utils.sh
@@ -24,7 +24,7 @@
PKGNAM=xdg-utils
# Pull a stable branch + patches
-BRANCH=${1:-v1.2.0}
+BRANCH=${1:-v1.2.1}
# Clear download area:
rm -rf ${PKGNAM}
diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild
index 6151abc55..97d93cf85 100755
--- a/source/x/xdg-utils/xdg-utils.SlackBuild
+++ b/source/x/xdg-utils/xdg-utils.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xdg-utils
-VERSION=1.2.0
+VERSION=1.2.1
PKG_VERSION=${VERSION/-/_}
ARCH=noarch
BUILD=${BUILD:-1}
@@ -50,16 +50,13 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP || exit 1
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION $PKGNAM-v$VERSION
+tar xvf $CWD/$PKGNAM-v$VERSION.tar.?z || tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-v$VERSION || cd $PKGNAM-$VERSION || exit 1
# Fix xdg-open usage in LXDE:
zcat $CWD/xdg-open.no.relative.paths.diff.gz | patch -p1 --verbose || exit 1
-# Post 1.2.0 upstream fix:
-cat $CWD/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/x/xdg-utils/xdg-utils.url b/source/x/xdg-utils/xdg-utils.url
index d4ff6173a..087118b43 100644
--- a/source/x/xdg-utils/xdg-utils.url
+++ b/source/x/xdg-utils/xdg-utils.url
@@ -1,3 +1 @@
-http://www.freedesktop.org/wiki/Software/xdg-utils/
-http://portland.freedesktop.org/download/
-https://cgit.freedesktop.org/xdg/xdg-utils/
+https://gitlab.freedesktop.org/xdg/xdg-utils