[pkgsrc/trunk]: pkgsrc/x11/gnome-session update to 2.18.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/gnome-session update to 2.18.0
From: drochner <drochner%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:46:53 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/71f504a73413
branches:  trunk
changeset: 527670:71f504a73413
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Apr 11 20:25:38 2007 +0000

description:
update to 2.18.0
This moves this pkg to the new stable gnome branch, too much to list here.

pkgsrc note: automatic dbus startup doesn't work well, it seems to
conflict with another dbus autostart. Better start the session with
"dbus-launch". gdm-2.18 will take care of that.

diffstat:

 x11/gnome-session/Makefile         |   16 +-
 x11/gnome-session/PLIST            |   14 +-
 x11/gnome-session/distinfo         |   15 +-
 x11/gnome-session/patches/patch-aa |   43 +---
 x11/gnome-session/patches/patch-ab |   10 +-
 x11/gnome-session/patches/patch-ac |   38 ---
 x11/gnome-session/patches/patch-ad |   34 ---
 x11/gnome-session/patches/patch-ae |  366 -------------------------------------
 8 files changed, 38 insertions(+), 498 deletions(-)

diffs (truncated from 620 to 300 lines):

diff -r d927a952613e -r 71f504a73413 x11/gnome-session/Makefile
--- a/x11/gnome-session/Makefile        Wed Apr 11 19:29:17 2007 +0000
+++ b/x11/gnome-session/Makefile        Wed Apr 11 20:25:38 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2007/03/21 12:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2007/04/11 20:25:38 drochner Exp $
 #
 
-DISTNAME=              gnome-session-2.16.2
-PKGREVISION=           1
+DISTNAME=              gnome-session-2.18.0
 CATEGORIES=            x11 gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.16/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.18/}
 SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=          .tar.bz2
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.16.0.png
@@ -56,15 +55,16 @@
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 
 post-extract:
-       ${MV} ${WRKSRC}/gnome-session/gnome-splash.png \
-           ${WRKSRC}/gnome-session/gnome-splash-orig.png
+       ${MV} ${WRKSRC}/data/gnome-splash.png \
+           ${WRKSRC}/data/gnome-splash-orig.png
        ${CP} ${DISTDIR}/gnome-splash-2.16.0.png \
-           ${WRKSRC}/gnome-session/gnome-splash.png
+           ${WRKSRC}/data/gnome-splash.png
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash-orig.png \
+       ${INSTALL_DATA} ${WRKSRC}/data/gnome-splash-orig.png \
            ${PREFIX}/share/pixmaps/splash/gnome-splash-orig.png
 
 .include "../../mk/bsd.pkg.mk"
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/PLIST
--- a/x11/gnome-session/PLIST   Wed Apr 11 19:29:17 2007 +0000
+++ b/x11/gnome-session/PLIST   Wed Apr 11 20:25:38 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/09/15 15:18:16 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/11 20:25:38 drochner Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -12,7 +12,11 @@
 share/applications/session-properties.desktop
 share/gconf/schemas/gnome-session.schemas
 share/gnome/default.session
-share/gnome/default.wm
+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/scalable/apps/session-properties.svg
 share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
@@ -98,6 +102,12 @@
 share/pixmaps/splash/gnome-splash.png
 @dirrm share/pixmaps/splash
 @comment in xdg-dirs: @dirrm share/pixmaps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/distinfo
--- a/x11/gnome-session/distinfo        Wed Apr 11 19:29:17 2007 +0000
+++ b/x11/gnome-session/distinfo        Wed Apr 11 20:25:38 2007 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.29 2006/11/28 22:17:24 drochner Exp $
+$NetBSD: distinfo,v 1.30 2007/04/11 20:25:38 drochner Exp $
 
-SHA1 (gnome-session-2.16.2.tar.bz2) = 37cbad34ce329c2109e5336bfe83a26f8ef44987
-RMD160 (gnome-session-2.16.2.tar.bz2) = aedb9906c7968080b5e5db044097c9294112d09a
-Size (gnome-session-2.16.2.tar.bz2) = 681853 bytes
+SHA1 (gnome-session-2.18.0.tar.bz2) = ab01a84f9ad78db85028192698cd1d6157fd8163
+RMD160 (gnome-session-2.18.0.tar.bz2) = c12e91cb49cd8314f9dbca69981fe93f65ece9fb
+Size (gnome-session-2.18.0.tar.bz2) = 707392 bytes
 SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d
 RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96
 Size (gnome-splash-2.16.0.png) = 36601 bytes
