- updated to 1.3.5

[packages/fltk.git] / fltk-as-needed.patch

diff --git a/fltk-as-needed.patch b/fltk-as-needed.patch
index 3b18eb6b500b3c90f3476b57c037adeddf9219f5..91e73f853323b42f84fa7b7a89590fd4685ba6e5 100644 (file)
--- a/fltk-as-needed.patch
+++ b/fltk-as-needed.patch
@@ -1,14 +1,14 @@
---- fltk-1.3.3/configure.in.orig       2014-11-18 22:26:21.621181598 +0100
-+++ fltk-1.3.3/configure.in    2014-11-19 16:58:39.211714220 +0100
-@@ -250,7 +250,7 @@
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
-             CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
+--- fltk-1.3.5/configure.ac.orig       2019-04-09 19:15:01.127591888 +0200
++++ fltk-1.3.5/configure.ac    2019-04-09 19:18:55.769654056 +0200
+@@ -274,7 +274,7 @@
+           GLDSONAME="libfltk_gl.so.$FL_DSO_VERSION"
+           IMGDSONAME="libfltk_images.so.$FL_DSO_VERSION"
+           CAIRODSONAME="libfltk_cairo.so.$FL_DSO_VERSION"
+-          DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
++          DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
  
-             # See if the compiler supports -fvisibility...
-             AC_CACHE_CHECK([if the compiler supports -fvisibility],
+           # See if the compiler supports -fvisibility...
+           AC_CACHE_CHECK([if the compiler supports -fvisibility],
 --- fltk-1.3.3/src/Makefile.orig       2014-10-30 17:05:22.000000000 +0100
 +++ fltk-1.3.3/src/Makefile    2014-11-18 22:26:21.624514932 +0100
 @@ -258,7 +258,7 @@
@@ -47,14 +47,14 @@
        echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
        $(RM) $@
        $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
---- fltk-1.3.3/cairo/Makefile.orig     2014-10-05 02:03:27.000000000 +0200
-+++ fltk-1.3.3/cairo/Makefile  2014-11-19 21:29:49.911031382 +0100
-@@ -39,7 +39,7 @@
+--- fltk-1.3.5/cairo/Makefile.orig     2019-04-09 19:15:01.130925203 +0200
++++ fltk-1.3.5/cairo/Makefile  2019-04-09 19:19:17.109538448 +0200
+@@ -42,7 +42,7 @@
  
- libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
+ libfltk_cairo.so.$(FL_DSO_VERSION): $(CAIROOBJECTS) ../src/libfltk.so.$(FL_DSO_VERSION)
        echo $(DSOCOMMAND) $@ ...
--      $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
-+      $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk -lcairo
+-      $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
++      $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) -lcairo
        $(RM) libfltk_cairo.so
        $(LN) $(CAIRODSONAME) libfltk_cairo.so