[arch-commits] Commit in gnome-mines/trunk (PKGBUILD icon-fixes.diff)

[Jan Steffens]

    Date: Wednesday, September 20, 2017 @ 21:11:01
  Author: heftig
Revision: 306019

3.26.0+5+g7f5a1e5-1

Added:
  gnome-mines/trunk/icon-fixes.diff
Modified:
  gnome-mines/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   26 ++++++++++++++------------
 icon-fixes.diff |   16 ++++++++++++++++
 2 files changed, 30 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-20 21:09:24 UTC (rev 306018)
+++ PKGBUILD	2017-09-20 21:11:01 UTC (rev 306019)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-mines
-pkgver=3.24.0+1+ga8c3697
+pkgver=3.26.0+5+g7f5a1e5
 pkgrel=1
 pkgdesc="Clear hidden mines from a minefield"
 url="https://wiki.gnome.org/Apps/Mines"
@@ -10,11 +10,13 @@
 arch=(i686 x86_64)
 license=(GPL)
 depends=(gtk3 librsvg libgnome-games-support)
-makedepends=(intltool itstool gobject-introspection yelp-tools appstream-glib vala git)
+makedepends=(itstool gobject-introspection yelp-tools appstream-glib vala git meson)
 groups=(gnome-extra)
-_commit=a8c3697a9f5bb7db24222ee22a7eeaf08a2e6277  # gnome-3-24
-source=("git+https://git.gnome.org/browse/gnome-mines#commit=$_commit")
-sha256sums=('SKIP')
+_commit=7f5a1e5c619325c17f378281c35bdd4b30534331  # master
+source=("git+https://git.gnome.org/browse/gnome-mines#commit=$_commit"
+        icon-fixes.diff)
+sha256sums=('SKIP'
+            'cf44d54e432a6e9b46a052070287e9d018339b9a49393d727ce6a2d807688a54')
 
 pkgver() {
   cd $pkgname
@@ -22,18 +24,18 @@
 }
 
 prepare() {
+  mkdir build
   cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
+  patch -Np1 -i ../icon-fixes.diff
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-schemas-compile
-  make
+  cd build
+  meson setup --prefix=/usr --buildtype=release ../$pkgname
+  ninja
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
 }

Added: icon-fixes.diff
===================================================================
--- icon-fixes.diff	                        (rev 0)
+++ icon-fixes.diff	2017-09-20 21:11:01 UTC (rev 306019)
@@ -0,0 +1,16 @@
+diff --git i/data/meson.build w/data/meson.build
+index 1b3585c00bd34553..f862c7a877419409 100644
+--- i/data/meson.build
++++ w/data/meson.build
+@@ -1,9 +1,9 @@
+-foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48' ]
++foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256' ]
+     install_data (join_paths ('icons', 'hicolor', size, 'gnome-mines.png'),
+                   install_dir: join_paths (datadir, 'icons', 'hicolor', size, 'apps'))
+ endforeach
+ install_data (join_paths ('icons', 'hicolor', 'scalable', 'gnome-mines-symbolic.svg'),
+-              install_dir: join_paths (datadir, 'icons', 'hicolor', size, 'apps'))
++              install_dir: join_paths (datadir, 'icons', 'hicolor', 'scalable', 'apps'))
+ install_data ('flag-symbolic.svg',
+               install_dir: join_paths (datadir, 'icons', 'hicolor', '16x16', 'actions'))
+