gedit 3.14.2
[git/cygwin-packages/gedit.git] / 3.14.2-cygwin.patch
1 --- origsrc/gedit-3.14.2/configure.ac 2015-01-08 21:30:41.515860300 -0600
2 +++ src/gedit-3.14.2/configure.ac 2015-01-08 20:18:26.413872200 -0600
3 @@ -70,18 +70,7 @@ AC_SUBST(ACTIVE_PLUGINS)
4 dnl check for win32 platform
5 AC_MSG_CHECKING([for Win32 platform])
6 case "$host" in
7 - *-*-mingw*|*-*-cygwin*)
8 - 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'
9 - # If the export-symbols file already is a .def file (1st line
10 - # is EXPORTS), use it as is; otherwise, prepend...
11 - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
12 - cp $export_symbols $output_objdir/$soname.def;
13 - else
14 - echo EXPORTS > $output_objdir/$soname.def;
15 - cat $export_symbols >> $output_objdir/$soname.def;
16 - fi~
17 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base;
18 - $DLLTOOL --dllname $soname --def $output_objdir/$soname.def --output-delaylib $lib'
19 + *-*-cygwin*|*-*-mingw*)
20 platform_win32=yes
21 ;;
22 *)
23 @@ -94,6 +83,17 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$pl
24 AC_MSG_CHECKING([for native Win32])
25 case "$host" in
26 *-*-mingw*)
27 + 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'
28 + # If the export-symbols file already is a .def file (1st line
29 + # is EXPORTS), use it as is; otherwise, prepend...
30 + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
31 + cp $export_symbols $output_objdir/$soname.def;
32 + else
33 + echo EXPORTS > $output_objdir/$soname.def;
34 + cat $export_symbols >> $output_objdir/$soname.def;
35 + fi~
36 + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base;
37 + $DLLTOOL --dllname $soname --def $output_objdir/$soname.def --output-delaylib $lib'
38 os_win32=yes
39 AC_CHECK_TOOL(WINDRES, windres)
40 ACTIVE_PLUGINS="${ACTIVE_PLUGINS}, 'checkupdate'"
41 @@ -339,7 +339,7 @@ else
42 X11_LIBS=
43 fi
44
45 -if test "$platform_win32" = "no"; then
46 +if test "$os_win32" = "no"; then
47 PKG_CHECK_MODULES(UNIX, [
48 gio-unix-2.0 >= 2.25.5
49 ])
50 --- origsrc/gedit-3.14.2/gedit/Makefile.am 2014-11-27 14:42:17.000000000 -0600
51 +++ src/gedit-3.14.2/gedit/Makefile.am 2015-01-08 21:29:48.640145900 -0600
52 @@ -322,13 +322,13 @@ CLEANFILES += $(VAPIGEN_VAPIS) gedit/ged
53 endif # ENABLE_VAPIGEN
54
55 install-exec-hook:
56 -if PLATFORM_WIN32
57 +if OS_WIN32
58 $(mkinstalldirs) "$(DESTDIR)$(libdir)/gedit"
59 mv -t $(DESTDIR)$(libdir)/gedit $(DESTDIR)$(libdir)/bin/*
60 rm -rf $(DESTDIR)$(libdir)/bin
61 else
62 rm -f $(DESTDIR)$(bindir)/gnome-text-editor
63 - ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
64 + ln -s gedit$(EXEEXT) $(DESTDIR)$(bindir)/gnome-text-editor
65 endif
66
67 BUILT_SOURCES += $(gedit_built_sources) gedit/gedit-resources.c
68 --- origsrc/gedit-3.14.2/plugins/externaltools/data/Makefile.am 2014-11-27 14:42:17.000000000 -0600
69 +++ src/gedit-3.14.2/plugins/externaltools/data/Makefile.am 2015-01-08 20:18:26.489381800 -0600
70 @@ -19,7 +19,7 @@ externaltools_install_tools_in_files = $
71 if PLATFORM_OSX
72 externaltools_install_tools_in_files += $(externaltools_tools_in_osx)
73 else
74 -if PLATFORM_WIN32
75 +if OS_WIN32
76 externaltools_install_tools_in_files += $(externaltools_tools_in_win32)
77 else
78 externaltools_install_tools_in_files += $(externaltools_tools_in_linux)
This page took 0.035907 seconds and 5 git commands to generate.