gnome/gedit 2.30.3
authoryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Tue, 29 Jun 2010 09:41:04 +0000 (09:41 +0000)
committeryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Tue, 29 Jun 2010 09:41:04 +0000 (09:41 +0000)
git-svn-id: https://cygwin-ports.svn.sourceforge.net/svnroot/cygwin-ports/ports/trunk@9853 e127d73d-b18e-4ae1-a744-a22e6a3ccd30

2.28.0-cygwin-x11.patch [deleted file]
2.30.3-cygwin.patch [new file with mode: 0644]
gedit-2.30.3-1.cygport [moved from gedit-2.28.4-1.cygport with 90% similarity]
setup.hint

diff --git a/2.28.0-cygwin-x11.patch b/2.28.0-cygwin-x11.patch
deleted file mode 100644 (file)
index e696b3d..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
---- origsrc/gedit-2.28.0/configure.ac  2009-09-21 09:58:06.000000000 -0500
-+++ src/gedit-2.28.0/configure.ac      2009-10-29 22:38:26.569199900 -0500
-@@ -60,8 +60,6 @@ AC_MSG_CHECKING([for Win32 platform])
- case "$host" in
-   *-*-mingw*|*-*-cygwin*)
-     platform_win32=yes
--    AC_CHECK_TOOL(WINDRES, windres)
--    ACTIVE_PLUGINS="${ACTIVE_PLUGINS},checkupdate"
-     ;;
-   *)
-     platform_win32=no
-@@ -74,6 +72,8 @@ AC_MSG_CHECKING([for native Win32])
- case "$host" in
-   *-*-mingw*)
-     os_win32=yes
-+    AC_CHECK_TOOL(WINDRES, windres)
-+    ACTIVE_PLUGINS="${ACTIVE_PLUGINS},checkupdate"
-     ;;
-   *)
-     os_win32=no
-@@ -180,7 +180,7 @@ if test "x$enable_updater" != "xno"; the
-               have_libsoup=no)
-       
-       if test "x$have_libsoup" = "xyes"; then
--              if test "x$platform_win32" = "xyes"; then
-+              if test "x$os_win32" = "xyes"; then
-                       enable_updater=yes
-               elif test "x$os_osx" = "xyes"; then
-                       enable_updater=yes
-@@ -418,8 +418,12 @@ fi
- # so we create a lib
- if test "$platform_win32" = yes; then
-       GEDIT_IMPLIB="-lgedit-$GEDIT_API_VERSION"
--      PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -mwindows -Wl,\$(top_builddir)/gedit/libgedit-\$(GEDIT_API_VERSION).a"
--      LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -mwindows -Wl,\$(top_builddir)/gedit/libgedit-\$(GEDIT_API_VERSION).a"
-+      PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit-\$(GEDIT_API_VERSION).a"
-+      LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit-\$(GEDIT_API_VERSION).a"
-+      if test "$os_win32" = yes; then
-+              PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
-+              LOADER_LIBTOOL_FLAGS="${LOADER_LIBTOOL_FLAGS} -mwindows"
-+      fi
- else
-       GEDIT_IMPLIB=""
-       PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
---- origsrc/gedit-2.28.0/gedit/Makefile.am     2009-09-20 12:43:50.000000000 -0500
-+++ src/gedit-2.28.0/gedit/Makefile.am 2009-10-29 22:38:26.579199900 -0500
-@@ -21,7 +21,10 @@ gedit_SOURCES = \
- gedit_LDADD = libgedit.la $(GEDIT_LIBS) $(EGG_SMCLIENT_LIBS)
-  
- if PLATFORM_WIN32
--gedit_LDFLAGS = -Wl,--export-all-symbols -mwindows -Wl,--out-implib,libgedit-$(GEDIT_API_VERSION).a
-+gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit-$(GEDIT_API_VERSION).a
-+if OS_WIN32
-+gedit_LDFLAGS += -mwindows
-+endif
- else
- gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
- endif
-@@ -45,7 +48,7 @@ BUILT_SOURCES =                      \
-       gedit-marshal.c                 \
-       gedit-marshal.h
--if PLATFORM_WIN32
-+if OS_WIN32
- gedit-res.o: gedit.rc
-       $(WINDRES) -i gedit.rc --input-format=rc -o gedit-res.o -O coff
-@@ -111,7 +114,7 @@ headerdir = $(prefix)/include/gedit-@GED
- header_DATA =                                 \
-       $(INST_H_FILES) 
--if !PLATFORM_WIN32
-+if !OS_WIN32
- POSIXIO_FILES =                       \
-       gedit-local-document-saver.c    
- else
-@@ -217,7 +220,7 @@ else
-       ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
- endif
--if !PLATFORM_WIN32
-+if !OS_WIN32
- BACON_DIR=$(srcdir)/../../libbacon/src/
- BACON_FILES=bacon-message-connection.h bacon-message-connection.c
diff --git a/2.30.3-cygwin.patch b/2.30.3-cygwin.patch
new file mode 100644 (file)
index 0000000..b246629
--- /dev/null
@@ -0,0 +1,15 @@
+--- origsrc/gedit-2.30.3/gedit/Makefile.am     2010-06-20 14:43:02.000000000 -0500
++++ src/gedit-2.30.3/gedit/Makefile.am 2010-06-28 15:30:10.947717900 -0500
+@@ -226,9 +226,10 @@ install-exec-hook:
+ if PLATFORM_WIN32
+       $(mkinstalldirs) "$(DESTDIR)$(libdir)"
+       $(INSTALL_DATA) libgedit-$(GEDIT_API_VERSION).a "$(DESTDIR)$(libdir)"
+-else
++endif
++if !OS_WIN32
+       rm -f $(DESTDIR)$(bindir)/gnome-text-editor
+-      ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
++      ln -s gedit$(EXEEXT) $(DESTDIR)$(bindir)/gnome-text-editor
+ endif
+ if !OS_WIN32
similarity index 90%
rename from gedit-2.28.4-1.cygport
rename to gedit-2.30.3-1.cygport
index d33a9bc7453dee70782c56eee66561a2a34b98ad..1e4fb298406873b03cb872bc1e7db61d5369f161 100644 (file)
@@ -2,7 +2,7 @@ inherit gnome2
 
 DESCRIPTION="GNOME text editor"
 
-PATCH_URI="2.28.0-cygwin-x11.patch"
+PATCH_URI="2.30.3-cygwin.patch"
 
 PKG_NAMES="${PN} ${PN}-devel"
 PKG_HINTS="setup devel"
index b53f64565296ccdadc62a69ead1556ac9a789eca..e9e890b76846b92361b78bc2f4fc9c0f7f3449ec 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome Editors
-requires: GConf2 libatk1.0_0 libattr1 libcairo2 libenchant1 libgcc1 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libgtk2.0_0 libgtksourceview2.0_0 libICE6 libintl8 libpango1.0_0 libSM6 libX11_6 libxml2 python python-gobject2.0 python-gtk2.0 python-gtksourceview2
+requires: GConf2 libatk1.0_0 libcairo2 libenchant1 libgcc1 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libgtk2.0_0 libgtksourceview2.0_0 libICE6 libintl8 libpango1.0_0 libSM6 libX11_6 libxml2 python python-gobject2.0 python-gtk2.0 python-gtksourceview2
 sdesc: "Text editor for the GNOME Desktop"
 ldesc: "gedit is a small and lightweight UTF-8 text editor for the GNOME
 environment. Complete GNOME integration is featured, with support for
This page took 0.029323 seconds and 5 git commands to generate.