[arch-commits] Commit in gnome-builder/trunk (PKGBUILD enchant-2.diff)

[Jan Steffens]

    Date: Thursday, January 18, 2018 @ 12:11:10
  Author: heftig
Revision: 315076

3.26.3-2: enchant 2.2

Added:
  gnome-builder/trunk/enchant-2.diff
Modified:
  gnome-builder/trunk/PKGBUILD

----------------+
 PKGBUILD       |   21 ++++++++++++---------
 enchant-2.diff |   16 ++++++++++++++++
 2 files changed, 28 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-18 11:50:27 UTC (rev 315075)
+++ PKGBUILD	2018-01-18 12:11:10 UTC (rev 315076)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-builder
 pkgver=3.26.3
-pkgrel=1
+pkgrel=2
 pkgdesc="An IDE for writing GNOME-based software"
 url="https://wiki.gnome.org/Apps/Builder"
 arch=(x86_64)
@@ -20,12 +20,14 @@
         "git+https://git.gnome.org/browse/libgd"
         "git+https://gitlab.gnome.org/GNOME/jsonrpc-glib.git"
         "git+https://gitlab.gnome.org/GNOME/template-glib.git"
-        "git+https://gitlab.gnome.org/GNOME/libdazzle.git")
+        "git+https://gitlab.gnome.org/GNOME/libdazzle.git"
+        enchant-2.diff)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            'a9c69574433f83de76e488d5da6656e455dcbea80ff788141bae269c04ebc92b')
 
 pkgver() {
   cd $pkgname
@@ -33,8 +35,11 @@
 }
 
 prepare() {
-  mkdir build
   cd $pkgname
+
+  # enchant 2.2
+  patch -Np1 -i ../enchant-2.diff
+
   git submodule init
   git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
   git config --local submodule.subprojects/jsonrpc-glib.url "$srcdir/jsonrpc-glib"
@@ -44,12 +49,10 @@
 }
 
 build() {
-  cd build
-  arch-meson ../$pkgname
-  ninja
+  arch-meson $pkgname build
+  ninja -C build
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C build install
 }

Added: enchant-2.diff
===================================================================
--- enchant-2.diff	                        (rev 0)
+++ enchant-2.diff	2018-01-18 12:11:10 UTC (rev 315076)
@@ -0,0 +1,16 @@
+ plugins/spellcheck/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/plugins/spellcheck/meson.build i/plugins/spellcheck/meson.build
+index a8dc0036a..a9835672b 100644
+--- c/plugins/spellcheck/meson.build
++++ i/plugins/spellcheck/meson.build
+@@ -30,7 +30,7 @@ spellcheck_sources = [
+ 
+ spellcheck_deps = plugin_deps + [
+   dependency('gspell-1', version: '>= 1.2.0'),
+-  dependency('enchant'),
++  dependency('enchant-2'),
+ ]
+ 
+ shared_module('spellcheck-plugin', spellcheck_sources,