CVS commit: pkgsrc/x11/gnome-shell

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul  6 21:45:25 UTC 2023

Modified Files:
        pkgsrc/x11/gnome-shell: Makefile distinfo
        pkgsrc/x11/gnome-shell/patches: patch-meson.build
Added Files:
        pkgsrc/x11/gnome-shell/patches: patch-config.h.meson
            patch-src_shell-polkit-authentication-agent.h

Log Message:
gnome-shell: fix build with polkit-121 using upstream patch.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/gnome-shell/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/gnome-shell/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gnome-shell/patches/patch-config.h.meson \
    pkgsrc/x11/gnome-shell/patches/patch-src_shell-polkit-authentication-agent.h
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/gnome-shell/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gnome-shell/Makefile
diff -u pkgsrc/x11/gnome-shell/Makefile:1.29 pkgsrc/x11/gnome-shell/Makefile:1.30
--- pkgsrc/x11/gnome-shell/Makefile:1.29        Sat May  6 19:09:52 2023
+++ pkgsrc/x11/gnome-shell/Makefile     Thu Jul  6 21:45:25 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2023/05/06 19:09:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2023/07/06 21:45:25 wiz Exp $
 
 DISTNAME=      gnome-shell-40.2
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

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

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

Added files:

Index: pkgsrc/x11/gnome-shell/patches/patch-config.h.meson
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-config.h.meson:1.1
--- /dev/null   Thu Jul  6 21:45:25 2023
+++ pkgsrc/x11/gnome-shell/patches/patch-config.h.meson Thu Jul  6 21:45:25 2023
@@ -0,0 +1,13 @@
+$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
Index: pkgsrc/x11/gnome-shell/patches/patch-src_shell-polkit-authentication-agent.h
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-src_shell-polkit-authentication-agent.h:1.1
--- /dev/null   Thu Jul  6 21:45:25 2023
+++ pkgsrc/x11/gnome-shell/patches/patch-src_shell-polkit-authentication-agent.h        Thu Jul  6 21:45:25 2023
@@ -0,0 +1,17 @@
+$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())
+