1 |
commit: 22c4cf9c6d295da8b1cda4a5eff7053ef6ee931f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 07:09:51 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 07:09:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c4cf9c |
7 |
|
8 |
net-libs/gloox: bump to 1.0.24 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/713224 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-libs/gloox/Manifest | 1 + |
15 |
net-libs/gloox/files/gloox-1.0.24-Makefile.patch | 36 +++++++++++++++ |
16 |
net-libs/gloox/files/gloox-1.0.24-musl.patch | 13 ++++++ |
17 |
net-libs/gloox/gloox-1.0.24.ebuild | 59 ++++++++++++++++++++++++ |
18 |
4 files changed, 109 insertions(+) |
19 |
|
20 |
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest |
21 |
index 37de0cfbb35..90396725d72 100644 |
22 |
--- a/net-libs/gloox/Manifest |
23 |
+++ b/net-libs/gloox/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416 |
26 |
+DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee |
27 |
|
28 |
diff --git a/net-libs/gloox/files/gloox-1.0.24-Makefile.patch b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..40fed6900f0 |
31 |
--- /dev/null |
32 |
+++ b/net-libs/gloox/files/gloox-1.0.24-Makefile.patch |
33 |
@@ -0,0 +1,36 @@ |
34 |
+Call make with the current instance if possible. |
35 |
+--- a/Makefile.am |
36 |
++++ b/Makefile.am |
37 |
+@@ -17,12 +17,12 @@ apidox: |
38 |
+ check: test |
39 |
+ |
40 |
+ test: |
41 |
+- make -C src test |
42 |
++ $(MAKE) -C src test |
43 |
+ |
44 |
+ leakcheck: leaktest |
45 |
+ |
46 |
+ leaktest: |
47 |
+- make -C src leaktest |
48 |
++ $(MAKE) -C src leaktest |
49 |
+ |
50 |
+ includetest: |
51 |
+- make -C src includetest |
52 |
++ $(MAKE) -C src includetest |
53 |
+--- a/src/Makefile.am |
54 |
++++ b/src/Makefile.am |
55 |
+@@ -117,12 +117,12 @@ noinst_HEADERS = config.h prep.h dns.h nonsaslauth.h mucmessagesession.h stanzae |
56 |
+ EXTRA_DIST = version.rc |
57 |
+ |
58 |
+ test: |
59 |
+- make -C tests test |
60 |
++ $(MAKE) -C tests test |
61 |
+ |
62 |
+ check: test |
63 |
+ |
64 |
+ leaktest: |
65 |
+- make -C tests leaktest |
66 |
++ $(MAKE) -C tests leaktest |
67 |
+ |
68 |
+ leakcheck: leaktest |
69 |
+ |
70 |
|
71 |
diff --git a/net-libs/gloox/files/gloox-1.0.24-musl.patch b/net-libs/gloox/files/gloox-1.0.24-musl.patch |
72 |
new file mode 100644 |
73 |
index 00000000000..041841ef345 |
74 |
--- /dev/null |
75 |
+++ b/net-libs/gloox/files/gloox-1.0.24-musl.patch |
76 |
@@ -0,0 +1,13 @@ |
77 |
+https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/gloox/patches/gloox-musl.patch |
78 |
+https://bugs.gentoo.org/713224 |
79 |
+--- a/src/connectiontcpserver.cpp |
80 |
++++ b/src/connectiontcpserver.cpp |
81 |
+@@ -51,7 +51,7 @@ |
82 |
+ #endif |
83 |
+ |
84 |
+ #include <cstdlib> |
85 |
+-#include <string> |
86 |
++#include <string.h> |
87 |
+ |
88 |
+ #ifndef _WIN32_WCE |
89 |
+ # include <sys/types.h> |
90 |
|
91 |
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild |
92 |
new file mode 100644 |
93 |
index 00000000000..4a083e0af49 |
94 |
--- /dev/null |
95 |
+++ b/net-libs/gloox/gloox-1.0.24.ebuild |
96 |
@@ -0,0 +1,59 @@ |
97 |
+# Copyright 1999-2020 Gentoo Authors |
98 |
+# Distributed under the terms of the GNU General Public License v2 |
99 |
+ |
100 |
+EAPI=7 |
101 |
+ |
102 |
+inherit autotools |
103 |
+ |
104 |
+MY_P="${P/_/-}" |
105 |
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++" |
106 |
+HOMEPAGE="https://camaya.net/gloox/" |
107 |
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2" |
108 |
+S="${WORKDIR}/${MY_P}" |
109 |
+ |
110 |
+LICENSE="GPL-3" |
111 |
+# Check upstream changelog: https://camaya.net/gloox/changelog/ |
112 |
+SLOT="0/18" |
113 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
114 |
+IUSE="debug gnutls idn libressl ssl static-libs test zlib" |
115 |
+ |
116 |
+DEPEND=" |
117 |
+ idn? ( net-dns/libidn:= ) |
118 |
+ gnutls? ( net-libs/gnutls:= ) |
119 |
+ ssl? ( |
120 |
+ !libressl? ( dev-libs/openssl:0= ) |
121 |
+ libressl? ( dev-libs/libressl:0= ) |
122 |
+ ) |
123 |
+ zlib? ( sys-libs/zlib ) |
124 |
+" |
125 |
+RDEPEND="${DEPEND}" |
126 |
+ |
127 |
+PATCHES=( |
128 |
+ "${FILESDIR}/${PN}-1.0.24-musl.patch" |
129 |
+ "${FILESDIR}/${PN}-1.0.24-Makefile.patch" |
130 |
+) |
131 |
+ |
132 |
+src_prepare() { |
133 |
+ default |
134 |
+ eautoreconf |
135 |
+} |
136 |
+ |
137 |
+src_configure() { |
138 |
+ # Examples are not installed anyway, so - why should we build them? |
139 |
+ local myeconfargs=( |
140 |
+ --without-examples |
141 |
+ $(usex debug "--enable-debug" '') |
142 |
+ $(use_enable static-libs static) |
143 |
+ $(use_with idn libidn) |
144 |
+ $(use_with gnutls) |
145 |
+ $(use_with ssl openssl) |
146 |
+ $(use_with test tests) |
147 |
+ $(use_with zlib) |
148 |
+ ) |
149 |
+ econf "${myeconfargs[@]}" |
150 |
+} |
151 |
+ |
152 |
+src_install() { |
153 |
+ default |
154 |
+ find "${ED}" -name "*.la" -delete || die |
155 |
+} |