PageRenderTime 53ms CodeModel.GetById 14ms RepoModel.GetById 0ms app.codeStats 0ms

/trunk/octave-forge/admin/Windows/mingw32/fltk/fltk-1.1.9-4.patch

#
Patch | 273 lines | 249 code | 24 blank | 0 comment | 0 complexity | 9e5a513d7178cf44ac7e76a74ac5263b MD5 | raw file
Possible License(s): GPL-2.0, BSD-3-Clause, LGPL-2.1, GPL-3.0, LGPL-3.0
  1. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/Makefile fltk-1.1.9/Makefile
  2. --- fltk-1.1.9-orig/Makefile 2009-10-05 19:30:01 +0200
  3. +++ fltk-1.1.9/Makefile 2009-10-05 19:30:14 +0200
  4. @@ -27,7 +27,7 @@
  5. include makeinclude
  6. -DIRS = $(IMAGEDIRS) src fluid test documentation
  7. +DIRS = $(IMAGEDIRS) src
  8. all: makeinclude fltk-config
  9. for dir in $(DIRS); do\
  10. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/configure fltk-1.1.9/configure
  11. --- fltk-1.1.9-orig/configure 2009-10-05 19:30:00 +0200
  12. +++ fltk-1.1.9/configure 2009-10-05 19:30:14 +0200
  13. @@ -1961,7 +1961,7 @@
  14. #-----------------------------------------------------------
  15. LDFLAGS="$LDFLAGS -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
  16. DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared \
  17. - -Wl,--whole-archive -Wl,--export-all-symbols \
  18. + -Wl,--whole-archive \
  19. -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-import \
  20. -Wl,--enable-auto-image-base -o \$@"
  21. ;;
  22. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/fltk-config.in fltk-1.1.9/fltk-config.in
  23. --- fltk-1.1.9-orig/fltk-config.in 2009-10-05 19:30:00 +0200
  24. +++ fltk-1.1.9/fltk-config.in 2009-10-05 19:54:47 +0200
  25. @@ -211,13 +211,13 @@
  26. done
  27. if test "$includedir" != /usr/include; then
  28. - includes=-I$includedir
  29. + includes=
  30. else
  31. includes=
  32. fi
  33. if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
  34. - libs=-L$libdir
  35. + libs=
  36. else
  37. libs=
  38. fi
  39. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/fluid/Makefile fltk-1.1.9/fluid/Makefile
  40. --- fltk-1.1.9-orig/fluid/Makefile 2009-10-05 19:30:00 +0200
  41. +++ fltk-1.1.9/fluid/Makefile 2009-10-05 19:30:14 +0200
  42. @@ -57,14 +57,14 @@
  43. fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
  44. ../lib/$(IMGLIBNAME)
  45. echo Linking $@...
  46. - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
  47. + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(CXXLIBS) $(LDLIBS)
  48. $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
  49. $(POSTBUILD) $@ ../FL/mac.r
  50. fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
  51. ../src/$(IMGDSONAME)
  52. echo Linking $@...
  53. - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
  54. + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(CXXLIBS) $(LDLIBS)
  55. $(POSTBUILD) $@ ../FL/mac.r
  56. clean:
  57. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/makeinclude.in fltk-1.1.9/makeinclude.in
  58. --- fltk-1.1.9-orig/makeinclude.in 2009-10-05 19:30:01 +0200
  59. +++ fltk-1.1.9/makeinclude.in 2009-10-05 19:41:28 +0200
  60. @@ -55,8 +55,8 @@
  61. # flags for C++ compiler:
  62. ARCHFLAGS = @ARCHFLAGS@
  63. OPTIM = @OPTIM@
  64. -CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@
  65. -CXXFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CXXFLAGS@
  66. +CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@ -DFL_LIBRARY
  67. +CXXFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CXXFLAGS@ -DFL_LIBRARY
  68. # program to make the archive:
  69. LIBNAME = @LIBNAME@
  70. @@ -70,13 +70,13 @@
  71. FLDSONAME = @FLDSONAME@
  72. GLDSONAME = @GLDSONAME@
  73. IMGDSONAME = @IMGDSONAME@
  74. -DSOCOMMAND = @DSOCOMMAND@
  75. +DSOCOMMAND = @DSOCOMMAND@ $(LDFLAGS)
  76. # libraries to link with:
  77. AUDIOLIBS = @AUDIOLIBS@
  78. DSOFLAGS = -L. @DSOFLAGS@
  79. LDFLAGS = $(OPTIM) @LDFLAGS@
  80. -LDLIBS = @LIBS@
  81. +LDLIBS = $(CXXLIBS) @LIBS@
  82. GLDLIBS = @GLLIB@ @LIBS@
  83. LINKFLTK = @LINKFLTK@
  84. LINKFLTKGL = @LINKFLTKGL@
  85. @@ -127,7 +127,7 @@
  86. UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
  87. # Be quiet when building...
  88. -.SILENT:
  89. +#.SILENT:
  90. # Build commands and filename extensions...
  91. .SUFFIXES: .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
  92. @@ -139,11 +139,11 @@
  93. .c.o:
  94. echo Compiling $<...
  95. - $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
  96. + $(CC) -I.. -I$(SRCDIR) $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
  97. .cxx.o:
  98. echo Compiling $<...
  99. - $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
  100. + $(CXX) -I.. -I$(SRCDIR) $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
  101. .man.0 .man.1 .man.3 .man.6:
  102. echo Formatting $<...
  103. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/src/Makefile fltk-1.1.9/src/Makefile
  104. --- fltk-1.1.9-orig/src/Makefile 2009-10-05 19:30:01 +0200
  105. +++ fltk-1.1.9/src/Makefile 2009-10-05 19:30:14 +0200
  106. @@ -25,6 +25,8 @@
  107. # http://www.fltk.org/str.php
  108. #
  109. +SRCDIR=@SRCDIR@
  110. +
  111. CPPFILES = \
  112. Fl.cxx \
  113. Fl_Adjuster.cxx \
  114. @@ -190,6 +192,12 @@
  115. ################################################################
  116. +vpath %.cxx $(SRCDIR)/src
  117. +vpath %.c $(SRCDIR)/src
  118. +vpath %.h $(SRCDIR)/src
  119. +vpath %.H $(SRCDIR)/src
  120. +vpath %.xpm $(SRCDIR)/src
  121. +
  122. include ../makeinclude
  123. OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
  124. @@ -436,53 +444,53 @@
  125. fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \
  126. fl_set_fonts_xft.cxx fl_set_fonts_win32.cxx
  127. -fl_arci.o: ../FL/mac.H ../FL/win32.H
  128. -Fl_arg.o: ../FL/mac.H ../FL/win32.H
  129. -fl_ask.o: ../FL/mac.H ../FL/win32.H
  130. -Fl_Bitmap.o: ../FL/mac.H ../FL/win32.H
  131. -fl_color.o: ../FL/mac.H ../FL/win32.H
  132. -fl_cursor.o: ../FL/mac.H ../FL/win32.H
  133. -fl_dnd.o: ../FL/mac.H ../FL/win32.H
  134. -Fl.o: ../FL/mac.H ../FL/win32.H Fl_win32.cxx Fl_mac.cxx
  135. -Fl_Double_Window.o: ../FL/mac.H ../FL/win32.H
  136. -fl_draw_image.o: ../FL/mac.H ../FL/win32.H
  137. -fl_draw_image_mac.o: ../FL/mac.H ../FL/win32.H
  138. -fl_draw_image_win32.o: ../FL/mac.H ../FL/win32.H
  139. -fl_draw_pixmap.o: ../FL/mac.H ../FL/win32.H
  140. -fl_encoding_latin1.o: ../FL/mac.H ../FL/win32.H
  141. -fl_encoding_mac_roman.o: ../FL/mac.H ../FL/win32.H
  142. -Fl_File_Chooser2.o: ../FL/mac.H ../FL/win32.H
  143. -fl_font.o: ../FL/mac.H ../FL/win32.H
  144. -Fl_get_key.o: ../FL/mac.H ../FL/win32.H
  145. -Fl_get_system_colors.o: ../FL/mac.H ../FL/win32.H
  146. -Fl_Gl_Choice.o: ../FL/mac.H ../FL/win32.H
  147. -Fl_Gl_Overlay.o: ../FL/mac.H ../FL/win32.H
  148. -Fl_Gl_Window.o: ../FL/mac.H ../FL/win32.H
  149. -Fl_grab.o: ../FL/mac.H ../FL/win32.H
  150. -Fl_Image.o: ../FL/mac.H ../FL/win32.H
  151. -fl_line_style.o: ../FL/mac.H ../FL/win32.H
  152. -Fl_mac.o: ../FL/mac.H ../FL/win32.H
  153. -Fl_Menu_Window.o: ../FL/mac.H ../FL/win32.H
  154. -fl_overlay.o: ../FL/mac.H ../FL/win32.H
  155. -fl_overlay_visual.o: ../FL/mac.H ../FL/win32.H
  156. -Fl_Overlay_Window.o: ../FL/mac.H ../FL/win32.H
  157. -Fl_own_colormap.o: ../FL/mac.H ../FL/win32.H
  158. -Fl_Pixmap.o: ../FL/mac.H ../FL/win32.H
  159. -fl_read_image.o: ../FL/mac.H ../FL/win32.H
  160. -fl_read_image_mac.o: ../FL/mac.H ../FL/win32.H
  161. -fl_read_image_win32.o: ../FL/mac.H ../FL/win32.H
  162. -fl_rect.o: ../FL/mac.H ../FL/win32.H
  163. -fl_scroll_area.o: ../FL/mac.H ../FL/win32.H
  164. -fl_set_font.o: ../FL/mac.H ../FL/win32.H
  165. -fl_set_fonts.o: ../FL/mac.H ../FL/win32.H
  166. -fl_shortcut.o: ../FL/mac.H ../FL/win32.H
  167. -fl_vertex.o: ../FL/mac.H ../FL/win32.H
  168. -Fl_visual.o: ../FL/mac.H ../FL/win32.H
  169. -Fl_Window_fullscreen.o: ../FL/mac.H ../FL/win32.H
  170. -Fl_Window_iconize.o: ../FL/mac.H ../FL/win32.H
  171. -Fl_x.o: ../FL/mac.H ../FL/win32.H
  172. -gl_draw.o: ../FL/mac.H ../FL/win32.H
  173. -gl_start.o: ../FL/mac.H ../FL/win32.H
  174. +fl_arci.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  175. +Fl_arg.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  176. +fl_ask.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  177. +Fl_Bitmap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  178. +fl_color.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  179. +fl_cursor.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  180. +fl_dnd.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  181. +Fl.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H Fl_win32.cxx Fl_mac.cxx
  182. +Fl_Double_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  183. +fl_draw_image.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  184. +fl_draw_image_mac.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  185. +fl_draw_image_win32.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  186. +fl_draw_pixmap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  187. +fl_encoding_latin1.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  188. +fl_encoding_mac_roman.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  189. +Fl_File_Chooser2.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  190. +fl_font.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  191. +Fl_get_key.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  192. +Fl_get_system_colors.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  193. +Fl_Gl_Choice.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  194. +Fl_Gl_Overlay.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  195. +Fl_Gl_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  196. +Fl_grab.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  197. +Fl_Image.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  198. +fl_line_style.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  199. +Fl_mac.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  200. +Fl_Menu_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  201. +fl_overlay.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  202. +fl_overlay_visual.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  203. +Fl_Overlay_Window.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  204. +Fl_own_colormap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  205. +Fl_Pixmap.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  206. +fl_read_image.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  207. +fl_read_image_mac.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  208. +fl_read_image_win32.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  209. +fl_rect.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  210. +fl_scroll_area.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  211. +fl_set_font.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  212. +fl_set_fonts.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  213. +fl_shortcut.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  214. +fl_vertex.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  215. +Fl_visual.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  216. +Fl_Window_fullscreen.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  217. +Fl_Window_iconize.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  218. +Fl_x.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  219. +gl_draw.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  220. +gl_start.o: $(SRCDIR)/FL/mac.H $(SRCDIR)/FL/win32.H
  221. ################################################################
  222. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/src/fl_rect.cxx fltk-1.1.9/src/fl_rect.cxx
  223. --- fltk-1.1.9-orig/src/fl_rect.cxx 2009-10-05 19:30:01 +0200
  224. +++ fltk-1.1.9/src/fl_rect.cxx 2009-10-05 19:30:14 +0200
  225. @@ -423,7 +423,7 @@
  226. #define STACK_MAX (STACK_SIZE - 1)
  227. static Fl_Region rstack[STACK_SIZE];
  228. static int rstackptr=0;
  229. -int fl_clip_state_number=0; // used by gl_begin.cxx to update GL clip
  230. +FL_EXPORT int fl_clip_state_number=0; // used by gl_begin.cxx to update GL clip
  231. #if !defined(WIN32) && !defined(__APPLE__)
  232. // Missing X call: (is this the fastest way to init a 1-rectangle region?)
  233. diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg -x '*.orig' fltk-1.1.9-orig/src/flstring.c fltk-1.1.9/src/flstring.c
  234. --- fltk-1.1.9-orig/src/flstring.c 2009-10-05 19:30:01 +0200
  235. +++ fltk-1.1.9/src/flstring.c 2009-10-05 19:30:14 +0200
  236. @@ -32,6 +32,7 @@
  237. * 'fl_strlcat()' - Safely concatenate two strings.
  238. */
  239. +FL_EXPORT
  240. size_t /* O - Length of string */
  241. fl_strlcat(char *dst, /* O - Destination string */
  242. const char *src, /* I - Source string */
  243. @@ -72,6 +73,7 @@
  244. * 'fl_strlcpy()' - Safely copy two strings.
  245. */
  246. +FL_EXPORT
  247. size_t /* O - Length of string */
  248. fl_strlcpy(char *dst, /* O - Destination string */
  249. const char *src, /* I - Source string */