[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Frederik Schwan via arch-commits]

Date: Friday, August 28, 2020 @ 12:55:10
  Author: freswa
Revision: 690799

fix unquoted variables

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |   31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-28 12:54:38 UTC (rev 690798)
+++ PKGBUILD2020-08-28 12:55:10 UTC (rev 690799)
@@ -17,10 +17,9 @@
  '71488c328e2381c27a5084b30ea3516a')
 
 prepare() {
-cd ${srcdir}
 tar xvf icons.tar.xz
 
-cd ${srcdir}/${pkgname}
+cd ${pkgname}
 
 # Generate the makefiles.
 ./mkfiles.pl
@@ -36,7 +35,7 @@
 }
 
 build() {
-cd ${srcdir}/${pkgname}
+cd ${pkgname}
 make -f Makefile.gtk prefix=/usr
 
 # Generating icons no longer works, xvfb-run reports
@@ -46,35 +45,35 @@
 
 package() {
 # Install the icons.
-cd ${srcdir}/icons
+cd icons
 
-install -d ${pkgdir}/usr/share/icons/hicolor/48x48/apps/
+install -d "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/
 for f in ./*.png; do
-install -Dm644 ${f} ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${f}
+install -Dm644 ${f} "${pkgdir}"/usr/share/icons/hicolor/48x48/apps/${f}
 done
 
 # Generate .desktop files.
-cd ${srcdir}/${pkgname}
+cd "${srcdir}"/${pkgname}
 
-install -d ${pkgdir}/usr/share/applications
-./desktop.pl ${pkgdir}/usr/share/applications \
+install -d "${pkgdir}"/usr/share/applications
+./desktop.pl "${pkgdir}"/usr/share/applications \
  /usr/bin \
  /unused/argument
 
 # And finally, install the games.
-cd ${srcdir}/${pkgname}
+cd "${srcdir}"/${pkgname}
 
-install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
-install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
+install -d "${pkgdir}"/usr/{bin,share/licenses/${pkgname}}
+install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/
 
-make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install
+make -f Makefile.gtk prefix=/usr DESTDIR="${pkgdir}" install
 
 # Fix FS#14600 (name conflicts with other packages).
-cd ${pkgdir}/usr/bin
+cd "${pkgdir}"/usr/bin
 for oldname in *; do
 newname=puzzles-${oldname}
-mv ${pkgdir}/usr/bin/${oldname} ${pkgdir}/usr/bin/${newname}
+mv "${pkgdir}"/usr/bin/${oldname} "${pkgdir}"/usr/bin/${newname}
 sed -i "s_Exec=/usr/bin/${oldname}_Exec=/usr/bin/${newname}_" \
-${pkgdir}/usr/share/applications/${oldname}.desktop
+"${pkgdir}"/usr/share/applications/${oldname}.desktop
 done
 }

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber via arch-commits]

Date: Tuesday, May 26, 2020 @ 14:55:13
  Author: schuay
Revision: 635109

upgpkg: puzzles 20200524-1: 20200524

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-26 14:54:19 UTC (rev 635108)
+++ PKGBUILD2020-05-26 14:55:13 UTC (rev 635109)
@@ -3,7 +3,7 @@
 # Maintainer: schuay 
 
 pkgname=puzzles
-pkgver=20200413
+pkgver=20200524
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('x86_64')
@@ -11,7 +11,7 @@
 license=('MIT')
 makedepends=('pkgconfig' 'git')
 depends=('gtk2' 'desktop-file-utils')
-source=("git://git.tartarus.org/simon/puzzles.git#commit=e2135d51c51a39f05e2c20c70111b27c15952803"
+source=("git://git.tartarus.org/simon/puzzles.git#commit=66b9e8c7de0eecb3d85d9a1766fab1082848448b"
 "icons.tar.xz")
 md5sums=('SKIP'
  '71488c328e2381c27a5084b30ea3516a')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber via arch-commits]

Date: Monday, April 27, 2020 @ 18:59:44
  Author: schuay
Revision: 621918

upgpkg: puzzles 20200413-1: 20200413-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 18:41:45 UTC (rev 621917)
+++ PKGBUILD2020-04-27 18:59:44 UTC (rev 621918)
@@ -3,7 +3,7 @@
 # Maintainer: schuay 
 
 pkgname=puzzles
-pkgver=20190415
+pkgver=20200413
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Monday, June 17, 2019 @ 20:45:13
  Author: arojas
Revision: 482021

https

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-17 20:44:40 UTC (rev 482020)
+++ PKGBUILD2019-06-17 20:45:13 UTC (rev 482021)
@@ -7,7 +7,7 @@
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('x86_64')
-url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
+url="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 license=('MIT')
 makedepends=('pkgconfig' 'git')
 depends=('gtk2' 'desktop-file-utils')

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

[Jakob Gruber via arch-commits]

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
===
--- PKGBUILD2019-06-06 13:13:30 UTC (rev 477452)
+++ PKGBUILD2019-06-06 13:44:47 UTC (rev 477453)
@@ -3,18 +3,23 @@
 # Maintainer: schuay 
 
 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.xz2019-06-06 13:13:30 UTC (rev 477452)
+++ icons.tar.xz2019-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

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Sunday, November 12, 2017 @ 13:47:26
  Author: schuay
Revision: 266354

puzzles-20171029

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 13:42:38 UTC (rev 266353)
+++ PKGBUILD2017-11-12 13:47:26 UTC (rev 266354)
@@ -3,7 +3,7 @@
 # Maintainer: schuay 
 
 pkgname=puzzles
-pkgver=20160428
+pkgver=20171029
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Tuesday, May 17, 2016 @ 19:56:19
  Author: schuay
Revision: 175553

FS#49308

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-17 17:00:51 UTC (rev 175552)
+++ PKGBUILD2016-05-17 17:56:19 UTC (rev 175553)
@@ -66,7 +66,8 @@
 make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install
 
 # Fix FS#14600 (name conflicts with other packages).
-for oldname in net cube blackbox; do
+cd ${pkgdir}/usr/bin
+for oldname in *; do
 newname=puzzles-${oldname}
 mv ${pkgdir}/usr/bin/${oldname} ${pkgdir}/usr/bin/${newname}
 sed -i "s_Exec=/usr/bin/${oldname}_Exec=/usr/bin/${newname}_" \

[arch-commits] Commit in puzzles/trunk (PKGBUILD puzzles.install)

[Jakob Gruber]

Date: Tuesday, May 3, 2016 @ 19:25:40
  Author: schuay
Revision: 173583

puzzles hooks rebuild and update

Modified:
  puzzles/trunk/PKGBUILD
Deleted:
  puzzles/trunk/puzzles.install

-+
 PKGBUILD|8 
 puzzles.install |   19 ---
 2 files changed, 4 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-03 17:13:51 UTC (rev 173582)
+++ PKGBUILD2016-05-03 17:25:40 UTC (rev 173583)
@@ -3,7 +3,7 @@
 # Maintainer: schuay 
 
 pkgname=puzzles
-pkgver=20160103
+pkgver=20160428
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64')
@@ -11,8 +11,7 @@
 license=('MIT')
 makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
 depends=('gtk2' 'desktop-file-utils')
-install=puzzles.install
-source=("git://git.tartarus.org/simon/puzzles.git#commit=55683abd")
+source=("git://git.tartarus.org/simon/puzzles.git#commit=b31155b7")
 md5sums=("SKIP")
 
 prepare() {
@@ -21,7 +20,8 @@
 # Generate the makefiles.
 ./mkfiles.pl
 sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk
-sed -i 's_CFLAGS := -O2_CFLAGS := -O2 -Wno-variadic-macros_g' Makefile.gtk
+sed -i 's_-Werror __' Makefile.gtk
+sed -i 's_CFLAGS := -O2_CFLAGS := -O2 -Wno-variadic-macros 
-Wno-long-long_g' Makefile.gtk
 
 # Tweak desktop file generation to use proper icon paths.
 sed -i 's_\$icondir\/\$id-48d24.png_$id_' desktop.pl

Deleted: puzzles.install
===
--- puzzles.install 2016-05-03 17:13:51 UTC (rev 173582)
+++ puzzles.install 2016-05-03 17:25:40 UTC (rev 173583)
@@ -1,19 +0,0 @@
-pkgname=puzzles
-
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Sunday, January 3, 2016 @ 11:07:18
  Author: schuay
Revision: 155215

puzzles 20160103

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-03 02:55:42 UTC (rev 155214)
+++ PKGBUILD2016-01-03 10:07:18 UTC (rev 155215)
@@ -3,7 +3,7 @@
 # Maintainer: schuay 
 
 pkgname=puzzles
-pkgver=20150209
+pkgver=20160103
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
 depends=('gtk2' 'desktop-file-utils')
 install=puzzles.install
-source=("git://git.tartarus.org/simon/puzzles.git#commit=f1e68fb")
+source=("git://git.tartarus.org/simon/puzzles.git#commit=55683abd")
 md5sums=("SKIP")
 
 prepare() {
@@ -21,6 +21,7 @@
 # Generate the makefiles.
 ./mkfiles.pl
 sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk
+sed -i 's_CFLAGS := -O2_CFLAGS := -O2 -Wno-variadic-macros_g' Makefile.gtk
 
 # Tweak desktop file generation to use proper icon paths.
 sed -i 's_\$icondir\/\$id-48d24.png_$id_' desktop.pl

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Friday, February 27, 2015 @ 10:29:03
  Author: schuay
Revision: 128342

puzzles-20150209

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-27 06:23:20 UTC (rev 128341)
+++ PKGBUILD2015-02-27 09:29:03 UTC (rev 128342)
@@ -3,8 +3,8 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=20150117
-pkgrel=2
+pkgver=20150209
+pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')
 url=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
@@ -12,7 +12,7 @@
 makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
 depends=('gtk2' 'desktop-file-utils')
 install=puzzles.install
-source=(git://git.tartarus.org/simon/puzzles.git#commit=cca302c01)
+source=(git://git.tartarus.org/simon/puzzles.git#commit=f1e68fb)
 md5sums=(SKIP)
 
 prepare() {

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Tuesday, January 20, 2015 @ 09:38:19
  Author: schuay
Revision: 126283

Add puzzles to LogicGame category

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 08:32:18 UTC (rev 126282)
+++ PKGBUILD2015-01-20 08:38:19 UTC (rev 126283)
@@ -24,6 +24,9 @@
 
 # Tweak desktop file generation to use proper icon paths.
 sed -i 's_\$icondir\/\$id-48d24.png_$id_' desktop.pl
+
+# And add to LogicGame category (FS#43512).
+sed -i 's_\(Categories=Game;\)_\1LogicGame;_' desktop.pl
 }
 
 build() {

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Saturday, January 17, 2015 @ 09:03:40
  Author: schuay
Revision: 126028

switch puzzles to git sources

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-17 04:05:11 UTC (rev 126027)
+++ PKGBUILD2015-01-17 08:03:40 UTC (rev 126028)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=10282
+pkgver=20150117
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')
@@ -12,30 +12,31 @@
 makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick')
 depends=('gtk2' 'desktop-file-utils')
 install=puzzles.install
-source=(svn://svn.tartarus.org/sgt/puzzles#revision=$pkgver)
+source=(git://git.tartarus.org/simon/puzzles.git#commit=cca302c01)
 md5sums=(SKIP)
 
 prepare() {
 cd ${srcdir}/${pkgname}
 
+# Generate the makefiles.
 ./mkfiles.pl
 sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk
+
+# Tweak desktop file generation to use proper icon paths.
 sed -i 's_\$icondir\/\$id-48d24.png_$id_' desktop.pl
 }
 
 build() {
 cd ${srcdir}/${pkgname}
-
 make -f Makefile.gtk prefix=/usr
 
 # Generate icons.
-
 cd ${srcdir}/${pkgname}/icons
-
 xvfb-run make pngicons
 }
 
 package() {
+# Install the icons.
 cd ${srcdir}/${pkgname}/icons
 
 install -d ${pkgdir}/usr/share/icons/hicolor/48x48/
@@ -44,6 +45,7 @@
 install -Dm644 ${oldname} 
${pkgdir}/usr/share/icons/hicolor/48x48/${newname}
 done
 
+# Generate .desktop files.
 cd ${srcdir}/${pkgname}
 
 install -d ${pkgdir}/usr/share/applications
@@ -51,6 +53,7 @@
  /usr/bin \
  /usr/share/icons/
 
+# And finally, install the games.
 cd ${srcdir}/${pkgname}
 
 install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
@@ -58,7 +61,7 @@
 
 make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install
 
-#fix FS#14600
+# Fix FS#14600 (name conflicts with other packages).
 for oldname in net cube blackbox; do
 newname=puzzles-${oldname}
 mv ${pkgdir}/usr/bin/${oldname} ${pkgdir}/usr/bin/${newname}

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Saturday, January 17, 2015 @ 09:09:40
  Author: schuay
Revision: 126029

puzzles: add git make dependency

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-17 08:03:40 UTC (rev 126028)
+++ PKGBUILD2015-01-17 08:09:40 UTC (rev 126029)
@@ -9,7 +9,7 @@
 arch=('i686' 'x86_64')
 url=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 license=('MIT')
-makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick')
+makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
 depends=('gtk2' 'desktop-file-utils')
 install=puzzles.install
 source=(git://git.tartarus.org/simon/puzzles.git#commit=cca302c01)

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Saturday, January 17, 2015 @ 13:39:15
  Author: schuay
Revision: 126035

fix puzzles icon paths

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-17 10:42:28 UTC (rev 126034)
+++ PKGBUILD2015-01-17 12:39:15 UTC (rev 126035)
@@ -4,7 +4,7 @@
 
 pkgname=puzzles
 pkgver=20150117
-pkgrel=1
+pkgrel=2
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')
 url=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
@@ -39,10 +39,10 @@
 # Install the icons.
 cd ${srcdir}/${pkgname}/icons
 
-install -d ${pkgdir}/usr/share/icons/hicolor/48x48/
+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/${newname}
+install -Dm644 ${oldname} 
${pkgdir}/usr/share/icons/hicolor/48x48/apps/${newname}
 done
 
 # Generate .desktop files.
@@ -51,7 +51,7 @@
 install -d ${pkgdir}/usr/share/applications
 ./desktop.pl ${pkgdir}/usr/share/applications \
  /usr/bin \
- /usr/share/icons/
+ /unused/argument
 
 # And finally, install the games.
 cd ${srcdir}/${pkgname}

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Friday, January 16, 2015 @ 21:30:31
  Author: schuay
Revision: 126003

generate and package icons and desktop files for puzzles

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |   43 ---
 1 file changed, 36 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-16 20:26:35 UTC (rev 126002)
+++ PKGBUILD2015-01-16 20:30:31 UTC (rev 126003)
@@ -9,24 +9,50 @@
 arch=('i686' 'x86_64')
 url=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 license=('MIT')
-makedepends=('pkgconfig' 'subversion')
-depends=('gtk2')
+makedepends=('pkgconfig' 'subversion' 'xorg-server-xvfb' 'imagemagick')
+depends=('gtk2' 'desktop-file-utils')
+install=puzzles.install
 source=(svn://svn.tartarus.org/sgt/puzzles#revision=$pkgver)
 md5sums=(SKIP)
 
-build() {
+prepare() {
 cd ${srcdir}/${pkgname}
 
 ./mkfiles.pl
-
 sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk
+sed -i 's_\$icondir\/\$id-48d24.png_$id_' desktop.pl
+}
 
+build() {
+cd ${srcdir}/${pkgname}
+
 make -f Makefile.gtk prefix=/usr
+
+# Generate icons.
+
+cd ${srcdir}/${pkgname}/icons
+
+xvfb-run make pngicons
 }
 
 package() {
+cd ${srcdir}/${pkgname}/icons
+
+install -d ${pkgdir}/usr/share/icons/hicolor/48x48/
+for oldname in *-48d24.png; do
+newname=$(sed 's/\(\w*\)-48d24.png/\1.png/'  ${oldname})
+install -Dm644 ${oldname} 
${pkgdir}/usr/share/icons/hicolor/48x48/${newname}
+done
+
 cd ${srcdir}/${pkgname}
 
+install -d ${pkgdir}/usr/share/applications
+./desktop.pl ${pkgdir}/usr/share/applications \
+ /usr/bin \
+ /usr/share/icons/
+
+cd ${srcdir}/${pkgname}
+
 install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
 install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
 
@@ -33,7 +59,10 @@
 make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install
 
 #fix FS#14600
-mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net
-mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube
-mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
+for oldname in net cube blackbox; do
+newname=puzzles-${oldname}
+mv ${pkgdir}/usr/bin/${oldname} ${pkgdir}/usr/bin/${newname}
+sed -i s_Exec=/usr/bin/${oldname}_Exec=/usr/bin/${newname}_ \
+${pkgdir}/usr/share/applications/${oldname}.desktop
+done
 }

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Wednesday, October 15, 2014 @ 09:46:46
  Author: schuay
Revision: 120692

puzzles-10282-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-15 07:20:45 UTC (rev 120691)
+++ PKGBUILD2014-10-15 07:46:46 UTC (rev 120692)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=10212
+pkgver=10282
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Kyle Keen]

Date: Sunday, August 10, 2014 @ 16:19:49
  Author: kkeen
Revision: 117096

upgpkg: puzzles 10212-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-10 13:14:08 UTC (rev 117095)
+++ PKGBUILD2014-08-10 14:19:49 UTC (rev 117096)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=10146
+pkgver=10212
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Wednesday, March 26, 2014 @ 20:47:36
  Author: schuay
Revision: 108324

puzzles-10146-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-26 18:54:04 UTC (rev 108323)
+++ PKGBUILD2014-03-26 19:47:36 UTC (rev 108324)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=10098
+pkgver=10146
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Monday, December 23, 2013 @ 18:39:43
  Author: schuay
Revision: 102900

puzzles-10098-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-23 16:46:24 UTC (rev 102899)
+++ PKGBUILD2013-12-23 17:39:43 UTC (rev 102900)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=10051
+pkgver=10098
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Saturday, November 23, 2013 @ 22:12:38
  Author: schuay
Revision: 101374

puzzles-10051-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-23 20:24:09 UTC (rev 101373)
+++ PKGBUILD2013-11-23 21:12:38 UTC (rev 101374)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=9893
+pkgver=10051
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Thursday, July 25, 2013 @ 21:48:27
  Author: schuay
Revision: 94478

puzzles-9893-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-25 17:54:42 UTC (rev 94477)
+++ PKGBUILD2013-07-25 19:48:27 UTC (rev 94478)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=9840
+pkgver=9893
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')
@@ -19,9 +19,9 @@
 
 ./mkfiles.pl
 
-sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile
+sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk
 
-make prefix=/usr
+make -f Makefile.gtk prefix=/usr
 }
 
 package() {
@@ -30,7 +30,7 @@
 install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
 install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
 
-make prefix=/usr DESTDIR=${pkgdir} install
+make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install
 
 #fix FS#14600
 mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Wednesday, May 22, 2013 @ 08:13:26
  Author: schuay
Revision: 91410

puzzles-9840-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-22 06:00:23 UTC (rev 91409)
+++ PKGBUILD2013-05-22 06:13:26 UTC (rev 91410)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=9838
+pkgver=9840
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Wednesday, May 8, 2013 @ 18:45:48
  Author: schuay
Revision: 90200

puzzles-9838-1

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |   32 +++-
 1 file changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-08 13:40:53 UTC (rev 90199)
+++ PKGBUILD2013-05-08 16:45:48 UTC (rev 90200)
@@ -3,39 +3,37 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=9835
+pkgver=9838
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')
 url=http://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
 license=('MIT')
-makedepends=('pkgconfig')
+makedepends=('pkgconfig' 'subversion')
 depends=('gtk2')
-source=(http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz;)
+source=(svn://svn.tartarus.org/sgt/puzzles#revision=$pkgver)
+md5sums=(SKIP)
 
 build() {
-   cd ${srcdir}/${pkgname}-r${pkgver}
+cd ${srcdir}/${pkgname}
 
 ./mkfiles.pl
 
-   sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile
+sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile
 
-export CFLAGS=$CFLAGS -lm
-   make prefix=/usr
+make prefix=/usr
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-r${pkgver}
+cd ${srcdir}/${pkgname}
 
-   install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
-   install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
+install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
+install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
 
-   make prefix=/usr DESTDIR=${pkgdir} install
+make prefix=/usr DESTDIR=${pkgdir} install
 
-   #fix FS#14600
-   mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net
-   mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube
-   mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
+#fix FS#14600
+mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net
+mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube
+mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
 }
-
-md5sums=('0db6e36f2ac04490f38ace15aabab555')

[arch-commits] Commit in puzzles/trunk (PKGBUILD)

[Jakob Gruber]

Date: Tuesday, April 23, 2013 @ 16:53:02
  Author: schuay
Revision: 88831

puzzles-9835

Modified:
  puzzles/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-23 13:02:47 UTC (rev 88830)
+++ PKGBUILD2013-04-23 14:53:02 UTC (rev 88831)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=puzzles
-pkgver=9694
+pkgver=9835
 pkgrel=1
 pkgdesc=Simon Tatham's Portable Puzzle Collection
 arch=('i686' 'x86_64')
@@ -38,4 +38,4 @@
mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
 }
 
-md5sums=('f5e7b7b2a1bab3c939bb03e4ff8201c1')
+md5sums=('0db6e36f2ac04490f38ace15aabab555')