summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/xscreensaver/LICENSE (renamed from libre/xscreensaver-libre/LICENSE)0
-rw-r--r--libre/xscreensaver/PKGBUILD (renamed from libre/xscreensaver-libre/PKGBUILD)21
-rw-r--r--libre/xscreensaver/xscreensaver-add-electricsheep.diff (renamed from libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff)0
3 files changed, 10 insertions, 11 deletions
diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver/LICENSE
index 406467cd4..406467cd4 100644
--- a/libre/xscreensaver-libre/LICENSE
+++ b/libre/xscreensaver/LICENSE
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver/PKGBUILD
index 5a22d37c9..b23bd47f5 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver/PKGBUILD
@@ -2,10 +2,10 @@
# Maintainer (Arch): Eric BĂ©langer <eric@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=xscreensaver
-pkgname=xscreensaver-libre
+_pkgname=xscreensaver-libre
+pkgname=xscreensaver
pkgver=5.29
-pkgrel=1
+pkgrel=1.parabola1
pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.jwz.org/xscreensaver/"
@@ -15,10 +15,9 @@ makedepends=('bc' 'intltool' 'libxpm' 'gdm')
optdepends=('gdm: for login manager support')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
backup=('etc/pam.d/xscreensaver')
-mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \
+mksource=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz)
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz \
xscreensaver-add-electricsheep.diff LICENSE)
mksha1sums=('a27a10c6eed024c458e927ee0dc1e6cb306d3335')
sha1sums=('0b0d8d57cac76460cb3a77aa5cd80adcfa856572'
@@ -26,19 +25,19 @@ sha1sums=('0b0d8d57cac76460cb3a77aa5cd80adcfa856572'
'3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
mksource() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
# Deleting dmsc.asm file due which don't have source code supplied
rm -v hacks/images/m6502/dmsc.asm
}
prepare() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
}
build() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
--with-pam --with-login-manager --with-gtk --with-gl \
@@ -47,10 +46,10 @@ build() {
}
package() {
- cd ${_pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
install -d "${pkgdir}/etc/pam.d"
make install_prefix="${pkgdir}" install
- install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+ install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
chmod 755 "${pkgdir}/usr/bin/xscreensaver"
echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
}
diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver/xscreensaver-add-electricsheep.diff
index 0c5c3ff40..0c5c3ff40 100644
--- a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
+++ b/libre/xscreensaver/xscreensaver-add-electricsheep.diff