Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Feb 2023 10:14:07 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: fd4899a4cc95 - main - sysutils/gnome-settings-daemon: actually switch to libsoup3
Message-ID:  <202302191014.31JAE7d0081116@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fd4899a4cc955ec834e88f686491c93330eaa942

commit fd4899a4cc955ec834e88f686491c93330eaa942
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-19 10:06:21 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-19 10:13:54 +0000

    sysutils/gnome-settings-daemon: actually switch to libsoup3
    
    $ /usr/local/libexec/gsd-datetime
    (process:1234): libsoup-ERROR **: libsoup2 symbols detected. Using libsoup2 and libsoup3 in the same process is not supported.
    Trace/BPT trap
    
    PR:             269676
---
 sysutils/gnome-settings-daemon/Makefile | 7 +++++--
 sysutils/gnome-settings-daemon/distinfo | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index fef7cfadc592..55862830f446 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,13 @@
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	42.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
+PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
+PATCHFILES+=	03739474621e.patch:-p1 # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300
+
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME settings daemon
 WWW=		https://www.gnome.org/
@@ -18,7 +21,7 @@ LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcups.so:print/cups \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgeoclue-2.so:net/geoclue \
-		libgeocode-glib.so:net/geocode-glib \
+		libgeocode-glib-2.so:net/geocode-glib2 \
 		libgweather-4.so:net/libgweather4 \
 		liblcms2.so:graphics/lcms2 \
 		libnotify.so:devel/libnotify \
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 7822f1c66bf2..8c2646f03d89 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1654141293
 SHA256 (gnome/gnome-settings-daemon-42.2.tar.xz) = 9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00
 SIZE (gnome/gnome-settings-daemon-42.2.tar.xz) = 1483864
+SHA256 (gnome/03739474621e.patch) = 885f142e092363362b5716eb6f3d9690db938a31f95ff38f17828649c4271280
+SIZE (gnome/03739474621e.patch) = 1270



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302191014.31JAE7d0081116>