Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 17 insertions, 165 deletions

diff --git a/x11/gnome-terminal/files/patch-configure b/x11/gnome-terminal/files/patch-configure
deleted file mode 100644
index 54434bd97..000000000
--- a/x11/gnome-terminal/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.orig	2011-01-13 04:08:02.000000000 +0000
-+++ configure	2011-01-13 04:08:30.000000000 +0000
-@@ -14510,6 +13851,52 @@
-  ;;
- esac
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5
-+$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; }
-+if ${ac_cv_lib_util_kinfo_getfile+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kinfo_getfile ();
-+int
-+main ()
-+{
-+return kinfo_getfile ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_util_kinfo_getfile=yes
-+else
-+  ac_cv_lib_util_kinfo_getfile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then :
-+  LIBS="${LIBS} -lutil"
-+
-+$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
-+
-+else
-+  :
-+fi
-+
-+
- if test "$GTK_BUILDER_CONVERT" = "false"; then
-   as_fn_error $? "gtk-builder-convert not found" "$LINENO" 5
- fi
diff --git a/x11/gnome-terminal/files/patch-configure.ac b/x11/gnome-terminal/files/patch-configure.ac
deleted file mode 100644
index 5e3a59f60..000000000
--- a/x11/gnome-terminal/files/patch-configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2011-01-11 19:41:06.000000000 +0000
-+++ configure.ac	2011-01-13 04:07:54.000000000 +0000
-@@ -136,6 +136,10 @@
-   3.0) AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert gtk-builder-convert-3.0],[false]) ;;
- esac
- 
-+AC_CHECK_LIB(util, kinfo_getfile,
-+  [LIBS="${LIBS} -lutil"
-+  AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
-+
- if test "$GTK_BUILDER_CONVERT" = "false"; then
-   AC_MSG_ERROR([gtk-builder-convert not found])
- fi
diff --git a/x11/gnome-terminal/files/patch-src_server.c b/x11/gnome-terminal/files/patch-src_server.c
new file mode 100644
index 000000000..cadbbf350
--- /dev/null
+++ b/x11/gnome-terminal/files/patch-src_server.c
@@ -0,0 +1,17 @@
+--- src/server.c.orig	2014-03-03 20:48:49.000000000 +0000
++++ src/server.c	2014-04-08 09:17:40.268173534 +0000
+@@ -72,10 +72,10 @@
+   const char *home_dir;
+   GError *error = NULL;
+ 
+-  if (G_UNLIKELY (getuid () != geteuid () ||
+-                  getgid () != getegid () ||
+-                  geteuid () == 0 || 
+-                  getegid () == 0)) {
++  if (G_UNLIKELY ((getuid () != geteuid () &&
++                  getgid () != getegid ()) &&
++                  geteuid () == 0 &&
++                  getegid () == 0)) {
+     g_printerr ("Wrong euid/egid, exiting.\n");
+     return EXIT_FAILURE;
+   }
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
deleted file mode 100644
index 096a53103..000000000
--- a/x11/gnome-terminal/files/patch-src_terminal-screen.c
+++ /dev/null
@@ -1,97 +0,0 @@
---- src/terminal-screen.c.orig	2010-12-03 01:12:50.000000000 +0000
-+++ src/terminal-screen.c	2011-01-13 04:06:12.000000000 +0000
-@@ -18,6 +18,15 @@
- 
- #include <config.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <sys/param.h>
-+#include <sys/user.h>
-+#ifdef HAVE_KINFO_GETFILE
-+#include <libutil.h>
-+#endif
-+#endif
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -179,15 +188,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
- static char *
- cwd_of_pid (int pid)
- {
-+#ifndef __FreeBSD__
-   static const char patterns[][18] = {
-     "/proc/%d/cwd",         /* Linux */
-     "/proc/%d/path/cwd",    /* Solaris >= 10 */
-   };
-+#else
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+  struct kinfo_file *freep, *kif;
-+#ifndef HAVE_KINFO_GETFILE
-+  size_t len;
-+  int name[4];
-+#else
-+  int cnt;
-+#endif /* HAVE_KINFO_GETFILE */
-+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
-+#endif /* __FreeBSD__ */
-   guint i;
-   
-   if (pid == -1)
-     return NULL;
- 
-+#ifndef __FreeBSD__
-   /* Try to get the working directory using various OS-specific mechanisms */
-   for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
-     {
-@@ -225,6 +247,49 @@ cwd_of_pid (int pid)
-             return working_dir;
-         }
-     }
-+#else
-+  int fgpid = pid;
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+#ifndef HAVE_KINFO_GETFILE
-+  name[0] = CTL_KERN;
-+  name[1] = KERN_PROC;
-+  name[2] = KERN_PROC_FILEDESC;
-+  name[3] = fgpid;
-+
-+  if (sysctl (name, 4, NULL, &len, NULL, 0) < 0)
-+    return NULL;
-+  freep = kif = g_malloc (len);
-+  if (sysctl (name, 4, kif, &len, NULL, 0) < 0)
-+    {
-+      g_free (freep);
-+      return NULL;
-+    }
-+#else
-+  freep = kinfo_getfile (fgpid, &cnt);
-+#endif /* HAVE_KINFO_GETFILE */
-+
-+#ifndef HAVE_KINFO_GETFILE
-+  for (i = 0; i < len / sizeof (*kif); i++, kif++)
-+    {
-+      if (kif->kf_structsize != sizeof (*kif))
-+        continue;
-+#else
-+  for (i = 0; i < cnt; i++)
-+    {
-+      kif = &freep[i];
-+#endif /* HAVE_KINFO_GETFILE */
-+      if (kif->kf_fd == KF_FD_TYPE_CWD)
-+        {
-+          char *working_dir;
-+
-+          working_dir = g_strdup (kif->kf_path);
-+          g_free (freep);
-+          return working_dir;
-+        }
-+    }
-+  g_free (freep);
-+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
-+#endif /* __FreeBSD__ */
- 
-   return NULL;
- }