Attachment #887274 for bug #926129

View | Details | Raw Unified | Return to bug 926129
Collapse All | Expand All




From 0539e12b3de14a77481bd3f87b301b7e7550172c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
Date: Thu, 23 Nov 2023 21:10:05 +0100
Subject: [PATCH] Fix building with libxml2-2.12.0

libxml-2.12.0 shuffled included header files.
---
 test/offline/isds_message_free.c | 1 +
 test/simline/service.c           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/offline/isds_message_free.c b/test/offline/isds_message_free.c
index 3c2096e..f819d19 100644
--- a/test/offline/isds_message_free.c
+++ b/test/offline/isds_message_free.c
@@ -1,5 +1,6 @@
 #include "../test.h"
 #include "isds.h"
+#include <libxml/parser.h>
 
 static int test_isds_message_free(struct isds_message **message) {
     isds_message_free(message);
diff --git a/test/simline/service.c b/test/simline/service.c
index 533bed5..fea6e87 100644
--- a/test/simline/service.c
+++ b/test/simline/service.c
@@ -6,6 +6,7 @@
 #include "system.h"
 #include <string.h>
 #include <stdint.h>     /* For intmax_t */
+#include <stdlib.h>     /* For free() */
 #include <inttypes.h>   /* For PRIdMAX */
 #include <ctype.h>      /* for isdigit() */
 #include <libxml/parser.h>
-- 
2.43.0





# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

DESCRIPTION="Client library for accessing ISDS Soap services"
HOMEPAGE="http://xpisar.wz.cz/libisds/"
SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
KEYWORDS="~amd64 ~mips ~x86"

LICENSE="LGPL-3"
SLOT="0"
IUSE="+curl debug doc nls openssl test"
RESTRICT="!test? ( test )"

RDEPEND="
	dev-libs/expat
	dev-libs/libxml2
	curl? ( net-misc/curl[ssl] )
	doc? (
		app-text/docbook-xsl-stylesheets
		dev-libs/libxslt
	)
	openssl? ( dev-libs/openssl:= )
	!openssl? (
		app-crypt/gnupg
		app-crypt/gpgme:=
		dev-libs/libgcrypt:=
	)"
DEPEND="${RDEPEND}
	test? ( net-libs/gnutls )"
BDEPEND="
	virtual/pkgconfig
	nls? ( sys-devel/gettext )"

PATCHES=(
	"${FILESDIR}/${PN}-0.11.1-Fix-building-with-libxml2-2.12.0.patch"
)

src_configure() {
	local myeconfargs=(
		--disable-fatalwarnings
		--disable-static
		$(use_with curl libcurl)
		$(use_enable curl curlreauthorizationbug)
		$(use_enable doc)
		$(use_enable debug)
		$(use_enable nls)
		$(use_enable openssl openssl-backend)
		$(use_enable test)
	)
	econf "${myeconfargs[@]}"
}

src_install() {
	default

	find "${ED}" -name '*.la' -delete || die
}

Return to bug 926129

Line 0 Link Here

(-)a/net-libs/libisds/files/libisds-0.11.1-Fix-building-with-libxml2-2.12.0.patch (+37 lines)
	1	From 0539e12b3de14a77481bd3f87b301b7e7550172c Mon Sep 17 00:00:00 2001
	2	From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
	3	Date: Thu, 23 Nov 2023 21:10:05 +0100
	4	Subject: [PATCH] Fix building with libxml2-2.12.0
	5
	6	libxml-2.12.0 shuffled included header files.
	7	---
	8	test/offline/isds_message_free.c \| 1 +
	9	test/simline/service.c \| 1 +
	10	2 files changed, 2 insertions(+)
	11
	12	diff --git a/test/offline/isds_message_free.c b/test/offline/isds_message_free.c
	13	index 3c2096e..f819d19 100644
	14	--- a/test/offline/isds_message_free.c
	15	+++ b/test/offline/isds_message_free.c
	16	@@ -1,5 +1,6 @@
	17	#include "../test.h"
	18	#include "isds.h"
	19	+#include <libxml/parser.h>
	20
	21	static int test_isds_message_free(struct isds_message **message) {
	22	isds_message_free(message);
	23	diff --git a/test/simline/service.c b/test/simline/service.c
	24	index 533bed5..fea6e87 100644
	25	--- a/test/simline/service.c
	26	+++ b/test/simline/service.c
	27	@@ -6,6 +6,7 @@
	28	#include "system.h"
	29	#include <string.h>
	30	#include <stdint.h> /* For intmax_t */
	31	+#include <stdlib.h> /* For free() */
	32	#include <inttypes.h> /* For PRIdMAX */
	33	#include <ctype.h> /* for isdigit() */
	34	#include <libxml/parser.h>
	35	--
	36	2.43.0
	37

Line 0 Link Here

(-)a/net-libs/libisds/libisds-0.11.1-r2.ebuild (-1 / +59 lines)
0	-	1	# Copyright 1999-2022 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=7
		5
		6	DESCRIPTION="Client library for accessing ISDS Soap services"
		7	HOMEPAGE="http://xpisar.wz.cz/libisds/"
		8	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
		9	KEYWORDS="~amd64 ~mips ~x86"
		10
		11	LICENSE="LGPL-3"
		12	SLOT="0"
		13	IUSE="+curl debug doc nls openssl test"
		14	RESTRICT="!test? ( test )"
		15
		16	RDEPEND="
		17	dev-libs/expat
		18	dev-libs/libxml2
		19	curl? ( net-misc/curl[ssl] )
		20	doc? (
		21	app-text/docbook-xsl-stylesheets
		22	dev-libs/libxslt
		23	)
		24	openssl? ( dev-libs/openssl:= )
		25	!openssl? (
		26	app-crypt/gnupg
		27	app-crypt/gpgme:=
		28	dev-libs/libgcrypt:=
		29	)"
		30	DEPEND="${RDEPEND}
		31	test? ( net-libs/gnutls )"
		32	BDEPEND="
		33	virtual/pkgconfig
		34	nls? ( sys-devel/gettext )"
		35
		36	PATCHES=(
		37	"${FILESDIR}/${PN}-0.11.1-Fix-building-with-libxml2-2.12.0.patch"
		38	)
		39
		40	src_configure() {
		41	local myeconfargs=(
		42	--disable-fatalwarnings
		43	--disable-static
		44	$(use_with curl libcurl)
		45	$(use_enable curl curlreauthorizationbug)
		46	$(use_enable doc)
		47	$(use_enable debug)
		48	$(use_enable nls)
		49	$(use_enable openssl openssl-backend)
		50	$(use_enable test)
		51	)
		52	econf "${myeconfargs[@]}"
		53	}
		54
		55	src_install() {
		56	default
		57
		58	find "${ED}" -name '*.la' -delete \|\| die
		59	}