diff options
author | megabaks <megagreener@gmail.com> | 2012-10-11 11:52:07 -0700 |
---|---|---|
committer | megabaks <megagreener@gmail.com> | 2012-10-11 11:52:07 -0700 |
commit | 4129ad95284e84d8af39ca34349a49057fc48b6e (patch) | |
tree | 0a4fa0e873b117c305f3786b489ed2e9d92b9939 | |
parent | 464cea1e481f78c6ebe021b33eaf0a361d397b70 (diff) | |
parent | af26ba6385d4aaf6254982282b56db54a9e07553 (diff) | |
download | profanity-4129ad95284e84d8af39ca34349a49057fc48b6e.tar.gz profanity-4129ad95284e84d8af39ca34349a49057fc48b6e.tar.xz |
Merge pull request #22 from pasis/master
dev-libs/libstrophe, net-misc/pppoat
5 files changed, 2 insertions, 134 deletions
diff --git a/dev-libs/libstrophe/files/libstrophe-build-shared-library.patch b/dev-libs/libstrophe/files/libstrophe-build-shared-library.patch deleted file mode 100644 index 10c9bef..0000000 --- a/dev-libs/libstrophe/files/libstrophe-build-shared-library.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 788d37c..b09ee58 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,15 +6,16 @@ PARSER_CFLAGS=@PARSER_CFLAGS@ - PARSER_LIBS=@PARSER_LIBS@ - - SSL_LIBS = -lssl -lcrypto -lz -+LIBS += $(SSL_LIBS) $(PARSER_LIBS) - - STROPHE_FLAGS = -I$(top_srcdir) --STROPHE_LIBS = libstrophe.a $(PARSER_LIBS) $(SSL_LIBS) -+STROPHE_LIBS = libstrophe.la - - ## Main build targets --lib_LIBRARIES = libstrophe.a -+lib_LTLIBRARIES = libstrophe.la - --libstrophe_a_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS) --libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \ -+libstrophe_la_CFLAGS=$(STROPHE_FLAGS) $(PARSER_CFLAGS) -+libstrophe_la_SOURCES = src/auth.c src/conn.c src/ctx.c \ - src/event.c src/handler.c src/hash.c \ - src/jid.c src/md5.c src/sasl.c src/sha1.c \ - src/snprintf.c src/sock.c src/stanza.c src/thread.c \ -@@ -23,9 +24,9 @@ libstrophe_a_SOURCES = src/auth.c src/conn.c src/ctx.c \ - src/sasl.h src/sha1.h src/sock.h src/thread.h src/tls.h src/util.h - - if PARSER_EXPAT --libstrophe_a_SOURCES += src/parser_expat.c -+libstrophe_la_SOURCES += src/parser_expat.c - else --libstrophe_a_SOURCES += src/parser_libxml2.c -+libstrophe_la_SOURCES += src/parser_libxml2.c - endif - - include_HEADERS = strophe.h -diff --git a/bootstrap.sh b/bootstrap.sh -index 473f746..3b72d88 100755 ---- a/bootstrap.sh -+++ b/bootstrap.sh -@@ -5,6 +5,7 @@ if [ -d /usr/local/share/aclocal ]; then - ACFLAGS="-I /usr/local/share/aclocal" - fi - -+libtoolize - aclocal ${ACFLAGS} - automake --add-missing --foreign --copy - autoconf -diff --git a/configure.ac b/configure.ac -index e170fc3..9ad2c1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,6 +3,7 @@ AM_INIT_AUTOMAKE - - AC_PROG_CC - AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AM_PROG_CC_C_O - - AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([couldn't find openssl headers, openssl required])]) diff --git a/dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch b/dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch deleted file mode 100644 index c7d6757..0000000 --- a/dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 97444e5..e170fc3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9,11 +9,9 @@ AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([couldn't find openssl headers, - PKG_CHECK_MODULES([check], [check >= 0.9.4], [], [AC_MSG_WARN([libcheck not found; unit tests will not be compilable])]) - - AC_ARG_WITH([libxml2], -- [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing])], -- [with_libxml2=check], -- [with_libxml2=no]) -+ [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing])]) - --if test "x$with_libxml2" != xno; then -+if test "x$with_libxml2" = xyes; then - PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7], - [with_libxml2=yes], - [AC_MSG_ERROR([couldn't find libxml2])]) diff --git a/dev-libs/libstrophe/files/libstrophe-pkg-config-support.patch b/dev-libs/libstrophe/files/libstrophe-pkg-config-support.patch deleted file mode 100644 index db16f0d..0000000 --- a/dev-libs/libstrophe/files/libstrophe-pkg-config-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index b09ee58..d6c534e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS = subdir-objects - - CFLAGS = -g -Wall - -+pkgconfigdir = $(libdir)/pkgconfig -+ - PARSER_CFLAGS=@PARSER_CFLAGS@ - PARSER_LIBS=@PARSER_LIBS@ - -@@ -34,6 +36,8 @@ noinst_HEADERS = strophepp.h - - EXTRA_DIST = docs - -+pkgconfig_DATA = libstrophe.pc -+ - ## Examples - noinst_PROGRAMS = examples/active examples/roster examples/basic examples/bot - examples_active_SOURCES = examples/active.c -diff --git a/configure.ac b/configure.ac -index 9ad2c1b..1496990 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,5 +43,5 @@ AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2]) - AC_SUBST(PARSER_NAME) - AC_SUBST(PARSER_CFLAGS) - AC_SUBST(PARSER_LIBS) --AC_CONFIG_FILES([Makefile]) -+AC_CONFIG_FILES([Makefile libstrophe.pc]) - AC_OUTPUT -diff --git a/libstrophe.pc.in b/libstrophe.pc.in -new file mode 100644 -index 0000000..9ab13d4 ---- /dev/null -+++ b/libstrophe.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libstrophe -+Description: A simple, lightweight C library for writing XMPP clients -+Requires: -+Version: @PACKAGE_VERSION@ -+Libs: -L${libdir} -lstrophe -+Cflags: -I${includedir} diff --git a/dev-libs/libstrophe/libstrophe-9999.ebuild b/dev-libs/libstrophe/libstrophe-9999.ebuild index a06dce6..578ebab 100644 --- a/dev-libs/libstrophe/libstrophe-9999.ebuild +++ b/dev-libs/libstrophe/libstrophe-9999.ebuild @@ -4,7 +4,7 @@ EAPI=4 -EGIT_REPO_URI="git://github.com/metajack/libstrophe.git" +EGIT_REPO_URI="git://github.com/pasis/libstrophe.git" inherit libtool autotools eutils git-2 @@ -25,9 +25,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P/-/_}" src_prepare() { - epatch "${FILESDIR}"/${PN}-libxml2-build-fix.patch - epatch "${FILESDIR}"/${PN}-build-shared-library.patch - epatch "${FILESDIR}"/${PN}-pkg-config-support.patch elibtoolize eautoreconf } diff --git a/dev-libs/libstrophe/metadata.xml b/dev-libs/libstrophe/metadata.xml index ea4583c..9e37ade 100644 --- a/dev-libs/libstrophe/metadata.xml +++ b/dev-libs/libstrophe/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>megagreener@gmail.com</email> + <email>pasis.ua@gmail.com</email> </maintainer> <use> <flag name='xml'>Use dev-libs/libxml2 to parse XML</flag> |