summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVryali2023-01-02 18:12:38 -0700
committerVryali2023-01-02 18:12:38 -0700
commit9be5e45be52f336786b96fd0f5f72ab2254e1f0b (patch)
treec991eb68c7945c1aa1b540f0f35598aee326e0ea
parent945f7bc25e6856b157bb3ae16cac41fdb86d528b (diff)
downloadaur-9be5e45be52f336786b96fd0f5f72ab2254e1f0b.tar.gz
Updated to 6.06 and fixed conflicts with xfce4-xscreensaver
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
2 files changed, 11 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1db38faa88db..fc3734952fb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xscreensaver-backends
pkgdesc = Screensavers from XScreenSaver for common frontends
- pkgver = 6.04
+ pkgver = 6.06
pkgrel = 1
url = http://www.jwz.org/xscreensaver/
arch = i686
@@ -18,12 +18,12 @@ pkgbase = xscreensaver-backends
conflicts = xscreensaver
conflicts = xscreensaver-hacks
conflicts = mate-screensaver-hacks
- noextract = xscreensaver-6.04.tar.gz
- source = http://www.jwz.org/xscreensaver/xscreensaver-6.04.tar.gz
+ noextract = xscreensaver-6.06.tar.gz
+ source = http://www.jwz.org/xscreensaver/xscreensaver-6.06.tar.gz
source = LICENSE
source = migrate-xscreensaver-config.sh
source = xscreensaver-config.xsl
- sha1sums = 86eec2287f7b4555e2317df93f0d6cf23c02f52c
+ sha1sums = fa7e1da709972c640a913d42039ba8609ed6218e
sha1sums = 3eedb8b91b13c29df9b1fe5cbb027e1470b802d2
sha1sums = 19195ef59f0dbc61c6ed599a968213a8f0a7a5d4
sha1sums = e561e36c7bae61c3f5da65e4fb19a22e698f4584
diff --git a/PKGBUILD b/PKGBUILD
index 9ef171a4b5d0..1a0fb5be7a89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=xscreensaver-backends
_srcname=xscreensaver
-pkgver=6.04
+pkgver=6.06
pkgrel=1
pkgdesc="Screensavers from XScreenSaver for common frontends"
arch=('i686' 'x86_64')
@@ -18,7 +18,8 @@ source=(http://www.jwz.org/xscreensaver/${_srcname}-${pkgver}.tar.gz
LICENSE
migrate-xscreensaver-config.sh
xscreensaver-config.xsl)
-sha1sums=('86eec2287f7b4555e2317df93f0d6cf23c02f52c'
+#sha1sums=('86eec2287f7b4555e2317df93f0d6cf23c02f52c'
+sha1sums=('fa7e1da709972c640a913d42039ba8609ed6218e'
'3eedb8b91b13c29df9b1fe5cbb027e1470b802d2'
'19195ef59f0dbc61c6ed599a968213a8f0a7a5d4'
'e561e36c7bae61c3f5da65e4fb19a22e698f4584')
@@ -48,6 +49,10 @@ package() {
cd "${pkgdir}/usr/share/applications/screensavers/"
sh "${srcdir}/migrate-xscreensaver-config.sh" "${pkgdir}/usr/share/xscreensaver/config/*.xml"
rm -r "${pkgdir}/usr/share/xscreensaver"
+ # There are property files that conflict with xfce4-xscreensaver - remove them.
+ # Thank you @dpirate & @Barracuda for your patience
+ rm "${pkgdir}/usr/share/applications/xscreensaver.desktop"
+ rm "${pkgdir}/usr/share/applications/xscreensaver-settings.desktop"
rmdir "${pkgdir}/etc"
# popsquares exists on most frontends
if [ -d "${pkgdir}/usr/share/applications/screensavers/popsquares.desktop" ]; then