Date: Wednesday, March 14, 2018 @ 19:47:17
  Author: heftig
Revision: 319071

3.28.0+8+gf3e2c90d24-1

Modified:
  evolution/trunk/PKGBUILD
Deleted:
  evolution/trunk/enchant-2.diff

----------------+
 PKGBUILD       |   34 +++++---------
 enchant-2.diff |  130 -------------------------------------------------------
 2 files changed, 13 insertions(+), 151 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-03-14 19:36:27 UTC (rev 319070)
+++ PKGBUILD    2018-03-14 19:47:17 UTC (rev 319071)
@@ -4,7 +4,7 @@
 
 pkgbase=evolution
 pkgname=(evolution evolution-bogofilter evolution-spamassassin)
-pkgver=3.26.5
+pkgver=3.28.0+8+gf3e2c90d24
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 url="https://wiki.gnome.org/Apps/Evolution";
@@ -15,11 +15,9 @@
 makedepends=(intltool itstool docbook-xsl networkmanager bogofilter
              spamassassin highlight gtk-doc yelp-tools git cmake ninja)
 options=(!emptydirs)
-_commit=ce6a53d0f4c04e3d617567c9c3f0a3b5a604710b  # tags/3.26.5^0
-source=("git+https://git.gnome.org/browse/evolution#commit=$_commit";
-        enchant-2.diff)
-sha256sums=('SKIP'
-            'cc0a9dea2f8ef78aaeade6e0b9ddaca8414eb0975ad79dfbb057b2b369a332ba')
+_commit=f3e2c90d24020bdc5953ef86b8cd68f98fb6875a  # gnome-3-28
+source=("git+https://git.gnome.org/browse/evolution#commit=$_commit";)
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
@@ -28,10 +26,6 @@
 
 build() {
   cd $pkgbase
-
-  # enchant 2.2
-  patch -Np1 -i ../enchant-2.diff
-
   cmake . -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIBEXEC_INSTALL_DIR=/usr/lib \
@@ -47,14 +41,14 @@
               'evolution-bogofilter: Bogofilter spam check plugin')
   groups=(gnome-extra)
 
-  cd $pkgbase
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C $pkgbase install
 
-  mkdir ../plugins
-  mv "$pkgdir/usr/lib/evolution/modules/module-bogofilter.so" ../plugins/
-  mv "$pkgdir/usr/lib/evolution/modules/module-spamassassin.so" ../plugins/
-  mv "$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml" ../plugins/
-  mv "$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml" 
../plugins/
+### Split
+  for _x in bogofilter spamassassin; do
+    mkdir -p $_x/usr/{lib/evolution/modules,share/metainfo}
+    mv {"$pkgdir",$_x}/usr/lib/evolution/modules/module-$_x.so
+    mv {"$pkgdir",$_x}/usr/share/metainfo/org.gnome.Evolution-$_x.metainfo.xml
+  done
 }
 
 
@@ -62,8 +56,7 @@
   pkgdesc="Spam filtering for Evolution, using Bogofilter"
   depends=("evolution=$pkgver" bogofilter)
 
-  install -Dm755 plugins/module-bogofilter.so 
"$pkgdir/usr/lib/evolution/modules/module-bogofilter.so"
-  install -Dm644 plugins/evolution-bogofilter.metainfo.xml 
"$pkgdir/usr/share/appdata/evolution-bogofilter.metainfo.xml"
+  mv bogofilter/usr "$pkgdir"
 }
 
 package_evolution-spamassassin() {
@@ -70,6 +63,5 @@
   pkgdesc="Spam filtering for Evolution, using SpamAssassin"
   depends=("evolution=$pkgver" spamassassin)
 
-  install -Dm755 plugins/module-spamassassin.so 
"$pkgdir/usr/lib/evolution/modules/module-spamassassin.so"
-  install -Dm644 plugins/evolution-spamassassin.metainfo.xml 
"$pkgdir/usr/share/appdata/evolution-spamassassin.metainfo.xml"
+  mv spamassassin/usr "$pkgdir"
 }

