diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..fab94c7ae1aae520c75a2147dacc5155b9ef5976 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.gz filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..7332661306ac4f5229411bbb4e9edd870a211b13 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/fltk diff --git a/fltk-1.3.11-fix-linkage.patch b/fltk-1.3.11-fix-linkage.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e5dd58c6ed22c0c6016ccd2f2e959010d050a0a --- /dev/null +++ b/fltk-1.3.11-fix-linkage.patch @@ -0,0 +1,22 @@ +diff --git a/fluid/Makefile b/fluid/Makefile +index 1e5a42f..ab8dff9 100644 +--- a/fluid/Makefile ++++ b/fluid/Makefile +@@ -48,7 +48,7 @@ all: $(FLUID) fluid$(EXEEXT) + fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ + $(IMGLIBNAME) + echo Linking $@... +- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS) ++ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) $(RM) -r -f fluid.app + $(OSX_ONLY) mkdir -p fluid.app/Contents/MacOS fluid.app/Contents/Resources + $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS +@@ -58,7 +58,7 @@ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ + fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ + ../src/$(IMGDSONAME) + echo Linking $@... +- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS) ++ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) + + clean: + -$(RM) *.o core.* *~ *.bck *.bak diff --git a/fltk-1.3.11-source.tar.bz2 b/fltk-1.3.11-source.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..5c0d6e1896844881ed81a53c0c00c0b87a9f6659 --- /dev/null +++ b/fltk-1.3.11-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca2e144e5f89173cd094cc273940d56230b1bf613083a0792e6406dc191cd99f +size 4776421 diff --git a/fltk-1.3.9-source.tar.gz b/fltk-1.3.9-source.tar.gz deleted file mode 100644 index 73aa0ee4d16f117591248a058941ed33a1a48241..0000000000000000000000000000000000000000 Binary files a/fltk-1.3.9-source.tar.gz and /dev/null differ diff --git a/fltk.spec b/fltk.spec index 9d6fef476ee374a5b92d8bc3c128c6c6aa196fa2..0d890653240b634339b14ec3b1b0b0d3060188e8 100644 --- a/fltk.spec +++ b/fltk.spec @@ -1,15 +1,16 @@ Name: fltk -Version: 1.3.9 -Release: 2 +Version: 1.3.11 +Release: 1 Summary: C++ user interface toolkit License: LGPL-2.0-or-later with exceptions -URL: http://www.fltk.org/ -Source0: https://www.fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz +URL: https://www.fltk.org/ +Source0: https://github.com/fltk/fltk/releases/download/release-%{version}/fltk-%{version}-source.tar.bz2 Source1: fltk-config.sh Patch0001: fltk-1.3.4-x-fluid_mimetype.patch +Patch0002: fltk-1.3.11-fix-linkage.patch 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) @@ -122,6 +123,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Mon Jun 02 2025 Funda Wang - 1.3.11-1 +- update to 1.3.11 + * Sun Sep 29 2024 Funda Wang - 1.3.9-2 - cleanup spec