* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libcmis/, dev-cpp/libcmis/files/
@ 2016-02-22 17:07 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2016-02-22 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 9527828aa0d2513706c55063a2d04eb783d6a808
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 6 22:22:35 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 17:06:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9527828a
dev-cpp/libcmis: Add upstream patches to fix bugs 556914, 569614
All tests passed.
Package-Manager: portage-2.2.27
.../files/libcmis-0.5.0-boost-linking.patch | 21 +++++++++++
dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch | 44 ++++++++++++++++++++++
dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild | 18 +++++----
dev-cpp/libcmis/libcmis-9999.ebuild | 19 ++++++----
4 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch
new file mode 100644
index 0000000..348a590
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch
@@ -0,0 +1,21 @@
+From b572b60a5fdc630f7f3b31dfd5dbdd1ed48659ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Thu, 16 Jul 2015 16:22:11 +0200
+Subject: [PATCH] Fix linking error when building with --with-boot
+
+---
+ src/libcmis/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libcmis/Makefile.am b/src/libcmis/Makefile.am
+index 3915d45..1955ea6 100644
+--- a/src/libcmis/Makefile.am
++++ b/src/libcmis/Makefile.am
+@@ -144,6 +144,7 @@ libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \
+ $(XML2_LIBS) \
+ $(CURL_LIBS) \
+ $(BOOST_SMART_PTR_LIBS) \
++ $(BOOST_DATE_TIME_LDFLAGS) \
+ $(BOOST_DATE_TIME_LIBS)
+
+ libcmis_@LIBCMIS_API_VERSION@_la_includedir = $(includedir)/libcmis-@LIBCMIS_API_VERSION@/libcmis
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch
new file mode 100644
index 0000000..8c89ab8
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch
@@ -0,0 +1,44 @@
+From 0ad3ec084d918be503a8ce971af1b54887d7726f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Thu, 16 Jul 2015 16:23:06 +0200
+Subject: [PATCH] Getting cppcheck-test to pass again
+
+---
+ Makefile.am | 1 +
+ cppcheck-suppress | 3 +++
+ cppcheck-test.sh.in | 4 +++-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 cppcheck-suppress
+
+diff --git a/Makefile.am b/Makefile.am
+index ebf1f3b..9263497 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,6 +35,7 @@ EXTRA_DIST = \
+ COPYING.LGPL \
+ doc/cmis-client.xml \
+ cppcheck-test.sh \
++ cppcheck-suppress \
+ qa/libcmis/data
+
+ if ENABLE_CPPCHECK
+diff --git a/cppcheck-suppress b/cppcheck-suppress
+new file mode 100644
+index 0000000..9ef8482
+--- /dev/null
++++ b/cppcheck-suppress
+@@ -0,0 +1,3 @@
++publicAllocationError:qa/libcmis/test-decoder.cxx
++noExplicitConstructor
++noExplicitCopyMoveConstructor
+diff --git a/cppcheck-test.sh.in b/cppcheck-test.sh.in
+index 20a73f8..175e0f5 100755
+--- a/cppcheck-test.sh.in
++++ b/cppcheck-test.sh.in
+@@ -1,3 +1,5 @@
+ #!/bin/sh
+-@CPPCHECK@ -q --enable=style,performance,portability,information --error-exitcode=1 @SRCDIR@
++@CPPCHECK@ -q --enable=style,performance,portability,information \
++ --suppressions-list=./cppcheck-suppress \
++ --error-exitcode=1 @SRCDIR@
+ exit $?
diff --git a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
index 96b3308..38a6a64 100644
--- a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,16 +22,12 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="static-libs man test"
-RDEPEND="
- !dev-cpp/libcmis:0
- !dev-cpp/libcmis:0.2
- !dev-cpp/libcmis:0.3
- !dev-cpp/libcmis:0.4
+COMMON_DEPEND="
dev-libs/boost:=
dev-libs/libxml2
net-misc/curl
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
man? (
app-text/docbook2X
@@ -42,9 +38,17 @@ DEPEND="${RDEPEND}
dev-util/cppunit
)
"
+RDEPEND="${COMMON_DEPEND}
+ !dev-cpp/libcmis:0
+ !dev-cpp/libcmis:0.2
+ !dev-cpp/libcmis:0.3
+ !dev-cpp/libcmis:0.4
+"
src_prepare() {
epatch "${WORKDIR}/${P}-gcc5.patch"
+ epatch "${FILESDIR}/${P}-boost-linking.patch" \
+ "${FILESDIR}/${P}-cppcheck.patch"
eautoreconf
}
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index dfc6902..c208611 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
@@ -22,16 +22,12 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs man test"
-RDEPEND="
- !dev-cpp/libcmis:0
- !dev-cpp/libcmis:0.2
- !dev-cpp/libcmis:0.3
- !dev-cpp/libcmis:0.4
+COMMON_DEPEND="
dev-libs/boost:=
dev-libs/libxml2
net-misc/curl
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
man? (
app-text/docbook2X
@@ -42,8 +38,15 @@ DEPEND="${RDEPEND}
dev-util/cppunit
)
"
+RDEPEND="${COMMON_DEPEND}
+ !dev-cpp/libcmis:0
+ !dev-cpp/libcmis:0.2
+ !dev-cpp/libcmis:0.3
+ !dev-cpp/libcmis:0.4
+"
src_prepare() {
+ eapply_user
[[ ${PV} == 9999 ]] && eautoreconf
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libcmis/, dev-cpp/libcmis/files/
@ 2017-04-06 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-04-06 22:08 UTC (permalink / raw
To: gentoo-commits
commit: f3722acc63671b8733c7a5680d89b913f91b6402
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 6 21:47:49 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 6 22:08:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3722acc
dev-cpp/libcmis: Fix gdrive 2FA again, restrict tests, use vcs-snapshot
Gentoo-bug: 577926
See also: https://bugs.documentfoundation.org/show_bug.cgi?id=98416
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/libcmis-0.5.2-fix-gdrive-2fa.patch | 70 ++++++++++++++++++++++
....ebuild => libcmis-0.5.2_pre20160820-r1.ebuild} | 29 +++++----
dev-cpp/libcmis/libcmis-9999.ebuild | 27 +++++----
3 files changed, 102 insertions(+), 24 deletions(-)
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch
new file mode 100644
index 00000000000..3c19e99a5ba
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch
@@ -0,0 +1,70 @@
+From 1effce6d286ba3a9f467e15074b532d2ba4b7c98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Szymon=20K=C5=82os?= <eszkadev@gmail.com>
+Date: Wed, 29 Mar 2017 17:45:10 +0200
+Subject: [PATCH] Fix 2FA for Google Drive
+
+---
+ src/libcmis/oauth2-providers.cxx | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx
+index 74c0fec..dd872dd 100644
+--- a/src/libcmis/oauth2-providers.cxx
++++ b/src/libcmis/oauth2-providers.cxx
+@@ -37,6 +37,7 @@
+ #define CHALLENGE_PAGE_ACTION_LEN sizeof( CHALLENGE_PAGE_ACTION ) - 1
+ #define PIN_FORM_ACTION "/signin/challenge/ipp"
+ #define PIN_FORM_ACTION_LEN sizeof( PIN_FORM_ACTION ) - 1
++#define PIN_INPUT_NAME "Pin"
+
+ using namespace std;
+
+@@ -152,7 +153,7 @@ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUr
+ }
+
+ loginChallengeLink = "https://accounts.google.com" + loginChallengeLink;
+- loginChallengePost += "Pin=";
++ loginChallengePost += string( PIN_INPUT_NAME ) + "=";
+ loginChallengePost += string( pin );
+
+ istringstream loginChallengeIs( loginChallengePost );
+@@ -291,6 +292,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
+ if ( reader == NULL ) return 0;
+
+ bool readInputField = false;
++ bool bIsRightForm = false;
++ bool bHasPinField = false;
+
+ while ( true )
+ {
+@@ -301,6 +304,12 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
+ // Find the redirect link
+ if ( xmlStrEqual( nodeName, BAD_CAST( "form" ) ) )
+ {
++ // 2FA: Don't add fields form other forms not having pin field
++ if ( bIsRightForm && !bHasPinField )
++ post = string( "" );
++ if ( bIsRightForm && bHasPinField )
++ break;
++
+ xmlChar* action = xmlTextReaderGetAttribute( reader,
+ BAD_CAST( "action" ));
+
+@@ -311,7 +320,7 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
+ bool bChallengePage = ( strncmp( (char*)action,
+ CHALLENGE_PAGE_ACTION,
+ CHALLENGE_PAGE_ACTION_LEN ) == 0 );
+- bool bIsRightForm = ( strncmp( (char*)action,
++ bIsRightForm = ( strncmp( (char*)action,
+ PIN_FORM_ACTION,
+ PIN_FORM_ACTION_LEN ) == 0 );
+ if ( ( xmlStrlen( action ) > 0 )
+@@ -332,6 +341,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string&
+ BAD_CAST( "name" ));
+ xmlChar* value = xmlTextReaderGetAttribute( reader,
+ BAD_CAST( "value" ));
++ if ( name != NULL && strcmp( (char*)name, PIN_INPUT_NAME ) == 0 )
++ bHasPinField = true;
+ if ( ( name != NULL ) && ( value!= NULL ) )
+ {
+ if ( ( xmlStrlen( name ) > 0) && ( xmlStrlen( value ) > 0) )
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild
similarity index 82%
copy from dev-cpp/libcmis/libcmis-9999.ebuild
copy to dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild
index 4db743bf442..08e6cd3a925 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2_pre20160820-r1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
-[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
-inherit alternatives autotools ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://github.com/tdf/libcmis"
-if [[ ${PV} = *_pre* ]]; then
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
+ SCM_ECLASS="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"
- S="${WORKDIR}/${PN}-${snapshot}"
unset snapshot
-elif [[ ${PV} != 9999 ]] ; then
+else
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
+inherit alternatives autotools ${SCM_ECLASS}
+unset SCM_ECLASS
+
+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"
@@ -26,7 +27,7 @@ SLOT="0.5"
[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs man test"
+IUSE="man static-libs test"
COMMON_DEPEND="
dev-libs/boost:=
@@ -48,6 +49,10 @@ RDEPEND="${COMMON_DEPEND}
!<dev-cpp/libcmis-0.5.0
"
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.2-fix-gdrive-2fa.patch" )
+
src_prepare() {
default
[[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index 4db743bf442..603a0334c7d 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
-[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
-inherit alternatives autotools ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://github.com/tdf/libcmis"
-if [[ ${PV} = *_pre* ]]; then
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
+ SCM_ECLASS="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"
- S="${WORKDIR}/${PN}-${snapshot}"
unset snapshot
-elif [[ ${PV} != 9999 ]] ; then
+else
SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
+inherit alternatives autotools ${SCM_ECLASS}
+unset SCM_ECLASS
+
+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"
@@ -26,7 +27,7 @@ SLOT="0.5"
[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs man test"
+IUSE="man static-libs test"
COMMON_DEPEND="
dev-libs/boost:=
@@ -48,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
!<dev-cpp/libcmis-0.5.0
"
+RESTRICT="test"
+
src_prepare() {
default
[[ ${PV} = *_pre* || ${PV} = 9999 ]] && eautoreconf
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libcmis/, dev-cpp/libcmis/files/
@ 2019-04-21 11:31 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-04-21 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 5f2d211486320137d50b3224eb260bbe9f3e747e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 23:56:27 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:30:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2d2114
dev-cpp/libcmis: Fix build with ICU 64.2
Bug: https://bugs.gentoo.org/674414
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch | 17 +++++++++++++++++
dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild | 2 ++
2 files changed, 19 insertions(+)
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch
new file mode 100644
index 00000000000..6ba63ee7fe7
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.2-icu-64.2.patch
@@ -0,0 +1,17 @@
+--- a/inc/libcmis-c/repository.h 2018-12-27 14:07:55.000000000 +0100
++++ b/inc/libcmis-c/repository.h 2019-04-21 01:29:46.504373226 +0200
+@@ -28,12 +28,12 @@
+ #ifndef _REPOSITORY_H_
+ #define _REPOSITORY_H_
+
++#include <libxml/tree.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+-#include <libxml/tree.h>
+-
+ #include "libcmis-c/libcmis-c-api.h"
+ #include "libcmis-c/types.h"
+
diff --git a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
index a060dbb78ee..c9f4938bb63 100644
--- a/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2-r1.ebuild
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}"
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-icu-64.2.patch" )
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libcmis/, dev-cpp/libcmis/files/
@ 2023-11-21 22:36 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-11-21 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 123eca67c41a657baef5709ec6fa9ff2dcf5403f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 20:42:16 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 22:19:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123eca67
dev-cpp/libcmis: Fix build with dev-libs/libxml2-2.12.0
Closes: https://bugs.gentoo.org/917523
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libcmis/files/libcmis-0.6.2-libxml2-2.12.patch | 26 ++++++++++++++++++++++
dev-cpp/libcmis/libcmis-0.6.2.ebuild | 3 +++
2 files changed, 29 insertions(+)
diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-libxml2-2.12.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-libxml2-2.12.patch
new file mode 100644
index 000000000000..a00fb863dcb5
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.6.2-libxml2-2.12.patch
@@ -0,0 +1,26 @@
+From 72618e63433c7243e4d9e79a638f19a09402eecc Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 21 Nov 2023 23:10:07 +0100
+Subject: [PATCH] Fix build with libxml2-2.12 (missing include)
+
+See also: https://github.com/tdf/libcmis/issues/51
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ inc/libcmis/xml-utils.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/inc/libcmis/xml-utils.hxx b/inc/libcmis/xml-utils.hxx
+index 929385e..9bd99ae 100644
+--- a/inc/libcmis/xml-utils.hxx
++++ b/inc/libcmis/xml-utils.hxx
+@@ -34,6 +34,7 @@
+ #include <string>
+
+ #include <boost/date_time.hpp>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include <libxml/xpathInternals.h>
+ #include <libxml/xmlwriter.h>
+--
+2.43.0
+
diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
index 1d4b60e4cd0e..6c8abf60f12d 100644
--- a/dev-cpp/libcmis/libcmis-0.6.2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
@@ -41,6 +41,9 @@ BDEPEND="
)
"
+# https://github.com/tdf/libcmis/pull/52
+PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libcmis/, dev-cpp/libcmis/files/
@ 2024-08-31 10:44 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2024-08-31 10:44 UTC (permalink / raw
To: gentoo-commits
commit: 2b65a97f3126c54f74c706e2e16e81e83989bdd4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 10:44:33 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 10:44:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b65a97f
dev-cpp/libcmis: patch for boost 1.86
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../libcmis/files/libcmis-0.6.2-boost-1.86.patch | 47 ++++++++++++++++++++++
dev-cpp/libcmis/libcmis-0.6.2.ebuild | 8 +++-
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch
new file mode 100644
index 000000000000..5d2a9ba404e3
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch
@@ -0,0 +1,47 @@
+https://github.com/tdf/libcmis/issues/67
+https://github.com/tdf/libcmis/pull/68
+
+From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 31 Aug 2024 12:39:39 +0200
+Subject: [PATCH] Fix boost 1.86 breakage
+
+The fix does not break building against <1.86 since we're now accessing the
+object representation of the return value.
+
+Fixes #67
+---
+ src/libcmis/xml-utils.cxx | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
+index e487d17..cdf088f 100644
+--- a/src/libcmis/xml-utils.cxx
++++ b/src/libcmis/xml-utils.cxx
+@@ -531,16 +531,22 @@ namespace libcmis
+ boost::uuids::detail::sha1 sha1;
+ sha1.process_bytes( str.c_str(), str.size() );
+
+- unsigned int digest[5];
++ // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5]
++ // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20]
++ boost::uuids::detail::sha1::digest_type digest;
+ sha1.get_digest( digest );
+
++ // by using a pointer to unsigned char, we can read the
++ // object representation of either typedef.
++ const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest );
++
+ stringstream out;
+- // Setup writing mode. Every number must produce eight
++ // Setup writing mode. Every number must produce two
+ // hexadecimal digits, including possible leading 0s, or we get
+ // less than 40 digits as result.
+ out << hex << setfill('0') << right;
+- for ( int i = 0; i < 5; ++i )
+- out << setw(8) << digest[i];
++ for ( int i = 0; i < sizeof( digest ); ++ptr, ++i )
++ out << setw(2) << static_cast<int>( *ptr );
+ return out.str();
+ }
+
diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
index c20057c85432..5130a7ba2744 100644
--- a/dev-cpp/libcmis/libcmis-0.6.2.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild
@@ -41,8 +41,12 @@ BDEPEND="
)
"
-# https://github.com/tdf/libcmis/pull/52
-PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523
+PATCHES=(
+ # https://github.com/tdf/libcmis/pull/52
+ "${FILESDIR}"/${P}-libxml2-2.12.patch # bug 917523
+ # https://github.com/tdf/libcmis/pull/68
+ "${FILESDIR}"/${P}-boost-1.86.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-31 10:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-21 11:31 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/libcmis/, dev-cpp/libcmis/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-31 10:44 David Seifert
2023-11-21 22:36 Andreas Sturmlechner
2017-04-06 22:08 Andreas Sturmlechner
2016-02-22 17:07 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox