mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
gloox: remove obsolete versions
1.0.22 confirmed working with Renga.
This commit is contained in:
@@ -1,79 +0,0 @@
|
||||
SUMMARY="Full-featured Jabber/XMPP client library"
|
||||
DESCRIPTION="Rock-solid, full-featured Jabber/XMPP client library, written in clean ANSI C++."
|
||||
HOMEPAGE="https://camaya.net/gloox/"
|
||||
COPYRIGHT="2002-2012 Jakob Schröter"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="4"
|
||||
SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="0243086c0f4f0440d6d8e55705f83249a4463a1d75a034be42b5312e8886dea8"
|
||||
PATCHES="gloox-1.0.9.patch"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
|
||||
|
||||
libVersion="17.0.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
gloox$secondaryArchSuffix = $portVersion
|
||||
lib:libgloox$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
gloox${secondaryArchSuffix}_devel = $portVersion
|
||||
cmd:gloox_config$secondaryArchSuffix
|
||||
devel:libgloox$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
gloox$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoreconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage gloox$secondaryArchSuffix \
|
||||
$libDir/libgloox.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/libgloox.la
|
||||
|
||||
# prepare development lib links
|
||||
prepareInstalledDevelLib libgloox
|
||||
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel $developDir $binDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 402c399..20555ba 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR(src/gloox.cpp)
|
||||
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
|
||||
|
||||
dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
|
||||
-AM_CONFIG_HEADER(config.h.unix)
|
||||
+AC_CONFIG_HEADER(config.h.unix)
|
||||
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
@@ -326,8 +326,8 @@ AC_MSG_RESULT($getaddrinfo)
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
-AC_CHECK_HEADERS(unistd.h strings.h errno.h arpa/nameser.h)
|
||||
-AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
|
||||
+AC_CHECK_HEADERS(unistd.h wchar.h string.h cstring.h strings.h errno.h arpa/nameser.h)
|
||||
+AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(network,setsockopt)])
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
diff --git a/src/connectiontcpbase.cpp b/src/connectiontcpbase.cpp
|
||||
index 2da70c0..b28f8e8 100644
|
||||
--- a/src/connectiontcpbase.cpp
|
||||
+++ b/src/connectiontcpbase.cpp
|
||||
@@ -10,7 +10,17 @@
|
||||
This software is distributed without any warranty.
|
||||
*/
|
||||
|
||||
+#if defined HAVE_STRING_H
|
||||
+#include <string.h>
|
||||
+#endif
|
||||
+
|
||||
+#if defined HAVE_WCHAR_H
|
||||
+#include <wchar.h>
|
||||
+#endif
|
||||
|
||||
+#if __GNUC__ > 3
|
||||
+#include <cstring>
|
||||
+#endif
|
||||
|
||||
#include "gloox.h"
|
||||
|
||||
diff --git a/src/connectiontcpserver.cpp b/src/connectiontcpserver.cpp
|
||||
index 68c8f7b..236ce8e 100644
|
||||
--- a/src/connectiontcpserver.cpp
|
||||
+++ b/src/connectiontcpserver.cpp
|
||||
@@ -10,7 +10,17 @@
|
||||
This software is distributed without any warranty.
|
||||
*/
|
||||
|
||||
+#if defined HAVE_STRING_H
|
||||
+#include <string.h>
|
||||
+#endif
|
||||
+
|
||||
+#if defined HAVE_WCHAR_H
|
||||
+#include <wchar.h>
|
||||
+#endif
|
||||
|
||||
+#if __GNUC__ > 3
|
||||
+#include <cstring>
|
||||
+#endif
|
||||
|
||||
#include "gloox.h"
|
||||
|
||||
diff --git a/src/dns.cpp b/src/dns.cpp
|
||||
index fd72c57..e03d99a 100644
|
||||
--- a/src/dns.cpp
|
||||
+++ b/src/dns.cpp
|
||||
@@ -10,6 +10,17 @@
|
||||
This software is distributed without any warranty.
|
||||
*/
|
||||
|
||||
+#if defined HAVE_STRING_H
|
||||
+#include <string.h>
|
||||
+#endif
|
||||
+
|
||||
+#if defined HAVE_WCHAR_H
|
||||
+#include <wchar.h>
|
||||
+#endif
|
||||
+
|
||||
+#if __GNUC__ > 3
|
||||
+#include <cstring>
|
||||
+#endif
|
||||
|
||||
#include "config.h"
|
||||
|
||||
Reference in New Issue
Block a user