[117876] users/devans/GNOME-3/stable/dports/gnome/gdm
devans at macports.org
devans at macports.org
Sat Mar 15 18:50:12 PDT 2014
Revision: 117876
https://trac.macports.org/changeset/117876
Author: devans at macports.org
Date: 2014-03-15 18:50:11 -0700 (Sat, 15 Mar 2014)
Log Message:
-----------
GNOME-3/stable: gdm, sync with trunk.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff
users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff
users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gdm/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gdm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gdm:108265-114987
/users/rmstonecipher/gnome/gdm:102363-103172
+ /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gdm:108265-117875
/users/rmstonecipher/gnome/gdm:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile 2014-03-16 01:43:57 UTC (rev 117875)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile 2014-03-16 01:50:11 UTC (rev 117876)
@@ -8,6 +8,7 @@
name gdm
version 3.10.0.1
+revision 2
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description The Gnome Display Manager is a re-implementation of the well known xdm program.
@@ -49,17 +50,26 @@
depends_run port:gnome-session \
port:gnome-settings-daemon
-patchfiles patch-configure.diff \
- patch-daemon-gdm-session.c.diff \
- patch-daemon-gdm-session-worker.c.diff
+patchfiles patch-daemon-gdm-session-worker.c.diff \
+ patch-use-g_credentials_get_unix_pid.diff \
+ patch-configure.ac.diff
post-patch {
- reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
- file attributes ${worksrcpath}/install-sh -permissions +x
+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
+ file attributes ${worksrcpath}/install-sh -permissions +x
}
use_parallel_build no
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.args --enable-ipv6 \
--without-console-kit \
--disable-schemas-compile \
Copied: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff (from rev 117871, trunk/dports/gnome/gdm/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-16 01:50:11 UTC (rev 117876)
@@ -0,0 +1,57 @@
+--- configure.ac.orig 2014-03-15 07:56:54.000000000 -0700
++++ configure.ac 2014-03-15 08:00:06.000000000 -0700
+@@ -499,6 +499,7 @@
+ AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])])
+
+ dnl test whether struct pam_message is const (Linux) or not (Sun)
++ac_pam_includes="/usr/include"
+ if test "x$have_pam" = "xyes"; then
+ pam_appl_h="$ac_pam_includes/security/pam_appl.h"
+ AC_MSG_CHECKING(for const pam_message)
+@@ -1217,7 +1218,17 @@
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/X11/bin/Xserver; then
++if test -x @MP_PREFIX@/bin/Xquartz; then
++ X_PATH="@MP_PREFIX@/bin"
++ X_SERVER_PATH="@MP_PREFIX@/bin"
++ X_SERVER="@MP_PREFIX@/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /opt/X11/bin/Xquartz; then
++ X_PATH="/opt/X11/bin"
++ X_SERVER_PATH="/opt/X11/bin"
++ X_SERVER="/opt/X11/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /usr/X11/bin/Xserver; then
+ X_PATH="/usr/X11/bin"
+ X_SERVER_PATH="/usr/X11/bin"
+ X_SERVER="/usr/X11/bin/Xserver"
+From c14b16af23529afb7371890e3c686457c365e8be Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Mon, 11 Nov 2013 06:36:26 +0000
+Subject: Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
+
+When using IT_PROG_INTLTOOL using the gettext automake macros isn't
+necessary. To make matters worse, when mixing the marcos both try to
+generate po/Makefile.in.in. Recent versions of intltool detect when
+gettext won and bails when building.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711818
+---
+diff --git a/configure.ac b/configure.ac
+index fdb0497..6afa49e 100644
+--- configure.ac
++++ configure.ac
+@@ -52,9 +52,6 @@ AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
+ # i18n stuff
+ IT_PROG_INTLTOOL([0.40.0])
+
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=gdm
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+--
+cgit v0.9.2
Deleted: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff 2014-03-16 01:43:57 UTC (rev 117875)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff 2014-03-16 01:50:11 UTC (rev 117876)
@@ -1,29 +0,0 @@
---- configure.orig 2013-10-16 07:46:13.000000000 -0700
-+++ configure 2013-11-08 21:31:12.000000000 -0800
-@@ -23256,6 +23256,7 @@
- fi
-
-
-+ac_pam_includes="/usr/include"
- if test "x$have_pam" = "xyes"; then
- pam_appl_h="$ac_pam_includes/security/pam_appl.h"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const pam_message" >&5
-@@ -25473,7 +25474,17 @@
- # and /usr/X11 since they often symlink to each other, and configure
- # should use the more stable location (the real directory) if possible.
- #
--if test -x /usr/X11/bin/Xserver; then
-+if test -x @MP_PREFIX@/bin/Xquartz; then
-+ X_PATH="/opt/local/bin"
-+ X_SERVER_PATH="/opt/local/bin"
-+ X_SERVER="/opt/local/bin/Xquartz"
-+ X_CONFIG_OPTIONS="-audit 0"
-+elif test -x /opt/X11/bin/Xquartz; then
-+ X_PATH="/opt/X11/bin"
-+ X_SERVER_PATH="/opt/X11/bin"
-+ X_SERVER="/opt/X11/bin/Xquartz"
-+ X_CONFIG_OPTIONS="-audit 0"
-+elif test -x /usr/X11/bin/Xserver; then
- X_PATH="/usr/X11/bin"
- X_SERVER_PATH="/usr/X11/bin"
- X_SERVER="/usr/X11/bin/Xserver"
Deleted: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2014-03-16 01:43:57 UTC (rev 117875)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2014-03-16 01:50:11 UTC (rev 117876)
@@ -1,12 +0,0 @@
---- daemon/gdm-session.c.orig 2013-09-19 12:29:48.000000000 -0700
-+++ daemon/gdm-session.c 2013-11-08 21:16:43.000000000 -0800
-@@ -979,6 +979,9 @@
- #ifdef __linux__
- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
- pid = (GPid) ((struct ucred *) native_credentials)->pid;
-+#elif defined (__APPLE__)
-+ native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_INVALID);
-+ pid = (GPid) (0);
- #elif defined (__FreeBSD__)
- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
Copied: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff (from rev 117871, trunk/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff 2014-03-16 01:50:11 UTC (rev 117876)
@@ -0,0 +1,87 @@
+From 87f181489983bb8d640a6a227caa8cbfc0fff853 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Sun, 10 Nov 2013 23:21:37 +0000
+Subject: Use g_credentials_get_unix_pid() instead of home baked function
+
+This function is available in GIO since 2.36
+
+Thanks to Petr Salinger <Petr.Salinger at seznam.cz> for the patch
+Debian Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692739
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687921
+---
+diff --git a/configure.ac b/configure.ac
+index bffc88b..0008c62 100644
+--- configure.ac
++++ configure.ac
+@@ -63,7 +63,7 @@ dnl ---------------------------------------------------------------------------
+ dnl - Dependencies
+ dnl ---------------------------------------------------------------------------
+
+-GLIB_REQUIRED_VERSION=2.35.0
++GLIB_REQUIRED_VERSION=2.36.0
+ GTK_REQUIRED_VERSION=2.91.1
+ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
+ ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index d74bed6..b2d931d 100644
+--- daemon/gdm-session.c
++++ daemon/gdm-session.c
+@@ -970,28 +970,6 @@ allow_worker_function (GDBusAuthObserver *observer,
+ return FALSE;
+ }
+
+-static GPid
+-credentials_get_unix_pid (GCredentials *credentials)
+-{
+- GPid pid = 0;
+- gpointer native_credentials = NULL;
+-
+-#ifdef __linux__
+- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
+- pid = (GPid) ((struct ucred *) native_credentials)->pid;
+-#elif defined (__FreeBSD__)
+- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
+- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
+-#elif defined (__OpenBSD__)
+- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
+- pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
+-#else
+-#error "platform not supported, need mechanism to detect pid of connected process"
+-#endif
+-
+- return pid;
+-}
+-
+ static gboolean
+ register_worker (GdmDBusWorkerManager *worker_manager_interface,
+ GDBusMethodInvocation *invocation,
+@@ -1021,7 +999,7 @@ register_worker (GdmDBusWorkerManager *worker_manager_interface,
+ connection_node);
+
+ credentials = g_dbus_connection_get_peer_credentials (connection);
+- pid = credentials_get_unix_pid (credentials);
++ pid = g_credentials_get_unix_pid (credentials, NULL);
+
+ conversation = find_conversation_by_pid (self, (GPid) pid);
+
+@@ -1479,7 +1457,7 @@ on_outside_connection_closed (GDBusConnection *connection,
+ connection);
+
+ credentials = g_dbus_connection_get_peer_credentials (connection);
+- pid_of_client = credentials_get_unix_pid (credentials);
++ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
+
+ g_signal_emit (G_OBJECT (self),
+ signals [CLIENT_DISCONNECTED],
+@@ -1531,7 +1509,7 @@ handle_connection_from_outside (GDBusServer *server,
+ }
+
+ credentials = g_dbus_connection_get_peer_credentials (connection);
+- pid_of_client = credentials_get_unix_pid (credentials);
++ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
+
+ g_signal_emit (G_OBJECT (self),
+ signals [CLIENT_CONNECTED],
+--
+cgit v0.9.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140315/2271a7bf/attachment-0001.html>
More information about the macports-changes
mailing list