pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnome-session: Update wip/gnome-session to 3.36.0



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Wed Jun 10 21:41:52 2020 +0200
Changeset:	241544a8e2c63543f1a4364467880808d375b12a

Modified Files:
	gnome-session/Makefile
	gnome-session/PLIST
	gnome-session/distinfo
Removed Files:
	gnome-session/patches/patch-ae
	gnome-session/patches/patch-gnome-session_main.c

Log Message:
gnome-session: Update wip/gnome-session to 3.36.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=241544a8e2c63543f1a4364467880808d375b12a

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

diffstat:
 gnome-session/Makefile                           | 21 ++++++++++++---------
 gnome-session/PLIST                              | 19 +++++++++----------
 gnome-session/distinfo                           |  8 ++++----
 gnome-session/patches/patch-ae                   | 12 ------------
 gnome-session/patches/patch-gnome-session_main.c | 15 ---------------
 5 files changed, 25 insertions(+), 50 deletions(-)

diffs:
diff --git a/gnome-session/Makefile b/gnome-session/Makefile
index 47afa505fa..f61a55a413 100644
--- a/gnome-session/Makefile
+++ b/gnome-session/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.166 2015/10/10 01:58:22 ryoon Exp $
 #
 
-DISTNAME=		gnome-session-3.16.0
+DISTNAME=		gnome-session-3.36.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/3.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/3.36/}
 #SITES.gnome-splash-2.16.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=		.tar.xz
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} #gnome-splash-2.16.0.png
@@ -18,11 +18,15 @@ BUILD_DEPENDS+=		xmlto-[0-9]*:../../textproc/xmlto
 #CONFLICTS+=		gnome-core<1.4.2nb4
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 
+MESON_ARGS+=		-Dsystemd=false
+MESON_ARGS+=		-Dsystemd_session=disable
+MESON_ARGS+=		-Dsystemd_journal=false
+MESON_ARGS+=		-Dconsolekit=true
+
 MAKE_ENV+=		REAL_GCONFTOOL=${GCONFTOOL2:Q}
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
@@ -41,11 +45,12 @@ GCONF_SCHEMAS=		gnome-session.schemas
 #	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash-orig.png \
 #	    ${DESTDIR}${PREFIX}/share/pixmaps/splash/gnome-splash-orig.png
 
+
+.include "../../devel/meson/build.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/policykit/buildlink3.mk"
@@ -54,12 +59,10 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.76
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 #.include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libxslt?=	build
-.include "../../textproc/libxslt/buildlink3.mk"
 #.include "../../x11/gnome-control-center/buildlink3.mk"
 #.include "../../x11/gnome-desktop/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.11.1
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libxslt?=  build
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
diff --git a/gnome-session/PLIST b/gnome-session/PLIST
index f3aa4cd8e2..03484406c7 100644
--- a/gnome-session/PLIST
+++ b/gnome-session/PLIST
@@ -1,9 +1,12 @@
 @comment $NetBSD$
 bin/gnome-session
+bin/gnome-session-custom-session
 bin/gnome-session-inhibit
 bin/gnome-session-quit
+libexec/gnome-session-binary
 libexec/gnome-session-check-accelerated
-libexec/gnome-session-check-accelerated-helper
+libexec/gnome-session-check-accelerated-gl-helper
+libexec/gnome-session-check-accelerated-gles-helper
 libexec/gnome-session-failed
 man/man1/gnome-session-inhibit.1
 man/man1/gnome-session-quit.1
@@ -12,16 +15,8 @@ share/GConf/gsettings/gnome-session.convert
 share/doc/gnome-session/dbus/gnome-session.html
 share/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 share/gnome-session/hardware-compatibility
-share/gnome-session/session-properties.ui
 share/gnome-session/sessions/gnome-dummy.session
-share/gnome-session/sessions/gnome-wayland.session
 share/gnome-session/sessions/gnome.session