-SHA1 (patch-aa) = 3a7bac87c0031ea73bf313d3a2dcb983b83d7cbf
-SHA1 (patch-ab) = 7287c9f0a921f2dfe28373027a4f3564d58e5ac8
-SHA1 (patch-ac) = 315fc1edf2cb23bd6cd895604a78eee6b3e0e6ca
-SHA1 (patch-ad) = 42aa7867f6b660e5eb4b59eb5d74a97a38078fe5
-SHA1 (patch-ae) = a1e2996e9c8ffa8afdc92e60172d9baee285e1a6
+SHA1 (patch-aa) = 817579fb223f59e5d86fd041585a714f9262cf89
+SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/patches/patch-aa
--- a/x11/gnome-session/patches/patch-aa        Wed Apr 11 19:29:17 2007 +0000
+++ b/x11/gnome-session/patches/patch-aa        Wed Apr 11 20:25:38 2007 +0000
@@ -1,42 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2006/04/01 17:36:41 jmmv Exp $
+$NetBSD: patch-aa,v 1.8 2007/04/11 20:25:38 drochner Exp $
 
-http://bugzilla.gnome.org/show_bug.cgi?id=336237
-The GONFTOOL_CMD change does not belong to the bug report!
-
---- gnome-session/Makefile.in.orig     2006-03-13 21:53:02.000000000 +0100
+--- gnome-session/Makefile.in.orig     2007-03-12 19:59:22.000000000 +0100
 +++ gnome-session/Makefile.in
