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

[Antonio Rojas]

    Date: Tuesday, December 28, 2021 @ 17:35:23
  Author: arojas
Revision: 1086434

archrelease: copy trunk to community-x86_64

Added:
  puzzles/repos/community-x86_64/PKGBUILD
    (from rev 1086433, puzzles/trunk/PKGBUILD)
Deleted:
  puzzles/repos/community-x86_64/PKGBUILD
  puzzles/repos/community-x86_64/icons.tar.xz

----------+
 PKGBUILD |  117 +++++++++++++++++++------------------------------------------
 1 file changed, 37 insertions(+), 80 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-28 17:35:14 UTC (rev 1086433)
+++ PKGBUILD	2021-12-28 17:35:23 UTC (rev 1086434)
@@ -1,80 +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=20200524
-pkgrel=1
-pkgdesc="Simon Tatham's Portable Puzzle Collection"
-arch=('x86_64')
-url="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-license=('MIT')
-makedepends=('pkgconfig' 'git')
-depends=('gtk2' 'desktop-file-utils')
-source=("git://git.tartarus.org/simon/puzzles.git#commit=66b9e8c7de0eecb3d85d9a1766fab1082848448b"
-        "icons.tar.xz")
-md5sums=('SKIP'
-         '71488c328e2381c27a5084b30ea3516a')
-
-prepare() {
-    cd ${srcdir}
-    tar xvf icons.tar.xz
-
-    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
-
-    # 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}/icons
-
-    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}
-    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).
-    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}_" \
-            ${pkgdir}/usr/share/applications/${oldname}.desktop
-    done
-}

Copied: puzzles/repos/community-x86_64/PKGBUILD (from rev 1086433, puzzles/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-28 17:35:23 UTC (rev 1086434)
@@ -0,0 +1,37 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: schuay <jakob.gruber at gmail.com>
+
+pkgname=puzzles
+pkgver=20211212
+pkgrel=1
+_commit=b56c994
+pkgdesc="Simon Tatham's Portable Puzzle Collection"
+arch=('x86_64')
+url='https://www.chiark.greenend.org.uk/~sgtatham/puzzles/'
+license=(MIT)
+depends=(gtk3)
+makedepends=(cmake imagemagick)
+source=(https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-$pkgver.$_commit.tar.gz)
+sha256sums=('0795a58fb0e958be178b5531f2e4793c18993907162fdf77b22e0106d62daa1a')
+
+build() {
+  cmake -B build -S puzzles-$pkgver.$_commit \
+   -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+
+  install -Dm644 puzzles-$pkgver.$_commit/LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+# Fix FS#14600 (name conflicts with other packages).
+  cd "$pkgdir"/usr/bin
+  for oldname in *; do
+    newname=puzzles-$oldname
+    mv "$pkgdir"/usr/bin/{$oldname,$newname}
+    sed -e "s|Exec=$oldname|Exec=$newname|" -i "$pkgdir"/usr/share/applications/$oldname.desktop
+  done
+}

Deleted: icons.tar.xz
===================================================================
(Binary files differ)