Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv13920
Added Files:
libsoup-gnome2.4.1.info libsoup-gnome2.4.1.patch
Log Message:
works on 10.7
--- NEW FILE: libsoup-gnome2.4.1.patch ---
diff -Nurd -x'*~' libsoup-2.28.2.orig/Makefile.am libsoup-2.28.2/Makefile.am
--- libsoup-2.28.2.orig/Makefile.am 2009-08-10 21:23:49.000000000 -0400
+++ libsoup-2.28.2/Makefile.am 2010-03-20 10:22:30.000000000 -0400
@@ -2,7 +2,11 @@
AUTOMAKE_OPTIONS = 1.6
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libsoup tests docs
+SUBDIRS = libsoup
+
+if BUILD_LIBSOUP
+SUBDIRS += tests docs
+endif
EXTRA_DIST = \
libsoup-2.4.pc.in \
@@ -13,9 +17,10 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
pkgconfigdir = $(libdir)/pkgconfig
-
-pkgconfig_DATA = libsoup-2.4.pc
-
+pkgconfig_DATA=
+if BUILD_LIBSOUP
+pkgconfig_DATA += libsoup-2.4.pc
+endif
if BUILD_LIBSOUP_GNOME
pkgconfig_DATA += libsoup-gnome-2.4.pc
endif
diff -Nurd -x'*~' libsoup-2.28.2.orig/configure.in libsoup-2.28.2/configure.in
--- libsoup-2.28.2.orig/configure.in 2009-12-16 09:43:22.000000000 -0500
+++ libsoup-2.28.2/configure.in 2010-03-20 11:19:27.000000000 -0400
@@ -81,7 +81,14 @@
dnl ***********************
dnl *** Checks for glib ***
dnl ***********************
+PKG_PROG_PKG_CONFIG
+enable_ssl=no
+have_ssl=no
+AC_ARG_WITH(libsoup-system,
+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to
build(default=no)]),
+ [with_libsoup_system=$withval], [with_libsoup_system=no])
+if test "$with_libsoup_system" = "no"; then
AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio)
if test "$GLIB_LIBS" = ""; then
AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup)
@@ -92,22 +99,6 @@
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
-dnl ***********************
-dnl *** Check for Win32 ***
-dnl ***********************
-
-AC_MSG_CHECKING([for Win32])
-case "$host" in
- *-*-mingw*)
- os_win32=yes
- ;;
- *)
- os_win32=no
- ;;
-esac
-AC_MSG_RESULT([$os_win32])
-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
-
dnl *******************
dnl *** Misc checks ***
dnl *******************
@@ -148,10 +139,25 @@
AC_SUBST(LIBGNUTLS_CFLAGS)
AC_SUBST(LIBGNUTLS_LIBS)
AC_SUBST(SSL_REQUIREMENT)
-
+fi
dnl This is not supposed to be conditional, but...
AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no)
+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+dnl ***********************
+dnl *** Check for Win32 ***
+dnl ***********************
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+ *-*-mingw*)
+ os_win32=yes
+ ;;
+ *)
+ os_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
dnl *********************
dnl *** GNOME support ***
@@ -176,7 +182,9 @@
if test $with_gnome != no; then
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
-
+ if test $with_libsoup_system != no; then
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
+ fi
PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
[Could not find libproxy:
diff -Nurd -x'*~' libsoup-2.28.2.orig/libsoup/Makefile.am
libsoup-2.28.2/libsoup/Makefile.am
--- libsoup-2.28.2.orig/libsoup/Makefile.am 2009-12-16 09:40:29.000000000
-0500
+++ libsoup-2.28.2/libsoup/Makefile.am 2010-03-20 10:48:16.000000000 -0400
@@ -4,17 +4,18 @@
LIBWS2_32 = -lws2_32
endif
-INCLUDES = \
+INCLUDES =
+lib_LTLIBRARIES =
+
+if BUILD_LIBSOUP
+
+INCLUDES += \
-DG_LOG_DOMAIN=\"libsoup\" \
-I$(top_srcdir) \
$(SOUP_DEBUG_FLAGS) \
$(SOUP_MAINTAINER_FLAGS) \
$(GLIB_CFLAGS) \
$(XML_CFLAGS) \
- $(GCONF_CFLAGS) \
- $(LIBPROXY_CFLAGS) \
- $(SQLITE_CFLAGS) \
- $(GNOME_KEYRING_CFLAGS) \
$(LIBGCRYPT_CFLAGS) \
$(LIBGNUTLS_CFLAGS)
@@ -91,7 +92,7 @@
$(soup_headers) \
soup-enum-types.h
-lib_LTLIBRARIES = libsoup-2.4.la
+lib_LTLIBRARIES += libsoup-2.4.la
libsoup_2_4_la_LDFLAGS = \
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
@@ -169,9 +170,16 @@
soup-uri.c \
soup-value-utils.c \
soup-xmlrpc.c
+endif
if BUILD_LIBSOUP_GNOME
+INCLUDES += $(LIBSOUP_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ $(LIBPROXY_CFLAGS) \
+ $(SQLITE_CFLAGS) \
+ $(GNOME_KEYRING_CFLAGS)
+
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
libsoupgnomeinclude_HEADERS = \
@@ -181,16 +189,26 @@
lib_LTLIBRARIES += libsoup-gnome-2.4.la
+if BUILD_LIBSOUP
libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
+else
+libsoup_gnome_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
+endif
libsoup_gnome_2_4_la_LIBADD = \
- libsoup-2.4.la \
$(GLIB_LIBS) \
$(GCONF_LIBS) \
$(LIBPROXY_LIBS) \
$(SQLITE_LIBS) \
$(GNOME_KEYRING_LIBS)
+if BUILD_LIBSOUP
+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
+else
+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
+endif
+
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
--- NEW FILE: libsoup-gnome2.4.1.info ---
Package: libsoup-gnome2.4.1
Version: 2.28.2
Revision: 1
Source-MD5: 31d7ad416005eed4b78f07ac01b6b9f0
Source: mirror:gnome:sources/libsoup/2.28/libsoup-%v.tar.bz2
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
autoconf2.6,
automake1.11,
fink (>= 0.24.12),
fink-package-precedence,
gconf2-dev (>= 2.28.0-1),
glib2-dev (>= 2.22.0-1),
gnome-keyring-dev (>= 2.28.0-1),
libproxy1,
libsoup2.4.1-ssl (>= %v-1),
libtool2,
pkgconfig (>= 0.23),
sqlite3-dev
<<
BuildDependsOnly: true
PatchFile: %n.patch
PatchFile-MD5: 131775b0caeffced9d448885cb2a3230
PatchScript: <<
%{default_script}
<<
SetCFLAGS: -Os
ConfigureParams: --enable-dependency-tracking --without-apache-httpd
--disable-static --with-libsoup-system --with-gnome
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
CompileScript: <<
autoreconf -fi
./configure %c
make
fink-package-precedence --prohibit-bdep %n .
<<
InstallScript: <<
make install DESTDIR=%d
<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
gconf2-shlibs (>= 2.28.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-keyring-shlibs (>= 2.28.0-1),
libproxy1-shlibs,
libsoup2.4.1-ssl-shlibs (>= %v-1),
sqlite3-shlibs
<<
Files: lib/libsoup-gnome-2.4.1*.dylib
Shlibs: %p/lib/libsoup-gnome-2.4.1.dylib 5.0.0 %n (>= 2.28.2-1)
DocFiles: AUTHORS COPYING NEWS README
<<
DocFiles: AUTHORS COPYING NEWS README
DescPackaging: <<
Autodetects curl, but only uses it for tests, which aren't run
anyway. Doesn't matter whether it finds fink's or falls back
to apple's.
Import hacks to build just gnome component against
pre-installed libsoup itself. See:
https://bugzilla.gnome.org/show_bug.cgi?id=595065
<<
Description: GNOME bindings for libsoup
DescDetail: <<
Soup is a SOAP (Simple Object Access Protocol) implementation in C. It
provides an queued asynchronous callback-based mechanism for sending
SOAP requests. A WSDL (Web Service Definition Language) to C compiler
which generates stubs for easily calling remote SOAP methods, and a
CORBA IDL to WSDL compiler are also included.
<<
License: LGPL
Maintainer: The Gnome Core Team <[email protected]>
Homepage: http://www.gnome.org/
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