-@@ -65,7 +65,7 @@ am__objects_1 = egg-screen-exec.$(OBJEXT
- am_gnome_session_OBJECTS = manager.$(OBJEXT) ice.$(OBJEXT) \
-       main.$(OBJEXT) prop.$(OBJEXT) save.$(OBJEXT) command.$(OBJEXT) \
-       remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \
--      gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \
-+      gsm-xrandr.$(OBJEXT) gsm-dbus.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \
-       gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \
-       gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \
-       gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \
-@@ -323,7 +323,7 @@ INCLUDES = \
-       -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""        \
-       -DHALT_COMMAND=\""$(HALT_COMMAND)\""            \
+@@ -309,7 +309,7 @@ INCLUDES = \
+       -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"        \
+       -DGNOME_ICONDIR=\""$(datadir)/pixmaps\""        \
        -DRSH_COMMAND=\""$(RSH_COMMAND)\""              \
 -      -DGCONFTOOL_CMD=\""$(GCONFTOOL)\""              \
 +      -DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""         \
        -DDEFAULTDIR="\"$(defaultdir)\""                \
-       -DESD_SERVER="\"$(ESD_SERVER)\""
- 
-@@ -386,6 +386,8 @@ gnome_session_SOURCES = \
-       splash-widget.h         \
-       gsm-xrandr.c            \
-       gsm-xrandr.h            \
-+      gsm-dbus.c              \
-+      gsm-dbus.h              \
-       gsm-keyring.c           \
-       gsm-keyring.h           \
-       gsm-gsd.c               \
-@@ -602,6 +604,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-client-list.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-client-row.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-gsd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-keyring.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-multiscreen.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-protocol.Po@am__quote@
+       -DESD_SERVER="\"$(ESD_SERVER)\""                \
+       -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/patches/patch-ab
--- a/x11/gnome-session/patches/patch-ab        Wed Apr 11 19:29:17 2007 +0000
+++ b/x11/gnome-session/patches/patch-ab        Wed Apr 11 20:25:38 2007 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2005/01/11 12:36:24 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2007/04/11 20:25:38 drochner Exp $
 
---- configure.orig     2004-10-12 17:57:32.000000000 +0200
+--- configure.orig     2007-03-12 19:59:01.000000000 +0100
 +++ configure
-@@ -24686,6 +24686,7 @@ case "$GNOME_SESSION_LIBS" in
+@@ -26374,6 +26374,7 @@ case "$GNOME_SESSION_LIBS" in
                GNOME_HAVE_SM=no
                ;;
  esac
 +GNOME_HAVE_SM=yes
- echo "$as_me:$LINENO: result: $GNOME_HAVE_SM" >&5
- echo "${ECHO_T}$GNOME_HAVE_SM" >&6
+ { echo "$as_me:$LINENO: result: $GNOME_HAVE_SM" >&5
+ echo "${ECHO_T}$GNOME_HAVE_SM" >&6; }
  if test "$GNOME_HAVE_SM" = no ; then
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/patches/patch-ac
--- a/x11/gnome-session/patches/patch-ac        Wed Apr 11 19:29:17 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2006/11/28 22:17:24 drochner Exp $
-
---- gnome-session/main.c.orig  2006-11-20 00:24:40.000000000 +0100
-+++ gnome-session/main.c
-@@ -43,6 +43,7 @@
- #include "command.h"
- #include "splash-widget.h"
- #include "util.h"
-+#include "gsm-dbus.h"
- #include "gsm-sound.h"
- #include "gsm-gsd.h"
- #include "gsm-proxy.h"
-@@ -336,6 +337,7 @@ main (int argc, char *argv[])
-   char **versions;
-   GConfClient *gconf_client;
-   GOptionContext *goption_context;
-+  gboolean dbus_daemon_owner;
-   
-   if (getenv ("GSM_VERBOSE_DEBUG"))
-     gsm_set_verbose (TRUE);
-@@ -420,6 +422,7 @@ main (int argc, char *argv[])
-   fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER"));
-   gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png");
- 
-+  dbus_daemon_owner = gsm_dbus_daemon_start ();
- 
-   /* Make sure children see the right value for DISPLAY.  This is
-      useful if --display was specified on the command line.  */
-@@ -506,6 +509,9 @@ main (int argc, char *argv[])
- 
-   gsm_keyring_daemon_stop ();
- 
-+  if (dbus_daemon_owner)
-+      gsm_dbus_daemon_stop ();
-+
-   g_object_unref (gconf_client);
-   gsm_shutdown_gconfd ();
- 
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/patches/patch-ad
--- a/x11/gnome-session/patches/patch-ad        Wed Apr 11 19:29:17 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/04/01 17:36:41 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=336237
-
---- /dev/null  2006-04-01 19:01:40.000000000 +0200
-+++ gnome-session/gsm-dbus.h   2006-04-01 19:02:57.000000000 +0200
-@@ -0,0 +1,27 @@
-+/* gsm-dbus.h - Handle the dbus-daemon process.
-+ *
-+ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ */
-+
-+#ifndef GSM_DBUS_H
-+#define GSM_DBUS_H
-+
-+gboolean gsm_dbus_daemon_start (void);
-+void     gsm_dbus_daemon_stop (void);
-+
-+#endif /* GSM_DBUS_H */
diff -r d927a952613e -r 71f504a73413 x11/gnome-session/patches/patch-ae
--- a/x11/gnome-session/patches/patch-ae        Wed Apr 11 19:29:17 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,366 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2006/04/02 11:07:28 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=336237
-
---- gnome-session/gsm-dbus.c.orig      2006-04-02 12:32:32.000000000 +0200
-+++ gnome-session/gsm-dbus.c
-@@ -0,0 +1,359 @@
-+/* gsm-dbus.c - Handle the dbus-daemon process.
-+ *
-+ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ */
-+
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <sys/wait.h>
-+
-+#include <errno.h>
-+#include <limits.h>
-+#include <signal.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+#include <glib.h>
-+#include <glib/gprintf.h>
-+
-+#include "gsm-dbus.h"
-+
-+static pid_t    dbus_daemon_pid = 0;
-+
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/qmail Update tls-smtpauth combined patch to 20070...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc + lincvs-2.0.0 [now called CrossVC], mimedefang-2.62,
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/qmail Update tls-smtpauth combined patch to 20070...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc + lincvs-2.0.0 [now called CrossVC], mimedefang-2.62,
Indexes:
Home | Main Index | Thread Index | Old Index