[113058] users/devans/GNOME-3/stable/dports/gnome
devans at macports.org
devans at macports.org
Wed Nov 6 21:57:57 PST 2013
Revision: 113058
https://trac.macports.org/changeset/113058
Author: devans at macports.org
Date: 2013-11-06 21:57:57 -0800 (Wed, 06 Nov 2013)
Log Message:
-----------
GNOME-3/stable/dports: delete bypassed port libgnome-media-profiles.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff
users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/libgnome-media-profiles/
Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff 2013-11-07 05:47:20 UTC (rev 113057)
+++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.diff 2013-11-07 05:57:57 UTC (rev 113058)
@@ -1,6 +1,6 @@
---- configure.orig 2011-03-28 09:55:35.000000000 -0700
-+++ configure 2013-07-06 14:00:57.000000000 -0700
-@@ -21438,6 +21438,7 @@
+--- configure.orig 2013-07-30 11:42:00.000000000 -0700
++++ configure 2013-09-19 10:18:43.000000000 -0700
+@@ -23611,6 +23611,7 @@
fi
@@ -8,16 +8,21 @@
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
-@@ -23540,7 +23541,12 @@
+@@ -25831,7 +25832,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 /opt/local/bin/Xquartz; 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"
Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2013-11-07 05:47:20 UTC (rev 113057)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2013-11-07 05:57:57 UTC (rev 113058)
@@ -1,145 +1,14 @@
---- configure.orig 2013-02-11 09:46:05.000000000 -0800
-+++ configure 2013-02-11 09:47:49.000000000 -0800
-@@ -13874,6 +13874,7 @@ if test -n "$GEDIT_CFLAGS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13883,6 +13884,7 @@ if test -n "$GEDIT_CFLAGS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13895,6 +13897,7 @@ if test -n "$GEDIT_CFLAGS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13914,6 +13917,7 @@ if test -n "$GEDIT_LIBS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13923,6 +13927,7 @@ if test -n "$GEDIT_LIBS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13935,6 +13940,7 @@ if test -n "$GEDIT_LIBS"; then
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13963,6 +13969,7 @@ fi
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13973,6 +13980,7 @@ fi
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -13986,6 +13994,7 @@ fi
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-+ gmodule-2.0
- gio-2.0 >= 2.23.1
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
-@@ -14038,15 +14047,18 @@ if test -n "$X11_CFLAGS"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- x11
-+ ice
- \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- x11
-+ ice
- ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "
- x11
-+ ice
- " 2>/dev/null`
- else
- pkg_failed=yes
-@@ -14060,15 +14072,18 @@ if test -n "$X11_LIBS"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- x11
-+ ice
- \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- x11
-+ ice
- ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "
- x11
-+ ice
- " 2>/dev/null`
- else
- pkg_failed=yes
-@@ -14091,10 +14106,12 @@ fi
- if test $_pkg_short_errors_supported = yes; then
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
- x11
-+ ice
- " 2>&1`
- else
- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "
- x11
-+ ice
- " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -14102,6 +14119,7 @@ fi
+--- configure.orig 2013-06-25 00:06:32.000000000 -0700
++++ configure 2013-08-30 11:35:54.000000000 -0700
+@@ -16310,9 +16310,9 @@
- as_fn_error $? "Package requirements (
- x11
-+ ice
- ) were not met:
- $X11_PKG_ERRORS
-@@ -14495,9 +14495,9 @@
-
-
- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
++ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
Added: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2013-11-07 05:57:57 UTC (rev 113058)
@@ -0,0 +1,29 @@
+--- gedit/gedit-app.c.orig 2013-09-29 07:56:34.000000000 -0700
++++ gedit/gedit-app.c 2013-11-03 01:37:41.000000000 -0800
+@@ -95,7 +95,7 @@
+ static gboolean new_window = FALSE;
+ static gboolean new_document = FALSE;
+ static gchar *geometry = NULL;
+-static gboolean wait = FALSE;
++static gboolean gwait = FALSE;
+ static gboolean standalone = FALSE;
+ static gchar **remaining_args = NULL;
+ static const GeditEncoding *encoding = NULL;
+@@ -161,7 +161,7 @@
+ /* Wait for closing documents */
+ {
+ "wait", 'w', 0, G_OPTION_ARG_NONE,
+- &wait,
++ &gwait,
+ N_("Open files and block process until files are closed"),
+ NULL
+ },
+@@ -753,7 +753,7 @@
+ new_window = FALSE;
+ new_document = FALSE;
+ geometry = NULL;
+- wait = FALSE;
++ gwait = FALSE;
+ standalone = FALSE;
+ remaining_args = NULL;
+ encoding = NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131106/9f5a326d/attachment.html>
More information about the macports-changes
mailing list