diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-04 06:31:21 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-04 06:31:21 +0800 |
| commit | 1644ee97fe87aaa656fcb1122c08c96fb4dd393a (patch) | |
| tree | a0de942ba6b6d51d09328367afb26c6b40a38beb /devel | |
| parent | 9c0bf11cd74766b698ee165c65842f53c3d07b05 (diff) | |
| download | marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.tar marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.tar.gz marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.tar.bz2 marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.tar.lz marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.tar.xz marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.tar.zst marcuscom-ports-1644ee97fe87aaa656fcb1122c08c96fb4dd393a.zip | |
Use USES=libtool Don't install .a file for libsoup-gnome.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18998 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libsoup/Makefile | 11 | ||||
| -rw-r--r-- | devel/libsoup/distinfo | 4 | ||||
| -rw-r--r-- | devel/libsoup/files/patch-libsoup_soup-message-io.c | 11 | ||||
| -rw-r--r-- | devel/libsoup/pkg-plist | 1 |
4 files changed, 20 insertions, 7 deletions
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index a48901a21..95242d606 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,7 +3,7 @@ # $MCom$ PORTNAME= libsoup -PORTVERSION= 2.42.2 +PORTVERSION= 2.42.3.1 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -20,8 +20,8 @@ USE_XZ= yes .if !defined(REFERENCE_PORT) -USES= gettext gmake pathfix pkgconfig -USE_GNOME= gnomehier glib20 libxml2 ltverhack referencehack intltool +USES= gettext gmake libtool pathfix pkgconfig +USE_GNOME= gnomehier glib20 libxml2 referencehack intltool USE_SQLITE= 3 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -30,7 +30,8 @@ CONFIGURE_ARGS= --disable-more-warnings CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB= VERSION="2.4" +LIBVERSION= 1.6.0 +PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} .if defined(SOUP_SLAVE) USE_SQLITE= yes @@ -53,10 +54,10 @@ do-build: cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/ cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS .endif diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 36cda7d58..ffc5d1f03 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/libsoup-2.42.2.tar.xz) = 1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf -SIZE (gnome2/libsoup-2.42.2.tar.xz) = 732296 +SHA256 (gnome2/libsoup-2.42.3.1.tar.xz) = 97a6be94daabd21fcfba7bde4939c44d0f260bb123d7e260fb71551458da6651 +SIZE (gnome2/libsoup-2.42.3.1.tar.xz) = 740164 diff --git a/devel/libsoup/files/patch-libsoup_soup-message-io.c b/devel/libsoup/files/patch-libsoup_soup-message-io.c new file mode 100644 index 000000000..76900f6b6 --- /dev/null +++ b/devel/libsoup/files/patch-libsoup_soup-message-io.c @@ -0,0 +1,11 @@ +--- libsoup/soup-message-io.c.orig 2014-02-03 23:20:23.000000000 +0100 ++++ libsoup/soup-message-io.c 2014-02-03 23:23:10.000000000 +0100 +@@ -977,7 +977,7 @@ soup_message_io_run_until_finish (SoupMe + g_object_ref (msg); + + if (io) { +- g_return_if_fail (io->mode == SOUP_MESSAGE_IO_CLIENT); ++ g_return_val_if_fail (io->mode == SOUP_MESSAGE_IO_CLIENT, FALSE); + + if (io->read_state < SOUP_MESSAGE_IO_STATE_BODY_DONE) + io->read_state = SOUP_MESSAGE_IO_STATE_FINISHING; diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 6df598891..107496bed 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -53,6 +53,7 @@ lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.la lib/libsoup-%%VERSION%%.so lib/libsoup-%%VERSION%%.so.1 +lib/libsoup-%%VERSION%%.so.%%LIBVERSION%% libdata/pkgconfig/libsoup-%%VERSION%%.pc share/gir-1.0/Soup-%%VERSION%%.gir share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html |