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 --- dev-cpp/libcmis/Manifest | 6 +- .../libcmis/files/libcmis-0.5.2-boost-1.68.patch | 25 +++++++ .../files/libcmis-0.5.2-oauth2-encode.patch | 69 +++++++++++++++++++ dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild | 77 ++++++++++++++++++++++ dev-cpp/libcmis/libcmis-9999.ebuild | 35 ++++------ 5 files changed, 188 insertions(+), 24 deletions(-) create mode 100644 dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch create mode 100644 dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch create mode 100644 dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild (limited to 'dev-cpp/libcmis') diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest index b7d529db4aae..7a17b16c08b3 100644 --- a/dev-cpp/libcmis/Manifest +++ b/dev-cpp/libcmis/Manifest @@ -1,5 +1,9 @@ +AUX libcmis-0.5.2-boost-1.68.patch 691 BLAKE2B da58ae11be1c7be1c1a048c5459ac0b0d7ac9b8df23f804da85b2f2e6f2c4c9348c08aa3faf31c88a1240fa882585823edac3900589c1dfa77ef0bef8145bb58 SHA512 55b7346dc6a9876a6a52473acbce65bf2488394e4982f6caa80ed5dd9e262ab62a6bb0a2eb2b4114b9b90c59497b813a1da85b7dacfd1638873c1523a86f5205 AUX libcmis-0.5.2-fix-gdrive-2fa.patch 3268 BLAKE2B be4d740655ae76c3cecde5d8ce643506c0a77f1b1cbd3320be9c9f3daa975e7579b28cb5f6ef11848bba875b6b9664fe07f81c3359be16f07b3ca305c7644279 SHA512 fbdae22b30da00b559111ce0b56aac8da90305ef0c1c4b9b55b5554a6747cf7690dd67c34bfdcb0c4597a8160a15fe9e611a01432523d31e6ea729e914a5fe6b +AUX libcmis-0.5.2-oauth2-encode.patch 2184 BLAKE2B 98f6a50ea28da32aafd4326cb14d3907098321ed42c98d3c633c80c22ad9272041e8e211956a562f23358e1b3d942f4def40b4670b2edba08ee2ca0da6c91ca4 SHA512 9e38abe126ea145f274a31063e111ff90f4d0306b18e99b166215d7e1db2b14b19a02e1dcdd2a5925a87cbb0c70309a6e2f82d62ca24abac62bc4e4c99fae6db DIST libcmis-0.5.2_pre20160820.tar.gz 285100 BLAKE2B 980200d1a56240d8d069aba2ad349ec02e90d345bad4956f6cbbea3606f9f90951523804293b349ad0419dd2db6db294a45a97872469105c1ba392c888fab332 SHA512 4b6d0fc4d80444fea2c5eb16621b92a10b41c58128cc8a355caca50f12648ed5113bd977cc5dbe8971e3dbc11f9d7ae8d45c9d2aa19f37c83659141af135bd1a +DIST libcmis-0.5.2_pre20180118.tar.gz 291080 BLAKE2B 1cb5664dcb0bef7f5a04c422b21ac54a9b70d38dec74d688327732630e4a134a88c7262d763a39d1730eda1cd45f5d3c3d47a56099959d01bf5e23972181a793 SHA512 630cf7e5c31266e2b55ca093aa942fc373eb24bbb5b9aedd687f67f1b3c6b627a3bdb58878859449bcb340626f3e1bdafa2b9cbb5e61e8e4336c45b804fca7a9 EBUILD libcmis-0.5.2_pre20160820-r1.ebuild 1851 BLAKE2B 9f1d434f8ac067cd81dd7f6d7fb63db241ac63924e56b1da5ff069f7cd739127e5ec21504e357fde7ecc6bfb88c2b186df9ff151f186bb8cf2286035f77c724e SHA512 ec65003739c84b64293c88c98eb9b5ae931cf5644256607a35718665b87577d9413c133be140b13a9ed664efd1b5572f549adf04116801555dc75c08ef64db41 -EBUILD libcmis-9999.ebuild 1786 BLAKE2B f6d20063e3cb48588f5251fa22c7ece2109773809afb9ad562755595a2aeafa0de85b57250bc562ce1f3a9bd801433aafd6bf3db11d7a3c0af1f2dd4856d693c SHA512 fdb149a255dc1dbf8b41d61dfdc4bde12e4e0b8548c02c87d7146a1a346617aac886be0a9a33e5066f7c5f75abe8f8ebc29bc12c3d0cfb1dcd7bac9840310530 +EBUILD libcmis-0.5.2_pre20180118.ebuild 1613 BLAKE2B 7c8170e78ab95dfe7c8e083a1f5ac8231a1543b41de8a4457c8b36668abb99dd54b61d2270eea2cb0fb767b6b0dac537b56f5e7b3cda786953dfb2b4cee6d606 SHA512 f091b0812abdd997e443c71aebcb9f064b9b14607e87f57abd5e3f56e3913b47e3e6b6de58738ec1e4d5b9b5fd31ab2a1c9b569046f9856f0c134ca0f8b1fe4f +EBUILD libcmis-9999.ebuild 1502 BLAKE2B 5a62f6f3af76b4711387c6806691771e3985dad07152d8532cca8ddb3ecb208834ae87cc2df26068c02d73ff9f577d245a6d583da37ed8b2b481960a4f91924f SHA512 37a5fa216885a766e04c47ead5f941dc1156717bedfa56bfc1514185342eb97977692e2f77c5194c6a36ead972a7b9d9670e3b3ef21533f90055fb0282d2414d MISC metadata.xml 401 BLAKE2B 51ccbd2b64899189a740c498dee304fa62676b4673b22f5215e5e587925d74a3582f9a4206e47da42524f527cb1d36545d45c64c9a38b9783c65d2e923aba0b0 SHA512 b01b808fa630d2d02ef61b4f8e1d286c51108eb3e9120b687b8e2bdf012b05d70a32de1264c0699f9778d0cb9574b88ddd4df1cc428992c90780b4934973841b diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch new file mode 100644 index 000000000000..767464242f78 --- /dev/null +++ b/dev-cpp/libcmis/files/libcmis-0.5.2-boost-1.68.patch @@ -0,0 +1,25 @@ +From 3ef3569c4ae1c5319aff0664d52cbd8a8d42c909 Mon Sep 17 00:00:00 2001 +From: rezso +Date: Tue, 4 Sep 2018 01:18:10 +0200 +Subject: tdf#119344 fix libcmis build with boost 1.68 + +Change-Id: I80d6ea8ecd001dc02b941c1eb8974c9244316045 +Reviewed-on: https://gerrit.libreoffice.org/59958 +Tested-by: Jenkins +Reviewed-by: Michael Stahl + +--- a/src/libcmis/xml-utils.cxx ++++ b/src/libcmis/xml-utils.cxx +@@ -31,7 +31,12 @@ + #include + #include + ++#include ++#if (BOOST_VERSION >= 106800) ++#include ++#else + #include ++#endif + #include + + #include "xml-utils.hxx" diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch new file mode 100644 index 000000000000..c6a99074c502 --- /dev/null +++ b/dev-cpp/libcmis/files/libcmis-0.5.2-oauth2-encode.patch @@ -0,0 +1,69 @@ +From 33f7485dedea90e0f80c6348fa8ac5f27c5052e0 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 4 Sep 2018 16:45:00 +0200 +Subject: Properly encode OAuth2 credentials + +Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5 +Reviewed-on: https://gerrit.libreoffice.org/59986 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann + +--- a/src/libcmis/oauth2-providers.cxx ++++ b/src/libcmis/oauth2-providers.cxx +@@ -26,6 +26,8 @@ + * instead of those above. + */ + ++#include ++ + #include + #include + +@@ -45,6 +47,29 @@ + #define HTML_PARSE_RECOVER 0 + #endif + ++namespace { ++ ++// See : ++void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) { ++ assert(buffer); ++ for (string::const_iterator i = data.begin(); i != data.end(); ++i) { ++ unsigned char c = static_cast(*i); ++ if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= '9') ++ || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z')) ++ { ++ *buffer += static_cast(c); ++ } else { ++ static const char hex[16] = { ++ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; ++ *buffer += '%'; ++ *buffer += hex[c >> 4]; ++ *buffer += hex[c & 0xF]; ++ } ++ } ++} ++ ++} ++ + string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl, + const string& username, const string& password ) + { +@@ -97,7 +120,7 @@ + return string( ); + + loginEmailPost += "Email="; +- loginEmailPost += string( username ); ++ addXWwwFormUrlencoded(&loginEmailPost, username); + + istringstream loginEmailIs( loginEmailPost ); + string loginEmailRes; +@@ -119,7 +142,7 @@ + return string( ); + + loginPasswdPost += "Passwd="; +- loginPasswdPost += string( password ); ++ addXWwwFormUrlencoded(&loginPasswdPost, password); + + istringstream loginPasswdIs( loginPasswdPost ); + string loginPasswdRes; diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild new file mode 100644 index 000000000000..2707ed8b6300 --- /dev/null +++ b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://github.com/tdf/libcmis.git" + inherit git-r3 +elif [[ ${PV} = *_pre* ]]; then + COMMIT=738528d790b2b1d52d9b72d673842969a852815d + SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi +inherit autotools flag-o-matic + +DESCRIPTION="C++ client library for the CMIS interface" +HOMEPAGE="https://github.com/tdf/libcmis" + +LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" +SLOT="0.5" + +# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="man static-libs test" + +RDEPEND=" + dev-libs/boost:= + dev-libs/libxml2 + net-misc/curl +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + man? ( + app-text/docbook2X + dev-libs/libxslt + ) + test? ( + dev-util/cppcheck + dev-util/cppunit + ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-0.5.2-boost-1.68.patch" + "${FILESDIR}/${PN}-0.5.2-oauth2-encode.patch" +) + +[[ ${PV} = *_pre* ]] && S="${WORKDIR}/${PN}-${COMMIT}" + +src_prepare() { + default + [[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf +} + +src_configure() { + # bug 618778 + append-cxxflags -std=c++14 + + econf \ + --program-suffix=-$(ver_cut 1-2) \ + --disable-werror \ + $(use_with man) \ + $(use_enable static-libs static) \ + $(use_enable test tests) \ + --enable-client +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild index 78e5b1990a3a..8513c4a8cb4f 100644 --- a/dev-cpp/libcmis/libcmis-9999.ebuild +++ b/dev-cpp/libcmis/libcmis-9999.ebuild @@ -1,21 +1,18 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://github.com/tdf/libcmis.git" - SCM_ECLASS="git-r3" + inherit git-r3 elif [[ ${PV} = *_pre* ]]; then - SCM_ECLASS="vcs-snapshot" - snapshot=d2054a12e3f52fff8e96341e8c48f0dcd75e2e2a - SRC_URI="https://github.com/tdf/${PN}/archive/${snapshot}.tar.gz -> ${P}.tar.gz" - unset snapshot + COMMIT=738528d790b2b1d52d9b72d673842969a852815d + SRC_URI="https://github.com/tdf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" else SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi -inherit alternatives autotools flag-o-matic ${SCM_ECLASS} -unset SCM_ECLASS +inherit autotools flag-o-matic DESCRIPTION="C++ client library for the CMIS interface" HOMEPAGE="https://github.com/tdf/libcmis" @@ -25,16 +22,17 @@ SLOT="0.5" # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 [[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="man static-libs test" -COMMON_DEPEND=" +RDEPEND=" dev-libs/boost:= dev-libs/libxml2 net-misc/curl " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig man? ( app-text/docbook2X @@ -45,12 +43,11 @@ DEPEND="${COMMON_DEPEND} dev-util/cppunit ) " -RDEPEND="${COMMON_DEPEND} - !