diff options
Diffstat (limited to 'devel/libsoup')
| -rw-r--r-- | devel/libsoup/Makefile | 23 | ||||
| -rw-r--r-- | devel/libsoup/distinfo | 4 | ||||
| -rw-r--r-- | devel/libsoup/files/patch-libsoup_Makefile.in | 14 | ||||
| -rw-r--r-- | devel/libsoup/files/patch-libsoup_soup-message-io.c | 11 | ||||
| -rw-r--r-- | devel/libsoup/files/patch-tests_coding-test.c | 11 | ||||
| -rw-r--r-- | devel/libsoup/pkg-plist | 6 |
6 files changed, 25 insertions, 44 deletions
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 3908785d2..f31962a2e 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,8 +3,7 @@ # $MCom$ PORTNAME= libsoup -PORTVERSION= 2.42.3.1 -PORTREVISION?= 0 +PORTVERSION= 2.46.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,30 +15,30 @@ BUILD_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking -USE_XZ= yes +USES= tar:xz .if !defined(REFERENCE_PORT) -USES= gettext gmake libtool pathfix pkgconfig -USE_GNOME= gnomehier glib20 libxml2 referencehack intltool +USES+= gettext gmake libtool pathfix pkgconfig tar:xz +USE_GNOME= glib20 gnomehier intltool introspection:build \ + libxml2 referencehack USE_SQLITE= 3 USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_PYTHON_BUILD= 2 +USE_PYTHON_BUILD= 3 CONFIGURE_ARGS= --disable-more-warnings CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LIBVERSION= 1.6.0 +LIBVERSION= 1.7.0 PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} .if defined(SOUP_SLAVE) -USE_SQLITE= 3 +USE_SQLITE= yes LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring CONFIGURE_ARGS+=--with-gnome .else -USE_GNOME+= introspection:build CONFIGURE_ARGS+=--without-gnome .endif @@ -50,11 +49,11 @@ post-patch: ${WRKSRC}/libsoup/tld-parser.py .if defined(SOUP_SLAVE) -do-build: - cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la - do-install: + @${SED} '/^relink_command/d' ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.gir ${STAGEDIR}${PREFIX}/share/gir-1.0/ + ${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.typelib ${STAGEDIR}${PREFIX}/lib/girepository-1.0/ ${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/ diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index ffc5d1f03..7da071eb4 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/libsoup-2.42.3.1.tar.xz) = 97a6be94daabd21fcfba7bde4939c44d0f260bb123d7e260fb71551458da6651 -SIZE (gnome2/libsoup-2.42.3.1.tar.xz) = 740164 +SHA256 (gnome2/libsoup-2.46.0.tar.xz) = fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 +SIZE (gnome2/libsoup-2.46.0.tar.xz) = 1693772 diff --git a/devel/libsoup/files/patch-libsoup_Makefile.in b/devel/libsoup/files/patch-libsoup_Makefile.in index 880ab2fd7..f68a85cb8 100644 --- a/devel/libsoup/files/patch-libsoup_Makefile.in +++ b/devel/libsoup/files/patch-libsoup_Makefile.in @@ -1,6 +1,6 @@ ---- libsoup/Makefile.in.orig 2013-03-30 07:53:47.000000000 +0000 -+++ libsoup/Makefile.in 2013-03-30 07:56:16.000000000 +0000 -@@ -146,7 +146,7 @@ +--- libsoup/Makefile.in.orig 2014-03-10 13:11:37.184605224 +0000 ++++ libsoup/Makefile.in 2014-03-10 13:13:20.683597512 +0000 +@@ -176,7 +176,7 @@ $(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \ $@ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES = \ @@ -9,7 +9,7 @@ am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \ soup-gnome-features.c soup-proxy-resolver-gnome.h \ soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \ -@@ -582,7 +582,7 @@ +@@ -629,7 +629,7 @@ @BUILD_LIBSOUP_GNOME_TRUE@ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \ @@ -18,12 +18,12 @@ @BUILD_LIBSOUP_GNOME_TRUE@ $(GLIB_LIBS) @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_SOURCES = \ -@@ -637,7 +637,7 @@ +@@ -682,7 +682,7 @@ @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --include-uninstalled=$(builddir)/Soup-2.4.gir - @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) + @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS) -@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la -+@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la -lsoup-2.4 ++@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la soup-2.4 @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 diff --git a/devel/libsoup/files/patch-libsoup_soup-message-io.c b/devel/libsoup/files/patch-libsoup_soup-message-io.c deleted file mode 100644 index 76900f6b6..000000000 --- a/devel/libsoup/files/patch-libsoup_soup-message-io.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/patch-tests_coding-test.c b/devel/libsoup/files/patch-tests_coding-test.c deleted file mode 100644 index 899c799bc..000000000 --- a/devel/libsoup/files/patch-tests_coding-test.c +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/coding-test.c.orig 2012-06-29 12:07:41.000000000 +0200 -+++ tests/coding-test.c 2012-06-29 12:47:16.000000000 +0200 -@@ -66,7 +66,7 @@ - } - } - if (file_path && encoding) { -- file = g_strdup_printf (file_path, path); -+ file = g_strdup_printf ("%s", path); - if (g_file_test (file, G_FILE_TEST_EXISTS)) { - soup_message_headers_append (msg->response_headers, - "Content-Encoding", diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 107496bed..ae87e7bea 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -76,7 +76,6 @@ share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageHeaders.html share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipart.html share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipartInputStream.html share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyResolverDefault.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyURIResolver.html share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequest.html share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html @@ -98,6 +97,7 @@ share/gtk-doc/html/libsoup-%%VERSION%%/home.png share/gtk-doc/html/libsoup-%%VERSION%%/index.html share/gtk-doc/html/libsoup-%%VERSION%%/index.sgml share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html +share/gtk-doc/html/libsoup-%%VERSION%%/left-insensitive.png share/gtk-doc/html/libsoup-%%VERSION%%/left.png share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-GValue-Support.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-HTML-Form-Support.html @@ -111,9 +111,12 @@ share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2 share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-request-howto.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-session-porting.html +share/gtk-doc/html/libsoup-%%VERSION%%/right-insensitive.png share/gtk-doc/html/libsoup-%%VERSION%%/right.png share/gtk-doc/html/libsoup-%%VERSION%%/style.css +share/gtk-doc/html/libsoup-%%VERSION%%/up-insensitive.png share/gtk-doc/html/libsoup-%%VERSION%%/up.png share/locale/an/LC_MESSAGES/libsoup.mo share/locale/as/LC_MESSAGES/libsoup.mo @@ -149,6 +152,7 @@ share/locale/lv/LC_MESSAGES/libsoup.mo share/locale/ml/LC_MESSAGES/libsoup.mo share/locale/mr/LC_MESSAGES/libsoup.mo share/locale/nb/LC_MESSAGES/libsoup.mo +share/locale/nl/LC_MESSAGES/libsoup.mo share/locale/or/LC_MESSAGES/libsoup.mo share/locale/pa/LC_MESSAGES/libsoup.mo share/locale/pl/LC_MESSAGES/libsoup.mo |