[arch-commits] Commit in puzzles/repos/community-i686 (4 files)
Date: Sunday, January 3, 2016 @ 11:07:31
Author: schuay
Revision: 155216
archrelease: copy trunk to community-i686
Added:
puzzles/repos/community-i686/PKGBUILD
(from rev 155215, puzzles/trunk/PKGBUILD)
puzzles/repos/community-i686/puzzles.install
(from rev 155215, puzzles/trunk/puzzles.install)
Deleted:
puzzles/repos/community-i686/PKGBUILD
puzzles/repos/community-i686/puzzles.install
-+
PKGBUILD| 149 +++---
puzzles.install | 38 ++---
2 files changed, 94 insertions(+), 93 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2016-01-03 10:07:18 UTC (rev 155215)
+++ PKGBUILD2016-01-03 10:07:31 UTC (rev 155216)
@@ -1,74 +0,0 @@
-# Contributor: Geoffroy Carrier
-# Contributor: Daniel J Griffiths
-# Maintainer: schuay
-
-pkgname=puzzles
-pkgver=20150209
-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=f1e68fb")
-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
-
-# 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-i686/PKGBUILD (from rev 155215,
puzzles/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2016-01-03 10:07:31 UTC (rev 155216)
@@ -0,0 +1,75 @@
+# Contributor: Geoffroy Carrier
+# Contributor: Daniel J Griffiths
+# Maintainer: schuay
+
+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
[arch-commits] Commit in puzzles/repos/community-i686 (4 files)
Date: Friday, February 27, 2015 @ 10:29:14
Author: schuay
Revision: 128343
archrelease: copy trunk to community-i686
Added:
puzzles/repos/community-i686/PKGBUILD
(from rev 128342, puzzles/trunk/PKGBUILD)
puzzles/repos/community-i686/puzzles.install
(from rev 128342, puzzles/trunk/puzzles.install)
Deleted:
puzzles/repos/community-i686/PKGBUILD
puzzles/repos/community-i686/puzzles.install
-+
PKGBUILD| 145 +++---
puzzles.install | 38 +++---
2 files changed, 93 insertions(+), 90 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2015-02-27 09:29:03 UTC (rev 128342)
+++ PKGBUILD2015-02-27 09:29:14 UTC (rev 128343)
@@ -1,71 +0,0 @@
-# Contributor: Geoffroy Carrier
-# Contributor: Daniel J Griffiths
-# Maintainer: schuay
-
-pkgname=puzzles
-pkgver=20150117
-pkgrel=2
-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=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/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-i686/PKGBUILD (from rev 128342,
puzzles/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-02-27 09:29:14 UTC (rev 128343)
@@ -0,0 +1,74 @@
+# Contributor: Geoffroy Carrier
+# Contributor: Daniel J Griffiths
+# Maintainer: schuay
+
+pkgname=puzzles
+pkgver=20150209
+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=f1e68fb")
+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
+
+# 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}
+
