[gentoo-commits] repo/gentoo:master commit in: net-libs/libgadu/files/, net-libs/libgadu/

2020-02-08 Thread Maciej Mrozowski 
commit: c399566a3b87b5e8cb2341e3d3c0c0368ce01f13
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sun Feb  9 02:25:58 2020 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Sun Feb  9 02:28:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c399566a

net-libs/libgadu: Fix building with -fno-common

Closes: https://bugs.gentoo.org/708686
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski  gentoo.org>

 .../libgadu/files/libgadu-1.12.2-fno-common.patch  | 30 ++
 net-libs/libgadu/libgadu-1.12.2-r1.ebuild  |  4 +++
 2 files changed, 34 insertions(+)

diff --git a/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch 
b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
new file mode 100644
index 000..2eafd3748ee
--- /dev/null
+++ b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
@@ -0,0 +1,30 @@
+diff -ruN libgadu-1.12.2/test/manual/userconfig.h 
my-libgadu/test/manual/userconfig.h
+--- libgadu-1.12.2/test/manual/userconfig.h2017-01-21 18:57:03.0 
+0100
 my-libgadu/test/manual/userconfig.h2020-02-09 03:18:29.040560145 
+0100
+@@ -19,16 +19,16 @@
+ #ifndef USERCONFIG_H
+ #define USERCONFIG_H
+ 
+-unsigned int config_uin;
+-char *config_password;
+-unsigned int config_peer;
+-char *config_file;
+-char *config_dir;
+-unsigned int config_size;
+-unsigned long config_ip;
+-unsigned int config_port;
+-char *config_server;
+-char *config_proxy;
++extern unsigned int config_uin;
++extern char *config_password;
++extern unsigned int config_peer;
++extern char *config_file;
++extern char *config_dir;
++extern unsigned int config_size;
++extern unsigned long config_ip;
++extern unsigned int config_port;
++extern char *config_server;
++extern char *config_proxy;
+ 
+ int config_read(void);
+ void config_free(void);

diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild 
b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index f48750979fe..87d39897c0d 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -33,6 +33,10 @@ RDEPEND="${DEPEND}"
 
 BUILD_DIR="${S}"
 
+PATCHES=(
+   "${FILESDIR}/${P}-fno-common.patch"
+)
+
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/libgadu/files/, net-libs/libgadu/

2018-05-22 Thread Maciej Mrozowski 
commit: d8f34ec392c4cc1e7da30a2aaa506added352573
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sat May 12 00:52:44 2018 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Tue May 22 23:47:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f34ec3

net-libs/libgadu: Remove old, restrict openssl to slot 0 to silence repoman

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-libs/libgadu/Manifest |  2 -
 net-libs/libgadu/files/libgadu-1.12.0-tests.patch | 12 
 net-libs/libgadu/libgadu-1.11.4.ebuild|  4 +-
 net-libs/libgadu/libgadu-1.12.0.ebuild| 76 ---
 net-libs/libgadu/libgadu-1.12.1.ebuild| 76 ---
 5 files changed, 2 insertions(+), 168 deletions(-)

diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index d138d09bcf5..a5e8481cce0 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,4 +1,2 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 
05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c
 SHA512 
3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
-DIST libgadu-1.12.0.tar.gz 290361 BLAKE2B 
7dc517b0704bd525aa2e71dc49bd64daee65cff6c4084776c01a48f806cebe57ce933a8be557ecf94648de0920765efeb293ba8d30d8a46cd1590f97fa40a877
 SHA512 
62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670
-DIST libgadu-1.12.1.tar.gz 296079 BLAKE2B 
0420e3a4e0d7180f0fd78fb8c5dd19c406d8f0d9880adca643301410c261ca9367f31ed72a3f9d27c07a4b6dcf0f3d6d5dd0e6b1025082f70c9442a5518557b3
 SHA512 
4786bcc517dcead278fed05c35e254d963ee42f029b09a59bfe01052cbe438fa4a0d86c17dcfa2ee39d2365f28864f887d28772a5e70ce2ece190714bec45590
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B 
eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee
 SHA512 
d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677

diff --git a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch 
b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
deleted file mode 100644
index 56e1da45b09..000
--- a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libgadu-1.12.0/test/manual/lib/base64.c my/test/manual/lib/base64.c
 libgadu-1.12.0/test/manual/lib/base64.c2014-06-13 20:41:37.0 
+0200
-+++ my/test/manual/lib/base64.c2014-08-13 03:08:00.612006311 +0200
-@@ -30,7 +30,7 @@
- #include 
- #include 
- 
--char *gg_base64_encode(const char *input, ssize_t len)
-+char *gg_base64_encode2(const char *input, ssize_t len)
- {
-   BIO *bmem, *b64;
-   BUF_MEM *bptr;

diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild 
b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 7c85cae4fd9..e269958d970 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ COMMON_DEPEND="
sys-libs/zlib
ssl? (
gnutls? ( net-libs/gnutls )
-   !gnutls? ( >=dev-libs/openssl-0.9.6m )
+   !gnutls? ( >=dev-libs/openssl-0.9.6m:0 )
)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild 
b/net-libs/libgadu/libgadu-1.12.0.ebuild
deleted file mode 100644
index 1448b9f6434..000
--- a/net-libs/libgadu/libgadu-1.12.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
-HOMEPAGE="http://toxygen.net/libgadu/;
-SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-
-REQUIRED_USE="
-   gnutls? ( ssl )
-"
-COMMON_DEPEND="
-   >=dev-libs/protobuf-c-0.15
-   sys-libs/zlib
-   ssl? (
-   gnutls? ( net-libs/gnutls )
-   !gnutls? ( >=dev-libs/openssl-0.9.6m )
-   )
-"
-DEPEND="${COMMON_DEPEND}
-   doc? ( app-doc/doxygen )
-   test? (
-   dev-libs/expat
-   dev-libs/libxml2:2
-   net-misc/curl
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   !=net-im/kadu-0.6.0.2
-   !=net-im/kadu-0.6.0.1
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-