Deleted: enchant-2.diff
===================================================================
--- enchant-2.diff      2018-03-14 19:36:27 UTC (rev 319070)
+++ enchant-2.diff      2018-03-14 19:47:17 UTC (rev 319071)
@@ -1,130 +0,0 @@
- CMakeLists.txt                                | 6 +++---
- evolution-shell.pc.in                         | 2 +-
- src/composer/CMakeLists.txt                   | 1 +
- src/composer/e-msg-composer.c                 | 2 +-
- src/e-util/e-html-editor-actions.c            | 2 +-
- src/e-util/e-html-editor-spell-check-dialog.c | 2 +-
- src/e-util/e-html-editor.c                    | 2 +-
- src/e-util/e-spell-dictionary.h               | 2 +-
- 8 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git c/CMakeLists.txt i/CMakeLists.txt
-index 2cb253f1a6..e5bc9e2bb2 100644
---- c/CMakeLists.txt
-+++ i/CMakeLists.txt
-@@ -71,7 +71,7 @@ 
add_definitions(-DGDK_VERSION_MIN_REQUIRED=${gdk_encoded_version})
- add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version})
- 
- set(eds_minimum_version 
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
--set(enchant_minimum_version 1.1.7)
-+set(enchant_minimum_version 2.2.0)
- set(gcr_minimum_version 3.4)
- set(gdk_pixbuf_minimum_version 2.24.0)
- set(gnome_desktop_minimum_version 2.91.3)
-@@ -287,14 +287,14 @@ pkg_check_modules(EVOLUTION_DATA_SERVER REQUIRED
- )
- 
- pkg_check_modules(A11Y REQUIRED atk)
--pkg_check_modules(ENCHANT REQUIRED enchant>=${enchant_minimum_version})
-+pkg_check_modules(ENCHANT REQUIRED enchant-2>=${enchant_minimum_version})
- pkg_check_modules(LIBSOUP REQUIRED libsoup-2.4>=${soup_minimum_version})
- pkg_check_modules(WEB_EXTENSION REQUIRED 
webkit2gtk-4.0>=${webkit2gtk_minimum_version})
- 
- set(CMAKE_REQUIRED_FLAGS ${ENCHANT_CFLAGS})
- set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LDFLAGS})
--CHECK_C_SOURCE_COMPILES("#include <enchant/enchant.h>
-+CHECK_C_SOURCE_COMPILES("#include <enchant.h>
-                       #include <stdio.h>
-                       int main(void) { enchant_dict_add (NULL, NULL, 0); 
enchant_dict_free_string_list (NULL, NULL); return 0; }" HAVE_ENCHANT_NEW_API)
- unset(CMAKE_REQUIRED_FLAGS)
-diff --git c/evolution-shell.pc.in i/evolution-shell.pc.in
-index 04a252d02e..24588c52b1 100644
---- c/evolution-shell.pc.in
-+++ i/evolution-shell.pc.in
-@@ -17,7 +17,7 @@ execversion=@BASE_VERSION@
- Name: evolution-shell
- Description: libraries needed for Evolution shell components
- Version: @PROJECT_VERSION@
--Requires: gtk+-3.0 libebackend-1.2 libedataserver-1.2 libedataserverui-1.2 
webkit2gtk-4.0
-+Requires: gtk+-3.0 libebackend-1.2 libedataserver-1.2 libedataserverui-1.2 
webkit2gtk-4.0 enchant-2
- @shell_private_requirements@
- Libs: -L${privlibdir} -levolution-shell 
-levolution-util@shell_privlibdir_rpath_flags@
- Cflags: -I${privincludedir}
-diff --git c/src/composer/CMakeLists.txt i/src/composer/CMakeLists.txt
-index c5800fdad5..b609d8dbe5 100644
---- c/src/composer/CMakeLists.txt
-+++ i/src/composer/CMakeLists.txt
-@@ -65,6 +65,7 @@ target_include_directories(evolution-mail-composer PUBLIC
-       ${CMAKE_BINARY_DIR}/src
-       ${CMAKE_SOURCE_DIR}/src
-       ${CMAKE_CURRENT_BINARY_DIR}
-+      ${ENCHANT_INCLUDE_DIRS}
-       ${CERT_UI_INCLUDE_DIRS}
-       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
-       ${GNOME_PLATFORM_INCLUDE_DIRS}
-diff --git c/src/composer/e-msg-composer.c i/src/composer/e-msg-composer.c
-index eb2583e558..0016c341d9 100644
---- c/src/composer/e-msg-composer.c
-+++ i/src/composer/e-msg-composer.c
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- #include <ctype.h>
- #include <fcntl.h>
--#include <enchant/enchant.h>
-+#include <enchant.h>
- 
- #include "e-composer-from-header.h"
- #include "e-composer-text-header.h"
-diff --git c/src/e-util/e-html-editor-actions.c 
i/src/e-util/e-html-editor-actions.c
-index 1cddfc2f67..e32249eb17 100644
---- c/src/e-util/e-html-editor-actions.c
-+++ i/src/e-util/e-html-editor-actions.c
-@@ -22,7 +22,7 @@
- #include <gio/gio.h>
- #include <glib/gi18n-lib.h>
- #include <string.h>
--#include <enchant/enchant.h>
-+#include <enchant.h>
- 
- #include "e-html-editor.h"
- #include "e-html-editor-private.h"
-diff --git c/src/e-util/e-html-editor-spell-check-dialog.c 
i/src/e-util/e-html-editor-spell-check-dialog.c
-index 05a1cd794b..62cd37aa24 100644
---- c/src/e-util/e-html-editor-spell-check-dialog.c
-+++ i/src/e-util/e-html-editor-spell-check-dialog.c
-@@ -23,7 +23,7 @@
- #include "e-html-editor-spell-check-dialog.h"
- 
- #include <glib/gi18n-lib.h>
--#include <enchant/enchant.h>
-+#include <enchant.h>
- 
- #include "e-spell-checker.h"
- #include "e-spell-dictionary.h"
-diff --git c/src/e-util/e-html-editor.c i/src/e-util/e-html-editor.c
-index 34edc4c9d9..7b3bdffd65 100644
---- c/src/e-util/e-html-editor.c
-+++ i/src/e-util/e-html-editor.c
-@@ -23,7 +23,7 @@
- #include <glib/gi18n-lib.h>
- 
- #include <camel/camel.h>
--#include <enchant/enchant.h>
-+#include <enchant.h>
- #include <libedataserver/libedataserver.h>
- 
- #include "e-html-editor.h"
-diff --git c/src/e-util/e-spell-dictionary.h i/src/e-util/e-spell-dictionary.h
-index 97cec2c02b..83b0fc43ac 100644
---- c/src/e-util/e-spell-dictionary.h
-+++ i/src/e-util/e-spell-dictionary.h
-@@ -24,7 +24,7 @@
- #define E_SPELL_DICTIONARY_H
- 
- #include <glib-object.h>
--#include <enchant/enchant.h>
-+#include <enchant.h>
- 
- /* Standard GObject macros */
- #define E_TYPE_SPELL_DICTIONARY \

Reply via email to