diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-12-12 14:27:25 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-12-12 14:27:25 +0100 |
| commit | 51d1a3e85e5a096a0f9fffc2302a27356259cd5e (patch) | |
| tree | 7fab456f175cbd0da2357c880a565479edd50b0d /net-libs | |
| parent | bump germinal (diff) | |
| download | keruspe-51d1a3e85e5a096a0f9fffc2302a27356259cd5e.tar.gz keruspe-51d1a3e85e5a096a0f9fffc2302a27356259cd5e.tar.bz2 keruspe-51d1a3e85e5a096a0f9fffc2302a27356259cd5e.zip | |
build fixes
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/libsoup-gnome/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest index e454005b..230d474e 100644 --- a/net-libs/libsoup-gnome/Manifest +++ b/net-libs/libsoup-gnome/Manifest @@ -1,2 +1,2 @@ -AUX libsoup-gnome-9999-system-lib.patch 6795 RMD160 493ca34ced82c798b4b323c5bce51bb3ed0d4cf5 SHA1 58d62469253e82d650d20822369eaead0e0dfa60 SHA256 76015b579cbb399af929c17ba0eb232310934c80a5a0326f58a8220fae0b0846 +AUX libsoup-gnome-9999-system-lib.patch 6819 RMD160 5b7c81031ba869716d7acbb6b786304c764cdd87 SHA1 161f4e67b6df6dcc438efa37fdc195864fadb36b SHA256 012aedd8606d62d2fab347d3e5d407fa9e1d998cae58b1ca7007a18b4090899e EBUILD libsoup-gnome-9999-r1.ebuild 1260 RMD160 b3992fd34fb1afebbda70d53de3ad014218ee821 SHA1 cd637dd029b5c538049708b1fdde381d1e5f8fe1 SHA256 7c174c9a6fdf1326464f7c6c1a277b298a240e7dec8e9ba4b2e3a7d0dab0f155 diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch index b8b39c5a..66f79cf3 100644 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch @@ -1,4 +1,4 @@ -From 4f4e9f3e2e54b485d6d1a43e5a94145a66289a9b Mon Sep 17 00:00:00 2001 +From 3abe0e9a7370324ffb7a4cf70dd068c492f0d502 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> Date: Thu, 13 Oct 2011 12:03:04 +0200 Subject: [PATCH] gentoo shit @@ -11,12 +11,12 @@ Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 3 files changed, 76 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 861daff..a6463fb 100644 +index bb94238..0562574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS = -I m4 + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libsoup tests docs +SUBDIRS = libsoup @@ -41,25 +41,25 @@ index 861daff..a6463fb 100644 if BUILD_LIBSOUP_GNOME pkgconfig_DATA += libsoup-gnome-2.4.pc diff --git a/configure.ac b/configure.ac -index 443f300..2025eb6 100644 +index 899f7af..2a3e12c 100644 --- a/configure.ac +++ b/configure.ac @@ -72,15 +72,30 @@ dnl *********************** dnl *** Checks for glib *** dnl *********************** --AM_PATH_GLIB_2_0(2.30.0,,,gobject gio) +-AM_PATH_GLIB_2_0(2.31.0,,,gobject gio) -if test "$GLIB_LIBS" = ""; then -- AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup) +- AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup) +PKG_PROG_PKG_CONFIG +enable_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.30.0,,,gobject gio) ++ AM_PATH_GLIB_2_0(2.31.0,,,gobject gio) + if test "$GLIB_LIBS" = ""; then -+ AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup) ++ AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup) + fi + GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" + @@ -241,5 +241,5 @@ index 096f0fb..416e523 100644 SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 -- -1.7.8.rc0.dirty +1.7.8.163.g9859a.dirty |