Date: Mon, 1 Jan 2024 17:44:02 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c83f2157ca2c - main - net/geoclue: Update to 2.7.1 Message-ID: <202401011744.401Hi2xJ092178@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c83f2157ca2c126d5ae49207d6c80fa9e5e439ff commit c83f2157ca2c126d5ae49207d6c80fa9e5e439ff Author: Olivier Duchateau <duchateau.olivier@gmail.com> AuthorDate: 2024-01-01 17:43:33 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-01-01 17:43:54 +0000 net/geoclue: Update to 2.7.1 PR: 273757 --- net/geoclue/Makefile | 18 +++++++----------- net/geoclue/distinfo | 6 +++--- net/geoclue/files/patch-data_geoclue.conf.in | 25 +++++++++++++++++++++++++ net/geoclue/files/patch-data_meson.build | 11 +++++++++++ net/geoclue/pkg-plist | 6 ++++-- 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/net/geoclue/Makefile b/net/geoclue/Makefile index f9a9934a9f17..5d85fb8484c2 100644 --- a/net/geoclue/Makefile +++ b/net/geoclue/Makefile @@ -1,8 +1,8 @@ PORTNAME= geoclue -DISTVERSION= 2.5.7 +DISTVERSION= 2.7.1 CATEGORIES= net devel gnome -MAINTAINER= gnome@FreeBSD.org +MAINTAINER= desktop@FreeBSD.org COMMENT= D-Bus service that provides location information WWW= https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home @@ -10,17 +10,16 @@ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ - libsoup-2.4.so:devel/libsoup \ - libnotify.so:devel/libnotify + libsoup-3.0.so:devel/libsoup3 -USES= gettext gnome meson pkgconfig tar:xz vala:build +USES= gettext gnome meson pkgconfig vala:build USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org -GL_TAGNAME= 3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8 +GL_TAGNAME= 8a24f60969d4c235d9918796c38a6a9c42e10131 MESON_ARGS= -D3g-source=false \ -Dcdma-source=false \ @@ -29,16 +28,13 @@ MESON_ARGS= -D3g-source=false \ OPTIONS_SUB= yes OPTIONS_DEFINE= DEMO DOCS +OPTIONS_DEFAULT= DEMO -DEMO_DESC= Install geoclue demo agent +DEMO_DESC= Install geoclue (demo) agent DEMO_LIB_DEPENDS= libnotify.so:devel/libnotify DEMO_MESON_TRUE= demo-agent DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc DOCS_MESON_TRUE= gtk-doc -post-install: - ${MV} ${STAGEDIR}${PREFIX}/etc/geoclue/geoclue.conf \ - ${STAGEDIR}${PREFIX}/etc/geoclue/geoclue.conf.sample - .include <bsd.port.mk> diff --git a/net/geoclue/distinfo b/net/geoclue/distinfo index aaefc5260487..1268a59f17e6 100644 --- a/net/geoclue/distinfo +++ b/net/geoclue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626543545 -SHA256 (geoclue-geoclue-3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8_GL0.tar.gz) = 57b61f3d9bb16f424eb456572b84eead565c44e4227b8645bab9453ff957e711 -SIZE (geoclue-geoclue-3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8_GL0.tar.gz) = 115010 +TIMESTAMP = 1694593664 +SHA256 (geoclue-geoclue-8a24f60969d4c235d9918796c38a6a9c42e10131_GL0.tar.gz) = 2a7acd674db3a5d5c9275c8af6774bd0f4a84210d12436d8f3bfdf591241546b +SIZE (geoclue-geoclue-8a24f60969d4c235d9918796c38a6a9c42e10131_GL0.tar.gz) = 146456 diff --git a/net/geoclue/files/patch-data_geoclue.conf.in b/net/geoclue/files/patch-data_geoclue.conf.in new file mode 100644 index 000000000000..e62f97d8a525 --- /dev/null +++ b/net/geoclue/files/patch-data_geoclue.conf.in @@ -0,0 +1,25 @@ +Remove pantheon-agent-geoclue2, not anymore maintained by upstream (since 2023-05-09) + +--- data/geoclue.conf.in.orig 2023-09-03 08:27:30 UTC ++++ data/geoclue.conf.in +@@ -10,7 +10,7 @@ + + # Whitelist of desktop IDs (without .desktop part) of all agents we recognise, + # separated by a ';'. +-whitelist=@demo_agent@gnome-shell;io.elementary.desktop.agent-geoclue2;sm.puri.Phosh;lipstick ++whitelist=@demo_agent@gnome-shell;sm.puri.Phosh;lipstick + + # Network NMEA source configuration options + [network-nmea] +@@ -138,11 +138,6 @@ system=true + users= + + [org.gnome.Shell] +-allowed=true +-system=true +-users= +- +-[io.elementary.desktop.agent-geoclue2] + allowed=true + system=true + users= diff --git a/net/geoclue/files/patch-data_meson.build b/net/geoclue/files/patch-data_meson.build new file mode 100644 index 000000000000..74eb6b2f8b42 --- /dev/null +++ b/net/geoclue/files/patch-data_meson.build @@ -0,0 +1,11 @@ +--- data/meson.build.orig 2023-09-03 08:27:30 UTC ++++ data/meson.build +@@ -9,7 +9,7 @@ if get_option('enable-backend') + endif + + conf_dir = join_paths(sysconfdir, 'geoclue') +- configure_file(output: 'geoclue.conf', ++ configure_file(output: 'geoclue.conf.sample', + input: 'geoclue.conf.in', + configuration: conf, + install_dir: conf_dir) diff --git a/net/geoclue/pkg-plist b/net/geoclue/pkg-plist index 954e61820ec0..ed9fbe5e8065 100644 --- a/net/geoclue/pkg-plist +++ b/net/geoclue/pkg-plist @@ -1,5 +1,3 @@ -etc/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf -etc/dbus-1/system.d/org.freedesktop.GeoClue2.conf @sample %%ETCDIR%%/geoclue.conf.sample %%DEMO%%etc/xdg/autostart/geoclue-demo-agent.desktop include/libgeoclue-2.0/gclue-client.h @@ -27,6 +25,8 @@ share/dbus-1/interfaces/org.freedesktop.GeoClue2.Client.xml share/dbus-1/interfaces/org.freedesktop.GeoClue2.Location.xml share/dbus-1/interfaces/org.freedesktop.GeoClue2.Manager.xml share/dbus-1/interfaces/org.freedesktop.GeoClue2.xml +share/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf +share/dbus-1/system.d/org.freedesktop.GeoClue2.conf share/dbus-1/system-services/org.freedesktop.GeoClue2.service share/gir-1.0/Geoclue-2.0.gir %%DOCS%%share/gtk-doc/html/geoclue/gdbus-org.freedesktop.GeoClue2.Agent.html @@ -76,3 +76,5 @@ share/gir-1.0/Geoclue-2.0.gir %%DOCS%%share/gtk-doc/html/libgeoclue/up.png share/vala/vapi/libgeoclue-2.0.deps share/vala/vapi/libgeoclue-2.0.vapi +@dir %%ETCDIR%%/conf.d +@dir %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401011744.401Hi2xJ092178>