summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2018-02-09 07:27:19 +0000
committerSven Wegener <swegener@gentoo.org>2018-02-09 07:28:02 +0000
commitf7d25cbc71ea6986bc7d439975637e00705b75b7 (patch)
tree5866bc7507eb7c45cdea5023ff5f999192530175 /net-im/centerim/files
parentdev-python/setuptools: version bump to 38.5.1 (diff)
downloadgentoo-f7d25cbc71ea6986bc7d439975637e00705b75b7.tar.gz
gentoo-f7d25cbc71ea6986bc7d439975637e00705b75b7.tar.bz2
gentoo-f7d25cbc71ea6986bc7d439975637e00705b75b7.zip
net-im/centerim: cleanup
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'net-im/centerim/files')
-rw-r--r--net-im/centerim/files/centerim-4.22.10-gcc46.patch12
-rw-r--r--net-im/centerim/files/centerim-4.22.10-system-expat.patch51
2 files changed, 0 insertions, 63 deletions
diff --git a/net-im/centerim/files/centerim-4.22.10-gcc46.patch b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
deleted file mode 100644
index a03e9eabd13f..000000000000
--- a/net-im/centerim/files/centerim-4.22.10-gcc46.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=363017
-
---- a/libicq2000/libicq2000/sigslot.h
-+++ b/libicq2000/libicq2000/sigslot.h
-@@ -82,6 +82,7 @@
- #ifndef SIGSLOT_H__
- #define SIGSLOT_H__
-
-+#include <cstddef>
- #include <set>
- #include <list>
-
diff --git a/net-im/centerim/files/centerim-4.22.10-system-expat.patch b/net-im/centerim/files/centerim-4.22.10-system-expat.patch
deleted file mode 100644
index ef3d52c28c3d..000000000000
--- a/net-im/centerim/files/centerim-4.22.10-system-expat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 539f0dd1b9b81c4b0aece3ab076b1c75073c8062 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 6 May 2016 02:33:51 +0200
-Subject: [PATCH] Build against system Expat
-
----
- libjabber/Makefile.am | 4 ++--
- libjabber/libxode.h | 2 +-
- src/Makefile.am | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libjabber/Makefile.am b/libjabber/Makefile.am
-index f91ad8f..7b20f6b 100644
---- a/libjabber/Makefile.am
-+++ b/libjabber/Makefile.am
-@@ -1,4 +1,4 @@
- AM_CPPFLAGS = -I$(top_srcdir)/connwrap
- noinst_LIBRARIES = liblibjabber.a
--noinst_HEADERS = xmltok_impl_c.h latin1tab.h log.h asciitab.h libxode.h jabber.h hashtable.h xmlparse.h iasciitab.h xmldef.h xmltok.h utf8tab.h xmltok_impl.h xmlrole.h nametab.h xmltok_ns_c.h
--liblibjabber_a_SOURCES = jid.c log.c jutil.c str.c expat.c hashtable.c genhash.c pproxy.c pool.c rate.c xmlparse.c xstream.c xmltok.c xmlnode.c jconn.c xmlrole.c jpacket.c snprintf.c socket.c sha.c
-+noinst_HEADERS = log.h libxode.h jabber.h nametab.h
-+liblibjabber_a_SOURCES = jid.c log.c jutil.c str.c expat.c genhash.c pproxy.c pool.c rate.c xstream.c xmlnode.c jconn.c jpacket.c snprintf.c socket.c sha.c
-diff --git a/libjabber/libxode.h b/libjabber/libxode.h
-index d6c92a6..8752b0c 100644
---- a/libjabber/libxode.h
-+++ b/libjabber/libxode.h
-@@ -16,7 +16,7 @@
- #include <arpa/inet.h>
- #include <sys/time.h>
-
--#include "xmlparse.h"
-+#include <expat.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif /* HAVE_CONFIG_H */
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3a0feaf..b8cf2ff 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,7 +22,7 @@ centerim_LDADD += -llibgadu
- endif
- if BUILD_JABBER
- centerim_LDFLAGS += -L$(top_builddir)/libjabber
--centerim_LDADD += -llibjabber
-+centerim_LDADD += -llibjabber -lexpat
- endif
- if BUILD_MSN
- centerim_LDFLAGS += -L$(top_builddir)/libmsn
---
-2.8.1
-