Archives
Archives
| From: | "Mart Raudsepp (leio)" <leio@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server/files: evolution-data-server-1.12.3-no-libsoup24.patch |
| Date: | Wed, 26 Mar 2008 01:31:15 |
| Message-Id: | E1JeKTw-0007by-Lb@stork.gentoo.org |
| 1 | leio 08/03/26 01:31:12 |
| 2 | |
| 3 | Added: evolution-data-server-1.12.3-no-libsoup24.patch |
| 4 | Log: |
| 5 | Do not build against libsoup-2.4 if available in this older version - it does not work with the stable API of libsoup-2.4, bug 214488 |
| 6 | (Portage version: 2.1.4.4) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: evolution-data-server-1.12.3-no-libsoup24.patch |
| 15 | =================================================================== |
| 16 | --- configure.in.orig 2008-03-26 02:45:26.000000000 +0200 |
| 17 | +++ configure.in 2008-03-26 02:46:03.000000000 +0200 |
| 18 | @@ -1407,14 +1407,8 @@ |
| 19 | AC_SUBST(E_FACTORY_LIBS) |
| 20 | |
| 21 | dnl --- Groupwise flags |
| 22 | -PKG_CHECK_EXISTS(libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no) |
| 23 | -if test $have_libsoup_24 = yes; then |
| 24 | - LIBSOUP_REQUIRED=2.3.0 |
| 25 | - LIBSOUP=libsoup-2.4 |
| 26 | -else |
| 27 | - LIBSOUP_REQUIRED=2.2.91 |
| 28 | - LIBSOUP=libsoup-2.2 |
| 29 | -fi |
| 30 | +LIBSOUP_REQUIRED=2.2.91 |
| 31 | +LIBSOUP=libsoup-2.2 |
| 32 | AC_SUBST(LIBSOUP_REQUIRED) |
| 33 | AC_SUBST(LIBSOUP) |
| 34 | EVO_SET_COMPILE_FLAGS(SOUP, $LIBSOUP >= $LIBSOUP_REQUIRED) |
| 35 | --- configure.orig 2008-03-26 02:45:29.000000000 +0200 |
| 36 | +++ configure 2008-03-26 02:46:18.000000000 +0200 |
| 37 | @@ -31479,23 +31479,8 @@ |
| 38 | |
| 39 | |
| 40 | |
| 41 | -if test -n "$PKG_CONFIG" && \ |
| 42 | - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5 |
| 43 | - ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 |
| 44 | - ac_status=$? |
| 45 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 46 | - (exit $ac_status); }; then |
| 47 | - have_libsoup_24=yes |
| 48 | -else |
| 49 | - have_libsoup_24=no |
| 50 | -fi |
| 51 | -if test $have_libsoup_24 = yes; then |
| 52 | - LIBSOUP_REQUIRED=2.3.0 |
| 53 | - LIBSOUP=libsoup-2.4 |
| 54 | -else |
| 55 | - LIBSOUP_REQUIRED=2.2.91 |
| 56 | - LIBSOUP=libsoup-2.2 |
| 57 | -fi |
| 58 | +LIBSOUP_REQUIRED=2.2.91 |
| 59 | +LIBSOUP=libsoup-2.2 |
| 60 | |
| 61 | |
| 62 | |
| 63 | |
| 64 | |
| 65 | |
| 66 | -- |
| 67 | gentoo-commits@l.g.o mailing list |