[arch-commits] Commit in puzzles/trunk (PKGBUILD icons.tar.xz)

[Jakob Gruber]

    Date: Thursday, June 6, 2019 @ 13:44:47
  Author: schuay
Revision: 477453

upgpkg: puzzles 20190415-1

20190415-1

Added:
  puzzles/trunk/icons.tar.xz
Modified:
  puzzles/trunk/PKGBUILD

--------------+
 PKGBUILD     |   26 +++++++++++++++-----------
 icons.tar.xz |    1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-06 13:13:30 UTC (rev 477452)
+++ PKGBUILD	2019-06-06 13:44:47 UTC (rev 477453)
@@ -3,18 +3,23 @@
 # Maintainer: schuay <jakob.gruber at gmail.com>
 
 pkgname=puzzles
-pkgver=20171029
+pkgver=20190415
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('x86_64')
 url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 license=('MIT')
-makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
+makedepends=('pkgconfig' 'git')
 depends=('gtk2' 'desktop-file-utils')
-source=("git://git.tartarus.org/simon/puzzles.git#commit=b31155b7")
-md5sums=("SKIP")
+source=("git://git.tartarus.org/simon/puzzles.git#commit=e2135d51c51a39f05e2c20c70111b27c15952803"
+        "icons.tar.xz")
+md5sums=('SKIP'
+         '71488c328e2381c27a5084b30ea3516a')
 
 prepare() {
+    cd ${srcdir}
+    tar xvf icons.tar.xz
+
     cd ${srcdir}/${pkgname}
 
     # Generate the makefiles.
@@ -34,19 +39,18 @@
     cd ${srcdir}/${pkgname}
     make -f Makefile.gtk prefix=/usr
 
-    # Generate icons.
-    cd ${srcdir}/${pkgname}/icons
-    xvfb-run make pngicons
+    # Generating icons no longer works, xvfb-run reports
+    # 'headless mode not supported below GTK3'. We now keep previously
+    # generated icons manually.
 }
 
 package() {
     # Install the icons.
-    cd ${srcdir}/${pkgname}/icons
+    cd ${srcdir}/icons
 
     install -d ${pkgdir}/usr/share/icons/hicolor/48x48/apps/
-    for oldname in *-48d24.png; do
-        newname=$(sed 's/\(\w*\)-48d24.png/\1.png/' <<< ${oldname})
-        install -Dm644 ${oldname} ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${newname}
+    for f in ./*.png; do
+        install -Dm644 ${f} ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${f}
     done
 
     # Generate .desktop files.

Added: icons.tar.xz
===================================================================
(Binary files differ)

Index: puzzles/trunk/icons.tar.xz
===================================================================
--- icons.tar.xz	2019-06-06 13:13:30 UTC (rev 477452)
+++ icons.tar.xz	2019-06-06 13:44:47 UTC (rev 477453)

Property changes on: puzzles/trunk/icons.tar.xz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-xz
\ No newline at end of property