[150851] users/devans/GNOME-3/unstable/dports/gnome/gdm

devans at macports.org devans at macports.org
Fri Jul 29 21:11:57 PDT 2016


Revision: 150851
          https://trac.macports.org/changeset/150851
Author:   devans at macports.org
Date:     2016-07-29 21:11:56 -0700 (Fri, 29 Jul 2016)
Log Message:
-----------
GNOME-3/unstable: gdm, update to version 3.21.4, configure fails due to want of libsystemd.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff
    users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff

Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile	2016-07-30 04:09:51 UTC (rev 150850)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile	2016-07-30 04:11:56 UTC (rev 150851)
@@ -8,7 +8,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                gdm
-version             3.17.2
+version             3.21.4
 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.
@@ -22,8 +22,8 @@
 
 use_xz              yes
 
-checksums           rmd160  e4400a3c51aef042856f8060e66e1c023f46b224 \
-                    sha256  ad6182d188451bbd8c48f12a3d99df2e2d03fedb18beaf003ec047bea5e5661d
+checksums           rmd160  7fbb6c666a5868cdf50be0d87e44d63987028259 \
+                    sha256  f42d7629d6b6689b6c6aad044622b7518a02479522610a45f3effe4d3f7fb8d3
 
 depends_build       port:pkgconfig \
                     port:intltool \

Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff	2016-07-30 04:09:51 UTC (rev 150850)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff	2016-07-30 04:11:56 UTC (rev 150851)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2014-02-21 05:24:30.000000000 -0800
-+++ configure.ac	2014-03-28 08:44:04.000000000 -0700
-@@ -510,6 +510,7 @@
+--- configure.ac.orig	2016-06-20 11:19:45.000000000 -0700
++++ configure.ac	2016-06-23 14:31:03.000000000 -0700
+@@ -501,6 +501,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)
@@ -8,15 +8,15 @@
  if test "x$have_pam" = "xyes"; then
     pam_appl_h="$ac_pam_includes/security/pam_appl.h"
     AC_MSG_CHECKING(for const pam_message)
-@@ -1245,7 +1246,17 @@
+@@ -1182,7 +1183,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"
++if test -x /opt/local/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"

Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff	2016-07-30 04:09:51 UTC (rev 150850)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff	2016-07-30 04:11:56 UTC (rev 150851)
@@ -1,7 +1,6 @@
-diff -ur daemon.orig/gdm-server.c daemon/gdm-server.c
---- daemon.orig/gdm-server.c	2015-04-02 06:52:39.000000000 -0700
-+++ daemon/gdm-server.c	2015-05-04 12:11:56.000000000 -0700
-@@ -94,6 +94,7 @@
+--- daemon/gdm-server.c.orig	2016-04-26 11:43:59.000000000 -0700
++++ daemon/gdm-server.c	2016-06-23 14:29:43.000000000 -0700
+@@ -92,6 +92,7 @@
          char    *auth_file;
  
          guint    child_watch_id;
@@ -9,8 +8,8 @@
  
          gboolean is_initial;
  };
-@@ -179,83 +180,15 @@
-         return g_strdup (server->priv->display_device);
+@@ -129,83 +130,15 @@
+         return NULL;
  }
  
 -static void
@@ -33,8 +32,7 @@
 -
  static gboolean
 -got_sigusr1 (gpointer user_data)
-+on_sigusr1(gpointer user_data)
- {
+-{
 -        GPid pid = GPOINTER_TO_UINT (user_data);
 -        GSList *l;
 -
@@ -71,8 +69,7 @@
 -
 -                if (sigwaitinfo (&sigusr1_mask, &info) == -1)
 -                        continue;
-+        GdmServer *server = user_data;
- 
+-
 -                g_idle_add (got_sigusr1, GUINT_TO_POINTER (info.si_pid));
 -        }
 -
@@ -81,9 +78,11 @@
 -
 -static void
 -gdm_server_launch_sigusr1_thread_if_needed (void)
--{
++on_sigusr1(gpointer user_data)
+ {
 -        static GThread *sigusr1_thread;
--
++        GdmServer *server = user_data;
+ 
 -        if (sigusr1_thread == NULL) {
 -                sigusr1_thread = g_thread_new ("gdm SIGUSR1 catcher", sigusr1_thread_main, NULL);
 +        g_debug ("GdmServer: Got USR1 from X server - emitting READY");
@@ -98,7 +97,7 @@
  }
  
  static void
-@@ -709,12 +642,6 @@
+@@ -663,12 +596,6 @@
          g_object_unref (server);
  }
  
@@ -111,7 +110,7 @@
  static gboolean
  gdm_server_spawn (GdmServer    *server,
                    const char   *vtarg,
-@@ -752,15 +679,6 @@
+@@ -706,15 +633,6 @@
          g_debug ("GdmServer: Starting X server process: %s", freeme);
          g_free (freeme);
  
@@ -127,7 +126,7 @@
          if (!g_spawn_async_with_pipes (NULL,
                                         argv,
                                         (char **)env->pdata,
-@@ -1096,11 +1014,16 @@
+@@ -1050,11 +968,16 @@
  static void
  gdm_server_init (GdmServer *server)
  {
@@ -144,7 +143,7 @@
  }
  
  static void
-@@ -1115,6 +1038,9 @@
+@@ -1069,6 +992,9 @@
  
          g_return_if_fail (server->priv != NULL);
  
@@ -154,38 +153,3 @@
          gdm_server_stop (server);
  
          g_free (server->priv->command);
-Only in daemon: gdm-server.c.orig
-Only in daemon: gdm-server.c.rej
-diff -ur daemon.orig/main.c daemon/main.c
---- daemon.orig/main.c	2015-04-02 06:52:42.000000000 -0700
-+++ daemon/main.c	2015-05-04 11:58:58.000000000 -0700
-@@ -289,19 +289,6 @@
-         return debug;
- }
- 
--/* SIGUSR1 is used by the X server to tell us that we're ready, so
-- * block it. We'll unblock it in the worker thread in gdm-server.c
-- */
--static void
--block_sigusr1 (void)
--{
--        sigset_t mask;
--
--        sigemptyset (&mask);
--        sigaddset (&mask, SIGUSR1);
--        sigprocmask (SIG_BLOCK, &mask, NULL);
--}
--
- int
- main (int    argc,
-       char **argv)
-@@ -322,8 +309,6 @@
-                 { NULL }
-         };
- 
--        block_sigusr1 ();
--
-         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-         textdomain (GETTEXT_PACKAGE);
-         setlocale (LC_ALL, "");
-Only in daemon: main.c.orig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160729/77975ba2/attachment.html>


More information about the macports-changes mailing list