diff options
author | Torben | 2019-01-23 10:59:05 +0100 |
---|---|---|
committer | Torben | 2019-01-23 10:59:05 +0100 |
commit | ec0e5e124a29bbcbdc290c9352402a76da3d2b34 (patch) | |
tree | 483a9c05c2ba475e84184b11c7beaed96693de12 | |
parent | 453b37dda086dece933faef65a9be9cc7015b257 (diff) | |
download | aur-ec0e5e124a29bbcbdc290c9352402a76da3d2b34.tar.gz |
Remove obsolete enchant2 patch
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | geary-enchant2.patch | 22 |
3 files changed, 5 insertions, 32 deletions
@@ -1,6 +1,6 @@ pkgbase = geary-git pkgdesc = A lightweight email client for the GNOME desktop - pkgver = r4025.668e4b46 + pkgver = r4095.a2350576 pkgrel = 1 url = https://wiki.gnome.org/Apps/Geary arch = i686 @@ -23,10 +23,8 @@ pkgbase = geary-git depends = webkit2gtk provides = geary conflicts = geary - source = git+https://gitlab.gnome.org/GNOME/geary.git - source = geary-enchant2.patch + source = git+https://gitlab.gnome.org/GNOME/geary.giti sha256sums = SKIP - sha256sums = c4978c3885085e5e35f94cbf6a33f227c5a7a6cab753c738186b5b72a62e636c pkgname = geary-git @@ -4,7 +4,7 @@ # Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com> pkgname=geary-git -pkgver=r4025.668e4b46 +pkgver=r4095.a2350576 pkgrel=1 pkgdesc="A lightweight email client for the GNOME desktop" arch=(i686 x86_64) @@ -15,10 +15,8 @@ depends=('enchant' 'gcr' 'gmime' 'gtk3' 'libgee' 'libnotify' 'libsoup' makedepends=('gobject-introspection' 'itstool' 'meson' 'vala') provides=('geary') conflicts=('geary') -source=('git+https://gitlab.gnome.org/GNOME/geary.git' - 'geary-enchant2.patch') -sha256sums=('SKIP' - 'c4978c3885085e5e35f94cbf6a33f227c5a7a6cab753c738186b5b72a62e636c') +source=('git+https://gitlab.gnome.org/GNOME/geary.git') +sha256sums=('SKIP') pkgver() { cd "$srcdir/geary" @@ -30,7 +28,6 @@ prepare() { if [[ -d build ]]; then rm -rf build fi - patch -Np1 -i ../geary-enchant2.patch } build() { diff --git a/geary-enchant2.patch b/geary-enchant2.patch deleted file mode 100644 index af5407d119f0..000000000000 --- a/geary-enchant2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --u a/meson.build b/meson.build ---- a/meson.build -+++ b/meson.build -@@ -52,7 +52,17 @@ - webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit) - - # Secondary deps - keep sorted alphabetically --enchant = dependency('enchant', version: '>= 1.6') -+enchant = dependency('enchant', version: '>= 1.6', required: false) -+if not enchant.found() -+ dependency('enchant-2', version: '>= 1.6') -+ enchant = valac.find_library( -+ 'enchant', -+ required: true -+ ) -+ # 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 - gck = dependency('gck-1') - gcr = dependency('gcr-3', version: '>= 3.10.1') - gdk = dependency('gdk-3.0', version: '>=' + target_gtk) |