aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2019-02-10 23:45:19 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-12 13:55:01 +0000
commitac6d1869294ed33dac2301d7cc773fde78c61663 (patch)
treec883c8e40c226117072199d33194d5203ce1d1df
parent1b4377072d7ecb1f9b8100f9cb4758402f8c8eaf (diff)
downloadaports-ac6d1869294ed33dac2301d7cc773fde78c61663.tar.bz2
aports-ac6d1869294ed33dac2301d7cc773fde78c61663.tar.xz
main/xscreensaver: upgrade to 5.42
-rw-r--r--main/xscreensaver/APKBUILD17
-rw-r--r--main/xscreensaver/fix-fontglide.patch11
2 files changed, 20 insertions, 8 deletions
diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD
index 272576e8c6..390b665af4 100644
--- a/main/xscreensaver/APKBUILD
+++ b/main/xscreensaver/APKBUILD
@@ -1,20 +1,20 @@
# Contributor:
# Maintainer:
pkgname=xscreensaver
-pkgver=5.40
+pkgver=5.42
pkgrel=0
-pkgdesc="screensavers for X11 environment"
+pkgdesc="Screensavers for X11 environment"
url="https://www.jwz.org/xscreensaver/"
+arch="all"
license="GPL"
depends="bc"
+options="suid"
makedepends="gtk+-dev libjpeg-turbo-dev mesa-dev gettext-dev libxmu-dev perl
libxml2-dev libglade-dev libxinerama-dev libxrandr-dev glu-dev sed"
-install=
subpackages="$pkgname-doc $pkgname-gl-extras:gl $pkgname-extras $pkgname-lang"
-source="https://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz"
-arch="all"
-options="suid"
-
+source="https://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz
+ fix-fontglide.patch
+ "
builddir="$srcdir"/$pkgname-$pkgver
_libexecdir=/usr/lib/xscreensaver
_confdir=/usr/share/xscreensaver/config
@@ -65,4 +65,5 @@ extras() {
mv "$pkgdir"/$_confdir/* "$subpkgdir"/$_confdir
}
-sha512sums="e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d xscreensaver-5.40.tar.gz"
+sha512sums="84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd xscreensaver-5.42.tar.gz
+26ef4e96f55c9e2f6a30804f1675b5267ffa4e36a573e15faaf6f536ee9517605e7e9424020a8678e32ac4489e7005b3e4197eeb80a416ad1a0fb1804aa22bce fix-fontglide.patch"
diff --git a/main/xscreensaver/fix-fontglide.patch b/main/xscreensaver/fix-fontglide.patch
new file mode 100644
index 0000000000..c1267dde63
--- /dev/null
+++ b/main/xscreensaver/fix-fontglide.patch
@@ -0,0 +1,11 @@
+--- a/hacks/fontglide.c
++++ b/hacks/fontglide.c
+@@ -2421,8 +2421,6 @@
+
+ textclient_close (s->tc);
+
+-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
+-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
+ XFreeGC (dpy, s->bg_gc);
+ if (s->charset) free (s->charset);
+ if (s->font_override) free (s->font_override);