[arch-commits] Commit in evolution/trunk (PKGBUILD enchant-2.diff)
Jan Steffens
heftig at archlinux.org
Thu Jan 18 11:39:22 UTC 2018
Date: Thursday, January 18, 2018 @ 11:39:20
Author: heftig
Revision: 315070
3.26.4-2: enchant 2.2
Added:
evolution/trunk/enchant-2.diff
Modified:
evolution/trunk/PKGBUILD
----------------+
PKGBUILD | 11 +++--
enchant-2.diff | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-18 10:27:30 UTC (rev 315069)
+++ PKGBUILD 2018-01-18 11:39:20 UTC (rev 315070)
@@ -5,7 +5,7 @@
pkgbase=evolution
pkgname=(evolution evolution-bogofilter evolution-spamassassin)
pkgver=3.26.4
-pkgrel=1
+pkgrel=2
pkgdesc="Manage your email, contacts and schedule"
url="https://wiki.gnome.org/Apps/Evolution"
arch=(x86_64)
@@ -16,8 +16,10 @@
spamassassin highlight gtk-doc yelp-tools git cmake ninja)
options=(!emptydirs)
_commit=2b7ba5bd28087c98b3606f7fe9986b23c3ecedfd # tags/3.26.4^0
-source=("git+https://git.gnome.org/browse/evolution#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://git.gnome.org/browse/evolution#commit=$_commit"
+ enchant-2.diff)
+sha256sums=('SKIP'
+ '4f94d79fd235686a47d6965d8302f61d652be404e36c273a999c98c750cfe9c2')
pkgver() {
cd $pkgbase
@@ -27,6 +29,9 @@
build() {
cd $pkgbase
+ # enchant 2.2
+ patch -Np1 -i ../enchant-2.diff
+
cmake . -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIBEXEC_INSTALL_DIR=/usr/lib \
Added: enchant-2.diff
===================================================================
--- enchant-2.diff (rev 0)
+++ enchant-2.diff 2018-01-18 11:39:20 UTC (rev 315070)
@@ -0,0 +1,116 @@
+ CMakeLists.txt | 6 +++---
+ 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 +-
+ 7 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index ab07fc644f..e44b54063c 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/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 \
More information about the arch-commits
mailing list