diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /extra/source/fltk/fltk.fltk-config.in.diff | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'extra/source/fltk/fltk.fltk-config.in.diff')
-rw-r--r-- | extra/source/fltk/fltk.fltk-config.in.diff | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/extra/source/fltk/fltk.fltk-config.in.diff b/extra/source/fltk/fltk.fltk-config.in.diff new file mode 100644 index 000000000..1125f61b8 --- /dev/null +++ b/extra/source/fltk/fltk.fltk-config.in.diff @@ -0,0 +1,98 @@ +diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in +--- fltk-1.3.3-orig/fltk-config.in 2014-12-31 15:43:07.203519633 -0500 ++++ fltk-1.3.3/fltk-config.in 2014-12-31 15:49:01.636277725 -0500 +@@ -54,21 +54,6 @@ + bindir="$selfdir/fluid" + includedir="$selfdir" + libdir="$selfdir/lib" +- +- if test -f "$libdir/libfltk_jpeg.a"; then +- CFLAGS="-I$includedir/jpeg $CFLAGS" +- CXXFLAGS="-I$includedir/jpeg $CXXFLAGS" +- fi +- +- if test -f "$libdir/libfltk_z.a"; then +- CFLAGS="-I$includedir/zlib $CFLAGS" +- CXXFLAGS="-I$includedir/zlib $CXXFLAGS" +- fi +- +- if test -f "$libdir/libfltk_png.a"; then +- CFLAGS="-I$includedir/png $CFLAGS" +- CXXFLAGS="-I$includedir/png $CXXFLAGS" +- fi + fi + + if test -d $includedir/FL/images; then +@@ -76,11 +61,6 @@ + CXXFLAGS="-I$includedir/FL/images $CXXFLAGS" + fi + +-if test -f "$libdir/libfltk_cairo.a"; then +- CFLAGS="$CAIROFLAGS $CFLAGS" +- CXXFLAGS="$CAIROFLAGS $CXXFLAGS" +-fi +- + # libraries to link with: + LIBNAME="@LIBNAME@" + DSONAME="@DSONAME@" +@@ -230,25 +210,20 @@ + fi + + # Calculate needed libraries +-LDSTATIC="$libdir/libfltk.a $LDLIBS" + LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS" + + if test x$use_forms = xyes; then + LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" +- LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" + fi + if test x$use_gl = xyes; then + LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" +- LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" + fi + if test x$use_images = xyes; then + LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" +- LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC" + fi + + if test x$use_cairo = xyes; then + LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS" +- LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC" + fi + + LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" +@@ -359,26 +334,26 @@ + fi + + if test "$echo_libs" = "yes"; then +- USELIBS="$libdir/libfltk.a" ++ USELIBS="$libdir/libfltk.so" + + if test x$use_forms = xyes; then +- USELIBS="$libdir/libfltk_forms.a $USELIBS" ++ USELIBS="$libdir/libfltk_forms.so $USELIBS" + fi + + if test x$use_gl = xyes; then +- USELIBS="$libdir/libfltk_gl.a $USELIBS" ++ USELIBS="$libdir/libfltk_gl.so $USELIBS" + fi + + if test x$use_cairo = xyes; then +- USELIBS="$libdir/libfltk_cairo.a $USELIBS" ++ USELIBS="$libdir/libfltk_cairo.so $USELIBS" + fi + + if test x$use_images = xyes; then +- USELIBS="$libdir/libfltk_images.a $USELIBS" ++ USELIBS="$libdir/libfltk_images.so $USELIBS" + + for lib in fltk_jpeg fltk_png fltk_z; do +- if test -f $libdir/lib$lib.a; then +- USELIBS="$libdir/lib$lib.a $USELIBS" ++ if test -f $libdir/lib$lib.so; then ++ USELIBS="$libdir/lib$lib.so $USELIBS" + fi + done + fi + |