gedit 3.14.2
authorYaakov Selkowitz <yselkowi@redhat.com>
Fri, 9 Jan 2015 03:55:41 +0000 (21:55 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Fri, 9 Jan 2015 03:55:41 +0000 (21:55 -0600)
3.14.2-cygwin.patch [new file with mode: 0644]
3.14.2-introspection.patch [new file with mode: 0644]
3.4.2-cygwin.patch [deleted file]
gedit.cygport

diff --git a/3.14.2-cygwin.patch b/3.14.2-cygwin.patch
new file mode 100644 (file)
index 0000000..113652f
--- /dev/null
@@ -0,0 +1,78 @@
+--- origsrc/gedit-3.14.2/configure.ac  2015-01-08 21:30:41.515860300 -0600
++++ src/gedit-3.14.2/configure.ac      2015-01-08 20:18:26.413872200 -0600
+@@ -70,18 +70,7 @@ AC_SUBST(ACTIVE_PLUGINS)
+ dnl check for win32 platform
+ AC_MSG_CHECKING([for Win32 platform])
+ case "$host" in
+-  *-*-mingw*|*-*-cygwin*)
+-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --output-def -Xlinker $lib.def && $DLLTOOL --dllname $soname --def $lib.def --output-delaylib $lib'
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-        cp $export_symbols $output_objdir/$soname.def;
+-      else
+-        echo EXPORTS > $output_objdir/$soname.def;
+-        cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
+-      $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base;
+-      $DLLTOOL --dllname $soname --def $output_objdir/$soname.def --output-delaylib $lib'
++  *-*-cygwin*|*-*-mingw*)
+     platform_win32=yes
+     ;;
+   *)
+@@ -94,6 +83,17 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$pl
+ AC_MSG_CHECKING([for native Win32])
+ case "$host" in
+   *-*-mingw*)
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --output-def -Xlinker $lib.def && $DLLTOOL --dllname $soname --def $lib.def --output-delaylib $lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++        cp $export_symbols $output_objdir/$soname.def;
++      else
++        echo EXPORTS > $output_objdir/$soname.def;
++        cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base;
++      $DLLTOOL --dllname $soname --def $output_objdir/$soname.def --output-delaylib $lib'
+     os_win32=yes
+     AC_CHECK_TOOL(WINDRES, windres)
+     ACTIVE_PLUGINS="${ACTIVE_PLUGINS}, 'checkupdate'"
+@@ -339,7 +339,7 @@ else
+       X11_LIBS=
+ fi
+-if test "$platform_win32" = "no"; then
++if test "$os_win32" = "no"; then
+       PKG_CHECK_MODULES(UNIX, [
+               gio-unix-2.0 >= 2.25.5
+       ])
+--- origsrc/gedit-3.14.2/gedit/Makefile.am     2014-11-27 14:42:17.000000000 -0600
++++ src/gedit-3.14.2/gedit/Makefile.am 2015-01-08 21:29:48.640145900 -0600
+@@ -322,13 +322,13 @@ CLEANFILES += $(VAPIGEN_VAPIS) gedit/ged
+ endif # ENABLE_VAPIGEN
+ install-exec-hook:
+-if PLATFORM_WIN32
++if OS_WIN32
+       $(mkinstalldirs) "$(DESTDIR)$(libdir)/gedit"
+       mv -t $(DESTDIR)$(libdir)/gedit $(DESTDIR)$(libdir)/bin/*
+       rm -rf $(DESTDIR)$(libdir)/bin
+ else
+       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
+ BUILT_SOURCES += $(gedit_built_sources) gedit/gedit-resources.c
+--- origsrc/gedit-3.14.2/plugins/externaltools/data/Makefile.am        2014-11-27 14:42:17.000000000 -0600
++++ src/gedit-3.14.2/plugins/externaltools/data/Makefile.am    2015-01-08 20:18:26.489381800 -0600
+@@ -19,7 +19,7 @@ externaltools_install_tools_in_files = $
+ if PLATFORM_OSX
+ externaltools_install_tools_in_files += $(externaltools_tools_in_osx)
+ else
+-if PLATFORM_WIN32
++if OS_WIN32
+ externaltools_install_tools_in_files += $(externaltools_tools_in_win32)
+ else
+ externaltools_install_tools_in_files += $(externaltools_tools_in_linux)
diff --git a/3.14.2-introspection.patch b/3.14.2-introspection.patch
new file mode 100644 (file)
index 0000000..c362eaa
--- /dev/null
@@ -0,0 +1,17 @@
+--- origsrc/gedit-3.14.2/gedit/Makefile.am     2014-11-27 14:42:17.000000000 -0600
++++ src/gedit-3.14.2/gedit/Makefile.am 2015-01-08 21:29:48.640145900 -0600
+@@ -275,12 +275,12 @@ if HAVE_INTROSPECTION
+ INTROSPECTION_GIRS = gedit/Gedit-3.0.gir
+ INTROSPECTION_SCANNER_ENV = CC="$(CC)"
+-gedit/Gedit-3.0.gir: gedit/gedit$(EXEEXT)
++gedit/Gedit-3.0.gir: gedit/libgedit.la
+ INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all
+ gedit_Gedit_3_0_gir_NAMESPACE = Gedit
+ gedit_Gedit_3_0_gir_VERSION = 3.0
+-gedit_Gedit_3_0_gir_PROGRAM = $(builddir)/gedit/gedit$(EXEEXT)
++gedit_Gedit_3_0_gir_LIBS = gedit/libgedit.la
+ gedit_Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
+ gedit_Gedit_3_0_gir_EXPORT_PACKAGES = gedit
+ gedit_Gedit_3_0_gir_SCANNERFLAGS = $(GEDIT_CFLAGS) $(foreach header,$(gedit_INST_H_FILES),--c-include="$(header)")
diff --git a/3.4.2-cygwin.patch b/3.4.2-cygwin.patch
deleted file mode 100644 (file)
index 6f03634..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
---- origsrc/gedit-3.4.2/configure.ac   2012-05-24 07:46:18.000000000 -0500
-+++ src/gedit-3.4.2/configure.ac       2012-06-28 15:12:45.109089600 -0500
-@@ -342,7 +342,7 @@ else
-       X11_LIBS=
- fi
--if test "$platform_win32" = "no"; then
-+if test "$os_win32" = "no"; then
-       PKG_CHECK_MODULES(UNIX, [
-               gio-unix-2.0 >= 2.25.5
-       ])
-@@ -411,8 +411,8 @@ fi
- # on win32 plugins must be able to resolve all symbols at link time
- # 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 -Wl,\$(top_builddir)/gedit/libgedit.a"
-+      GEDIT_IMPLIB="-lgedit-private"
-+      PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined \$(top_builddir)/gedit/libgedit-private.la"
-       if test "$os_win32" = yes; then
-               PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
-       fi
---- origsrc/gedit-3.4.2/data/gedit.pc.in       2011-07-04 06:12:41.000000000 -0500
-+++ src/gedit-3.4.2/data/gedit.pc.in   2012-06-28 15:13:40.139165500 -0500
-@@ -8,4 +8,4 @@ Description: gedit
- Requires: gtksourceview-3.0 libpeas-1.0 libpeas-gtk-1.0
- Version: @VERSION@
- Cflags: -I${includedir}/gedit-@GEDIT_API_VERSION@
--Libs: -L${libdir} @GEDIT_IMPLIB@
-+Libs: -L${libdir}/gedit @GEDIT_IMPLIB@
---- origsrc/gedit-3.4.2/gedit/Makefile.am      2012-05-11 06:34:49.000000000 -0500
-+++ src/gedit-3.4.2/gedit/Makefile.am  2012-06-28 15:41:39.228380000 -0500
-@@ -23,7 +23,6 @@ gedit_SOURCES = \
-       gedit.c
- gedit_LDADD =                 \
--      libgedit.la             \
-       libgedit-private.la     \
-       $(GEDIT_LIBS)           \
-       $(GTK_MAC_LIBS)         \
-@@ -47,7 +46,7 @@ libgedit_la_LIBADD += $(GEDIT_LIBS) $(GT
- libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
--libgedit_private_la_LDFLAGS = -avoid-version
-+libgedit_private_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
- # Mac OSX convenience library and ldflags
- if OS_OSX
-@@ -289,11 +288,11 @@ if HAVE_INTROSPECTION
- -include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS = Gedit-3.0.gir
--Gedit-3.0.gir: gedit
-+Gedit-3.0.gir: gedit$(EXEEXT)
- INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all
- Gedit_3_0_gir_NAMESPACE = Gedit
- Gedit_3_0_gir_VERSION = 3.0
--Gedit_3_0_gir_PROGRAM = $(builddir)/gedit
-+Gedit_3_0_gir_PROGRAM = $(builddir)/gedit$(EXEEXT)
- Gedit_3_0_gir_FILES = $(INST_H_FILES) $(libgedit_c_files) $(BUILT_SOURCES)
- Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
-@@ -312,12 +311,9 @@ dist-hook:
-       cd $(distdir); rm -f $(BUILT_SOURCES) $(BUILT_SOURCES_PRIVATE)
- install-exec-hook:
--if PLATFORM_WIN32
--      $(mkinstalldirs) "$(DESTDIR)$(libdir)"
--      $(INSTALL_DATA) libgedit.a "$(DESTDIR)$(libdir)"
--else
-+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
- -include $(top_srcdir)/git.mk
---- origsrc/gedit-3.10.4/plugins/externaltools/data/Makefile.am        2014-01-21 16:34:41.000000000 -0600
-+++ src/gedit-3.10.4/plugins/externaltools/data/Makefile.am    2014-03-19 20:34:34.393523700 -0500
-@@ -18,7 +18,7 @@ install_tools_in_files = $(tools_in_file
- if PLATFORM_OSX
- install_tools_in_files += $(tools_in_osx)
- else
--if PLATFORM_WIN32
-+if OS_WIN32
- install_tools_in_files += $(tools_in_win32) 
- else
- install_tools_in_files += $(tools_in_linux)
index 70f452ce78004f91ac895311b2d00e4296162374..26f92f71f033d96110e0aa46575fad2accb2ff59 100644 (file)
@@ -1,7 +1,7 @@
 inherit python3 gnome2
 
 NAME="gedit"
-VERSION=3.10.4
+VERSION=3.14.2
 RELEASE=1
 CATEGORY="Editors"
 SUMMARY="Text editor for the GNOME Desktop"
@@ -12,8 +12,9 @@ use of the GNOME help system, the GNOME Virtual File System and the
 GNOME print framework."
 
 PATCH_URI="
-       3.4.2-cygwin.patch
        3.10.4-glib-gettext.patch
+       3.14.2-cygwin.patch
+       3.14.2-introspection.patch
 "
 
 DEPEND="gnome-common gtk-doc
This page took 0.026402 seconds and 5 git commands to generate.