[144308] trunk/dports/xfce/xfce4-session

afb at macports.org afb at macports.org
Wed Jan 6 05:29:36 PST 2016


Revision: 144308
          https://trac.macports.org/changeset/144308
Author:   afb at macports.org
Date:     2016-01-06 05:29:35 -0800 (Wed, 06 Jan 2016)
Log Message:
-----------
xfce4-session: escape display name

Modified Paths:
--------------
    trunk/dports/xfce/xfce4-session/Portfile
    trunk/dports/xfce/xfce4-session/files/patch-launchd.diff

Modified: trunk/dports/xfce/xfce4-session/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-session/Portfile	2016-01-06 13:28:01 UTC (rev 144307)
+++ trunk/dports/xfce/xfce4-session/Portfile	2016-01-06 13:29:35 UTC (rev 144308)
@@ -6,7 +6,7 @@
 name            xfce4-session
 version         4.12.0
 set branch      [join [lrange [split ${version} .] 0 1] .]
-revision        1
+revision        2
 categories      xfce
 platforms       darwin
 license         GPL-2+

Modified: trunk/dports/xfce/xfce4-session/files/patch-launchd.diff
===================================================================
--- trunk/dports/xfce/xfce4-session/files/patch-launchd.diff	2016-01-06 13:28:01 UTC (rev 144307)
+++ trunk/dports/xfce/xfce4-session/files/patch-launchd.diff	2016-01-06 13:29:35 UTC (rev 144308)
@@ -13,3 +13,25 @@
  
    xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
  
+--- xfce4-session/xfsm-manager.c.orig	2015-02-28 17:28:00.000000000 +0100
++++ xfce4-session/xfsm-manager.c	2016-01-06 14:19:51.000000000 +0100
+@@ -765,6 +765,7 @@
+ #ifdef HAVE_OS_CYGWIN
+   gchar *s;
+ #endif
++  gchar *t;
+ 
+   manager->compat_gnome = xfconf_channel_get_bool (channel, "/compat/LaunchGNOME", FALSE);
+   manager->compat_kde = xfconf_channel_get_bool (channel, "/compat/LaunchKDE", FALSE);
+@@ -780,6 +780,11 @@ xfsm_manager_load (XfsmManager   *manage
+       *s = '#';
+ #endif
+ 
++  /* rename a slash (/) to a hash (#) for launchd */
++  for (t = display_name; *t != '\0'; ++t)
++    if (*t == '/')
++      *t = '#';
++
+   resource_name = g_strconcat ("sessions/xfce4-session-", display_name, NULL);
+   manager->session_file  = xfce_resource_save_location (XFCE_RESOURCE_CACHE, resource_name, TRUE);
+   g_free (resource_name);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160106/ec519cf3/attachment.html>


More information about the macports-changes mailing list