-share/icons/hicolor/16x16/apps/session-properties.png
-share/icons/hicolor/22x22/apps/session-properties.png
-share/icons/hicolor/24x24/apps/session-properties.png
-share/icons/hicolor/32x32/apps/session-properties.png
-share/icons/hicolor/48x48/apps/session-properties.png
-share/icons/hicolor/scalable/apps/session-properties.svg
 share/locale/af/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/an/LC_MESSAGES/gnome-session-3.0.mo
@@ -38,6 +33,7 @@ share/locale/br/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/bs/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ca/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/ckb/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/crh/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/cs/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/csb/LC_MESSAGES/gnome-session-3.0.mo
@@ -74,6 +70,7 @@ share/locale/is/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/it/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ja/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ka/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/kab/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/kk/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/km/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/kn/LC_MESSAGES/gnome-session-3.0.mo
@@ -84,6 +81,7 @@ share/locale/lv/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/mai/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/mg/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/mi/LC_MESSAGES/gnome-session-3.0.mo
+share/locale/mjw/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/ml/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/mn/LC_MESSAGES/gnome-session-3.0.mo
@@ -130,5 +128,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-3.0.mo
-share/wayland-sessions/gnome-wayland.desktop
+share/wayland-sessions/gnome.desktop
+share/xsessions/gnome-xorg.desktop
 share/xsessions/gnome.desktop
diff --git a/gnome-session/distinfo b/gnome-session/distinfo
index df9ecd04d8..9ae564eb13 100644
--- a/gnome-session/distinfo
+++ b/gnome-session/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.49 2015/11/04 03:28:30 agc Exp $
 
-SHA1 (gnome-session-3.16.0.tar.xz) = 5517871b98f65e009e1874efe7902055035f180f
-RMD160 (gnome-session-3.16.0.tar.xz) = 0c7a029159dc7864c63a6348bf9b8c703430a2dd
-SHA512 (gnome-session-3.16.0.tar.xz) = 4f02e73ab632ce0c2b961f1d88d93ef62fb6ebfa39d98bf12e672ca7cd9680d07aeffcd3c8792eddcbd9b5e13b0ef87d064352d8f209b3befd8445c1ba17e485
-Size (gnome-session-3.16.0.tar.xz) = 764808 bytes
+SHA1 (gnome-session-3.36.0.tar.xz) = dcdecdd85a40894408aa36eceb13ea9b256dd208
+RMD160 (gnome-session-3.36.0.tar.xz) = 4c24337f04c812b7edcb3c2cc88f98ff30e20971
+SHA512 (gnome-session-3.36.0.tar.xz) = 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
+Size (gnome-session-3.36.0.tar.xz) = 475492 bytes
 SHA1 (patch-ae) = 31759f8ee3f4415c43feb9ce5e93cba549de06a3
 SHA1 (patch-gnome-session_main.c) = 81283ba5d57bc41842fc267b2d37d43ed24e8fbf
diff --git a/gnome-session/patches/patch-ae b/gnome-session/patches/patch-ae
deleted file mode 100644
index 17ee2a9d36..0000000000
--- a/gnome-session/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2008/10/16 18:17:30 drochner Exp $
-
---- gnome-session/gsm-autostart-app.c.orig	2008-10-15 19:38:53.000000000 +0200
-+++ gnome-session/gsm-autostart-app.c
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <sys/wait.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <gio/gio.h>
diff --git a/gnome-session/patches/patch-gnome-session_main.c b/gnome-session/patches/patch-gnome-session_main.c
deleted file mode 100644
index 207f3e22c3..0000000000
--- a/gnome-session/patches/patch-gnome-session_main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-rpmatch is only in glibc.
-
---- gnome-session/main.c.orig	2015-02-17 19:53:01.000000000 +0000
-+++ gnome-session/main.c
-@@ -260,7 +260,7 @@ main (int argc, char **argv)
- 
-         debug_string = g_getenv ("GNOME_SESSION_DEBUG");
-         if (debug_string != NULL) {
--                debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1;
-+                debug = atoi (debug_string) == 1;
-         }
- 
-         error = NULL;


Home | Main Index | Thread Index | Old Index