Plugins use python3
[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
3@@ -411,8 +411,8 @@ fi
4 # on win32 plugins must be able to resolve all symbols at link time
5 # so we create a lib
6 if test "$platform_win32" = yes; then
7- GEDIT_IMPLIB="-lgedit-$GEDIT_API_VERSION"
8- PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit.a"
9+ GEDIT_IMPLIB="-lgedit-private"
10+ PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined \$(top_builddir)/gedit/libgedit-private.la"
11 if test "$os_win32" = yes; then
12 PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
13 fi
14--- origsrc/gedit-3.4.2/data/gedit.pc.in 2011-07-04 06:12:41.000000000 -0500
15+++ src/gedit-3.4.2/data/gedit.pc.in 2012-06-28 15:13:40.139165500 -0500
16@@ -8,4 +8,4 @@ Description: gedit
17 Requires: gtksourceview-3.0 libpeas-1.0 libpeas-gtk-1.0
18 Version: @VERSION@
19 Cflags: -I${includedir}/gedit-@GEDIT_API_VERSION@
20-Libs: -L${libdir} @GEDIT_IMPLIB@
21+Libs: -L${libdir}/gedit @GEDIT_IMPLIB@
22--- origsrc/gedit-3.4.2/gedit/Makefile.am 2012-05-11 06:34:49.000000000 -0500
23+++ src/gedit-3.4.2/gedit/Makefile.am 2012-06-28 15:41:39.228380000 -0500
24@@ -23,7 +23,6 @@ gedit_SOURCES = \
25 gedit.c
26
27 gedit_LDADD = \
28- libgedit.la \
29 libgedit-private.la \
30 $(GEDIT_LIBS) \
31 $(GTK_MAC_LIBS) \
32@@ -47,7 +46,7 @@ libgedit_la_LIBADD += $(GEDIT_LIBS) $(GT
33
34 libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
35
36-libgedit_private_la_LDFLAGS = -avoid-version
37+libgedit_private_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
38
39 # Mac OSX convenience library and ldflags
40 if OS_OSX
4cd0219d
YS
41@@ -289,11 +288,11 @@ if HAVE_INTROSPECTION
42 -include $(INTROSPECTION_MAKEFILE)
43 INTROSPECTION_GIRS = Gedit-3.0.gir
44
45-Gedit-3.0.gir: gedit
46+Gedit-3.0.gir: gedit$(EXEEXT)
47 INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all
48 Gedit_3_0_gir_NAMESPACE = Gedit
49 Gedit_3_0_gir_VERSION = 3.0
50-Gedit_3_0_gir_PROGRAM = $(builddir)/gedit
51+Gedit_3_0_gir_PROGRAM = $(builddir)/gedit$(EXEEXT)
52 Gedit_3_0_gir_FILES = $(INST_H_FILES) $(libgedit_c_files) $(BUILT_SOURCES)
53 Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
54
55@@ -312,12 +311,9 @@ dist-hook:
56 cd $(distdir); rm -f $(BUILT_SOURCES) $(BUILT_SOURCES_PRIVATE)
57
58 install-exec-hook:
59-if PLATFORM_WIN32
60- $(mkinstalldirs) "$(DESTDIR)$(libdir)"
61- $(INSTALL_DATA) libgedit.a "$(DESTDIR)$(libdir)"
62-else
63+if !OS_WIN32
64 rm -f $(DESTDIR)$(bindir)/gnome-text-editor
65- ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
66+ ln -s gedit$(EXEEXT) $(DESTDIR)$(bindir)/gnome-text-editor
67 endif
68
69 -include $(top_srcdir)/git.mk
This page took 0.02229 seconds and 5 git commands to generate.