| 1 |
commit: 6deb97ac602e74be621d8ec7f459f4a27f335b6d |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Sun Sep 2 10:13:56 2012 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Sun Sep 2 10:13:56 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6deb97ac |
| 7 |
|
| 8 |
mail-client/evolution: 3.5.90 → 3.5.91 |
| 9 |
|
| 10 |
--- |
| 11 |
...on-3.5.90-r1.ebuild => evolution-3.5.91.ebuild} | 3 +- |
| 12 |
mail-client/evolution/evolution-9999.ebuild | 1 + |
| 13 |
.../evolution-3.5.90-webkit-api-abi-break.patch | 26 -------------------- |
| 14 |
3 files changed, 2 insertions(+), 28 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/evolution/evolution-3.5.90-r1.ebuild b/mail-client/evolution/evolution-3.5.91.ebuild |
| 17 |
similarity index 98% |
| 18 |
rename from mail-client/evolution/evolution-3.5.90-r1.ebuild |
| 19 |
rename to mail-client/evolution/evolution-3.5.91.ebuild |
| 20 |
index 121e05f..5cbb0e8 100644 |
| 21 |
--- a/mail-client/evolution/evolution-3.5.90-r1.ebuild |
| 22 |
+++ b/mail-client/evolution/evolution-3.5.91.ebuild |
| 23 |
@@ -29,6 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi |
| 24 |
|
| 25 |
# glade-3 support is for maintainers only per configure.ac |
| 26 |
# pst is not mature enough and changes API/ABI frequently |
| 27 |
+# also supports gstreamer 1.0 |
| 28 |
COMMON_DEPEND=">=dev-libs/glib-2.32:2 |
| 29 |
>=x11-libs/cairo-1.9.15[glib] |
| 30 |
>=x11-libs/gtk+-3.4.0:3 |
| 31 |
@@ -118,8 +119,6 @@ src_prepare() { |
| 32 |
# Fix paths for Gentoo spamassassin executables |
| 33 |
epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch" |
| 34 |
|
| 35 |
- epatch "${FILESDIR}/${P}-webkit-api-abi-break.patch" |
| 36 |
- |
| 37 |
sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
| 38 |
-i data/org.gnome.evolution.spamassassin.gschema.xml.in \ |
| 39 |
-i modules/spamassassin/evolution-spamassassin.c || die "sed failed" |
| 40 |
|
| 41 |
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild |
| 42 |
index cf8c024..5cbb0e8 100644 |
| 43 |
--- a/mail-client/evolution/evolution-9999.ebuild |
| 44 |
+++ b/mail-client/evolution/evolution-9999.ebuild |
| 45 |
@@ -29,6 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi |
| 46 |
|
| 47 |
# glade-3 support is for maintainers only per configure.ac |
| 48 |
# pst is not mature enough and changes API/ABI frequently |
| 49 |
+# also supports gstreamer 1.0 |
| 50 |
COMMON_DEPEND=">=dev-libs/glib-2.32:2 |
| 51 |
>=x11-libs/cairo-1.9.15[glib] |
| 52 |
>=x11-libs/gtk+-3.4.0:3 |
| 53 |
|
| 54 |
diff --git a/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch b/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch |
| 55 |
deleted file mode 100644 |
| 56 |
index c5c61e1..0000000 |
| 57 |
--- a/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch |
| 58 |
+++ /dev/null |
| 59 |
@@ -1,26 +0,0 @@ |
| 60 |
-From 485704419b11685e4753024dabec53d1668aaa9d Mon Sep 17 00:00:00 2001 |
| 61 |
-From: Dominique Leuenberger <dimstar@××××××××.org> |
| 62 |
-Date: Fri, 24 Aug 2012 20:47:00 +0000 |
| 63 |
-Subject: Adjust for webkit 1.9.90 API change. |
| 64 |
- |
| 65 |
---- |
| 66 |
-diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c |
| 67 |
-index 802e402..6612876 100644 |
| 68 |
---- a/widgets/misc/e-web-view.c |
| 69 |
-+++ b/widgets/misc/e-web-view.c |
| 70 |
-@@ -390,8 +390,13 @@ replace_text (WebKitDOMNode *node, |
| 71 |
- } |
| 72 |
- |
| 73 |
- split_offset = offset - node_data + text_length; |
| 74 |
-+ #if WEBKIT_CHECK_VERSION (1, 9, 90) |
| 75 |
-+ replacement_node = |
| 76 |
-+ webkit_dom_node_clone_node (replacement, TRUE, NULL); |
| 77 |
-+ #else |
| 78 |
- replacement_node = |
| 79 |
- webkit_dom_node_clone_node (replacement, TRUE); |
| 80 |
-+ #endif |
| 81 |
- |
| 82 |
- data_length = webkit_dom_character_data_get_length ( |
| 83 |
- (WebKitDOMCharacterData *) node); |
| 84 |
--- |
| 85 |
-cgit v0.9.0.2 |
Archives