Date: Mon, 12 Oct 2020 14:20:08 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552130 - in head: . audio/rhythmbox devel devel/libosinfo devel/librest devel/libsoup devel/libsoup-gnome devel/libsoup/files graphics/gthumb www/epiphany www/midori Message-ID: <202010121420.09CEK8XV002784@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Oct 12 14:20:08 2020 New Revision: 552130 URL: https://svnweb.freebsd.org/changeset/ports/552130 Log: Update libsoup to 2.72.0 Merge back libsoup and libsoup-gnome, they both have the same dependencies now, and they are more complicated to split now that they switched to meson Bump portrevision of dependant ports Deleted: head/devel/libsoup-gnome/ head/devel/libsoup/files/ Modified: head/MOVED head/audio/rhythmbox/Makefile head/devel/Makefile head/devel/libosinfo/Makefile head/devel/librest/Makefile head/devel/libsoup/Makefile head/devel/libsoup/distinfo head/devel/libsoup/pkg-plist head/graphics/gthumb/Makefile head/www/epiphany/Makefile head/www/midori/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Oct 12 14:14:08 2020 (r552129) +++ head/MOVED Mon Oct 12 14:20:08 2020 (r552130) @@ -15647,3 +15647,4 @@ sysutils/syslog-ng321|sysutils/syslog-ng|2020-10-12|Ha sysutils/syslog-ng320|sysutils/syslog-ng|2020-10-12|Has expired: Agreed upon upstream one year deprecation policy dns/opendnssec|dns/opendnssec2|2020-10-12|Has expired: EOLed by upstream sysutils/syslog-ng323|sysutils/syslog-ng|2020-10-12|Has expired: Agreed upon upstream one year deprecation policy +devel/libsoup-gnome|devel/libsoup|2020-10-12|Reunited into on package they have the same dependencies Modified: head/audio/rhythmbox/Makefile ============================================================================== --- head/audio/rhythmbox/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/audio/rhythmbox/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -3,7 +3,7 @@ PORTNAME= rhythmbox PORTVERSION= 3.4.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -27,7 +27,6 @@ LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5 libcheck.so:devel/check \ libpeas-1.0.so:devel/libpeas \ libjson-glib-1.0.so:devel/json-glib \ - libsoup-gnome-2.4.so:devel/libsoup-gnome \ libsecret-1.so:security/libsecret \ libtdb.so:databases/tdb Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/devel/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -1298,7 +1298,6 @@ SUBDIR += libsmpp34 SUBDIR += libsmraw SUBDIR += libsoup - SUBDIR += libsoup-gnome SUBDIR += libspark2012 SUBDIR += libspice-server SUBDIR += libstatgrab Modified: head/devel/libosinfo/Makefile ============================================================================== --- head/devel/libosinfo/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/devel/libosinfo/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -3,14 +3,14 @@ PORTNAME= libosinfo PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://releases.pagure.org/libosinfo/ MAINTAINER= novel@FreeBSD.org COMMENT= Library for managing OS information for virtualization -LIB_DEPENDS= libsoup-gnome-2.4.so:devel/libsoup-gnome \ - libsoup-2.4.so:devel/libsoup +LIB_DEPENDS= libsoup-2.4.so:devel/libsoup BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids RUN_DEPENDS:= ${BUILD_DEPENDS} \ Modified: head/devel/librest/Makefile ============================================================================== --- head/devel/librest/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/devel/librest/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -3,6 +3,7 @@ PORTNAME= rest PORTVERSION= 0.7.93 +PORTREVISION= 1 CATEGORIES= devel www MASTER_SITES= GNOME @@ -24,12 +25,9 @@ TEST_TARGET= check PORTEXAMPLES= *.c -OPTIONS_DEFINE= GNOME EXAMPLES -OPTIONS_DEFAULT= GNOME +OPTIONS_DEFINE= EXAMPLES -GNOME_LIB_DEPENDS= libsoup-gnome-2.4.so:devel/libsoup-gnome -GNOME_CONFIGURE_OFF= --without-gnome -GNOME_LIB_DEPENDS_OFF= libsoup-2.4.so:devel/libsoup +LIB_DEPENDS= libsoup-2.4.so:devel/libsoup post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librest-0.7.so.0 Modified: head/devel/libsoup/Makefile ============================================================================== --- head/devel/libsoup/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/devel/libsoup/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libsoup -PORTVERSION= 2.62.3 +PORTVERSION= 2.72.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -14,60 +14,25 @@ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= glib-networking>=2.29.18:net/glib-networking -LIB_DEPENDS= libgcrypt.so:security/libgcrypt +LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libpsl.so:dns/libpsl RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libtool localbase pathfix \ +USES= gettext gnome localbase meson \ pkgconfig python:3.6+,build sqlite ssl tar:xz USE_GNOME= glib20 intlhack introspection:build \ - libxml2 referencehack + libxml2 USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-more-warnings \ - --disable-vala -INSTALL_TARGET= install-strip +MESON_ARGS= -Dvapi=disabled \ + -Dsysprof=disabled \ + -Dtests=false \ + -Dgnome=true \ + -Dbrotli=disabled \ + -Dntlm=disabled -LIBVERSION= 1.8.0 +LIBVERSION= 1.11.0 PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} - -.if defined(SOUP_SLAVE) -USES+= sqlite -LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup -CONFIGURE_ARGS+=--with-gnome -.else -CONFIGURE_ARGS+=--without-gnome -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|env python3|env ${PYTHON_VERSION}|g' \ - ${WRKSRC}/libsoup/tld-parser.py - @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \ - ${WRKSRC}/configure - -.if defined(SOUP_SLAVE) -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/gir-1.0/ - ${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.gir ${STAGEDIR}${PREFIX}/share/gir-1.0/ - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/girepository-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/ - cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS -.endif - -post-install: -.if defined(SOUP_SLAVE) - @${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ -.else - ${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \ - ${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h -.endif .include <bsd.port.mk> Modified: head/devel/libsoup/distinfo ============================================================================== --- head/devel/libsoup/distinfo Mon Oct 12 14:14:08 2020 (r552129) +++ head/devel/libsoup/distinfo Mon Oct 12 14:20:08 2020 (r552130) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539116814 -SHA256 (gnome/libsoup-2.62.3.tar.xz) = d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172 -SIZE (gnome/libsoup-2.62.3.tar.xz) = 1851780 +TIMESTAMP = 1602510520 +SHA256 (gnome/libsoup-2.72.0.tar.xz) = 170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387 +SIZE (gnome/libsoup-2.72.0.tar.xz) = 1477940 Modified: head/devel/libsoup/pkg-plist ============================================================================== --- head/devel/libsoup/pkg-plist Mon Oct 12 14:14:08 2020 (r552129) +++ head/devel/libsoup/pkg-plist Mon Oct 12 14:20:08 2020 (r552130) @@ -6,7 +6,6 @@ include/libsoup-%%VERSION%%/libsoup/soup-auth-manager. include/libsoup-%%VERSION%%/libsoup/soup-auth.h include/libsoup-%%VERSION%%/libsoup/soup-autocleanups.h include/libsoup-%%VERSION%%/libsoup/soup-cache.h -include/libsoup-%%VERSION%%/libsoup/soup-connection.h include/libsoup-%%VERSION%%/libsoup/soup-content-decoder.h include/libsoup-%%VERSION%%/libsoup/soup-content-sniffer.h include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-db.h @@ -17,6 +16,9 @@ include/libsoup-%%VERSION%%/libsoup/soup-date.h include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h include/libsoup-%%VERSION%%/libsoup/soup-form.h include/libsoup-%%VERSION%%/libsoup/soup-headers.h +include/libsoup-%%VERSION%%/libsoup/soup-hsts-enforcer-db.h +include/libsoup-%%VERSION%%/libsoup/soup-hsts-enforcer.h +include/libsoup-%%VERSION%%/libsoup/soup-hsts-policy.h include/libsoup-%%VERSION%%/libsoup/soup-logger.h include/libsoup-%%VERSION%%/libsoup/soup-message-body.h include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h @@ -48,79 +50,28 @@ include/libsoup-%%VERSION%%/libsoup/soup-uri.h include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h include/libsoup-%%VERSION%%/libsoup/soup-version.h include/libsoup-%%VERSION%%/libsoup/soup-websocket-connection.h +include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension-deflate.h +include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension-manager.h +include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension.h include/libsoup-%%VERSION%%/libsoup/soup-websocket.h include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-old.h include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h include/libsoup-%%VERSION%%/libsoup/soup.h +include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h +include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h +include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h lib/girepository-1.0/Soup-%%VERSION%%.typelib -lib/libsoup-%%VERSION%%.a +lib/girepository-1.0/SoupGNOME-%%VERSION%%.typelib lib/libsoup-%%VERSION%%.so lib/libsoup-%%VERSION%%.so.1 lib/libsoup-%%VERSION%%.so.%%LIBVERSION%% +lib/libsoup-gnome-%%VERSION%%.so +lib/libsoup-gnome-%%VERSION%%.so.1 +lib/libsoup-gnome-%%VERSION%%.so.%%LIBVERSION%% libdata/pkgconfig/libsoup-%%VERSION%%.pc +libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc share/gir-1.0/Soup-%%VERSION%%.gir -share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuth.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomain.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainBasic.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainDigest.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthManager.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupCache.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentDecoder.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentSniffer.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookie.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJar.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarDB.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarText.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupLogger.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessage.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageBody.html -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%%/SoupRequest.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestHTTP.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupServer.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupSession.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionAsync.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionFeature.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionSync.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupSocket.html -share/gtk-doc/html/libsoup-%%VERSION%%/SoupURI.html -share/gtk-doc/html/libsoup-%%VERSION%%/annotation-glossary.html -share/gtk-doc/html/libsoup-%%VERSION%%/ch01.html -share/gtk-doc/html/libsoup-%%VERSION%%/ch02.html -share/gtk-doc/html/libsoup-%%VERSION%%/ch03.html -share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html -share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html -share/gtk-doc/html/libsoup-%%VERSION%%/home.png -share/gtk-doc/html/libsoup-%%VERSION%%/index.html -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%%-HTML-Form-Support.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Utilities.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupServer-deprecated-API.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Version-Information.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-WebSockets.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html -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-request-howto.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-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/gir-1.0/SoupGNOME-%%VERSION%%.gir share/locale/an/LC_MESSAGES/libsoup.mo share/locale/as/LC_MESSAGES/libsoup.mo share/locale/be/LC_MESSAGES/libsoup.mo @@ -139,6 +90,7 @@ share/locale/es/LC_MESSAGES/libsoup.mo share/locale/et/LC_MESSAGES/libsoup.mo share/locale/eu/LC_MESSAGES/libsoup.mo share/locale/fa/LC_MESSAGES/libsoup.mo +share/locale/fi/LC_MESSAGES/libsoup.mo share/locale/fr/LC_MESSAGES/libsoup.mo share/locale/fur/LC_MESSAGES/libsoup.mo share/locale/gd/LC_MESSAGES/libsoup.mo @@ -157,6 +109,7 @@ share/locale/lt/LC_MESSAGES/libsoup.mo share/locale/lv/LC_MESSAGES/libsoup.mo share/locale/ml/LC_MESSAGES/libsoup.mo share/locale/mr/LC_MESSAGES/libsoup.mo +share/locale/ms/LC_MESSAGES/libsoup.mo share/locale/nb/LC_MESSAGES/libsoup.mo share/locale/ne/LC_MESSAGES/libsoup.mo share/locale/nl/LC_MESSAGES/libsoup.mo Modified: head/graphics/gthumb/Makefile ============================================================================== --- head/graphics/gthumb/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/graphics/gthumb/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -4,6 +4,7 @@ PORTNAME= gthumb PORTVERSION= 3.10.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -96,7 +97,6 @@ WEBP_MESON_TRUE= libwebp WEBSERVICES_DESC= Web services WEBSERVICES_LIB_DEPENDS=\ libjson-glib-1.0.so:devel/json-glib \ - libsoup-gnome-2.4.so:devel/libsoup-gnome \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 WEBSERVICES_MESON_TRUE= webservices YELP_DESC= Viewer for built-in help system Modified: head/www/epiphany/Makefile ============================================================================== --- head/www/epiphany/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/www/epiphany/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -3,6 +3,7 @@ PORTNAME= epiphany PORTVERSION= 3.38.0 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -17,8 +18,6 @@ BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \ itstool:textproc/itstool \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ - libsoup-2.4.so:devel/libsoup \ - libsoup-gnome-2.4.so:devel/libsoup-gnome \ libsoup-2.4.so:devel/libsoup \ libgcr-3.so:security/gcr \ libstartup-notification-1.so:x11/startup-notification \ Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Mon Oct 12 14:14:08 2020 (r552129) +++ head/www/midori/Makefile Mon Oct 12 14:20:08 2020 (r552130) @@ -4,7 +4,7 @@ PORTNAME= midori PORTVERSION= 9.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www xfce MAINTAINER= xfce@FreeBSD.org @@ -18,7 +18,6 @@ BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 \ LIB_DEPENDS= libnotify.so:devel/libnotify \ libjson-glib-1.0.so:devel/json-glib \ libsoup-2.4.so:devel/libsoup \ - libsoup-gnome-2.4.so:devel/libsoup-gnome \ libp11-kit.so:security/p11-kit \ libgcr-3.so:security/gcr \ libpeas-1.0.so:devel/libpeas \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010121420.09CEK8XV002784>