[arch-commits] Commit in geary/trunk (PKGBUILD geary-enchant2.patch)

[Maxime Gauduin]

    Date: Tuesday, January 16, 2018 @ 20:59:26
  Author: alucryd
Revision: 283516

enchant rebuild: geary 0.12.0-3

Added:
  geary/trunk/geary-enchant2.patch
Modified:
  geary/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 +++++++++---
 geary-enchant2.patch |   24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-16 20:21:32 UTC (rev 283515)
+++ PKGBUILD	2018-01-16 20:59:26 UTC (rev 283516)
@@ -5,7 +5,7 @@
 
 pkgname=geary
 pkgver=0.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A lightweight email client for the GNOME desktop'
 arch=('x86_64')
 url='http://www.yorba.org/projects/geary/'
@@ -15,8 +15,10 @@
          'libsecret' 'libsoup' 'libxml2' 'pango' 'sqlite' 'webkit2gtk')
 makedepends=('cmake' 'gnome-doc-utils' 'gobject-introspection' 'intltool'
              'vala')
-source=("https://download.gnome.org/sources/geary/${pkgver%.*}/geary-${pkgver}.tar.xz")
-sha256sums=('cef1093033ddfb52942b45c901562539cee7a192e981c7f19e2075ecb0c22446')
+source=("https://download.gnome.org/sources/geary/${pkgver%.*}/geary-${pkgver}.tar.xz"
+        'geary-enchant2.patch')
+sha256sums=('cef1093033ddfb52942b45c901562539cee7a192e981c7f19e2075ecb0c22446'
+            'd90243e5ede36399562b5c2e53350e8f0f1a6a56f8a062910a4d4e83b006acb7')
 
 prepare() {
   if [[ -d build ]]; then
@@ -23,6 +25,10 @@
     rm -rf build
   fi
   mkdir build
+
+  cd geary-${pkgver}
+
+  patch -Np1 -i ../geary-enchant2.patch
 }
 
 build() {

Added: geary-enchant2.patch
===================================================================
--- geary-enchant2.patch	                        (rev 0)
+++ geary-enchant2.patch	2018-01-16 20:59:26 UTC (rev 283516)
@@ -0,0 +1,24 @@
+diff -rupN geary-0.12.0.orig/CMakeLists.txt geary-0.12.0/CMakeLists.txt
+--- geary-0.12.0.orig/CMakeLists.txt	2018-01-16 21:45:14.731988942 +0100
++++ geary-0.12.0/CMakeLists.txt	2018-01-16 21:47:51.510178769 +0100
+@@ -96,7 +96,7 @@ find_package(PkgConfig)
+ pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
+ pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
+ 
+-pkg_check_modules(ENCHANT QUIET enchant)
++pkg_check_modules(ENCHANT QUIET enchant-2)
+ 
+ pkg_check_modules(SQLITE3 sqlite3 REQUIRED)
+ if (NOT ${SQLITE3_VERSION} VERSION_LESS 3.12)
+diff -rupN geary-0.12.0.orig/src/CMakeLists.txt geary-0.12.0/src/CMakeLists.txt
+--- geary-0.12.0.orig/src/CMakeLists.txt	2018-01-16 21:45:14.738655384 +0100
++++ geary-0.12.0/src/CMakeLists.txt	2018-01-16 21:48:40.088633141 +0100
+@@ -508,7 +508,7 @@ pkg_check_modules(DEPS REQUIRED
+     webkit2gtk-4.0>=${TARGET_WEBKIT}
+     webkit2gtk-web-extension-4.0>=${TARGET_WEBKIT}
+     javascriptcoregtk-4.0>=${TARGET_WEBKIT}
+-    enchant>=1.6
++    enchant-2>=1.6
+     ${EXTRA_CLIENT_PKG_CONFIG}
+ )
+