[arch-commits] Commit in puzzles/repos/community-x86_64 (3 files)

[Jakob Gruber]

    Date: Tuesday, May 3, 2016 @ 19:26:04
  Author: schuay
Revision: 173585

archrelease: copy trunk to community-x86_64

Added:
  puzzles/repos/community-x86_64/PKGBUILD
    (from rev 173584, puzzles/trunk/PKGBUILD)
Deleted:
  puzzles/repos/community-x86_64/PKGBUILD
  puzzles/repos/community-x86_64/puzzles.install

-----------------+
 PKGBUILD        |  150 +++++++++++++++++++++++++++---------------------------
 puzzles.install |   19 ------
 2 files changed, 75 insertions(+), 94 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-03 17:25:58 UTC (rev 173584)
+++ PKGBUILD	2016-05-03 17:26:04 UTC (rev 173585)
@@ -1,75 +0,0 @@
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Maintainer: schuay <jakob.gruber at gmail.com>
-
-pkgname=puzzles
-pkgver=20160103
-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' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
-depends=('gtk2' 'desktop-file-utils')
-install=puzzles.install
-source=("git://git.tartarus.org/simon/puzzles.git#commit=55683abd")
-md5sums=("SKIP")
-
-prepare() {
-    cd ${srcdir}/${pkgname}
-
-    # 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
-
-    # And add to LogicGame category (FS#43512).
-    sed -i 's_\(Categories=Game;\)_\1LogicGame;_' 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/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}
-    done
-
-    # Generate .desktop files.
-    cd ${srcdir}/${pkgname}
-
-    install -d ${pkgdir}/usr/share/applications
-    ./desktop.pl ${pkgdir}/usr/share/applications \
-                 /usr/bin \
-                 /unused/argument
-
-    # And finally, install the games.
-    cd ${srcdir}/${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
-
-    # 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}
-        sed -i "s_Exec=/usr/bin/${oldname}_Exec=/usr/bin/${newname}_" \
-            ${pkgdir}/usr/share/applications/${oldname}.desktop
-    done
-}

Copied: puzzles/repos/community-x86_64/PKGBUILD (from rev 173584, puzzles/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-05-03 17:26:04 UTC (rev 173585)
@@ -0,0 +1,75 @@
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer: schuay <jakob.gruber at gmail.com>
+
+pkgname=puzzles
+pkgver=20160428
+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' 'subversion' 'xorg-server-xvfb' 'imagemagick' 'git')
+depends=('gtk2' 'desktop-file-utils')
+source=("git://git.tartarus.org/simon/puzzles.git#commit=b31155b7")
+md5sums=("SKIP")
+
+prepare() {
+    cd ${srcdir}/${pkgname}
+
+    # Generate the makefiles.
+    ./mkfiles.pl
+    sed -i 's|\$(gamesdir)|\$(bindir)|' 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
+
+    # And add to LogicGame category (FS#43512).
+    sed -i 's_\(Categories=Game;\)_\1LogicGame;_' 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/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}
+    done
+
+    # Generate .desktop files.
+    cd ${srcdir}/${pkgname}
+
+    install -d ${pkgdir}/usr/share/applications
+    ./desktop.pl ${pkgdir}/usr/share/applications \
+                 /usr/bin \
+                 /unused/argument
+
+    # And finally, install the games.
+    cd ${srcdir}/${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
+
+    # 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}
+        sed -i "s_Exec=/usr/bin/${oldname}_Exec=/usr/bin/${newname}_" \
+            ${pkgdir}/usr/share/applications/${oldname}.desktop
+    done
+}

Deleted: puzzles.install
===================================================================
--- puzzles.install	2016-05-03 17:25:58 UTC (rev 173584)
+++ puzzles.install	2016-05-03 17:26:04 UTC (rev 173585)
@@ -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
-}
-