diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /gnome-extra/evolution-data-server | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'gnome-extra/evolution-data-server')
-rw-r--r-- | gnome-extra/evolution-data-server/Manifest | 6 | ||||
-rw-r--r-- | gnome-extra/evolution-data-server/evolution-data-server-3.36.2.ebuild (renamed from gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild) | 13 | ||||
-rw-r--r-- | gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch | 88 | ||||
-rw-r--r-- | gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch | 29 |
4 files changed, 9 insertions, 127 deletions
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index fc4df1057a5f..bfb11118d6ab 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,8 +1,6 @@ -AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa -AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 -DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6 DIST evolution-data-server-3.34.4.tar.xz 4627704 BLAKE2B d1b93f17eec1dc71b31c9a842af369646c7412c63461a63a0c42026795d97f8b282c498ca56e14b258e7764ce333fad159d4fae534891cd02b99be6166bfbc23 SHA512 e353724591216f472faabaab468d6a8555e05cafda4a8b2c55fa3113226475f0ec9edad65d8acbf95c92844d33f36cf32d49ddc14fe934a2b8c127c32cc7b74f -EBUILD evolution-data-server-3.32.5.ebuild 4243 BLAKE2B ee346e8ffa8546d5a6b5d9abdaebfaee9b63f1843daf249f7a609f4793e962f08f535c03faa6022a8d661c3e99c9a22172dd85bae41917a4d35ae89367ac5416 SHA512 df2c900af47b3e17759f3f6a2bb2733dccbb12c59363f1e755f0567f1119884187af5fcb323b9d4b4cd684d4d6b58530ed4921604d68b8f751024b5fdfa5afa4 +DIST evolution-data-server-3.36.2.tar.xz 4631984 BLAKE2B 946a2c30a631f3e7efa5f084bdc3a7267c6ebeea63fc84d8a5f23aeddbdd9c81d95ff87ae34519f9faf86fbac54cd4faa8749fc57017a7aad78b9a3eedcc2f66 SHA512 3549d8ce4cf47080c426a023b88d4a1f4432096018d69c1cf6628f96c4b56312b487ba53c4813968a7aea051c3cf9e8d5438bd3fbdb9605e49eb4f1402b8c8fa EBUILD evolution-data-server-3.34.4.ebuild 4329 BLAKE2B 32512b88545711e9bddfcec3b7efdf6e384ac0397751eb5fa41f47ce97d3fc726a0f63a8e174d07137b8b0d42433cc837b35f27d098800fb1180099921f56a39 SHA512 d708438396f55a08e7a407a3e0967779afa38e7e08e0da61ae01b8e18d37a972ccee4c937d974fe14d8fb8cee210cc6a3e27578654bbcd1d338e018dc46e811e +EBUILD evolution-data-server-3.36.2.ebuild 4202 BLAKE2B 720a0c22cc6bd7d06d1f7d3425f03907f099e441a8636ea5a968b336ce03133707635c268360f3d7a12264cacca4dff03e6b0f4311ec6a9e25a5455184494297 SHA512 cf6a4418e275ae0da4152f6d7db564878ccefc9975050c6c80a68906535c98af769eb1282cb20a992fc3365e99a319c90d7fec4697b0a441b429e83d6d9d1352 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.2.ebuild index d6a2e24c528e..5089f36061ec 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.2.ebuild @@ -11,23 +11,22 @@ 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/62-24" # subslot = libcamel-1.2/libedataserver-1.2 soname version +SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" # 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 addressbook data from <3.13 versions, bug #519512 -# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend 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-3.0.2:= + >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= @@ -65,7 +64,10 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig - vala? ( $(vala_depend) ) + vala? ( $(vala_depend) + net-libs/libsoup:2.4[vala] + dev-libs/libical[vala] + ) " # Some tests fail due to missing locales. @@ -75,7 +77,6 @@ RESTRICT="test !test? ( test )" # global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call src_prepare() { - eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch use vala && vala_src_prepare cmake-utils_src_prepare gnome2_src_prepare diff --git a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch deleted file mode 100644 index 54a5fc714def..000000000000 --- a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan <lantw@src.gnome.org> -Date: Mon, 22 Jul 2019 16:06:21 +0800 -Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line - -When a library provides no way to find linker flags for linking with it, -the build system usually depends on the user to necessary put -L flags -in LDFLAGS environment variable in order to find it. However, GtkDoc -module constructs the command line by itself, and it forgets to add -LDFLAGS to the command line of gtkdoc-scangobj. - -It is especially important to include LDFLAGS on non-GNU systems. For -example, FreeBSD libc doesn't include a gettext implementation. GLib -requires gettext, and it pulls in an external gettext runtime for it. -However, gettext-runtime doesn't include a .pc file, so LDFLAGS is -required if gettext-runtime isn't installed in the same prefix as GLib. -Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can -result in a linking error because -lintl cannot be found. - -In evolution-data-server we are lucky most of the time because it -depends on a lot of external libraries. These external libraries are -likely to be installed in the same prefix as gettext-runtime, so not -using LDFLAGS doesn't cause linking failure because required flags are -already pulled in by other libraries. In fact, this problem was found -when building libical, which uses a similar GtkDoc.cmake file. - -In addition to the change to include LDFLAGS, this commit also changes -the following things: - - - Instead of constructing _scangobj_ldflags in reverse order, do it in - normal order. Appending is easier to understand than prepending, and - the linker also interprets -L and -l flags in normal order. - - - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment - says, and it is expected to work because we no longer constructs - _scangobj_ldflags in reverse order. - -Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28 ---- - cmake/modules/GtkDoc.cmake | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake -index cc6cc007a..0ba1a7a78 100644 ---- a/cmake/modules/GtkDoc.cmake -+++ b/cmake/modules/GtkDoc.cmake -@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign - list(APPEND _scangobj_deps ${opt}) - endforeach(opt) - -- # Add them as the last, thus in-tree headers/libs have precedence -+ # Add it as the last, thus in-tree headers have precedence - list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) -- list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR}) - - if(_scangobj_deps) - list(REMOVE_DUPLICATES _scangobj_deps) -@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign - if(NOT _output_name) - set(_output_name ${opt}) - endif(NOT _output_name) -- set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}") -+ set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}") - - if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY")) - set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>") -@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign - endif(TARGET ${opt}) - endforeach(opt) - -+ # Add extra flags from LDFLAGS environment variable -+ set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}") -+ - foreach(opt IN LISTS _scangobj_deps) - if(NOT TARGET ${opt}) - set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}") - endif(NOT TARGET ${opt}) - endforeach(opt) - -+ # Add it as the last, thus in-tree libs have precedence -+ set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}") -+ - set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}") - - if(NOT (_scangobj_cflags STREQUAL "")) --- -2.20.1 - diff --git a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch deleted file mode 100644 index 56e66eae8938..000000000000 --- a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001 -From: Milan Crha <mcrha@redhat.com> -Date: Mon, 5 Aug 2019 12:55:23 +0200 -Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line - -The LDFLAGS could imply certain compile options being used (like -fPIC), -but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation -could fail. - -Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28 ---- - cmake/modules/GtkDoc.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake -index 0ba1a7a78..2dfc4d691 100644 ---- a/cmake/modules/GtkDoc.cmake -+++ b/cmake/modules/GtkDoc.cmake -@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign - - # Add it as the last, thus in-tree headers have precedence - list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR}) -+ list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS}) - - if(_scangobj_deps) - list(REMOVE_DUPLICATES _scangobj_deps) --- -2.20.1 - |