From 3e3de0d3e566170512724e179f66a05b5666cfa8 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Sat, 20 Jul 2019 18:17:16 -0500
Subject: user/xscreensaver: upgrade to 5.43

---
 user/xscreensaver/APKBUILD                 |  8 +++-----
 user/xscreensaver/xscreensaver-fixes.patch | 14 --------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 user/xscreensaver/xscreensaver-fixes.patch

(limited to 'user/xscreensaver')

diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD
index 06f648560..9e68c3eda 100644
--- a/user/xscreensaver/APKBUILD
+++ b/user/xscreensaver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xscreensaver
-pkgver=5.42
+pkgver=5.43
 pkgrel=0
 pkgdesc="X Screensaver suite"
 url="https://www.jwz.org/xscreensaver/"
@@ -13,8 +13,7 @@ makedepends="bc gtk+2.0-dev intltool libglade-dev libice-dev libjpeg-turbo-dev
 	libx11-dev libxft-dev libxinerama-dev libxml2-dev libxml2-utils
 	libxrandr-dev libxt-dev linux-pam-dev mesa-dev mesa-glapi"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz
-	xscreensaver-fixes.patch"
+source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz"
 
 build() {
 	cd "$builddir"
@@ -33,5 +32,4 @@ package() {
 	make install_prefix="$pkgdir" install
 }
 
-sha512sums="84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd  xscreensaver-5.42.tar.gz
-1df5d3a1456990eb0b2a9efb65fcd26ce576e470a0d6ee268e84e4b399dda930f5ed0960d185e55a7fdab10e5dc42fa2c90060b16443954ec2fce306c8855b54  xscreensaver-fixes.patch"
+sha512sums="7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd  xscreensaver-5.43.tar.gz"
diff --git a/user/xscreensaver/xscreensaver-fixes.patch b/user/xscreensaver/xscreensaver-fixes.patch
deleted file mode 100644
index 0f5381902..000000000
--- a/user/xscreensaver/xscreensaver-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurd xscreensaver-5.42/hacks/fontglide.c xscreensaver-5.42.new/hacks/fontglide.c
---- xscreensaver-5.42/hacks/fontglide.c	2018-09-02 17:56:45.000000000 -0500
-+++ xscreensaver-5.42.new/hacks/fontglide.c	2019-03-24 14:09:46.559263834 -0500
-@@ -2421,8 +2421,8 @@
- 
-   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);
-+/*  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);
-- 
cgit v1.2.3-70-g09d2