restore fltk_config.patch lost in last (cmake) merge
This commit is contained in:
parent
76f53b61af
commit
6b800dce9a
58
fltk-1.3.4-fltk_config.patch
Normal file
58
fltk-1.3.4-fltk_config.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
|
||||||
|
--- fltk-1.3.4-1/fltk-config.in.fltk_config 2016-01-30 20:49:56.000000000 -0600
|
||||||
|
+++ fltk-1.3.4-1/fltk-config.in 2017-03-04 12:29:28.910316677 -0600
|
||||||
|
@@ -44,8 +44,8 @@ CXX="@CXX@"
|
||||||
|
|
||||||
|
# flags for C++ compiler:
|
||||||
|
ARCHFLAGS="@ARCHFLAGS@"
|
||||||
|
-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
|
||||||
|
-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
|
||||||
|
+CFLAGS=""
|
||||||
|
+CXXFLAGS=""
|
||||||
|
LDFLAGS="@LDFLAGS@"
|
||||||
|
LDLIBS="@LIBS@"
|
||||||
|
OPTIM="@OPTIM@"
|
||||||
|
@@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then
|
||||||
|
includes="-I$BINARY_DIR $includes"
|
||||||
|
fi
|
||||||
|
|
||||||
|
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
||||||
|
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
||||||
|
libs=-L$libdir
|
||||||
|
else
|
||||||
|
libs=
|
||||||
|
@@ -236,28 +236,28 @@ fi
|
||||||
|
|
||||||
|
# Calculate needed libraries
|
||||||
|
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
||||||
|
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
||||||
|
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
||||||
|
|
||||||
|
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"
|
||||||
|
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
|
||||||
|
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
||||||
|
fi
|
||||||
|
if test x$use_images = xyes; then
|
||||||
|
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
||||||
|
+ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS"
|
||||||
|
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$use_cairo = xyes; then
|
||||||
|
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
||||||
|
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
|
||||||
|
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
||||||
|
fi
|
||||||
|
|
||||||
|
-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
||||||
|
-LDSTATIC="$LDFLAGS $LDSTATIC"
|
||||||
|
+LDLIBS="$libs $LDLIBS"
|
||||||
|
+#LDSTATIC="$LDFLAGS $LDSTATIC"
|
||||||
|
|
||||||
|
# Answer to user requests
|
||||||
|
if test -n "$echo_help"; then
|
@ -6,7 +6,7 @@
|
|||||||
Summary: C++ user interface toolkit
|
Summary: C++ user interface toolkit
|
||||||
Name: fltk
|
Name: fltk
|
||||||
Version: 1.3.5
|
Version: 1.3.5
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
|
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
|
||||||
License: LGPLv2+ with exceptions
|
License: LGPLv2+ with exceptions
|
||||||
@ -21,7 +21,8 @@ Source0: http://fltk.org/pub/%{name}/%{version}/%{name}-%{version}-source
|
|||||||
Source1: fltk-config.sh
|
Source1: fltk-config.sh
|
||||||
|
|
||||||
Patch0: fltk-cmake.patch
|
Patch0: fltk-cmake.patch
|
||||||
|
# add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930)
|
||||||
|
Patch1: fltk-1.3.4-fltk_config.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -150,6 +151,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-5
|
||||||
|
- restore fltk_config.patch lost in last (cmake) merge
|
||||||
|
|
||||||
* Mon May 11 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-4
|
* Mon May 11 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-4
|
||||||
- merge cmake PR
|
- merge cmake PR
|
||||||
- spec cosmetics
|
- spec cosmetics
|
||||||
|
Loading…
Reference in New Issue
Block a user