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

Maxime Gauduin alucryd at archlinux.org
Tue Feb 19 20:33:37 UTC 2019


    Date: Tuesday, February 19, 2019 @ 20:33:37
  Author: alucryd
Revision: 434630

upgpkg: geary 0.13.0-1

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

----------------------+
 PKGBUILD             |   68 +++++++++++++++++++++++++------------------------
 geary-enchant2.patch |   24 -----------------
 2 files changed, 35 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-19 20:28:08 UTC (rev 434629)
+++ PKGBUILD	2019-02-19 20:33:37 UTC (rev 434630)
@@ -3,50 +3,52 @@
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=geary
-pkgver=0.12.4
+pkgver=0.13.0
 pkgrel=1
 pkgdesc='A lightweight email client for the GNOME desktop'
-arch=('x86_64')
-url='https://wiki.gnome.org/Apps/Geary'
-license=('GPL3')
+arch=(x86_64)
+url=https://wiki.gnome.org/Apps/Geary
+license=(GPL3)
 depends=(
-  'cairo' 'enchant' 'gcr' 'gdk-pixbuf2' 'glib2' 'gmime' 'gnome-keyring' 'gtk3'
-  'iso-codes' 'libcanberra' 'libgee' 'libnotify' 'libsecret' 'libsoup'
-  'libxml2' 'pango' 'sqlite' 'webkit2gtk'
+  cairo
+  enchant
+  gcr
+  gdk-pixbuf2
+  glib2
+  gmime
+  gnome-keyring
+  gnome-online-accounts
+  gtk3
+  iso-codes
+  libcanberra
+  libgee
+  libnotify
+  libsecret
+  libsoup
+  libxml2
+  pango
+  sqlite
+  webkit2gtk
 )
 makedepends=(
-  'cmake' 'git' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala'
+  git
+  gnome-doc-utils
+  gobject-introspection
+  intltool
+  itstool
+  meson
+  vala
 )
-source=("git+https://gitlab.gnome.org/GNOME/geary.git#tag=geary-${pkgver}"
-        'geary-enchant2.patch')
-sha256sums=('SKIP'
-            'd90243e5ede36399562b5c2e53350e8f0f1a6a56f8a062910a4d4e83b006acb7')
+source=(git+https://gitlab.gnome.org/GNOME/geary.git#tag=geary-${pkgver})
+sha256sums=(SKIP)
 
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-
-  cd geary
-
-  patch -Np1 -i ../geary-enchant2.patch
-}
-
 build() {
-  cd build
-
-  cmake ../geary \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DDESKTOP_UPDATE='FALSE' \
-    -DICON_UPDATE='FALSE' \
-    -DGSETTINGS_COMPILE='FALSE' \
-    -DGSETTINGS_COMPILE_IN_PLACE='FALSE'
-  make
+  arch-meson geary build
+  ninja -C build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C build install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et:

Deleted: geary-enchant2.patch
===================================================================
--- geary-enchant2.patch	2019-02-19 20:28:08 UTC (rev 434629)
+++ geary-enchant2.patch	2019-02-19 20:33:37 UTC (rev 434630)
@@ -1,24 +0,0 @@
-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}
- )
- 



More information about the arch-commits mailing list