summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben2019-09-27 16:59:07 +0200
committerTorben2019-09-27 16:59:07 +0200
commit7fb8b0834a7529c64c53de5f939ad5e75ac753de (patch)
tree342ec9cec992305ec9902ec10f7a617374a8df3f
parente12de1caf50b9a9aa89629241cb3805115e32aaa (diff)
downloadaur-7fb8b0834a7529c64c53de5f939ad5e75ac753de.tar.gz
Update libhandy patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--force-system-libhandy.patch11
3 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 43ead230c09..80c145f9884 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = geary-git
pkgdesc = An email application built around conversations, for the GNOME 3 desktop.
- pkgver = r5013.b153755d
+ pkgver = r5046.41b72d59
pkgrel = 1
url = https://gitlab.gnome.org/GNOME/geary
arch = i686
@@ -32,7 +32,7 @@ pkgbase = geary-git
source = git+https://gitlab.gnome.org/GNOME/geary.git
source = force-system-libhandy.patch
sha256sums = SKIP
- sha256sums = 3817bad616f8187c45d47101b62f2dcc5172717dfbf91892e81d88905e2406cf
+ sha256sums = e55e842557f68c3630a2ad1fa19b09bbaf0d1bdeb556650dd9065794cdc80de9
pkgname = geary-git
diff --git a/PKGBUILD b/PKGBUILD
index 26c9148d541..10e06bbea28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
pkgname=geary-git
-pkgver=r5013.b153755d
+pkgver=r5046.41b72d59
pkgrel=1
pkgdesc="An email application built around conversations, for the GNOME 3 desktop."
arch=(i686 x86_64)
@@ -19,7 +19,7 @@ conflicts=('geary')
source=('git+https://gitlab.gnome.org/GNOME/geary.git'
'force-system-libhandy.patch')
sha256sums=('SKIP'
- '3817bad616f8187c45d47101b62f2dcc5172717dfbf91892e81d88905e2406cf')
+ 'e55e842557f68c3630a2ad1fa19b09bbaf0d1bdeb556650dd9065794cdc80de9')
pkgver() {
cd "$srcdir/geary"
diff --git a/force-system-libhandy.patch b/force-system-libhandy.patch
index 458befb3dda..74e977ba5d1 100644
--- a/force-system-libhandy.patch
+++ b/force-system-libhandy.patch
@@ -1,16 +1,17 @@
-diff --u a/meson.build b/meson.build
+diff --git a/meson.build b/meson.build
+index 98d4527f..d4015e7e 100644
--- a/meson.build
+++ b/meson.build
-@@ -88,7 +88,7 @@ iso_codes = dependency('iso-codes')
+@@ -88,7 +88,7 @@ gthread = dependency('gthread-2.0', version: '>=' + target_glib)
+ iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
json_glib = dependency('json-glib-1.0', version: '>= 1.0')
- libcanberra = dependency('libcanberra', version: '>= 0.28')
-libhandy = dependency('libhandy-0.0', version: '>= 0.0.9', required: false)
+libhandy = dependency('libhandy-0.0', version: '>= 0.0.9')
libmath = cc.find_library('m')
+ libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
libsecret = dependency('libsecret-1', version: '>= 0.11')
- libsoup = dependency('libsoup-2.4', version: '>= 2.48')
-@@ -108,26 +108,6 @@ if not enchant.found()
+@@ -109,26 +109,6 @@ if not enchant.found()
enchant = dependency('enchant', version: '>=1.6')
endif