summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoremersion2018-02-01 11:17:47 +0100
committeremersion2018-02-01 11:18:59 +0100
commitd648ae86b061533e9dd5857cddc0a688eac6fed7 (patch)
treeb3096e03ac5147c70b4e4454f5034a39aeab4091
parent80ccd4682bbd98327db215e00a5331fc9f0d4011 (diff)
downloadaur-d648ae86b061533e9dd5857cddc0a688eac6fed7.tar.gz
Use CMake
-rw-r--r--.SRCINFO40
-rw-r--r--PKGBUILD44
-rw-r--r--geary-enchant2.patch37
3 files changed, 97 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 49df640d52f..6dad6ede2a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,41 @@
pkgbase = geary-git
- pkgdesc = A new lightweight, easy-to-use, feature-rich email client (beta version)
- pkgver = r3094.6154e2ea
+ pkgdesc = A lightweight email client for the GNOME desktop
+ pkgver = r3419.b7eea857
pkgrel = 1
url = https://wiki.gnome.org/Apps/Geary
arch = i686
arch = x86_64
- license = GPL
+ license = GPL3
makedepends = cmake
- makedepends = vala
- makedepends = git
- makedepends = intltool
makedepends = gnome-doc-utils
- depends = libcanberra
+ makedepends = gobject-introspection
+ makedepends = intltool
+ makedepends = vala
+ depends = cairo
+ depends = enchant
+ depends = gcr
+ depends = gdk-pixbuf2
+ depends = glib2
+ depends = glibc
depends = gmime
- depends = webkit2gtk
- depends = libgnome-keyring
- depends = libnotify
+ depends = gnome-keyring
+ depends = gtk3
+ depends = iso-codes
+ depends = libcanberra
depends = libgee
- depends = hicolor-icon-theme
- depends = desktop-file-utils
- depends = gobject-introspection
+ depends = libnotify
+ depends = libsecret
+ depends = libsoup
+ depends = libxml2
+ depends = pango
+ depends = sqlite
+ depends = webkit2gtk
provides = geary
conflicts = geary
source = git://git.gnome.org/geary
- md5sums = SKIP
+ source = geary-enchant2.patch
+ sha256sums = SKIP
+ sha256sums = SKIP
pkgname = geary-git
diff --git a/PKGBUILD b/PKGBUILD
index 832f5797c69..434218fd4e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,56 @@
# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=geary-git
-pkgver=r3094.6154e2ea
+pkgver=r3419.b7eea857
pkgrel=1
-pkgdesc="A new lightweight, easy-to-use, feature-rich email client (beta version)"
+pkgdesc="A lightweight email client for the GNOME desktop"
arch=(i686 x86_64)
url="https://wiki.gnome.org/Apps/Geary"
-license=('GPL')
-depends=('libcanberra' 'gmime' 'webkit2gtk' 'libgnome-keyring' 'libnotify' 'libgee' 'hicolor-icon-theme' 'desktop-file-utils' 'gobject-introspection')
-makedepends=('cmake' 'vala' 'git' 'intltool' 'gnome-doc-utils')
+license=('GPL3')
+depends=('cairo' 'enchant' 'gcr' 'gdk-pixbuf2' 'glib2' 'glibc' 'gmime'
+ 'gnome-keyring' 'gtk3' 'iso-codes' 'libcanberra' 'libgee' 'libnotify'
+ 'libsecret' 'libsoup' 'libxml2' 'pango' 'sqlite' 'webkit2gtk')
+makedepends=('cmake' 'gnome-doc-utils' 'gobject-introspection' 'intltool'
+ 'vala')
provides=('geary')
conflicts=('geary')
-source=('git://git.gnome.org/geary')
-md5sums=('SKIP')
+source=('git://git.gnome.org/geary'
+ 'geary-enchant2.patch')
+sha256sums=('SKIP'
+ 'SKIP')
pkgver() {
cd "$srcdir/geary"
printf "r%s.%s" "$(git rev-list --count master)" "$(git rev-parse --short master)"
}
+prepare() {
+ cd "$srcdir/geary"
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build
+
+ patch -Np1 -i ../geary-enchant2.patch
+}
+
build() {
cd "$srcdir/geary"
- ./configure --prefix=/usr --disable-schemas-compile --disable-desktop-update --disable-icon-update
+
+ cd build
+
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DDESKTOP_UPDATE='FALSE' \
+ -DICON_UPDATE='FALSE' \
+ -DGSETTINGS_COMPILE='FALSE' \
+ -DGSETTINGS_COMPILE_IN_PLACE='FALSE'
make
}
package() {
cd "$srcdir/geary"
- make install DESTDIR="$pkgdir"
- install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ cd build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/geary-enchant2.patch b/geary-enchant2.patch
new file mode 100644
index 00000000000..bc7bfffbbfc
--- /dev/null
+++ b/geary-enchant2.patch
@@ -0,0 +1,37 @@
+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
+ libunwind-generic>=1.1
+ ${EXTRA_CLIENT_PKG_CONFIG}
+ )
+diff --git a/meson.build b/meson.build
+index 5874a98c..818d55f6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -61,7 +61,7 @@ webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
+ webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
+ javascriptcoregtk_lib = cc.find_library('javascriptcoregtk-4.0', version: '>=' + target_webkit)
+ javascriptcoregtk_vapi = valac.find_library('javascriptcore-4.0', dirs: vapi_dir)
+-enchant = dependency('enchant', version: '>= 1.6')
++enchant = dependency('enchant-2', version: '>= 1.6')
+ libunwind = declare_dependency(
+ dependencies: [
+ valac.find_library('libunwind', dirs: vapi_dir),