Date: Sunday, January 3, 2016 @ 11:07:39 Author: schuay Revision: 155217
archrelease: copy trunk to community-x86_64 Added: puzzles/repos/community-x86_64/PKGBUILD (from rev 155216, puzzles/trunk/PKGBUILD) puzzles/repos/community-x86_64/puzzles.install (from rev 155216, puzzles/trunk/puzzles.install) Deleted: puzzles/repos/community-x86_64/PKGBUILD puzzles/repos/community-x86_64/puzzles.install -----------------+ PKGBUILD | 149 +++++++++++++++++++++++++++--------------------------- puzzles.install | 38 ++++++------- 2 files changed, 94 insertions(+), 93 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-01-03 10:07:31 UTC (rev 155216) +++ PKGBUILD 2016-01-03 10:07:39 UTC (rev 155217) @@ -1,74 +0,0 @@ -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Maintainer: schuay <jakob.gru...@gmail.com> - -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-x86_64/PKGBUILD (from rev 155216, puzzles/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-01-03 10:07:39 UTC (rev 155217) @@ -0,0 +1,75 @@ +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Maintainer: schuay <jakob.gru...@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 +} Deleted: puzzles.install =================================================================== --- puzzles.install 2016-01-03 10:07:31 UTC (rev 155216) +++ puzzles.install 2016-01-03 10:07:39 UTC (rev 155217) @@ -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 -} - Copied: puzzles/repos/community-x86_64/puzzles.install (from rev 155216, puzzles/trunk/puzzles.install) =================================================================== --- puzzles.install (rev 0) +++ puzzles.install 2016-01-03 10:07:39 UTC (rev 155217) @@ -0,0 +1,19 @@ +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 +} +