[102984] trunk/dports/gnome/gedit/files
jeremyhu at macports.org
jeremyhu at macports.org
Mon Feb 11 09:53:34 PST 2013
Revision: 102984
https://trac.macports.org/changeset/102984
Author: jeremyhu at macports.org
Date: 2013-02-11 09:53:34 -0800 (Mon, 11 Feb 2013)
Log Message:
-----------
gedit: Add missing links and delete unused patches
Modified Paths:
--------------
trunk/dports/gnome/gedit/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/gnome/gedit/files/patch-configure.ac.diff
trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff
Deleted: trunk/dports/gnome/gedit/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-configure.ac.diff 2013-02-11 16:59:54 UTC (rev 102983)
+++ trunk/dports/gnome/gedit/files/patch-configure.ac.diff 2013-02-11 17:53:34 UTC (rev 102984)
@@ -1,39 +0,0 @@
---- configure.ac.orig 2009-04-13 08:46:20.000000000 -0700
-+++ configure.ac 2009-05-10 17:41:50.000000000 -0700
-@@ -93,6 +93,25 @@
- AC_DEFINE([PLATFORM_OSX],[1],[Defined if platform is Mac OSX])
- fi
-
-+dnl check for gdk quartz support
-+AC_MSG_CHECKING([if GDK supports quartz])
-+gdk_has_quartz=no
-+if $PKG_CONFIG --exists gdk-quartz-2.0; then
-+ gdk_has_quartz=yes
-+fi
-+AC_MSG_RESULT([$gdk_has_quartz])
-+
-+dnl check if osx quartz platform
-+AC_MSG_CHECKING([if platform is osx quartz])
-+platform_osx_quartz=no
-+if test "$platform_osx" = "yes" &&
-+ test "$gdk_has_quartz" = "yes" ; then
-+ platform_osx_quartz=yes
-+fi
-+AC_MSG_RESULT([$platform_osx_quartz])
-+
-+AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "$platform_osx_quartz" = "yes")
-+
- dnl ===============================================================
- dnl Expanded dirs
- dnl ===============================================================
-@@ -233,8 +252,8 @@
-
- AM_CONDITIONAL(BUILD_SEXY, test "$gtkatleast" = "no")
-
--if test "$platform_osx" = "no" &&
-- test "$os_win32" = no; then
-+if test "$platform_osx_quartz" = "no" &&
-+ test "$os_win32" = "no"; then
- PKG_CHECK_MODULES(EGG_SMCLIENT, [
- sm >= 1.0.0
- ])
Modified: trunk/dports/gnome/gedit/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-configure.diff 2013-02-11 16:59:54 UTC (rev 102983)
+++ trunk/dports/gnome/gedit/files/patch-configure.diff 2013-02-11 17:53:34 UTC (rev 102984)
@@ -1,5 +1,136 @@
---- configure.orig 2010-09-28 00:31:53.000000000 -0700
-+++ configure 2010-09-30 15:58:55.000000000 -0700
+--- 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
+
+ as_fn_error $? "Package requirements (
+ x11
++ ice
+ ) were not met:
+
+ $X11_PKG_ERRORS
@@ -14495,9 +14495,9 @@
Deleted: trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff 2013-02-11 16:59:54 UTC (rev 102983)
+++ trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff 2013-02-11 17:53:34 UTC (rev 102984)
@@ -1,11 +0,0 @@
---- gedit/smclient/Makefile.am.orig 2009-05-09 19:07:51.000000000 -0700
-+++ gedit/smclient/Makefile.am 2009-05-09 19:08:22.000000000 -0700
-@@ -2,7 +2,7 @@
- platform_sources = eggsmclient-win32.c
- platform_logout_test_ldflags = -mwindows
- else
--if PLATFORM_OSX
-+if PLATFORM_OSX_QUARTZ
- platform_defines = -xobjective-c
- platform_ldflags = -framework Carbon
- platform_sources = eggsmclient-osx.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130211/890e9055/attachment.html>
More information about the macports-changes
mailing list