summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgenstern2021-07-18 16:43:35 +1200
committerMorgenstern2021-07-18 16:43:35 +1200
commit2052a05f9b8e378dc8ff5a9f02ec987ce88ba948 (patch)
treecdd0a7ed662d4e359d58e40eacd945d0e4b4216b
parent3cef7174adde8da97e7d0cb9909b6d3ec72f221b (diff)
downloadaur-2052a05f9b8e378dc8ff5a9f02ec987ce88ba948.tar.gz
Fix FS#70573
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD13
2 files changed, 7 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 19b978154d5a..7056b2f5c831 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xscreensaver-arch-logo
pkgdesc = Screen saver and locker for the X Window System with Arch Linux branding
pkgver = 6.00
- pkgrel = 1
+ pkgrel = 2
url = https://www.jwz.org/xscreensaver/
arch = x86_64
license = BSD
@@ -33,4 +33,3 @@ pkgbase = xscreensaver-arch-logo
sha256sums = 8357f9e631b80ae373cb0fc8e27fa96fd032c3d5e3869bd04dde843b79260b19
pkgname = xscreensaver-arch-logo
-
diff --git a/PKGBUILD b/PKGBUILD
index 309093f47c63..f1bbc0ec8e45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=xscreensaver-arch-logo
pkgver=6.00
-pkgrel=1
+pkgrel=2
pkgdesc="Screen saver and locker for the X Window System with Arch Linux branding"
url="https://www.jwz.org/${pkgname%%-*}/"
arch=('x86_64')
@@ -25,7 +25,7 @@ optdepends=('gdm: for login manager support')
conflicts=('xscreensaver')
provides=('xscreensaver')
backup=('etc/pam.d/xscreensaver')
-source=("${pkgname}-${pkgver}.tar.gz::https://www.jwz.org/xscreensaver/${pkgname%%-*}-${pkgver}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://www.jwz.org/${pkgname%%-*}/${pkgname%%-*}-${pkgver}.tar.gz"
LICENSE
logo-50.xpm
logo-180.xpm
@@ -43,7 +43,7 @@ prepare() {
for _file in logo-*; do
install "${_file}" -Dm0644 "${srcdir}/${pkgname%%-*}-${pkgver}/hacks/images/${_file}"
done
- install -Dm0644 "$srcdir"/logo-180.xpm "${srcdir}/${pkgname%%-*}-${pkgver}/utils/images/logo-180.xpm"
+ install -Dm0644 "${srcdir}/logo-180.xpm" "${srcdir}/${pkgname%%-*}-${pkgver}/utils/images/logo-180.xpm"
}
build() {
@@ -54,6 +54,8 @@ build() {
--localstatedir=/var \
--libexecdir=/usr/lib \
--with-app-defaults=/usr/share/X11/app-defaults \
+ --without-setuid-hacks \
+ --without-setcap-hacks \
--with-pam \
--with-login-manager \
--with-gtk \
@@ -69,8 +71,5 @@ package() {
install -d "${pkgdir}/etc/pam.d"
make install_prefix="${pkgdir}" install
install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # Remove sticky bit
- chmod 0755 "${pkgdir}/usr/bin/xscreensaver" "${pkgdir}/usr/lib/xscreensaver/sonar"
- echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
+ echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/${pkgname%%-*}-properties.desktop"
}