gedit 3.10.4
[git/cygwin-packages/gedit.git] / 3.4.2-cygwin.patch
CommitLineData
4cd0219d
YS
1--- origsrc/gedit-3.4.2/configure.ac 2012-05-24 07:46:18.000000000 -0500
2+++ src/gedit-3.4.2/configure.ac 2012-06-28 15:12:45.109089600 -0500
2acf5ab7
YS
3@@ -342,7 +342,7 @@ else
4 X11_LIBS=
5 fi
6
7-if test "$platform_win32" = "no"; then
8+if test "$os_win32" = "no"; then
9 PKG_CHECK_MODULES(UNIX, [
10 gio-unix-2.0 >= 2.25.5
11 ])
4cd0219d
YS
12@@ -411,8 +411,8 @@ fi
13 # on win32 plugins must be able to resolve all symbols at link time
14 # so we create a lib
15 if test "$platform_win32" = yes; then
16- GEDIT_IMPLIB="-lgedit-$GEDIT_API_VERSION"
17- PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit.a"
18+ GEDIT_IMPLIB="-lgedit-private"
19+ PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined \$(top_builddir)/gedit/libgedit-private.la"
20 if test "$os_win32" = yes; then
21 PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
22 fi
23--- origsrc/gedit-3.4.2/data/gedit.pc.in 2011-07-04 06:12:41.000000000 -0500
24+++ src/gedit-3.4.2/data/gedit.pc.in 2012-06-28 15:13:40.139165500 -0500
25@@ -8,4 +8,4 @@ Description: gedit
26 Requires: gtksourceview-3.0 libpeas-1.0 libpeas-gtk-1.0
27 Version: @VERSION@
28 Cflags: -I${includedir}/gedit-@GEDIT_API_VERSION@
29-Libs: -L${libdir} @GEDIT_IMPLIB@
30+Libs: -L${libdir}/gedit @GEDIT_IMPLIB@
31--- origsrc/gedit-3.4.2/gedit/Makefile.am 2012-05-11 06:34:49.000000000 -0500
32+++ src/gedit-3.4.2/gedit/Makefile.am 2012-06-28 15:41:39.228380000 -0500
33@@ -23,7 +23,6 @@ gedit_SOURCES = \
34 gedit.c
35
36 gedit_LDADD = \
37- libgedit.la \
38 libgedit-private.la \
39 $(GEDIT_LIBS) \
40 $(GTK_MAC_LIBS) \
41@@ -47,7 +46,7 @@ libgedit_la_LIBADD += $(GEDIT_LIBS) $(GT
42
43 libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
44
45-libgedit_private_la_LDFLAGS = -avoid-version
46+libgedit_private_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
47
48 # Mac OSX convenience library and ldflags
49 if OS_OSX
4cd0219d
YS
50@@ -289,11 +288,11 @@ if HAVE_INTROSPECTION
51 -include $(INTROSPECTION_MAKEFILE)
52 INTROSPECTION_GIRS = Gedit-3.0.gir
53
54-Gedit-3.0.gir: gedit
55+Gedit-3.0.gir: gedit$(EXEEXT)
56 INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all
57 Gedit_3_0_gir_NAMESPACE = Gedit
58 Gedit_3_0_gir_VERSION = 3.0
59-Gedit_3_0_gir_PROGRAM = $(builddir)/gedit
60+Gedit_3_0_gir_PROGRAM = $(builddir)/gedit$(EXEEXT)
61 Gedit_3_0_gir_FILES = $(INST_H_FILES) $(libgedit_c_files) $(BUILT_SOURCES)
62 Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
63
64@@ -312,12 +311,9 @@ dist-hook:
65 cd $(distdir); rm -f $(BUILT_SOURCES) $(BUILT_SOURCES_PRIVATE)
66
67 install-exec-hook:
68-if PLATFORM_WIN32
69- $(mkinstalldirs) "$(DESTDIR)$(libdir)"
70- $(INSTALL_DATA) libgedit.a "$(DESTDIR)$(libdir)"
71-else
72+if !OS_WIN32
73 rm -f $(DESTDIR)$(bindir)/gnome-text-editor
74- ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
75+ ln -s gedit$(EXEEXT) $(DESTDIR)$(bindir)/gnome-text-editor
76 endif
77
78 -include $(top_srcdir)/git.mk
2acf5ab7
YS
79--- origsrc/gedit-3.10.4/plugins/externaltools/data/Makefile.am 2014-01-21 16:34:41.000000000 -0600
80+++ src/gedit-3.10.4/plugins/externaltools/data/Makefile.am 2014-03-19 20:34:34.393523700 -0500
81@@ -18,7 +18,7 @@ install_tools_in_files = $(tools_in_file
82 if PLATFORM_OSX
83 install_tools_in_files += $(tools_in_osx)
84 else
85-if PLATFORM_WIN32
86+if OS_WIN32
87 install_tools_in_files += $(tools_in_win32)
88 else
89 install_tools_in_files += $(tools_in_linux)
This page took 0.026558 seconds and 5 git commands to generate.