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 =================================================================== --- PKGBUILD 2015-01-17 04:05:11 UTC (rev 126027) +++ PKGBUILD 2015-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}