summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben2018-09-14 13:01:01 +0200
committerTorben2018-09-14 13:01:01 +0200
commit1c4938ab54f422874c95d25104c59d2592b37b12 (patch)
treedf71ce6947f54ffe2d4255316ad6347496b925e8
parentfd8815740a8d18f19babd5b8b71803b08ed5f0a1 (diff)
downloadaur-1c4938ab54f422874c95d25104c59d2592b37b12.tar.gz
Don't use explicit vapi dir in patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--geary-enchant2.patch5
3 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26fab64f663..f35f7b83198 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = geary-git
pkgdesc = A lightweight email client for the GNOME desktop
- pkgver = r3681.77ea2898
+ pkgver = r3790.f3ad1fe0
pkgrel = 1
url = https://wiki.gnome.org/Apps/Geary
arch = i686
@@ -26,7 +26,7 @@ pkgbase = geary-git
source = git+https://gitlab.gnome.org/GNOME/geary.git
source = geary-enchant2.patch
sha256sums = SKIP
- sha256sums = 23261cd5ff7b3a602d6e6e5bbf8cfce05d975026be476cfd120a98000d0aa5c6
+ sha256sums = 35022afaa1b7f4081a2759987de7ec8e7ed74c0837a4d663ead9180ee8d76156
pkgname = geary-git
diff --git a/PKGBUILD b/PKGBUILD
index 8f135b67ffd..1463621241b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
pkgname=geary-git
-pkgver=r3681.77ea2898
+pkgver=r3790.f3ad1fe0
pkgrel=1
pkgdesc="A lightweight email client for the GNOME desktop"
arch=(i686 x86_64)
@@ -18,7 +18,7 @@ conflicts=('geary')
source=('git+https://gitlab.gnome.org/GNOME/geary.git'
'geary-enchant2.patch')
sha256sums=('SKIP'
- '23261cd5ff7b3a602d6e6e5bbf8cfce05d975026be476cfd120a98000d0aa5c6')
+ '35022afaa1b7f4081a2759987de7ec8e7ed74c0837a4d663ead9180ee8d76156')
pkgver() {
cd "$srcdir/geary"
diff --git a/geary-enchant2.patch b/geary-enchant2.patch
index 364f24fd57f..07bc0c98db9 100644
--- a/geary-enchant2.patch
+++ b/geary-enchant2.patch
@@ -1,7 +1,7 @@
diff --u a/meson.build b/meson.build
--- a/meson.build
+++ b/meson.build
-@@ -51,7 +51,18 @@
+@@ -51,7 +51,17 @@
webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
# Secondary deps - keep sorted alphabetically
@@ -11,10 +11,9 @@ diff --u a/meson.build b/meson.build
+ dependency('enchant-2', version: '>= 1.6')
+ enchant = valac.find_library(
+ 'enchant',
-+ dirs: '/usr/share/vala-0.40/vapi/',
+ required: true
+ )
-+ # TODO These arguments should be applied more specifically
++ # TODO These arguments should be only applied where actually needed.
+ add_project_arguments('-I/usr/include/enchant-2/', language : 'c')
+ add_project_link_arguments('-lenchant-2', language : 'c')
+endif