Thu Jul 6 21:45:25 2023 UTC ()
gnome-shell: fix build with polkit-121 using upstream patch.

Bump PKGREVISION.


(wiz)
diff -r1.29 -r1.30 pkgsrc/x11/gnome-shell/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/gnome-shell/distinfo
diff -r0 -r1.1 pkgsrc/x11/gnome-shell/patches/patch-config.h.meson
diff -r0 -r1.1 pkgsrc/x11/gnome-shell/patches/patch-src_shell-polkit-authentication-agent.h
diff -r1.1 -r1.2 pkgsrc/x11/gnome-shell/patches/patch-meson.build
cvs diff -r1.29 -r1.30 pkgsrc/x11/gnome-shell/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-shell/Makefile 2023/05/06 19:09:52 1.29
+++ pkgsrc/x11/gnome-shell/Makefile 2023/07/06 21:45:25 1.30
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.29 2023/05/06 19:09:52 ryoon Exp $ 1# $NetBSD: Makefile,v 1.30 2023/07/06 21:45:25 wiz Exp $
2 2
3DISTNAME= gnome-shell-40.2 3DISTNAME= gnome-shell-40.2
4PKGREVISION= 16 4PKGREVISION= 17
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= cirnatdan@NetBSD.org 9MAINTAINER= cirnatdan@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeShell 10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeShell
11COMMENT= Next generation GNOME shell 11COMMENT= Next generation GNOME shell
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config perl msgfmt xgettext gdbus-codegen 14USE_TOOLS+= pkg-config perl msgfmt xgettext gdbus-codegen
15 15
16MESON_ARGS+= -Dnetworkmanager=false 16MESON_ARGS+= -Dnetworkmanager=false
17MESON_ARGS+= -Dsystemd=false 17MESON_ARGS+= -Dsystemd=false
cvs diff -r1.6 -r1.7 pkgsrc/x11/gnome-shell/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gnome-shell/distinfo 2022/03/11 07:37:41 1.6
+++ pkgsrc/x11/gnome-shell/distinfo 2023/07/06 21:45:25 1.7
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: distinfo,v 1.6 2022/03/11 07:37:41 nia Exp $ 1$NetBSD: distinfo,v 1.7 2023/07/06 21:45:25 wiz Exp $
2 2
3BLAKE2s (gnome-shell-40.2.tar.xz) = 865b979ac26f1dcbe401dec8f0fba2ea00dc8d42ae594bb43cb797e7c304306d 3BLAKE2s (gnome-shell-40.2.tar.xz) = 865b979ac26f1dcbe401dec8f0fba2ea00dc8d42ae594bb43cb797e7c304306d
4SHA512 (gnome-shell-40.2.tar.xz) = 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87 4SHA512 (gnome-shell-40.2.tar.xz) = 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87
5Size (gnome-shell-40.2.tar.xz) = 1869600 bytes 5Size (gnome-shell-40.2.tar.xz) = 1869600 bytes
 6SHA1 (patch-config.h.meson) = 204829c331612de97f5c8d60b7788c96d60cc010
6SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7 7SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7
7SHA1 (patch-data_meson.build) = 3b9949fbdc34c547b8778506b75ffca10f3834e1 8SHA1 (patch-data_meson.build) = 3b9949fbdc34c547b8778506b75ffca10f3834e1
8SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c 9SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c
9SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c 10SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c
10SHA1 (patch-js_ui_main.js) = ea2f5b715fac292019438fe9baec074cf90fe686 11SHA1 (patch-js_ui_main.js) = ea2f5b715fac292019438fe9baec074cf90fe686
11SHA1 (patch-meson.build) = e6d2e514dcc64c744e308b08190d9e2e20190ac7 12SHA1 (patch-meson.build) = 559875343b8183bb96dad8317e55aa6347efb5cc
12SHA1 (patch-src_calendar-server_meson.build) = bd07b27f8e3f19816f255e82445d335db2e462cb 13SHA1 (patch-src_calendar-server_meson.build) = bd07b27f8e3f19816f255e82445d335db2e462cb
13SHA1 (patch-src_main.c) = d6d109ff7aee58a437aa9389403366e4be241d40 14SHA1 (patch-src_main.c) = d6d109ff7aee58a437aa9389403366e4be241d40
 15SHA1 (patch-src_shell-polkit-authentication-agent.h) = 3b6375eb43e5dc11631f712c0a38aa810fc1db37
14SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6 16SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6
File Added: pkgsrc/x11/gnome-shell/patches/patch-config.h.meson
$NetBSD: patch-config.h.meson,v 1.1 2023/07/06 21:45:25 wiz Exp $

Fix build with polkit-121.

--- config.h.meson.orig	2021-06-10 11:33:01.518931600 +0000
+++ config.h.meson
@@ -30,3 +30,6 @@
 
 /* Define if fdwalk is available in libc */
 #mesondefine HAVE_FDWALK
+
+/* Define if polkit defines autocleanup functions */
+#mesondefine HAVE_POLKIT_AUTOCLEANUP
File Added: pkgsrc/x11/gnome-shell/patches/patch-src_shell-polkit-authentication-agent.h
$NetBSD: patch-src_shell-polkit-authentication-agent.h,v 1.1 2023/07/06 21:45:25 wiz Exp $

Fix build with polkit-121.

--- src/shell-polkit-authentication-agent.h.orig	2021-06-10 11:33:01.889923000 +0000
+++ src/shell-polkit-authentication-agent.h
@@ -14,8 +14,10 @@
 
 G_BEGIN_DECLS
 
+#ifndef HAVE_POLKIT_AUTOCLEANUP
 /* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
+#endif
 
 #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())
cvs diff -r1.1 -r1.2 pkgsrc/x11/gnome-shell/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/x11/gnome-shell/patches/patch-meson.build 2020/11/10 12:06:59 1.1
+++ pkgsrc/x11/gnome-shell/patches/patch-meson.build 2023/07/06 21:45:25 1.2
@@ -1,15 +1,31 @@ @@ -1,15 +1,31 @@
1$NetBSD: patch-meson.build,v 1.1 2020/11/10 12:06:59 nia Exp $ 1$NetBSD: patch-meson.build,v 1.2 2023/07/06 21:45:25 wiz Exp $
2 2
3Install config files to examples. 3Install config files to examples.
4 4
5--- meson.build.orig 2020-10-05 18:36:07.906838400 +0000 5Fix build with polkit-121.
 6
 7--- meson.build.orig 2021-06-10 11:33:01.644928700 +0000
6+++ meson.build 8+++ meson.build
7@@ -52,7 +52,7 @@ sysconfdir = join_paths(prefix, get_opti 9@@ -53,7 +53,7 @@ sysconfdir = join_paths(prefix, get_opti
8 pkgdatadir = join_paths(datadir, meson.project_name()) 10 pkgdatadir = join_paths(datadir, meson.project_name())
9 pkglibdir = join_paths(libdir, meson.project_name()) 11 pkglibdir = join_paths(libdir, meson.project_name())
10  12
11-autostartdir = join_paths(sysconfdir, 'xdg', 'autostart') 13-autostartdir = join_paths(sysconfdir, 'xdg', 'autostart')
12+autostartdir = join_paths(datadir, 'examples', 'xdg', 'autostart') 14+autostartdir = join_paths(datadir, 'examples', 'xdg', 'autostart')
13 convertdir = join_paths(datadir, 'GConf', 'gsettings') 15 convertdir = join_paths(datadir, 'GConf', 'gsettings')
14 desktopdir = join_paths(datadir, 'applications') 16 desktopdir = join_paths(datadir, 'applications')
15 icondir = join_paths(datadir, 'icons') 17 icondir = join_paths(datadir, 'icons')
 18@@ -168,6 +168,13 @@ cdata.set('HAVE_FDWALK',
 19 cc.has_function('fdwalk')
 20 )
 21
 22+polkit_has_autocleanup = cc.compiles(
 23+ '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
 24+ #include <polkitagent/polkitagent.h>
 25+ void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
 26+ dependencies: polkit_dep)
 27+cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
 28+
 29 buildtype = get_option('buildtype')
 30 if buildtype != 'plain'
 31 all_warnings = [