ssuominen 14/06/22 11:44:01
Modified: libsyncml-0.5.4.ebuild libsyncml-9999.ebuild
ChangeLog
Log:
Fix building with >=dev-libs/libwbxml-0.11.0 by using #include
<wbxml/wbxml.h> instead of #include <wbxml.h> wrt #425738 by Diego Elio Pettenò
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.4 app-pda/libsyncml/libsyncml-0.5.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild?r1=1.3&r2=1.4
Index: libsyncml-0.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsyncml-0.5.4.ebuild 3 May 2012 20:20:59 -0000 1.3
+++ libsyncml-0.5.4.ebuild 22 Jun 2014 11:44:01 -0000 1.4
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v
1.3 2012/05/03 20:20:59 jdhore Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.5.4.ebuild,v
1.4 2014/06/22 11:44:01 ssuominen Exp $
+EAPI=5
inherit cmake-utils
DESCRIPTION="Implementation of the SyncML protocol"
@@ -30,29 +29,31 @@
doc? ( app-doc/doxygen )
test? ( >=dev-libs/check-0.9.7 )"
-pkg_setup() {
- if ! use obex && ! use http; then
- eerror "${CATEGORY}/${P} without support for obex nor http is
unusable."
- eerror "Please enable \"obex\" or/and \"http\" USE flags."
- die "Please enable \"obex\" or/and \"http\" USE flags."
- fi
+REQUIRED_USE="|| ( http obex )"
+
+DOCS="AUTHORS CODING ChangeLog RELEASE"
- DOCS="AUTHORS CODING ChangeLog RELEASE"
+src_prepare() {
+ # http://bugs.gentoo.org/425738
+ sed -i \
+ -e '/include/s:wbxml.h:wbxml/&:' \
+ libsyncml/parser/sml_wbxml_internals.h
tests/mobiles/obex_mobile_ds_client.c || die
}
src_configure() {
- local mycmakeargs="
+ local mycmakeargs=(
-DHAVE_LIBSOUP22=OFF
-DDOC_INSTALL_DIR=/usr/share/doc/${PF}
$(cmake-utils_use_enable debug TRACE)
$(cmake-utils_use_enable http HTTP)
$(cmake-utils_use_enable obex OBEX)
$(cmake-utils_use_enable obex BLUETOOTH)
- $(cmake-utils_use_enable test UNIT_TEST)"
+ $(cmake-utils_use_enable test UNIT_TEST)
+ )
if use http && use obex; then
# Doc builds with those previous USE flags only
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_build doc
DOCUMENTATION)"
+ mycmakeargs+=( $(cmake-utils_use_build doc DOCUMENTATION) )
fi
cmake-utils_src_configure
1.8 app-pda/libsyncml/libsyncml-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild?r1=1.7&r2=1.8
Index: libsyncml-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsyncml-9999.ebuild 3 May 2012 20:20:59 -0000 1.7
+++ libsyncml-9999.ebuild 22 Jun 2014 11:44:01 -0000 1.8
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v
1.7 2012/05/03 20:20:59 jdhore Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v
1.8 2014/06/22 11:44:01 ssuominen Exp $
+EAPI=5
inherit cmake-utils subversion
DESCRIPTION="Implementation of the SyncML protocol"
@@ -32,25 +31,27 @@
doc? ( app-doc/doxygen )
test? ( >=dev-libs/check-0.9.7 )"
-pkg_setup() {
- if ! use obex && ! use http; then
- eerror "${CATEGORY}/${P} without support for obex nor http is
unusable."
- eerror "Please enable \"obex\" or/and \"http\" USE flags."
- die "Please enable \"obex\" or/and \"http\" USE flags."
- fi
+REQUIRED_USE="|| ( http obex )"
+
+DOCS="AUTHORS CODING ChangeLog RELEASE"
- DOCS="AUTHORS CODING ChangeLog RELEASE"
+src_prepare() {
+ # http://bugs.gentoo.org/425738
+ sed -i \
+ -e '/include/s:wbxml.h:wbxml/&:' \
+ libsyncml/parser/sml_wbxml_internals.h
tests/mobiles/obex_mobile_ds_client.c || die
}
src_configure() {
- local mycmakeargs="
+ local mycmakeargs=(
-DHAVE_LIBSOUP22=OFF
$(cmake-utils_use_build doc DOCUMENTATION)
$(cmake-utils_use_enable debug TRACE)
$(cmake-utils_use_enable http HTTP)
$(cmake-utils_use_enable obex OBEX)
$(cmake-utils_use_enable obex BLUETOOTH)
- $(cmake-utils_use_enable test UNIT_TEST)"
+ $(cmake-utils_use_enable test UNIT_TEST)
+ )
cmake-utils_src_configure
}
1.21 app-pda/libsyncml/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/ChangeLog?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/ChangeLog?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libsyncml/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 3 May 2012 20:20:59 -0000 1.20
+++ ChangeLog 22 Jun 2014 11:44:01 -0000 1.21
@@ -1,6 +1,11 @@
# ChangeLog for app-pda/libsyncml
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.20
2012/05/03 20:20:59 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.21
2014/06/22 11:44:01 ssuominen Exp $
+
+ 22 Jun 2014; Samuli Suominen <[email protected]> libsyncml-0.5.4.ebuild,
+ libsyncml-9999.ebuild:
+ Fix building with >=dev-libs/libwbxml-0.11.0 by using #include
<wbxml/wbxml.h>
+ instead of #include <wbxml.h> wrt #425738 by Diego Elio Pettenò
03 May 2012; Jeff Horelick <[email protected]> libsyncml-0.5.4.ebuild,
libsyncml-9999.ebuild:
@@ -109,4 +114,3 @@
13 Nov 2006; Piotr Jaroszyński <[email protected]> +metadata.xml,
+libsyncml-0.4.2.ebuild:
New package.
-
