From e954044f5faf603f5caa1b043be56fefea470d6d Mon Sep 17 00:00:00 2001 From: prspkt Date: Fri, 5 Jul 2019 19:36:25 +0300 Subject: [PATCH] community/xscreensaver: upgrade to 5.43 * Modernize. * Adopt maintainership. * Remove fix-fontglide.patch. Fix has been applied upstream. --- community/xscreensaver/APKBUILD | 17 ++++++----------- community/xscreensaver/fix-fontglide.patch | 11 ----------- 2 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 community/xscreensaver/fix-fontglide.patch diff --git a/community/xscreensaver/APKBUILD b/community/xscreensaver/APKBUILD index 742c888978a..b48ebe24aca 100644 --- a/community/xscreensaver/APKBUILD +++ b/community/xscreensaver/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: -# Maintainer: +# Contributor: prspkt +# Maintainer: prspkt pkgname=xscreensaver -pkgver=5.42 +pkgver=5.43 pkgrel=0 pkgdesc="Screensavers for X11 environment" url="https://www.jwz.org/xscreensaver/" @@ -12,15 +12,12 @@ 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" subpackages="$pkgname-doc $pkgname-gl-extras:gl $pkgname-extras $pkgname-lang" -source="https://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz - fix-fontglide.patch - " -builddir="$srcdir"/$pkgname-$pkgver +source="https://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz" + _libexecdir=/usr/lib/xscreensaver _confdir=/usr/share/xscreensaver/config build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,7 +34,6 @@ build() { } package() { - cd "$builddir" make install_prefix="$pkgdir" install } @@ -65,5 +61,4 @@ extras() { mv "$pkgdir"/$_confdir/* "$subpkgdir"/$_confdir } -sha512sums="84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd xscreensaver-5.42.tar.gz -26ef4e96f55c9e2f6a30804f1675b5267ffa4e36a573e15faaf6f536ee9517605e7e9424020a8678e32ac4489e7005b3e4197eeb80a416ad1a0fb1804aa22bce fix-fontglide.patch" +sha512sums="e745711c5760434652aa6bee99c1060717f15cad5946fba2fa3aadbcb300bec6620935c27d095b6e8a68c06e5bbe6fc1879474674b6d07f04b2af82d05cc383a xscreensaver-5.43.tar.gz" diff --git a/community/xscreensaver/fix-fontglide.patch b/community/xscreensaver/fix-fontglide.patch deleted file mode 100644 index c1267dde636..00000000000 --- a/community/xscreensaver/fix-fontglide.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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);