From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- gnome-extra/Manifest.gz | Bin 10695 -> 10690 bytes gnome-extra/evolution-data-server/Manifest | 7 +- .../evolution-data-server-3.22.7.ebuild | 135 --------------------- .../evolution-data-server-3.24.7.ebuild | 1 + .../evolution-data-server-3.26.6.ebuild | 5 +- .../evolution-data-server/files/icu61-compat.patch | 38 ++++++ 6 files changed, 44 insertions(+), 142 deletions(-) delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild create mode 100644 gnome-extra/evolution-data-server/files/icu61-compat.patch (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index e3b8d70567fb..b6054722e45d 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 27f3d73b7733..01bff1781176 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,10 +1,9 @@ AUX 3.24.7-DESTDIR-honoring.patch 1122 BLAKE2B 73d95683bd162f0e93de3b005787b2aa722b0a0f4ba58e3313fa3e66f90c159d5766ac03ee81c2fa3cb33ff2dedfcd4ffb59fb32ac88b17f04447d38c4a7605e SHA512 311e0163ef783430f4eea638e2ece92ab6d1c52d79f399190607eead5359f28eec647c626bb1c435eba427f7844456b4fd2dd60e75ca40331f1d249d1549eb0c AUX 3.24.7-libical3-compat.patch 5323 BLAKE2B 5a2392751b009d6726490cbd11227d1d4c5ed5e61c8d0b6acdf282182dffcdeb31a2ed6395626231dc729dd9ee7b1ca26a3ce9148b3cca1fbdc83376e58baca7 SHA512 0b29c1d86eedf778d489a4a4c78bfc292898ceba2d90ac4c81aae2a0c65ac132e71de767f7a74ef839977c2fbdcc38da50579735e1775cfb5b2414fa304d19b5 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 -DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44 +AUX icu61-compat.patch 1218 BLAKE2B 931b8894d8a6bd29e7dae1dc88b00ce50e59c745c44d4f771793dd26c50ded3f1be4b34ded9c0b9a3de3adecb6247fefd3128a25f47b74267d0fd05f48000a7b SHA512 f694a6b9ba0f5e6b881f932897a2df9dbedb0bdeaf53a75c432738b934a6e956e0fcaf78e6a00d8f28022a69e854c81d6e31d0f903ecf08b267ddb9eaf0e835c DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df DIST evolution-data-server-3.26.6.tar.xz 4406676 BLAKE2B d12fcc412736b505a30254a55763ffec68c1d8cd810fe62c82d7dd5947047caf7c296ccf8103b4a06496dbae38aa55ba9d071dc02442872274e2955d662be4cf SHA512 17522a19d9b4d19f89ccb67c76a89d599377eba36cf6dbe9fbc88fb162947b0208eaf1b4b6b5c4e9850dadf7e6ffea5161ba149b308415e94afc745bc1a448a7 -EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb -EBUILD evolution-data-server-3.24.7.ebuild 4145 BLAKE2B 57e6f7f7908806fa50aa131648aaae3e6a2a835826bd0184f0cc89a631e876e8c2bbca68442fb134855f4b86513b13c8fbc2f5e573ace476ee3f8e82b739f5f7 SHA512 3091dac9ea3d6ccc827b84d68fb6e08d1a8dc0579f2aa7e08f320628d58e1641f65186e104b1e6f15759261813cd7857bba2334335f849c4f69dbece01b89e35 -EBUILD evolution-data-server-3.26.6.ebuild 4258 BLAKE2B c99d4485b0bbf7ad7979a2e37cc47b823d27b98258edf3fda55913e0a76bfc37f3f0b8b31f3da9ef954b2164949aca860f848b716b5d48b28261588e037e439a SHA512 fdfd1377f5f83eb2a84d96f150f37337a448c2e6c6579a58e96ecf47f94d998d4866b569ce2510bcaf2514caf5d5b6e29587e75057f7d42142599b09592165c1 +EBUILD evolution-data-server-3.24.7.ebuild 4179 BLAKE2B 735021316c8e2e9eb46a4033e9789e33edd470d227c14b7971db0dc4aba89e90bb0632f9ca4fdd519221e8c9542df879df04b227109b2c21e313381130121a46 SHA512 007b8e12ff9ab7659862f047be1d1e455983e75ecd8eabea2c3ff8897fcfdcf814d9c0239c7c64e16e58a60b3a2225061a731a260afeea4072ac37b50d59b151 +EBUILD evolution-data-server-3.26.6.ebuild 4225 BLAKE2B 31cec53985d6c542a5be2c4e45cfced3ed1e1291e7b25692fe0193f4a3099b54377b1062b80be07d835c48738d3c94b61aad740d9c36f5a30565f7bab1409797 SHA512 759b523a6f3538c96e8979e2f54eb314c92ea16dc635ae4d469008c7a7c0b66da4585c810a8b447bd0cbc19231fb092d50eac8b4d23da0d3a7c33b58546c3632 MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild deleted file mode 100644 index 5d597fe7d157..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/59" # subslot = libcamel-1.2 soname version - -IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -# sys-libs/db is only required for migrating from <3.13 versions -# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks -# berkdb needed only for migrating old calendar data, bug #519512 -gdata_depend=">=dev-libs/libgdata-0.17.7:=" -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.7.17:= - >=dev-libs/glib-2.46:2 - >=dev-libs/libical-0.43:= - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=net-libs/libsoup-2.42:2.4 - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.10:3 - ) - google? ( - >=dev-libs/json-glib-1.0.4 - >=net-libs/webkit-gtk-2.11.91:4 - ${gdata_depend} - ) - gnome-online-accounts? ( - >=net-libs/gnome-online-accounts-3.8:= - ${gdata_depend} ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.10:2= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/gperf - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-2 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -# Some tests fail due to missings locales. -# Also, dbus tests are flacky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - use berkdb && append-cppflags "-I$(db_includedir)" - local gdata_flag - if use google || use gnome-online-accounts; then - gdata_flag="--enable-google" - else - gdata_flag="--disable-google" - fi - - # phonenumber does not exist in tree - gnome2_src_configure \ - $(use_enable api-doc-extras gtk-doc) \ - $(use_with api-doc-extras private-docs) \ - $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable gtk) \ - $(use_enable google google-auth) \ - ${gdata_flag} \ - $(use_enable introspection) \ - $(use_enable ipv6) \ - $(use_with kerberos krb5 "${EPREFIX}"/usr) \ - $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \ - $(use_with ldap openldap) \ - $(use_enable vala vala-bindings) \ - $(use_enable weather) \ - --enable-largefile \ - --enable-smime \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - --without-phonenumber \ - --disable-examples \ - --disable-uoa -} - -src_test() { - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - virtx emake check -} - -src_install() { - gnome2_src_install - - if use ldap; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema - dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild index cfc4ff4b4e9f..6047dfa5c700 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild @@ -76,6 +76,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PV}-DESTDIR-honoring.patch "${FILESDIR}"/${PV}-libical3-compat.patch + "${FILESDIR}"/icu61-compat.patch ) pkg_setup() { diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild index c48dbec871be..e38990e8c245 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild @@ -78,10 +78,9 @@ pkg_setup() { python-any-r1_pkg_setup } -# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare -# call; if needed, set them after cmake-utils_src_prepare call, if that works - +# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call src_prepare() { + eapply "${FILESDIR}"/icu61-compat.patch use vala && vala_src_prepare cmake-utils_src_prepare gnome2_src_prepare diff --git a/gnome-extra/evolution-data-server/files/icu61-compat.patch b/gnome-extra/evolution-data-server/files/icu61-compat.patch new file mode 100644 index 000000000000..2b5b76afd737 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/icu61-compat.patch @@ -0,0 +1,38 @@ +From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001 +From: Hussam Al-Tayeb +Date: Mon, 16 Apr 2018 13:38:33 +0200 +Subject: [PATCH] Bug 795295 - Fails to compile after icu 61.1 upgrade + (icu::UnicodeString) + +--- + src/libedataserver/e-alphabet-index-private.cpp | 1 + + src/libedataserver/e-transliterator-private.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp +index d3e44f488..a789f4409 100644 +--- a/src/libedataserver/e-alphabet-index-private.cpp ++++ b/src/libedataserver/e-alphabet-index-private.cpp +@@ -36,6 +36,7 @@ + + using icu::AlphabeticIndex; + using icu::Locale; ++using icu::UnicodeString; + + struct _EAlphabetIndex { + AlphabeticIndex *priv; +diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp +index bb15593d5..6f1d89c8d 100644 +--- a/src/libedataserver/e-transliterator-private.cpp ++++ b/src/libedataserver/e-transliterator-private.cpp +@@ -35,6 +35,7 @@ + #include + + using icu::Transliterator; ++using icu::UnicodeString; + + struct _ETransliterator { + Transliterator *priv; +-- +2.18.0 + -- cgit v1.2.3