Compare commits

..

No commits in common. "cb79ac77debd709921919f8aee910cf1452fe2cf" and "e664047195f9341d8af75e70168f5faa85a1da5b" have entirely different histories.

5 changed files with 75 additions and 56 deletions

BIN
fltk-1.3.4-1-source.tar.gz Normal file

Binary file not shown.

View 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

Binary file not shown.

View File

@ -1,21 +1,26 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: fltk
Version: 1.3.9
Release: 1
Version: 1.3.4
Release: 9
Summary: C++ user interface toolkit
License: LGPLv2+ with exceptions
URL: http://www.fltk.org/
Source0: https://www.fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz
Source0: http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz
Source1: fltk-config.sh
Patch0001: fltk-1.3.4-x-fluid_mimetype.patch
#PATCH-FIX-https://bugzilla.redhat.com/
Patch0001: fltk-1.3.4-fltk_config.patch
#PATCH-FIX-https://bugzilla.redhat.com/
Patch0002: fltk-1.3.4-x-fluid_mimetype.patch
Provides: %{name}-fluid = %{version}-%{release}
Obsoletes: %{name}-fluid < %{version}-%{release}
BuildRequires: gcc-c++ desktop-file-utils libjpeg-devel pkgconfig(libpng) pkgconfig(gl) pkgconfig(glu) pkgconfig(ice)
BuildRequires: pkgconfig(sm) pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
BuildRequires: pkgconfig(xcursor) pkgconfig(xproto) xorg-x11-utils zlib-devel autoconf
BuildRequires: pkgconfig(xcursor) pkgconfig(xproto) xorg-x11-utils zlib-devel autoconf gdb
%description
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.It provides modern GUI functionality without
@ -25,6 +30,8 @@ the bloat, and supports 3D graphics via OpenGL and its built-in GLUT emulation.
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} libstdc++-devel pkgconfig(gl) pkgconfig(glu)
Requires: pkgconfig(ice) pkgconfig(sm) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
Provides: %{name}-static = %{version}-%{release}
Obsoletes: %{name}-static < %{version}-%{release}
%description devel
@ -33,25 +40,10 @@ Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides modern GUI functionality
graphics via OpenGL(r) and its built-in GLUT emulation. It was originally developed by Mr. Bill Spitzak and is
currently maintained by a small group of developers across the world with a central repository
%package static
Summary: Static libraries for %{name}
Requires: %{name}-devel = %{version}-%{release}
%description static
%{summary}.
%package fluid
Summary: Fast Light User Interface Designer
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-devel
%description fluid
%{summary}, an interactive GUI designer for %{name}.
%package_help
%prep
%autosetup -n %{name}-%{version} -p1
%autosetup -n %{name}-%{version}-1 -p1
sed -i.silent '\,^.SILENT:,d' makeinclude.in
autoconf
@ -102,7 +94,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
%files
%defattr(-,root,root)
%license COPYING
%{_bindir}/fluid
%{_libdir}/*.so.*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/fluid.desktop
%files devel
%defattr(-,root,root)
@ -112,45 +107,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
%{_libdir}/*.so
%{_includedir}/FL/
%{_includedir}/Fl
%exclude %{_libdir}/libfltk.a
%exclude %{_libdir}/libfltk_forms.a
%exclude %{_libdir}/libfltk_gl.a
%exclude %{_libdir}/libfltk_images.a
%files help
%defattr(-,root,root)
%doc README* ANNOUNCEMENT CHANGES* CREDITS __docs/*
%{_mandir}/man1/fltk-config.1*
%{_mandir}/man3/fltk.3*
%files static
%{_libdir}/libfltk.a
%{_libdir}/libfltk_forms.a
%{_libdir}/libfltk_gl.a
%{_libdir}/libfltk_images.a
%files fluid
%{_bindir}/fluid
%{_mandir}/man1/fluid.1*
%{_datadir}/applications/fluid.desktop
%{_datadir}/icons/hicolor/*/*/*
%changelog
* Fri Dec 29 2023 Paul Thomas <paulthomas100199@gmail.com> - 1.3.9-1
- update to version 1.3.9
* Fri Dec 24 2021 liuyumeng <liuyumeng5@huawei.com> - 1.3.8-1
- update to fltk-1.3.8-1
* Thu Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 1.3.5-2
- delete gdb in buildrequires
* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.3.5-1
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:update version to 1.3.5
* Thu Oct 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.3.4-9
- Type:bugfix
- Id:NA

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: fltk/fltk
tag_prefix: ^release-
seperator: .