From 52b8ca498f223fa5cc72c7d398adba5dd63fa656 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:49:12 +0000 Subject: [PATCH 01/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 1370483..be08e82 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 30%{?dist} +Release: 31%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -250,6 +250,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.999-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 24 2018 Zdenek Dohnal - 0.999-30 - correcting license From c77adf1cbb4c3578911f00cddc0b98509aa19ded Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Apr 2019 15:40:34 +0200 Subject: [PATCH 02/40] rebuilt for gimp-2.10.10 --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index be08e82..071c4c9 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 31%{?dist} +Release: 32%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -250,6 +250,9 @@ fi %{_datadir}/sane/xsane %changelog +* Mon Apr 08 2019 Zdenek Dohnal - 0.999-32 +- rebuilt for gimp-2.10.10 + * Sun Feb 03 2019 Fedora Release Engineering - 0.999-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2fdb26c343542ad900eb67eec30fb3ac06f4e3af Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 9 Apr 2019 09:14:10 +0200 Subject: [PATCH 03/40] rebuilt again (because bodhi cannot remove builds from even unpushed updates) --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 071c4c9..a2a13a6 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 32%{?dist} +Release: 33%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -250,6 +250,9 @@ fi %{_datadir}/sane/xsane %changelog +* Tue Apr 09 2019 Zdenek Dohnal - 0.999-33 +- rebuilt again (because bodhi cannot remove builds from even unpushed updates) + * Mon Apr 08 2019 Zdenek Dohnal - 0.999-32 - rebuilt for gimp-2.10.10 From e5df09bec059a008a39ea19d53be6f9769569e58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:38:18 +0000 Subject: [PATCH 04/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index a2a13a6..5367c3e 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 33%{?dist} +Release: 34%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -250,6 +250,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.999-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Apr 09 2019 Zdenek Dohnal - 0.999-33 - rebuilt again (because bodhi cannot remove builds from even unpushed updates) From 24334bc24d615ceba5b480888ad194c56465cd00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:55:04 +0000 Subject: [PATCH 05/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 5367c3e..3f22928 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 34%{?dist} +Release: 35%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -250,6 +250,9 @@ fi %{_datadir}/sane/xsane %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.999-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.999-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6c26b55042a767b46f7cdd51aa4ed791f9b3fd96 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 14:59:35 +0000 Subject: [PATCH 06/40] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- xsane.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xsane.spec b/xsane.spec index 3f22928..bed7379 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 35%{?dist} +Release: 36%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -148,7 +148,7 @@ export CFLAGS pushd build-with-gimp %configure --enable-gimp -make %{?_smp_mflags} +%make_build popd pushd build-without-gimp @@ -161,7 +161,7 @@ cp %{SOURCE1} src/ %install pushd build-without-gimp -make DESTDIR=%{buildroot} install +%make_install popd # install GIMP plugin @@ -250,6 +250,10 @@ fi %{_datadir}/sane/xsane %changelog +* Tue Jul 14 2020 Tom Stellard - 0.999-36 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Fri Jan 31 2020 Fedora Release Engineering - 0.999-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f3c5a6a5cf1b72ff96fb040e3df745387859488e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:05:03 +0000 Subject: [PATCH 07/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index bed7379..17aef86 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 36%{?dist} +Release: 37%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -250,6 +250,9 @@ fi %{_datadir}/sane/xsane %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.999-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Tom Stellard - 0.999-36 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 0ca5b5d0350f83bf84b41927b00dceda65fff737 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 5 Nov 2020 14:12:57 +0100 Subject: [PATCH 08/40] make is no longer in buildroot by default --- xsane.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 17aef86..22bcafb 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 37%{?dist} +Release: 38%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -74,6 +74,8 @@ URL: http://www.xsane.org/ # gcc is no longer in buildroot by default BuildRequires: gcc +# uses make +BuildRequires: make BuildRequires: gimp-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel @@ -250,6 +252,9 @@ fi %{_datadir}/sane/xsane %changelog +* Thu Nov 05 2020 Zdenek Dohnal - 0.999-38 +- make is no longer in buildroot by default + * Wed Jul 29 2020 Fedora Release Engineering - 0.999-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6b253127dc2c57ea9409c4d1c4b1a449828b5b46 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 Jan 2021 08:18:06 +0100 Subject: [PATCH 09/40] remove gimp plugin for eln, put an explicit build requirement for GTK2 gtk2-devel was an implicit requirement via gimp till now --- xsane.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 22bcafb..a726077 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 38%{?dist} +Release: 39%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -76,7 +76,10 @@ URL: http://www.xsane.org/ BuildRequires: gcc # uses make BuildRequires: make +%if 0%{?rhel} <= 8 || 0%{?fedora} BuildRequires: gimp-devel +%endif +BuildRequires: gtk2-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -93,6 +96,7 @@ library, which provides access to scanners, digital cameras, and other capture devices. XSane is written in GTK+ and provides control for performing the scan and then manipulating the captured image. +%if 0%{?rhel} <= 8 || 0%{?fedora} %package gimp Summary: GIMP plug-in providing the SANE scanner interface Requires: gimp >= 2:2.2.12-4 @@ -102,6 +106,7 @@ Requires: xsane-common This package provides the regular XSane frontend for the SANE scanner interface, but it works as a GIMP plug-in. You must have GIMP installed to use this package. +%endif %package common Summary: Common files for xsane packages @@ -148,10 +153,12 @@ mkdir build-without-gimp CFLAGS='%optflags -fno-strict-aliasing -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"' export CFLAGS +%if 0%{?rhel} <= 8 || 0%{?fedora} pushd build-with-gimp %configure --enable-gimp %make_build popd +%endif pushd build-without-gimp %configure --disable-gimp @@ -166,9 +173,11 @@ pushd build-without-gimp %make_install popd +%if 0%{?rhel} <= 8 || 0%{?fedora} # install GIMP plugin install -m 0755 -d %{buildroot}%{gimpplugindir} install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir} +%endif # install customized desktop file rm %{buildroot}%{_datadir}/applications/xsane.desktop @@ -221,11 +230,13 @@ EOF %find_lang %{name} XSANE.lang +%if 0%{?rhel} <= 8 || 0%{?fedora} %pre gimp # remove obsolete gimp-plugin-mgr managed symlink if [ -L "%{gimpplugindir}/xsane" ]; then rm -f "%{gimpplugindir}/xsane" fi +%endif %files -f XSANE.lang %doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO @@ -242,8 +253,10 @@ fi %{_datadir}/pixmaps/xsane.xpm %{iconrootdir}/*/apps/%{name}.png +%if 0%{?rhel} <= 8 || 0%{?fedora} %files gimp %{gimpplugindir}/xsane +%endif %files common %doc xsane.AUTHOR @@ -252,6 +265,9 @@ fi %{_datadir}/sane/xsane %changelog +* Thu Jan 14 2021 Zdenek Dohnal - 0.999-39 +- remove gimp plugin for eln, put explicit requirement for GTK2 + * Thu Nov 05 2020 Zdenek Dohnal - 0.999-38 - make is no longer in buildroot by default From 00688d523835e4f992c2ef2e0ad4f999207a1614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:23:30 +0000 Subject: [PATCH 10/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index a726077..d6f3c35 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 39%{?dist} +Release: 40%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -265,6 +265,9 @@ fi %{_datadir}/sane/xsane %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.999-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 14 2021 Zdenek Dohnal - 0.999-39 - remove gimp plugin for eln, put explicit requirement for GTK2 From c888778f187f882fc2aca9c889469260fc80802f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:57:08 +0000 Subject: [PATCH 11/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index d6f3c35..55d698a 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 40%{?dist} +Release: 41%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -265,6 +265,9 @@ fi %{_datadir}/sane/xsane %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.999-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.999-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9bbd583227946be6712303400cc7542825c40873 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:30:38 +0000 Subject: [PATCH 12/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 55d698a..7b03bad 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 41%{?dist} +Release: 42%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -265,6 +265,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.999-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.999-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 945c54ab0a965eb73e3ba313228be64937bd1ca9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:31:56 +0000 Subject: [PATCH 13/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 7b03bad..e9add92 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 42%{?dist} +Release: 43%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -265,6 +265,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.999-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.999-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5112ed2a1f3d7dbcc1b7b9486f6225d1254c4ae8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 17 Jan 2023 17:18:35 +0100 Subject: [PATCH 14/40] Port configure script to C99 Related to: --- xsane-configure-c99.patch | 36 ++++++++++++++++++++++++++++++++++++ xsane.spec | 9 ++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 xsane-configure-c99.patch diff --git a/xsane-configure-c99.patch b/xsane-configure-c99.patch new file mode 100644 index 0000000..75e6cff --- /dev/null +++ b/xsane-configure-c99.patch @@ -0,0 +1,36 @@ +Avoid implicit function declarations, for improved compatibility with +future compilers. + +Fixed upstream via: + +commit 562008027f343127d70bae44457cf8f06c666428 +Author: Ralph Little +Date: Thu Aug 29 21:49:08 2019 -0700 + + m4/sane.m4: remove m4/sane.m4 and update aclocal.m4 to suit. + + We are now using pkg-config and it is pretty much a one-liner. + No point in a whole file in m4 for just this feature. + +diff -up xsane-0.999/configure.c99 xsane-0.999/configure +--- xsane-0.999/configure.c99 2023-01-17 17:11:53.179785420 +0100 ++++ xsane-0.999/configure 2023-01-17 17:11:58.234735290 +0100 +@@ -6672,6 +6672,7 @@ else + + #include + #include ++#include + + int + main () +diff -up xsane-0.999/m4/sane.m4.c99 xsane-0.999/m4/sane.m4 +--- xsane-0.999/m4/sane.m4.c99 2023-01-17 17:11:08.940224113 +0100 ++++ xsane-0.999/m4/sane.m4 2023-01-17 17:11:11.565198082 +0100 +@@ -44,6 +44,7 @@ dnl + AC_TRY_RUN([ + #include + #include ++#include + + int + main () diff --git a/xsane.spec b/xsane.spec index e9add92..f8706a4 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 43%{?dist} +Release: 44%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -69,6 +69,9 @@ Patch15: xsane-0.999-signal-handling.patch # autoconf-generated files Patch100: xsane-0.999-7-autoconf.patch.bz2 + +Patch101: xsane-configure-c99.patch + License: GPLv2+ and LGPLv2+ URL: http://www.xsane.org/ @@ -142,6 +145,7 @@ done %patch15 -p1 -b .signal-handling %patch100 -p1 -b .autoconf +%patch101 -p1 -b .c99 # in-root config.h breaks off-root building rm include/config.h @@ -265,6 +269,9 @@ fi %{_datadir}/sane/xsane %changelog +* Tue Jan 17 2023 Florian Weimer - 0.999-44 +- Port configure script to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 0.999-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 750f845c2cbd64dde8ea5ad5547660c857f60d9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:52:00 +0000 Subject: [PATCH 15/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index f8706a4..1bfe640 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 44%{?dist} +Release: 45%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -269,6 +269,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.999-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Florian Weimer - 0.999-44 - Port configure script to C99 From 01bf1fcb809ebf60da683e19201aedcdacb71073 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 28 Jun 2023 16:37:47 +0200 Subject: [PATCH 16/40] Remove unused files --- xsane.conf.in | 1 - 1 file changed, 1 deletion(-) delete mode 100644 xsane.conf.in diff --git a/xsane.conf.in b/xsane.conf.in deleted file mode 100644 index 57c055f..0000000 --- a/xsane.conf.in +++ /dev/null @@ -1 +0,0 @@ -PLUGINFILE=@BINDIR@/xsane-gimp From bf8310dae310a6192272c0930a2f10dd30743eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Wed, 19 Jul 2023 09:42:30 +0200 Subject: [PATCH 17/40] Migrate to SPDX license format --- xsane.spec | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/xsane.spec b/xsane.spec index 1bfe640..5f4d1ae 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 45%{?dist} +Release: 46%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -72,7 +72,8 @@ Patch100: xsane-0.999-7-autoconf.patch.bz2 Patch101: xsane-configure-c99.patch -License: GPLv2+ and LGPLv2+ +# LGPL-3.0-or-later is due of using gimp libraries +License: GPL-2.0-or-later and LGPL-3.0-or-later URL: http://www.xsane.org/ # gcc is no longer in buildroot by default @@ -127,25 +128,25 @@ for doc in xsane.{CHANGES,PROBLEMS,INSTALL}; do mv "$doc.new" "$doc" done -%patch0 -p1 -b .xdg-open -%patch1 -p1 -b .close-fds -%patch2 -p1 -b .no-eula -%patch3 -p1 -b .off-root-build -%patch4 -p1 -b .no-file-selected -%patch5 -p1 -b .ipv6 -%patch6 -p1 -b .preview-selection.patch -%patch7 -p1 -b .libpng -%patch8 -p1 -b .wmclass -%patch9 -p1 -b .desktop-file -%patch10 -p1 -b .man-page -%patch11 -p1 -b .pdf-no-high-bpp -%patch12 -p1 -b .lcms2 -%patch13 -p1 -b .coverity -%patch14 -p1 -b .snprintf-update -%patch15 -p1 -b .signal-handling +%patch 0 -p1 -b .xdg-open +%patch 1 -p1 -b .close-fds +%patch 2 -p1 -b .no-eula +%patch 3 -p1 -b .off-root-build +%patch 4 -p1 -b .no-file-selected +%patch 5 -p1 -b .ipv6 +%patch 6 -p1 -b .preview-selection.patch +%patch 7 -p1 -b .libpng +%patch 8 -p1 -b .wmclass +%patch 9 -p1 -b .desktop-file +%patch 10 -p1 -b .man-page +%patch 11 -p1 -b .pdf-no-high-bpp +%patch 12 -p1 -b .lcms2 +%patch 13 -p1 -b .coverity +%patch 14 -p1 -b .snprintf-update +%patch 15 -p1 -b .signal-handling -%patch100 -p1 -b .autoconf -%patch101 -p1 -b .c99 +%patch 100 -p1 -b .autoconf +%patch 101 -p1 -b .c99 # in-root config.h breaks off-root building rm include/config.h @@ -269,6 +270,9 @@ fi %{_datadir}/sane/xsane %changelog +* Wed Jul 19 2023 Josef Ridky - 0.999-46 +- Migrate to SPDX license format + * Sat Jan 21 2023 Fedora Release Engineering - 0.999-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From fc4164fac6bbad35081f3bb04d3c1b635fc176b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:17:32 +0000 Subject: [PATCH 18/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 5f4d1ae..079d4bd 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 46%{?dist} +Release: 47%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -270,6 +270,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.999-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jul 19 2023 Josef Ridky - 0.999-46 - Migrate to SPDX license format From a013de8fa1f82a00bc1d17ea92a93737bb43a240 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 26 Jul 2023 16:36:26 +0200 Subject: [PATCH 19/40] SPDX migration --- xsane.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xsane.spec b/xsane.spec index 079d4bd..f772903 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 47%{?dist} +Release: 48%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -73,7 +73,9 @@ Patch100: xsane-0.999-7-autoconf.patch.bz2 Patch101: xsane-configure-c99.patch # LGPL-3.0-or-later is due of using gimp libraries -License: GPL-2.0-or-later and LGPL-3.0-or-later +# src/* - GPL2+ +# lib/* (copies from glibc) - LGPL2+ +License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xsane.org/ # gcc is no longer in buildroot by default @@ -270,6 +272,9 @@ fi %{_datadir}/sane/xsane %changelog +* Wed Jul 26 2023 Zdenek Dohnal - 0.999-48 +- SPDX migration + * Sat Jul 22 2023 Fedora Release Engineering - 0.999-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 20fd053cd3b1a9b0b0d13ca6e835c00da7377bbd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 26 Jul 2023 16:40:24 +0200 Subject: [PATCH 20/40] Use compatible patch numbering --- xsane.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/xsane.spec b/xsane.spec index f772903..3b7844f 100644 --- a/xsane.spec +++ b/xsane.spec @@ -130,25 +130,25 @@ for doc in xsane.{CHANGES,PROBLEMS,INSTALL}; do mv "$doc.new" "$doc" done -%patch 0 -p1 -b .xdg-open -%patch 1 -p1 -b .close-fds -%patch 2 -p1 -b .no-eula -%patch 3 -p1 -b .off-root-build -%patch 4 -p1 -b .no-file-selected -%patch 5 -p1 -b .ipv6 -%patch 6 -p1 -b .preview-selection.patch -%patch 7 -p1 -b .libpng -%patch 8 -p1 -b .wmclass -%patch 9 -p1 -b .desktop-file -%patch 10 -p1 -b .man-page -%patch 11 -p1 -b .pdf-no-high-bpp -%patch 12 -p1 -b .lcms2 -%patch 13 -p1 -b .coverity -%patch 14 -p1 -b .snprintf-update -%patch 15 -p1 -b .signal-handling +%patch -P 0 -p1 -b .xdg-open +%patch -P 1 -p1 -b .close-fds +%patch -P 2 -p1 -b .no-eula +%patch -P 3 -p1 -b .off-root-build +%patch -P 4 -p1 -b .no-file-selected +%patch -P 5 -p1 -b .ipv6 +%patch -P 6 -p1 -b .preview-selection.patch +%patch -P 7 -p1 -b .libpng +%patch -P 8 -p1 -b .wmclass +%patch -P 9 -p1 -b .desktop-file +%patch -P 10 -p1 -b .man-page +%patch -P 11 -p1 -b .pdf-no-high-bpp +%patch -P 12 -p1 -b .lcms2 +%patch -P 13 -p1 -b .coverity +%patch -P 14 -p1 -b .snprintf-update +%patch -P 15 -p1 -b .signal-handling -%patch 100 -p1 -b .autoconf -%patch 101 -p1 -b .c99 +%patch -P 100 -p1 -b .autoconf +%patch -P 101 -p1 -b .c99 # in-root config.h breaks off-root building rm include/config.h From 43c3bf9ca505928821232d4fe1e8a04d77d2fce1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 26 Jul 2023 16:42:55 +0200 Subject: [PATCH 21/40] Use AND in license tag --- xsane.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 3b7844f..5c53a96 100644 --- a/xsane.spec +++ b/xsane.spec @@ -75,7 +75,7 @@ Patch101: xsane-configure-c99.patch # LGPL-3.0-or-later is due of using gimp libraries # src/* - GPL2+ # lib/* (copies from glibc) - LGPL2+ -License: GPL-2.0-or-later and LGPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: http://www.xsane.org/ # gcc is no longer in buildroot by default From 4d46d3d0a563a3effa5b60386d25e1320e80a8ed Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 1 Nov 2023 01:24:32 -0400 Subject: [PATCH 22/40] Fix flatpak build PKG_CONFIG_PATH needs to be set before gimptool can find the gimp-2.0 pkg-config data. --- xsane.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 5c53a96..c6d26ad 100644 --- a/xsane.spec +++ b/xsane.spec @@ -1,7 +1,7 @@ # if you rebuild, please change bugtracker_url accordingly: %global bugtracker_url http://bugzilla.redhat.com -%global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins %global iconrootdir %{_datadir}/icons/hicolor # needed for off-root building From f3566da8278ae4125dcc42a898abb772acebbd3a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 Nov 2023 16:27:56 +0100 Subject: [PATCH 23/40] add license for gimp library - used in plugin which we build it in Fedora because --- xsane.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xsane.spec b/xsane.spec index c6d26ad..117c378 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 48%{?dist} +Release: 49%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -75,7 +75,7 @@ Patch101: xsane-configure-c99.patch # LGPL-3.0-or-later is due of using gimp libraries # src/* - GPL2+ # lib/* (copies from glibc) - LGPL2+ -License: GPL-2.0-or-later AND LGPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-3.0-or-later URL: http://www.xsane.org/ # gcc is no longer in buildroot by default @@ -272,6 +272,9 @@ fi %{_datadir}/sane/xsane %changelog +* Thu Nov 23 2023 Zdenek Dohnal - 0.999-49 +- add license for gimp library - used in plugin which we build it in Fedora because + * Wed Jul 26 2023 Zdenek Dohnal - 0.999-48 - SPDX migration From 00467b6e071af1adc9698404ed8d1af6de5555b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:10:35 +0000 Subject: [PATCH 24/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 117c378..8bba32a 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 49%{?dist} +Release: 50%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -272,6 +272,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.999-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 23 2023 Zdenek Dohnal - 0.999-49 - add license for gimp library - used in plugin which we build it in Fedora because From 9a3beb4b6c86d645157f4d30299d0fa1b783d323 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:28:06 +0000 Subject: [PATCH 25/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xsane.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 8bba32a..534f6b2 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 50%{?dist} +Release: 51%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -272,6 +272,9 @@ fi %{_datadir}/sane/xsane %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.999-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.999-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cdf33f7414d221dcc1ab0f1b0feec4802c84c937 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Jul 2024 23:24:38 -0700 Subject: [PATCH 26/40] Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276661) --- xsane.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 534f6b2..b9ba460 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 51%{?dist} +Release: 52%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -95,6 +95,9 @@ BuildRequires: libtiff-devel BuildRequires: gettext-devel Requires: xsane-common Requires: hicolor-icon-theme +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description XSane is an X based interface for the SANE (Scanner Access Now Easy) @@ -107,6 +110,9 @@ performing the scan and then manipulating the captured image. Summary: GIMP plug-in providing the SANE scanner interface Requires: gimp >= 2:2.2.12-4 Requires: xsane-common +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description gimp This package provides the regular XSane frontend for the SANE scanner @@ -272,6 +278,9 @@ fi %{_datadir}/sane/xsane %changelog +* Fri Jul 26 2024 Benjamin Gilbert - 0.999-52 +- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276661) + * Sat Jul 20 2024 Fedora Release Engineering - 0.999-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4ec418cb914b445ee6d45c64f9aff058219a5061 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 20 Aug 2024 00:32:48 +0200 Subject: [PATCH 27/40] Convert to %autorelease and %autochangelog [skip changelog] Signed-off-by: Nils Philippsen --- changelog | 614 ++++++++++++++++++++++++++++++++++++++++++++++++++++ xsane.spec | 617 +---------------------------------------------------- 2 files changed, 616 insertions(+), 615 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..b3619a0 --- /dev/null +++ b/changelog @@ -0,0 +1,614 @@ +* Fri Jul 26 2024 Benjamin Gilbert - 0.999-52 +- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276661) + +* Sat Jul 20 2024 Fedora Release Engineering - 0.999-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.999-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Nov 23 2023 Zdenek Dohnal - 0.999-49 +- add license for gimp library - used in plugin which we build it in Fedora because + +* Wed Jul 26 2023 Zdenek Dohnal - 0.999-48 +- SPDX migration + +* Sat Jul 22 2023 Fedora Release Engineering - 0.999-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 19 2023 Josef Ridky - 0.999-46 +- Migrate to SPDX license format + +* Sat Jan 21 2023 Fedora Release Engineering - 0.999-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Florian Weimer - 0.999-44 +- Port configure script to C99 + +* Sat Jul 23 2022 Fedora Release Engineering - 0.999-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.999-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.999-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 0.999-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Zdenek Dohnal - 0.999-39 +- remove gimp plugin for eln, put explicit requirement for GTK2 + +* Thu Nov 05 2020 Zdenek Dohnal - 0.999-38 +- make is no longer in buildroot by default + +* Wed Jul 29 2020 Fedora Release Engineering - 0.999-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Tom Stellard - 0.999-36 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Fri Jan 31 2020 Fedora Release Engineering - 0.999-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.999-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 09 2019 Zdenek Dohnal - 0.999-33 +- rebuilt again (because bodhi cannot remove builds from even unpushed updates) + +* Mon Apr 08 2019 Zdenek Dohnal - 0.999-32 +- rebuilt for gimp-2.10.10 + +* Sun Feb 03 2019 Fedora Release Engineering - 0.999-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 24 2018 Zdenek Dohnal - 0.999-30 +- correcting license + +* Sat Jul 14 2018 Fedora Release Engineering - 0.999-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Apr 09 2018 Zdenek Dohnal - 0.999-28 +- remove dependency on ImageMagick and netpbm-progs, because they were needed for + tests during %%build phase, which were removed in commit SHA 0595c15da29 + +* Mon Apr 09 2018 Zdenek Dohnal - 0.999-27 +- remove vendor tag, license needs to be in %%license (FPG) + +* Mon Feb 19 2018 Zdenek Dohnal - 0.999-26 +- remove old stuff +- gcc is no longer in buildroot by default + +* Fri Feb 09 2018 Fedora Release Engineering - 0.999-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 0.999-24 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 0.999-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.999-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.999-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0.999-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.999-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Richard Hughes - 0.999-18 +- Add an AppData file for the software center + +* Mon Dec 08 2014 David King - 0.999-17 +- Depend on hicolor-icon-theme for icon directories (#1171826) + +* Mon Aug 18 2014 Fedora Release Engineering - 0.999-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 03 2014 Nils Philippsen - 0.999-15 +- make signal-handling patch work with older glib versions +- use consistent name for snprintf patch + +* Sun Jun 08 2014 Fedora Release Engineering - 0.999-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Tom Callaway - 0.999-13 +- update to newer snprintf implementation from LPRng that resolves license + issue (#1102523) + +* Thu Apr 03 2014 Nils Philippsen - 0.999-12 +- don't unnecessarily recreate 32px icon (#966301) +- ship 16px icon + +* Wed Apr 02 2014 Nils Philippsen - 0.999-11 +- fix coverity patch: ensure directories exist instead of indiscriminately + attempting to create them (#1079586) + +* Wed Mar 19 2014 Nils Philippsen - 0.999-10 +- fix signal handling (#1073698) +- fix issues found during static analysis that don't require far-reaching + refactoring + +* Mon Sep 23 2013 Nils Philippsen - 0.999-7 +- get rid of ancient compat cruft +- build against lcms2 + +* Mon Sep 09 2013 Nils Philippsen - 0.999-6 +- avoid producing PDFs with bpp > 8 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.999-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 08 2013 Nils Philippsen - 0.999-4 +- man page: update command line options + +* Fri Jul 05 2013 Nils Philippsen - 0.999-3 +- fix no-file-selected patch: change working directories (#621778, fix by Pavel + Polischouk) + +* Thu Jun 27 2013 Nils Philippsen - 0.999-2 +- ensure correct autoconf patch is used + +* Tue Jun 04 2013 Nils Philippsen - 0.999-1 +- version 0.999 +- remove obsolete patches +- update/fix patch comments +- fix changelog dates + +* Fri May 17 2013 Nils Philippsen - 0.998-21 +- don't dereference NULL preview objects when quitting (#963696) +- fix vendor tag logic in a prettier way + +* Tue May 14 2013 Jon Ciesla - 0.998-20 +- Re-fix vendor tag logic. + +* Fri Mar 08 2013 Nils Philippsen - 0.998-19 +- fix vendor tag retaining logic (thanks to Toshio Kuratomi) + +* Thu Mar 07 2013 Nils Philippsen - 0.998-18 +- retain vendor tag up to Fedora 18 + +* Mon Feb 11 2013 Parag Nemade - 0.998-17 +- Add BR: ImageMagick for identify + +* Sun Feb 10 2013 Parag Nemade - 0.998-16 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 + +* Wed Jan 30 2013 Nils Philippsen - 0.998-15 +- build with -fno-strict-aliasing +- tidy up desktop file +- catch errors when determining the %%gimpplugindir macro +- use netpbm pipeline to create 32px PNG icon instead of convert (which embeds + timestamps in the resulting file) + +* Mon Jan 21 2013 Adam Tkac - 0.998-14 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Dec 21 2012 Adam Tkac - 0.998-13 +- rebuild against new libjpeg + +* Mon Sep 03 2012 Nils Philippsen - 0.998-12 +- calculate minimum window size better for multi-head setups +- correct man page (#675437) + +* Sun Jul 22 2012 Fedora Release Engineering - 0.998-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat May 26 2012 Nils Philippsen - 0.998-10 +- add icon cache update scriptlets + +* Fri May 25 2012 Nils Philippsen - 0.998-9 +- install and use higher resolution icons (#795085) + +* Tue Apr 03 2012 Nils Philippsen - 0.998-8 +- rebuild against gimp 2.8.0 release candidate + +* Tue Jan 10 2012 Nils Philippsen - 0.998-7 +- rebuild for gcc 4.7 + +* Fri Dec 16 2011 Nils Philippsen - 0.998-6 +- rebuild for GIMP 2.7 + +* Mon Nov 21 2011 Nils Philippsen - 0.998-5 +- patch and rebuild for libpng-1.5 + +* Wed Jun 01 2011 Nils Philippsen - 0.998-4 +- fix a problem in mouse event processing that interferes with selecting the + scan rectangle in the preview window (#624190, patch by Reinhard Fössmeier) + +* Mon Apr 04 2011 Nils Philippsen - 0.998-3 +- don't dereference unset xsane.preview (#693224) + +* Tue Feb 08 2011 Fedora Release Engineering - 0.998-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Nov 19 2010 Nils Philippsen - 0.998-1 +- version 0.998 +- patch desktop file instead of copying it over + +* Tue Jul 13 2010 Nils Philippsen - 0.997-10 +- don't crash if no files are selected, take two + +* Mon Jul 12 2010 Nils Philippsen - 0.997-9 +- distribute license and other documentation with xsane-common + +* Tue Jun 29 2010 Nils Philippsen 0.997-8 +- support IPv6 (#198422) + +* Mon Jun 28 2010 Nils Philippsen 0.997-7 +- work around old %%configure macro + +* Mon Jun 28 2010 Nils Philippsen 0.997-6 +- don't crash if no files are selected (#608047) + +* Wed Jun 23 2010 Nils Philippsen 0.997-5 +- don't use gimp-plugin-mgr anymore +- use off-root builds + +* Thu Feb 25 2010 Nils Philippsen 0.997-4 +- quote RPM macros in changelog + +* Tue Aug 18 2009 Nils Philippsen +- explain patches + +* Wed Aug 05 2009 Nils Philippsen 0.997-3 +- Merge Review (#226658): + - replace %%desktop_vendor macro with "fedora" + - fix xsane-gimp requirements + - move EULA and documentation into -common subpackage + +* Mon Aug 03 2009 Nils Philippsen 0.997-2 +- remove ExcludeArch: s390 s390x + +* Fri Jul 31 2009 Nils Philippsen 0.997-1 +- version 0.997 +- drop obsolete sane-backends-1.0.20 patch + +* Mon Jul 27 2009 Fedora Release Engineering - 0.996-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 21 2009 Nils Philippsen 0.996-9 +- don't show EULA, mention bugzilla in about dialog (#504344) + +* Mon Jul 20 2009 Nils Philippsen 0.996-8 +- don't use obsolete SANE_CAP_ALWAYS_SETTABLE macro (#507823) + +* Tue Jul 7 2009 Tom "spot" Callaway 0.996-7 +- don't own %%{_datadir}/applications/ (filesystem package owns it) + +* Fri May 29 2009 Nils Philippsen +- Merge review (#226658): + - convert documentation files to UTF-8 + - don't BR: sed + - don't own %%{_datadir}/applications, %%{_sysconfdir}/gimp, + %%{_sysconfdir}/gimp/plugins.d + - don't package unnecessary documentation + +* Mon Mar 02 2009 Nils Philippsen - 0.996-6 +- rebuild against new sane-backends (just in case) + +* Thu Feb 26 2009 Fedora Release Engineering - 0.996-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 20 2009 Nils Philippsen - 0.996-3 +- pickup changed desktop file, close-fds patch in F9, F10 + +* Tue Jan 20 2009 Nils Philippsen - 0.996-2 +- BR: lcms-devel + +* Sun Jan 18 2009 Nils Philippsen - 0.996-1 +- version 0.996 +- don't use %%makeinstall +- use shipped xsane.xpm as application icon + +* Fri Jul 18 2008 Nils Philippsen - 0.995-5 +- fix fd leak prevention (#455450) + +* Tue Jul 15 2008 Nils Philippsen - 0.995-4 +- don't leak file descriptors to help browser process (#455450) + +* Tue Feb 19 2008 Fedora Release Engineering - 0.995-3 +- Autorebuild for GCC 4.3 + +* Thu Nov 29 2007 Nils Philippsen - 0.995-2 +- make EULA, license dialogs be viewable on 800x600 displays + +* Fri Nov 23 2007 Nils Philippsen - 0.995-1 +- version 0.995 +- remove obsolete gimp2.0, medium-definitions, showeulaonce patches + +* Thu Nov 15 2007 Nils Philippsen +- explicitely enable building the gimp plugin in configure call +- reorder spec file sections + +* Wed Sep 05 2007 Nils Philippsen - 0.994-4 +- fix "Category" entries in desktop file + +* Wed Sep 05 2007 Nils Philippsen +- change license to GPLv2+ + +* Tue Apr 24 2007 Nils Philippsen - 0.994-3 +- don't include obsolete Application category in desktop file (#226658) + +* Wed Apr 04 2007 Nils Philippsen - 0.994-2 +- save prefs when EULA is accepted to ensure that EULA is only shown once at + startup (#233645) + +* Tue Apr 03 2007 Nils Philippsen - 0.994-1 +- version 0.994 (#235038) + +* Fri Mar 30 2007 Nils Philippsen - 0.993-2 +- fix summaries and buildroot, don't remove buildroot on %%prep, mark dirs and + config files, don't reference %%buildroot in %%build, use double-%% in + changelog entries (#226658) + +* Fri Mar 02 2007 Nils Philippsen - 0.993-1 +- version 0.993 (#230706) + +* Wed Oct 25 2006 Nils Philippsen - 0.991-4 +- fix typo in scriptlet (#212063) + +* Mon Oct 23 2006 Nils Philippsen - 0.991-3 +- really don't barf on missing gimp-plugin-mgr when updating (#208159) + +* Mon Oct 02 2006 Nils Philippsen - 0.991-2 +- don't barf on missing gimp-plugin-mgr when updating (#208159) + +* Mon Aug 28 2006 Nils Philippsen - 0.991-1 +- version 0.991 +- remove obsolete buffer patch + +* Wed Aug 16 2006 Nils Philippsen - 0.99-6 +- revamp scheme for integrating external GIMP plugins (#202545) +- use disttag + +* Wed Jul 12 2006 Jesse Keating - 0.99-5.1 +- rebuild + +* Thu Jun 08 2006 Nils Philippsen - 0.99-5 +- re-add desktop file (#170835) +- use %%buildroot consistently +- add automake, autoconf build requirements + +* Wed Apr 05 2006 Nils Philippsen - 0.99-4 +- use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression + +* Tue Apr 04 2006 Nils Philippsen - 0.99-3 +- fix medium-definitions patch to not barf on obsolete options in config file + (#185269, by Aldy Hernandez) + +* Fri Feb 10 2006 Jesse Keating - 0.99-2.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0.99-2.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Jan 16 2006 Nils Philippsen 0.99-2 +- fix buffer overflow + +* Fri Jan 13 2006 Nils Philippsen 0.99-1 +- version 0.99 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Nov 24 2005 Nils Philippsen 0.98a-1 +- version 0.98a + +* Tue Oct 04 2005 Nils Philippsen 0.97-1 +- version 0.97 + +* Mon Jun 20 2005 Tim Waugh 0.95-4 +- Build requires gettext-devel (bug #160994). + +* Wed Mar 2 2005 Tim Waugh 0.95-3 +- Rebuild for new GCC. + +* Wed Dec 8 2004 Tim Waugh 0.95-2 +- Fix crash on start (bug #142148). + +* Fri Dec 3 2004 Tim Waugh 0.95-1 +- 0.95. +- No longer need badcode patch. +- Enable translations again. +- New method of installing GIMP plug-in due to Nils Philippsen. + +* Mon Jun 28 2004 Tim Waugh 0.92-13 +- Build requires libtiff-devel (bug #126564). + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Jun 4 2004 Tim Waugh 0.92-11 +- Fix GIMP plug-in package (bug #125254). + +* Wed Apr 21 2004 Seth Nickell 0.92-10 +- Remove .desktop file + +* Wed Mar 31 2004 Tim Waugh 0.92-9 +- Rebuilt. + +* Thu Mar 18 2004 Nils Philippsen 0.92-8 +- Rebuild against new gimp. + +* Tue Mar 9 2004 Tim Waugh 0.92-7 +- Fix desktop file Name (bug #117370). + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Tim Waugh 0.92-5 +- Fixed %%post scriptlet. + +* Sun Jan 25 2004 Tim Waugh 0.92-4 +- Gimp patch updated. + +* Fri Jan 23 2004 Tim Waugh 0.92-3 +- Translations are broken -- turn them off for the time being. +- Really apply the patch this time. +- Fix up post/postun scriptlets. + +* Fri Jan 23 2004 Tim Waugh 0.92-2 +- Apply patch for building against new gimp. + +* Mon Dec 15 2003 Tim Waugh 0.92-1 +- 0.92. + +* Thu Nov 27 2003 Thomas Woerner 0.91-2 +- removed rpath + +* Wed Oct 8 2003 Tim Waugh +- Avoid undefined behaviour in xsane-preview.c (bug #106314). + +* Thu Jul 24 2003 Tim Waugh 0.91-1 +- 0.91. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Apr 9 2003 Tim Waugh 0.90-2 +- Set default HTML viewer to htmlview (bug #88318). + +* Thu Mar 20 2003 Tim Waugh 0.90-1 +- 0.90. + +* Sat Feb 1 2003 Matt Wilson 0.89-3 +- use %%{_libdir} for gimp plugin path + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Oct 25 2002 Tim Waugh 0.89-1 +- 0.89. +- Use %%find_lang. + +* Fri Aug 30 2002 Tim Waugh 0.84-8 +- Don't require gimp-devel (cf. bug #70754). + +* Tue Jul 23 2002 Tim Waugh 0.84-7 +- Desktop file fixes (bug #69555). + +* Mon Jul 15 2002 Tim Waugh 0.84-6 +- Use desktop-file-install. + +* Fri Jun 21 2002 Tim Powers 0.84-5 +- automated rebuild + +* Wed Jun 12 2002 Tim Waugh 0.84-4 +- Rebuild to fix bug #66132. + +* Thu May 23 2002 Tim Powers 0.84-3 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 0.84-2 +- Rebuild in new environment. + +* Wed Jan 23 2002 Tim Waugh 0.84-1 +- 0.84. +- Remove explicit sane-backends dependency, since it is automatically + found by rpm. + +* Wed Jan 09 2002 Tim Powers 0.83-2 +- automated rebuild + +* Tue Jan 8 2002 Tim Waugh 0.83-1 +- 0.83. + +* Tue Dec 11 2001 Tim Waugh 0.82-3.1 +- 0.82. +- Some extra patches from Oliver Rauch. +- Require sane not sane-backends since it's available throughout 7.x. +- Built for Red Hat Linux 7.1, 7.2. + +* Tue Jul 24 2001 Tim Waugh 0.77-4 +- Build requires libpng-devel, libjpeg-devel (#bug 49760). + +* Tue Jul 17 2001 Preston Brown 0.77-3 +- add an icon to the desktop entry + +* Tue Jun 19 2001 Florian La Roche +- add ExcludeArch: s390 s390x + +* Mon Jun 11 2001 Tim Waugh 0.77-1 +- 0.77. + +* Sun Jun 3 2001 Tim Waugh 0.76-2 +- Require sane-backends, not all of sane. + +* Wed May 23 2001 Tim Waugh 0.76-1 +- 0.76. + +* Thu May 3 2001 Tim Waugh 0.75-1 +- 0.75 +- Fix summary/description to match specspo. + +* Mon Jan 8 2001 Matt Wilson +- fix post script of gimp subpackage to install into the correct location + +* Mon Dec 25 2000 Matt Wilson +- rebuilt against gimp 1.2.0 + +* Thu Dec 21 2000 Matt Wilson +- rebuilt against gimp 1.1.32 +- use -DGIMP_ENABLE_COMPAT_CRUFT=1 to build with compat macros + +* Thu Oct 12 2000 Than Ngo +- 0.62 + +* Wed Aug 23 2000 Matt Wilson +- rebuilt against gimp-1.1.25 + +* Mon Aug 07 2000 Than Ngo +- added swedish translation (Bug #15316) + +* Fri Aug 4 2000 Than Ngo +- fix, shows error dialogbox if no scanner exists (Bug #15445) +- update to 0.61 + +* Wed Aug 2 2000 Matt Wilson +- rebuilt against new libpng + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Mon Jul 3 2000 Matt Wilson +- rebuilt against gimp 1.1.24 +- make clean before building non gimp version + +* Fri Jun 30 2000 Preston Brown +- made gimp subpkg + +* Wed Jun 14 2000 Preston Brown +- desktop entry added + +* Tue Jun 13 2000 Preston Brown +- fixed gimp link +- FHS paths + +* Tue May 30 2000 Karsten Hopp +- update to 0.59 + +* Sat Jan 29 2000 TIm Powers +- fixed bug 8948 + +* Thu Dec 2 1999 Tim Powers +- updated to 0.47 +- gzip man pages + +* Mon Aug 30 1999 Tim Powers +- changed group + +* Mon Jul 26 1999 Tim Powers +- update to 0.30 +- added %%defattr +- built for 6.1 + +* Thu Apr 22 1999 Preston Brown +- initial RPM for PowerTools 6.0 diff --git a/xsane.spec b/xsane.spec index b9ba460..e58b767 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 52%{?dist} +Release: %autorelease Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -278,617 +278,4 @@ fi %{_datadir}/sane/xsane %changelog -* Fri Jul 26 2024 Benjamin Gilbert - 0.999-52 -- Require gdk-pixbuf2-modules-extra on F41+ to fix crash (rhbz#2276661) - -* Sat Jul 20 2024 Fedora Release Engineering - 0.999-51 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.999-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 23 2023 Zdenek Dohnal - 0.999-49 -- add license for gimp library - used in plugin which we build it in Fedora because - -* Wed Jul 26 2023 Zdenek Dohnal - 0.999-48 -- SPDX migration - -* Sat Jul 22 2023 Fedora Release Engineering - 0.999-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 19 2023 Josef Ridky - 0.999-46 -- Migrate to SPDX license format - -* Sat Jan 21 2023 Fedora Release Engineering - 0.999-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 17 2023 Florian Weimer - 0.999-44 -- Port configure script to C99 - -* Sat Jul 23 2022 Fedora Release Engineering - 0.999-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.999-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.999-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 0.999-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Zdenek Dohnal - 0.999-39 -- remove gimp plugin for eln, put explicit requirement for GTK2 - -* Thu Nov 05 2020 Zdenek Dohnal - 0.999-38 -- make is no longer in buildroot by default - -* Wed Jul 29 2020 Fedora Release Engineering - 0.999-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 14 2020 Tom Stellard - 0.999-36 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Fri Jan 31 2020 Fedora Release Engineering - 0.999-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.999-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 09 2019 Zdenek Dohnal - 0.999-33 -- rebuilt again (because bodhi cannot remove builds from even unpushed updates) - -* Mon Apr 08 2019 Zdenek Dohnal - 0.999-32 -- rebuilt for gimp-2.10.10 - -* Sun Feb 03 2019 Fedora Release Engineering - 0.999-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 24 2018 Zdenek Dohnal - 0.999-30 -- correcting license - -* Sat Jul 14 2018 Fedora Release Engineering - 0.999-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 09 2018 Zdenek Dohnal - 0.999-28 -- remove dependency on ImageMagick and netpbm-progs, because they were needed for - tests during %%build phase, which were removed in commit SHA 0595c15da29 - -* Mon Apr 09 2018 Zdenek Dohnal - 0.999-27 -- remove vendor tag, license needs to be in %%license (FPG) - -* Mon Feb 19 2018 Zdenek Dohnal - 0.999-26 -- remove old stuff -- gcc is no longer in buildroot by default - -* Fri Feb 09 2018 Fedora Release Engineering - 0.999-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 0.999-24 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 0.999-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.999-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.999-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.999-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.999-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 26 2015 Richard Hughes - 0.999-18 -- Add an AppData file for the software center - -* Mon Dec 08 2014 David King - 0.999-17 -- Depend on hicolor-icon-theme for icon directories (#1171826) - -* Mon Aug 18 2014 Fedora Release Engineering - 0.999-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 03 2014 Nils Philippsen - 0.999-15 -- make signal-handling patch work with older glib versions -- use consistent name for snprintf patch - -* Sun Jun 08 2014 Fedora Release Engineering - 0.999-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Tom Callaway - 0.999-13 -- update to newer snprintf implementation from LPRng that resolves license - issue (#1102523) - -* Thu Apr 03 2014 Nils Philippsen - 0.999-12 -- don't unnecessarily recreate 32px icon (#966301) -- ship 16px icon - -* Wed Apr 02 2014 Nils Philippsen - 0.999-11 -- fix coverity patch: ensure directories exist instead of indiscriminately - attempting to create them (#1079586) - -* Wed Mar 19 2014 Nils Philippsen - 0.999-10 -- fix signal handling (#1073698) -- fix issues found during static analysis that don't require far-reaching - refactoring - -* Mon Sep 23 2013 Nils Philippsen - 0.999-7 -- get rid of ancient compat cruft -- build against lcms2 - -* Mon Sep 09 2013 Nils Philippsen - 0.999-6 -- avoid producing PDFs with bpp > 8 - -* Sun Aug 04 2013 Fedora Release Engineering - 0.999-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 08 2013 Nils Philippsen - 0.999-4 -- man page: update command line options - -* Fri Jul 05 2013 Nils Philippsen - 0.999-3 -- fix no-file-selected patch: change working directories (#621778, fix by Pavel - Polischouk) - -* Thu Jun 27 2013 Nils Philippsen - 0.999-2 -- ensure correct autoconf patch is used - -* Tue Jun 04 2013 Nils Philippsen - 0.999-1 -- version 0.999 -- remove obsolete patches -- update/fix patch comments -- fix changelog dates - -* Fri May 17 2013 Nils Philippsen - 0.998-21 -- don't dereference NULL preview objects when quitting (#963696) -- fix vendor tag logic in a prettier way - -* Tue May 14 2013 Jon Ciesla - 0.998-20 -- Re-fix vendor tag logic. - -* Fri Mar 08 2013 Nils Philippsen - 0.998-19 -- fix vendor tag retaining logic (thanks to Toshio Kuratomi) - -* Thu Mar 07 2013 Nils Philippsen - 0.998-18 -- retain vendor tag up to Fedora 18 - -* Mon Feb 11 2013 Parag Nemade - 0.998-17 -- Add BR: ImageMagick for identify - -* Sun Feb 10 2013 Parag Nemade - 0.998-16 -- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - -* Wed Jan 30 2013 Nils Philippsen - 0.998-15 -- build with -fno-strict-aliasing -- tidy up desktop file -- catch errors when determining the %%gimpplugindir macro -- use netpbm pipeline to create 32px PNG icon instead of convert (which embeds - timestamps in the resulting file) - -* Mon Jan 21 2013 Adam Tkac - 0.998-14 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Dec 21 2012 Adam Tkac - 0.998-13 -- rebuild against new libjpeg - -* Mon Sep 03 2012 Nils Philippsen - 0.998-12 -- calculate minimum window size better for multi-head setups -- correct man page (#675437) - -* Sun Jul 22 2012 Fedora Release Engineering - 0.998-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat May 26 2012 Nils Philippsen - 0.998-10 -- add icon cache update scriptlets - -* Fri May 25 2012 Nils Philippsen - 0.998-9 -- install and use higher resolution icons (#795085) - -* Tue Apr 03 2012 Nils Philippsen - 0.998-8 -- rebuild against gimp 2.8.0 release candidate - -* Tue Jan 10 2012 Nils Philippsen - 0.998-7 -- rebuild for gcc 4.7 - -* Fri Dec 16 2011 Nils Philippsen - 0.998-6 -- rebuild for GIMP 2.7 - -* Mon Nov 21 2011 Nils Philippsen - 0.998-5 -- patch and rebuild for libpng-1.5 - -* Wed Jun 01 2011 Nils Philippsen - 0.998-4 -- fix a problem in mouse event processing that interferes with selecting the - scan rectangle in the preview window (#624190, patch by Reinhard Fössmeier) - -* Mon Apr 04 2011 Nils Philippsen - 0.998-3 -- don't dereference unset xsane.preview (#693224) - -* Tue Feb 08 2011 Fedora Release Engineering - 0.998-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Nov 19 2010 Nils Philippsen - 0.998-1 -- version 0.998 -- patch desktop file instead of copying it over - -* Tue Jul 13 2010 Nils Philippsen - 0.997-10 -- don't crash if no files are selected, take two - -* Mon Jul 12 2010 Nils Philippsen - 0.997-9 -- distribute license and other documentation with xsane-common - -* Tue Jun 29 2010 Nils Philippsen 0.997-8 -- support IPv6 (#198422) - -* Mon Jun 28 2010 Nils Philippsen 0.997-7 -- work around old %%configure macro - -* Mon Jun 28 2010 Nils Philippsen 0.997-6 -- don't crash if no files are selected (#608047) - -* Wed Jun 23 2010 Nils Philippsen 0.997-5 -- don't use gimp-plugin-mgr anymore -- use off-root builds - -* Thu Feb 25 2010 Nils Philippsen 0.997-4 -- quote RPM macros in changelog - -* Tue Aug 18 2009 Nils Philippsen -- explain patches - -* Wed Aug 05 2009 Nils Philippsen 0.997-3 -- Merge Review (#226658): - - replace %%desktop_vendor macro with "fedora" - - fix xsane-gimp requirements - - move EULA and documentation into -common subpackage - -* Mon Aug 03 2009 Nils Philippsen 0.997-2 -- remove ExcludeArch: s390 s390x - -* Fri Jul 31 2009 Nils Philippsen 0.997-1 -- version 0.997 -- drop obsolete sane-backends-1.0.20 patch - -* Mon Jul 27 2009 Fedora Release Engineering - 0.996-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jul 21 2009 Nils Philippsen 0.996-9 -- don't show EULA, mention bugzilla in about dialog (#504344) - -* Mon Jul 20 2009 Nils Philippsen 0.996-8 -- don't use obsolete SANE_CAP_ALWAYS_SETTABLE macro (#507823) - -* Tue Jul 7 2009 Tom "spot" Callaway 0.996-7 -- don't own %%{_datadir}/applications/ (filesystem package owns it) - -* Fri May 29 2009 Nils Philippsen -- Merge review (#226658): - - convert documentation files to UTF-8 - - don't BR: sed - - don't own %%{_datadir}/applications, %%{_sysconfdir}/gimp, - %%{_sysconfdir}/gimp/plugins.d - - don't package unnecessary documentation - -* Mon Mar 02 2009 Nils Philippsen - 0.996-6 -- rebuild against new sane-backends (just in case) - -* Thu Feb 26 2009 Fedora Release Engineering - 0.996-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jan 20 2009 Nils Philippsen - 0.996-3 -- pickup changed desktop file, close-fds patch in F9, F10 - -* Tue Jan 20 2009 Nils Philippsen - 0.996-2 -- BR: lcms-devel - -* Sun Jan 18 2009 Nils Philippsen - 0.996-1 -- version 0.996 -- don't use %%makeinstall -- use shipped xsane.xpm as application icon - -* Fri Jul 18 2008 Nils Philippsen - 0.995-5 -- fix fd leak prevention (#455450) - -* Tue Jul 15 2008 Nils Philippsen - 0.995-4 -- don't leak file descriptors to help browser process (#455450) - -* Tue Feb 19 2008 Fedora Release Engineering - 0.995-3 -- Autorebuild for GCC 4.3 - -* Thu Nov 29 2007 Nils Philippsen - 0.995-2 -- make EULA, license dialogs be viewable on 800x600 displays - -* Fri Nov 23 2007 Nils Philippsen - 0.995-1 -- version 0.995 -- remove obsolete gimp2.0, medium-definitions, showeulaonce patches - -* Thu Nov 15 2007 Nils Philippsen -- explicitely enable building the gimp plugin in configure call -- reorder spec file sections - -* Wed Sep 05 2007 Nils Philippsen - 0.994-4 -- fix "Category" entries in desktop file - -* Wed Sep 05 2007 Nils Philippsen -- change license to GPLv2+ - -* Tue Apr 24 2007 Nils Philippsen - 0.994-3 -- don't include obsolete Application category in desktop file (#226658) - -* Wed Apr 04 2007 Nils Philippsen - 0.994-2 -- save prefs when EULA is accepted to ensure that EULA is only shown once at - startup (#233645) - -* Tue Apr 03 2007 Nils Philippsen - 0.994-1 -- version 0.994 (#235038) - -* Fri Mar 30 2007 Nils Philippsen - 0.993-2 -- fix summaries and buildroot, don't remove buildroot on %%prep, mark dirs and - config files, don't reference %%buildroot in %%build, use double-%% in - changelog entries (#226658) - -* Fri Mar 02 2007 Nils Philippsen - 0.993-1 -- version 0.993 (#230706) - -* Wed Oct 25 2006 Nils Philippsen - 0.991-4 -- fix typo in scriptlet (#212063) - -* Mon Oct 23 2006 Nils Philippsen - 0.991-3 -- really don't barf on missing gimp-plugin-mgr when updating (#208159) - -* Mon Oct 02 2006 Nils Philippsen - 0.991-2 -- don't barf on missing gimp-plugin-mgr when updating (#208159) - -* Mon Aug 28 2006 Nils Philippsen - 0.991-1 -- version 0.991 -- remove obsolete buffer patch - -* Wed Aug 16 2006 Nils Philippsen - 0.99-6 -- revamp scheme for integrating external GIMP plugins (#202545) -- use disttag - -* Wed Jul 12 2006 Jesse Keating - 0.99-5.1 -- rebuild - -* Thu Jun 08 2006 Nils Philippsen - 0.99-5 -- re-add desktop file (#170835) -- use %%buildroot consistently -- add automake, autoconf build requirements - -* Wed Apr 05 2006 Nils Philippsen - 0.99-4 -- use XSANE.lang instead of xsane.lang to avoid %%doc multilib regression - -* Tue Apr 04 2006 Nils Philippsen - 0.99-3 -- fix medium-definitions patch to not barf on obsolete options in config file - (#185269, by Aldy Hernandez) - -* Fri Feb 10 2006 Jesse Keating - 0.99-2.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 0.99-2.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Mon Jan 16 2006 Nils Philippsen 0.99-2 -- fix buffer overflow - -* Fri Jan 13 2006 Nils Philippsen 0.99-1 -- version 0.99 - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Nov 24 2005 Nils Philippsen 0.98a-1 -- version 0.98a - -* Tue Oct 04 2005 Nils Philippsen 0.97-1 -- version 0.97 - -* Mon Jun 20 2005 Tim Waugh 0.95-4 -- Build requires gettext-devel (bug #160994). - -* Wed Mar 2 2005 Tim Waugh 0.95-3 -- Rebuild for new GCC. - -* Wed Dec 8 2004 Tim Waugh 0.95-2 -- Fix crash on start (bug #142148). - -* Fri Dec 3 2004 Tim Waugh 0.95-1 -- 0.95. -- No longer need badcode patch. -- Enable translations again. -- New method of installing GIMP plug-in due to Nils Philippsen. - -* Mon Jun 28 2004 Tim Waugh 0.92-13 -- Build requires libtiff-devel (bug #126564). - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Jun 4 2004 Tim Waugh 0.92-11 -- Fix GIMP plug-in package (bug #125254). - -* Wed Apr 21 2004 Seth Nickell 0.92-10 -- Remove .desktop file - -* Wed Mar 31 2004 Tim Waugh 0.92-9 -- Rebuilt. - -* Thu Mar 18 2004 Nils Philippsen 0.92-8 -- Rebuild against new gimp. - -* Tue Mar 9 2004 Tim Waugh 0.92-7 -- Fix desktop file Name (bug #117370). - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Tim Waugh 0.92-5 -- Fixed %%post scriptlet. - -* Sun Jan 25 2004 Tim Waugh 0.92-4 -- Gimp patch updated. - -* Fri Jan 23 2004 Tim Waugh 0.92-3 -- Translations are broken -- turn them off for the time being. -- Really apply the patch this time. -- Fix up post/postun scriptlets. - -* Fri Jan 23 2004 Tim Waugh 0.92-2 -- Apply patch for building against new gimp. - -* Mon Dec 15 2003 Tim Waugh 0.92-1 -- 0.92. - -* Thu Nov 27 2003 Thomas Woerner 0.91-2 -- removed rpath - -* Wed Oct 8 2003 Tim Waugh -- Avoid undefined behaviour in xsane-preview.c (bug #106314). - -* Thu Jul 24 2003 Tim Waugh 0.91-1 -- 0.91. - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Apr 9 2003 Tim Waugh 0.90-2 -- Set default HTML viewer to htmlview (bug #88318). - -* Thu Mar 20 2003 Tim Waugh 0.90-1 -- 0.90. - -* Sat Feb 1 2003 Matt Wilson 0.89-3 -- use %%{_libdir} for gimp plugin path - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Fri Oct 25 2002 Tim Waugh 0.89-1 -- 0.89. -- Use %%find_lang. - -* Fri Aug 30 2002 Tim Waugh 0.84-8 -- Don't require gimp-devel (cf. bug #70754). - -* Tue Jul 23 2002 Tim Waugh 0.84-7 -- Desktop file fixes (bug #69555). - -* Mon Jul 15 2002 Tim Waugh 0.84-6 -- Use desktop-file-install. - -* Fri Jun 21 2002 Tim Powers 0.84-5 -- automated rebuild - -* Wed Jun 12 2002 Tim Waugh 0.84-4 -- Rebuild to fix bug #66132. - -* Thu May 23 2002 Tim Powers 0.84-3 -- automated rebuild - -* Thu Feb 21 2002 Tim Waugh 0.84-2 -- Rebuild in new environment. - -* Wed Jan 23 2002 Tim Waugh 0.84-1 -- 0.84. -- Remove explicit sane-backends dependency, since it is automatically - found by rpm. - -* Wed Jan 09 2002 Tim Powers 0.83-2 -- automated rebuild - -* Tue Jan 8 2002 Tim Waugh 0.83-1 -- 0.83. - -* Tue Dec 11 2001 Tim Waugh 0.82-3.1 -- 0.82. -- Some extra patches from Oliver Rauch. -- Require sane not sane-backends since it's available throughout 7.x. -- Built for Red Hat Linux 7.1, 7.2. - -* Tue Jul 24 2001 Tim Waugh 0.77-4 -- Build requires libpng-devel, libjpeg-devel (#bug 49760). - -* Tue Jul 17 2001 Preston Brown 0.77-3 -- add an icon to the desktop entry - -* Tue Jun 19 2001 Florian La Roche -- add ExcludeArch: s390 s390x - -* Mon Jun 11 2001 Tim Waugh 0.77-1 -- 0.77. - -* Sun Jun 3 2001 Tim Waugh 0.76-2 -- Require sane-backends, not all of sane. - -* Wed May 23 2001 Tim Waugh 0.76-1 -- 0.76. - -* Thu May 3 2001 Tim Waugh 0.75-1 -- 0.75 -- Fix summary/description to match specspo. - -* Mon Jan 8 2001 Matt Wilson -- fix post script of gimp subpackage to install into the correct location - -* Mon Dec 25 2000 Matt Wilson -- rebuilt against gimp 1.2.0 - -* Thu Dec 21 2000 Matt Wilson -- rebuilt against gimp 1.1.32 -- use -DGIMP_ENABLE_COMPAT_CRUFT=1 to build with compat macros - -* Thu Oct 12 2000 Than Ngo -- 0.62 - -* Wed Aug 23 2000 Matt Wilson -- rebuilt against gimp-1.1.25 - -* Mon Aug 07 2000 Than Ngo -- added swedish translation (Bug #15316) - -* Fri Aug 4 2000 Than Ngo -- fix, shows error dialogbox if no scanner exists (Bug #15445) -- update to 0.61 - -* Wed Aug 2 2000 Matt Wilson -- rebuilt against new libpng - -* Thu Jul 13 2000 Prospector -- automatic rebuild - -* Mon Jul 3 2000 Matt Wilson -- rebuilt against gimp 1.1.24 -- make clean before building non gimp version - -* Fri Jun 30 2000 Preston Brown -- made gimp subpkg - -* Wed Jun 14 2000 Preston Brown -- desktop entry added - -* Tue Jun 13 2000 Preston Brown -- fixed gimp link -- FHS paths - -* Tue May 30 2000 Karsten Hopp -- update to 0.59 - -* Sat Jan 29 2000 TIm Powers -- fixed bug 8948 - -* Thu Dec 2 1999 Tim Powers -- updated to 0.47 -- gzip man pages - -* Mon Aug 30 1999 Tim Powers -- changed group - -* Mon Jul 26 1999 Tim Powers -- update to 0.30 -- added %%defattr -- built for 6.1 - -* Thu Apr 22 1999 Preston Brown -- initial RPM for PowerTools 6.0 +%autochangelog From 3acc79ce10296a61617fe6e0f9c9803f7638b401 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 20 Aug 2024 00:32:54 +0200 Subject: [PATCH 28/40] Rebuild against new gimp Signed-off-by: Nils Philippsen From 067e07a1ec2fe558a5b2c50d62a6a95377e25728 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 27 Aug 2024 17:31:27 +0200 Subject: [PATCH 29/40] Use procedure registration for the plugin --- ...nvention-for-registering-gimp-plugin.patch | 72 +++++++++++++++++++ xsane.spec | 11 ++- 2 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 0001-Follow-new-convention-for-registering-gimp-plugin.patch diff --git a/0001-Follow-new-convention-for-registering-gimp-plugin.patch b/0001-Follow-new-convention-for-registering-gimp-plugin.patch new file mode 100644 index 0000000..23be0d2 --- /dev/null +++ b/0001-Follow-new-convention-for-registering-gimp-plugin.patch @@ -0,0 +1,72 @@ +diff -up xsane-0.999/src/xsane-save.c.use-register xsane-0.999/src/xsane-save.c +--- xsane-0.999/src/xsane-save.c.use-register 2024-08-27 17:26:05.375925695 +0200 ++++ xsane-0.999/src/xsane-save.c 2024-08-27 17:26:05.383925749 +0200 +@@ -6641,10 +6641,14 @@ static void xsane_gimp_query(void) + + snprintf(name, sizeof(name), "%s", xsane.prog_name); + #ifdef GIMP_CHECK_VERSION +-# if GIMP_CHECK_VERSION(1,1,9) ++# if GIMP_CHECK_VERSION(2,10,30) ++ snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU_DIALOG_NEW); ++#else ++# if GIMP_CHECK_VERSION(1,1,9) + snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU_DIALOG); +-# else ++# else + snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU_DIALOG_OLD); ++# endif + # endif + #else + snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU_DIALOG_OLD); +@@ -6660,6 +6664,11 @@ static void xsane_gimp_query(void) + GIMP_EXTENSION, + nargs, nreturn_vals, + args, return_vals); ++#ifdef GIMP_CHECK_VERSION ++# if GIMP_CHECK_VERSION(2,10,30) ++ gimp_plugin_menu_register(name, XSANE_GIMP_MENU); ++# endif ++#endif + + sane_init(&xsane.sane_backend_versioncode, (void *) xsane_authorization_callback); + if (SANE_VERSION_MAJOR(xsane.sane_backend_versioncode) != SANE_V_MAJOR) +@@ -6689,10 +6698,14 @@ static void xsane_gimp_query(void) + } + + #ifdef GIMP_CHECK_VERSION +-# if GIMP_CHECK_VERSION(1,1,9) +- snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU); ++# if GIMP_CHECK_VERSION(2,10,30) ++ mpath[0] = 0; + # else ++# if GIMP_CHECK_VERSION(1,1,9) ++ snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU); ++# else + snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU_OLD); ++# endif + # endif + #else + snprintf(mpath, sizeof(mpath), "%s", XSANE_GIMP_MENU_OLD); +@@ -6722,6 +6735,11 @@ static void xsane_gimp_query(void) + GIMP_EXTENSION, + nargs, nreturn_vals, + args, return_vals); ++#ifdef GIMP_CHECK_VERSION ++# if GIMP_CHECK_VERSION(2,10,30) ++ gimp_plugin_menu_register(name, XSANE_GIMP_MENU); ++# endif ++#endif + } + + sane_exit(); +diff -up xsane-0.999/src/xsane-text.h.use-register xsane-0.999/src/xsane-text.h +--- xsane-0.999/src/xsane-text.h.use-register 2024-08-27 17:26:05.383925749 +0200 ++++ xsane-0.999/src/xsane-text.h 2024-08-27 17:28:08.811758730 +0200 +@@ -873,6 +873,7 @@ The format of [DEVICE] is backendname:de + #define XSANE_GIMP_INSTALL_HELP _("This function provides access to scanners and other image acquisition devices through the SANE (Scanner Access Now Easy) interface.") + + /* Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/" */ ++#define XSANE_GIMP_MENU_DIALOG_NEW _("Device dialog...") + #define XSANE_GIMP_MENU_DIALOG _("/File/Acquire/XSane: Device dialog...") + #define XSANE_GIMP_MENU _("/File/Acquire/XSane: ") + #define XSANE_GIMP_MENU_DIALOG_OLD _("/Xtns/XSane/Device dialog...") diff --git a/xsane.spec b/xsane.spec index e58b767..4269b66 100644 --- a/xsane.spec +++ b/xsane.spec @@ -10,7 +10,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: %autorelease +Release: %{autorelease} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-256x256.png # use "xdg-open" instead of "netscape" to launch help browser @@ -66,6 +66,8 @@ Patch14: xsane-0.999-snprintf-update.patch # fix signal handling (#1073698) # submitted to upstream (Oliver Rauch) via email, 2014-07-03 Patch15: xsane-0.999-signal-handling.patch +# https://gitlab.com/sane-project/frontend/xsane/-/commit/96424e369f67 +Patch16: 0001-Follow-new-convention-for-registering-gimp-plugin.patch # autoconf-generated files Patch100: xsane-0.999-7-autoconf.patch.bz2 @@ -152,6 +154,7 @@ done %patch -P 13 -p1 -b .coverity %patch -P 14 -p1 -b .snprintf-update %patch -P 15 -p1 -b .signal-handling +%patch -P 16 -p1 -b .use-register %patch -P 100 -p1 -b .autoconf %patch -P 101 -p1 -b .c99 @@ -189,7 +192,8 @@ popd %if 0%{?rhel} <= 8 || 0%{?fedora} # install GIMP plugin install -m 0755 -d %{buildroot}%{gimpplugindir} -install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir} +install -m 0755 -d %{buildroot}%{gimpplugindir}/%{name} +install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}/%{name} %endif # install customized desktop file @@ -268,7 +272,8 @@ fi %if 0%{?rhel} <= 8 || 0%{?fedora} %files gimp -%{gimpplugindir}/xsane +%dir %{gimpplugindir}/%{name} +%{gimpplugindir}/%{name}/%{name} %endif %files common From a3903071734900ca810c4e117445ce54e5f5d281 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 29 Aug 2024 12:53:21 +0200 Subject: [PATCH 30/40] Remove old cruft and use symbolic conditionals [skip changelog] Signed-off-by: Nils Philippsen --- xsane.spec | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/xsane.spec b/xsane.spec index 4269b66..5401b56 100644 --- a/xsane.spec +++ b/xsane.spec @@ -1,3 +1,9 @@ +%if ! 0%{?fedora} || 0%{?fedora} >= 41 +%bcond pixbuf_extra_modules 1 +%else +%bcond pixbuf_extra_modules 1 +%endif + # if you rebuild, please change bugtracker_url accordingly: %global bugtracker_url http://bugzilla.redhat.com @@ -84,9 +90,7 @@ URL: http://www.xsane.org/ BuildRequires: gcc # uses make BuildRequires: make -%if 0%{?rhel} <= 8 || 0%{?fedora} BuildRequires: gimp-devel -%endif BuildRequires: gtk2-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel @@ -97,7 +101,7 @@ BuildRequires: libtiff-devel BuildRequires: gettext-devel Requires: xsane-common Requires: hicolor-icon-theme -%if 0%{?fedora} >= 41 +%if %{with pixbuf_extra_modules} Requires: gdk-pixbuf2-modules-extra%{?_isa} %endif @@ -107,12 +111,11 @@ library, which provides access to scanners, digital cameras, and other capture devices. XSane is written in GTK+ and provides control for performing the scan and then manipulating the captured image. -%if 0%{?rhel} <= 8 || 0%{?fedora} %package gimp Summary: GIMP plug-in providing the SANE scanner interface Requires: gimp >= 2:2.2.12-4 Requires: xsane-common -%if 0%{?fedora} >= 41 +%if %{with pixbuf_extra_modules} Requires: gdk-pixbuf2-modules-extra%{?_isa} %endif @@ -120,7 +123,6 @@ Requires: gdk-pixbuf2-modules-extra%{?_isa} This package provides the regular XSane frontend for the SANE scanner interface, but it works as a GIMP plug-in. You must have GIMP installed to use this package. -%endif %package common Summary: Common files for xsane packages @@ -169,12 +171,10 @@ mkdir build-without-gimp CFLAGS='%optflags -fno-strict-aliasing -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"' export CFLAGS -%if 0%{?rhel} <= 8 || 0%{?fedora} pushd build-with-gimp %configure --enable-gimp %make_build popd -%endif pushd build-without-gimp %configure --disable-gimp @@ -189,12 +189,10 @@ pushd build-without-gimp %make_install popd -%if 0%{?rhel} <= 8 || 0%{?fedora} # install GIMP plugin install -m 0755 -d %{buildroot}%{gimpplugindir} install -m 0755 -d %{buildroot}%{gimpplugindir}/%{name} install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}/%{name} -%endif # install customized desktop file rm %{buildroot}%{_datadir}/applications/xsane.desktop @@ -247,34 +245,19 @@ EOF %find_lang %{name} XSANE.lang -%if 0%{?rhel} <= 8 || 0%{?fedora} -%pre gimp -# remove obsolete gimp-plugin-mgr managed symlink -if [ -L "%{gimpplugindir}/xsane" ]; then - rm -f "%{gimpplugindir}/xsane" -fi -%endif - %files -f XSANE.lang %doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO %license xsane.COPYING %{_bindir}/xsane %{_mandir}/man1/* -%if %{with desktop_vendor_tag} -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/fedora-xsane.desktop -%else %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/xsane.desktop -%endif %{_datadir}/pixmaps/xsane.xpm %{iconrootdir}/*/apps/%{name}.png -%if 0%{?rhel} <= 8 || 0%{?fedora} %files gimp %dir %{gimpplugindir}/%{name} %{gimpplugindir}/%{name}/%{name} -%endif %files common %doc xsane.AUTHOR From aa423413aa1eb4d9f66ad2a934d287e6dfd036ec Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 29 Aug 2024 12:54:45 +0200 Subject: [PATCH 31/40] Preserve plugin path for GIMP version 2 [skip changelog] Signed-off-by: Nils Philippsen --- xsane.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xsane.spec b/xsane.spec index 5401b56..81cecc9 100644 --- a/xsane.spec +++ b/xsane.spec @@ -1,6 +1,8 @@ %if ! 0%{?fedora} || 0%{?fedora} >= 41 +%bcond gimp3 1 %bcond pixbuf_extra_modules 1 %else +%bcond gimp3 0 %bcond pixbuf_extra_modules 1 %endif @@ -191,7 +193,9 @@ popd # install GIMP plugin install -m 0755 -d %{buildroot}%{gimpplugindir} +%if %{with gimp3} install -m 0755 -d %{buildroot}%{gimpplugindir}/%{name} +%endif install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}/%{name} # install customized desktop file @@ -256,8 +260,12 @@ EOF %{iconrootdir}/*/apps/%{name}.png %files gimp +%if %{with gimp3} %dir %{gimpplugindir}/%{name} %{gimpplugindir}/%{name}/%{name} +%else +%{gimpplugindir}/%{name} +%endif %files common %doc xsane.AUTHOR From e29e5dc0b578e14d3834293338d90dd5aaf0ae75 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 29 Aug 2024 12:54:12 +0200 Subject: [PATCH 32/40] Use https bugzilla URL Signed-off-by: Nils Philippsen --- xsane.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsane.spec b/xsane.spec index 81cecc9..ee63a7f 100644 --- a/xsane.spec +++ b/xsane.spec @@ -7,7 +7,7 @@ %endif # if you rebuild, please change bugtracker_url accordingly: -%global bugtracker_url http://bugzilla.redhat.com +%global bugtracker_url https://bugzilla.redhat.com %global gimpplugindir %(%___build_pre; gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins %global iconrootdir %{_datadir}/icons/hicolor From e94236695b0a1c02178fc5126d4afdaf3ceb1aea Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 29 Aug 2024 16:10:51 +0200 Subject: [PATCH 33/40] =?UTF-8?q?Bail=20out=20early=20if=20GIMP=20plugin?= =?UTF-8?q?=20can=E2=80=99t=20be=20built?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip changelog] Signed-off-by: Nils Philippsen --- xsane.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xsane.spec b/xsane.spec index ee63a7f..059cf86 100644 --- a/xsane.spec +++ b/xsane.spec @@ -175,6 +175,10 @@ export CFLAGS pushd build-with-gimp %configure --enable-gimp +if grep -Fq '#undef HAVE_ANY_GIMP' include/config.h; then + echo "The configure script didn’t detect GIMP" >&2 + exit 1 +fi %make_build popd From 2cc8bf48bc05631e188937e143682ed13e7945af Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 13 Oct 2024 23:27:07 +0200 Subject: [PATCH 34/40] Drop GIMP plugin for Fedora >= 41 Signed-off-by: Nils Philippsen --- xsane.spec | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/xsane.spec b/xsane.spec index 059cf86..40f2d86 100644 --- a/xsane.spec +++ b/xsane.spec @@ -1,15 +1,17 @@ %if ! 0%{?fedora} || 0%{?fedora} >= 41 -%bcond gimp3 1 +%bcond gimp 1 %bcond pixbuf_extra_modules 1 %else -%bcond gimp3 0 -%bcond pixbuf_extra_modules 1 +%bcond gimp 0 +%bcond pixbuf_extra_modules 0 %endif # if you rebuild, please change bugtracker_url accordingly: %global bugtracker_url https://bugzilla.redhat.com +%if %{with gimp} %global gimpplugindir %(%___build_pre; gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins +%endif %global iconrootdir %{_datadir}/icons/hicolor # needed for off-root building @@ -92,7 +94,9 @@ URL: http://www.xsane.org/ BuildRequires: gcc # uses make BuildRequires: make +%if %{with gimp} BuildRequires: gimp-devel +%endif BuildRequires: gtk2-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel @@ -106,6 +110,9 @@ Requires: hicolor-icon-theme %if %{with pixbuf_extra_modules} Requires: gdk-pixbuf2-modules-extra%{?_isa} %endif +%if %{without gimp} +Obsoletes: xsane-gimp < %{version}-%{release} +%endif %description XSane is an X based interface for the SANE (Scanner Access Now Easy) @@ -113,6 +120,7 @@ library, which provides access to scanners, digital cameras, and other capture devices. XSane is written in GTK+ and provides control for performing the scan and then manipulating the captured image. +%if %{with gimp} %package gimp Summary: GIMP plug-in providing the SANE scanner interface Requires: gimp >= 2:2.2.12-4 @@ -125,6 +133,7 @@ Requires: gdk-pixbuf2-modules-extra%{?_isa} This package provides the regular XSane frontend for the SANE scanner interface, but it works as a GIMP plug-in. You must have GIMP installed to use this package. +%endif %package common Summary: Common files for xsane packages @@ -173,6 +182,7 @@ mkdir build-without-gimp CFLAGS='%optflags -fno-strict-aliasing -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"' export CFLAGS +%if %{with gimp} pushd build-with-gimp %configure --enable-gimp if grep -Fq '#undef HAVE_ANY_GIMP' include/config.h; then @@ -181,6 +191,7 @@ if grep -Fq '#undef HAVE_ANY_GIMP' include/config.h; then fi %make_build popd +%endif pushd build-without-gimp %configure --disable-gimp @@ -195,12 +206,11 @@ pushd build-without-gimp %make_install popd +%if %{with gimp} # install GIMP plugin install -m 0755 -d %{buildroot}%{gimpplugindir} -%if %{with gimp3} -install -m 0755 -d %{buildroot}%{gimpplugindir}/%{name} -%endif install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}/%{name} +%endif # install customized desktop file rm %{buildroot}%{_datadir}/applications/xsane.desktop @@ -263,11 +273,8 @@ EOF %{_datadir}/pixmaps/xsane.xpm %{iconrootdir}/*/apps/%{name}.png +%if %{with gimp} %files gimp -%if %{with gimp3} -%dir %{gimpplugindir}/%{name} -%{gimpplugindir}/%{name}/%{name} -%else %{gimpplugindir}/%{name} %endif From 846ace0a29063335c708b01e9696eda062d7459c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 13 Oct 2024 23:40:02 +0200 Subject: [PATCH 35/40] Got the GIMP logic in reverse, oops [skip changelog] Signed-off-by: Nils Philippsen --- xsane.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xsane.spec b/xsane.spec index 40f2d86..2b8ec98 100644 --- a/xsane.spec +++ b/xsane.spec @@ -1,8 +1,8 @@ %if ! 0%{?fedora} || 0%{?fedora} >= 41 -%bcond gimp 1 +%bcond gimp 0 %bcond pixbuf_extra_modules 1 %else -%bcond gimp 0 +%bcond gimp 1 %bcond pixbuf_extra_modules 0 %endif From d98b998450db2a1b047b863914e8b21d5a6b8213 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:18:04 +0000 Subject: [PATCH 36/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 67c7f6591398ab46f71ba4f0eb33cb0539e56a4b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 27 Jan 2025 10:44:18 +0100 Subject: [PATCH 37/40] Fix FTBFS (fedora#2341584) --- 0001-replace-gtk_timeout-with-g_timeout.patch | 273 ++++++++++++++++++ xsane-gcc15-c23.patch | 13 + xsane.spec | 6 + 3 files changed, 292 insertions(+) create mode 100644 0001-replace-gtk_timeout-with-g_timeout.patch create mode 100644 xsane-gcc15-c23.patch diff --git a/0001-replace-gtk_timeout-with-g_timeout.patch b/0001-replace-gtk_timeout-with-g_timeout.patch new file mode 100644 index 0000000..2821891 --- /dev/null +++ b/0001-replace-gtk_timeout-with-g_timeout.patch @@ -0,0 +1,273 @@ +diff -up xsane-0.999/src/xsane.c.replace-gtk-timeout xsane-0.999/src/xsane.c +--- xsane-0.999/src/xsane.c.replace-gtk-timeout 2025-01-27 10:31:25.223795660 +0100 ++++ xsane-0.999/src/xsane.c 2025-01-27 10:35:45.159120946 +0100 +@@ -636,8 +636,10 @@ static void xsane_printer_callback(GtkWi + + /* ---------------------------------------------------------------------------------------------------------------------- */ + +-static gint xsane_resolution_timer_callback(GtkAdjustment *adj) ++static gboolean xsane_resolution_timer_callback(gpointer data) + { ++ GtkAdjustment *adj = GTK_ADJUSTMENT(data); ++ + if ((adj) && (!preferences.show_resolution_list)) /* make sure adjustment is valid */ + { + float val = adj->value; +@@ -646,10 +648,10 @@ static gint xsane_resolution_timer_callb + gtk_adjustment_set_value(adj, val); + } + +- gtk_timeout_remove(xsane_resolution_timer); ++ g_source_remove(xsane_resolution_timer); + xsane_resolution_timer = 0; + +- return 0; /* stop timeout */ ++ return FALSE; /* stop timeout */ + } + + /* ---------------------------------------------------------------------------------------------------------------------- */ +@@ -676,10 +678,10 @@ static void xsane_resolution_scale_updat + /* the resolution slider gets almost unusable when we do this with win32 */ + if (xsane_resolution_timer) + { +- gtk_timeout_remove(xsane_resolution_timer); ++ g_source_remove(xsane_resolution_timer); + xsane_resolution_timer = 0; + } +- xsane_resolution_timer = gtk_timeout_add(XSANE_HOLD_TIME, (GtkFunction) xsane_resolution_timer_callback, (gpointer) adj); ++ xsane_resolution_timer = g_timeout_add(XSANE_HOLD_TIME, xsane_resolution_timer_callback, (gpointer) adj); + #endif + } + else +diff -up xsane-0.999/src/xsane-email-project.c.replace-gtk-timeout xsane-0.999/src/xsane-email-project.c +--- xsane-0.999/src/xsane-email-project.c.replace-gtk-timeout 2025-01-27 10:31:25.215795681 +0100 ++++ xsane-0.999/src/xsane-email-project.c 2025-01-27 10:31:25.226795652 +0100 +@@ -586,7 +586,7 @@ static void xsane_email_project_display_ + + /* ---------------------------------------------------------------------------------------------------------------------- */ + +-static gint xsane_email_send_timer_callback(gpointer data) ++static gboolean xsane_email_send_timer_callback(gpointer data) + { + xsane_email_project_display_status(); + +@@ -599,7 +599,7 @@ static gint xsane_email_send_timer_callb + } + } + +- return xsane_email_send_timer; ++ return (xsane_email_send_timer!=0); + } + + /* ---------------------------------------------------------------------------------------------------------------------- */ +@@ -819,9 +819,9 @@ static void xsane_email_project_load() + gtk_widget_set_sensitive(xsane.project_entry_box, TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(xsane.start_button), FALSE); + +- if (xsane_email_send_timer == 0) ++ if (xsane_email_send_timer) + { +- xsane_email_send_timer = gtk_timeout_add(100, (GtkFunction) xsane_email_send_timer_callback, NULL); ++ xsane_email_send_timer = g_timeout_add(100, xsane_email_send_timer_callback, NULL); + DBG(DBG_info, "enabling email send timer (%d)\n", xsane_email_send_timer); + } + } +@@ -1959,7 +1959,7 @@ static void xsane_email_send() + xsane_front_gtk_add_process_to_list(pid); /* add pid to child process list */ + } + +- xsane_email_send_timer = gtk_timeout_add(100, (GtkFunction) xsane_email_send_timer_callback, NULL); ++ xsane_email_send_timer = g_timeout_add(100, xsane_email_send_timer_callback, NULL); + DBG(DBG_info, "enabling email send timer (%d)\n", xsane_email_send_timer); + + xsane_set_sensitivity(TRUE); /* allow changing xsane mode */ +diff -up xsane-0.999/src/xsane-gamma.c.replace-gtk-timeout xsane-0.999/src/xsane-gamma.c +--- xsane-0.999/src/xsane-gamma.c.replace-gtk-timeout 2010-11-16 21:25:38.000000000 +0100 ++++ xsane-0.999/src/xsane-gamma.c 2025-01-27 10:31:25.227795650 +0100 +@@ -553,13 +553,13 @@ void xsane_update_sliders() + + /* ---------------------------------------------------------------------------------------------------------------------- */ + +-static gint xsane_batch_scan_gamma_event() ++static gboolean xsane_batch_scan_gamma_event(gpointer user_data) + { + DBG(DBG_proc, "xsane_batch_scan_gamma_event\n"); + + xsane_batch_scan_update_icon_list(); /* update gamma of batch scan icons */ + +- gtk_timeout_remove(xsane.batch_scan_gamma_timer); ++ g_source_remove(xsane.batch_scan_gamma_timer); + xsane.batch_scan_gamma_timer = 0; + + return FALSE; +@@ -567,18 +567,18 @@ static gint xsane_batch_scan_gamma_event + + /* ---------------------------------------------------------------------------------------------------------------------- */ + +-static gint xsane_slider_hold_event() ++static gboolean xsane_slider_hold_event(gpointer user_data) + { + DBG(DBG_proc, "xsane_slider_hold_event\n"); + + xsane_enhancement_by_histogram(TRUE); + +- gtk_timeout_remove(xsane.slider_timer); ++ g_source_remove(xsane.slider_timer); + xsane.slider_timer = 0; + + if (xsane.slider_timer_restart) + { +- xsane.slider_timer = gtk_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, xsane_slider_hold_event, 0); ++ xsane.slider_timer = g_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, xsane_slider_hold_event, 0); + xsane.slider_timer_restart = FALSE; + } + +@@ -676,7 +676,7 @@ static gint xsane_slider_callback(GtkWid + /* call xsane_enhancement_by_histogram by event handler */ + if (!xsane.slider_timer) + { +- xsane.slider_timer = gtk_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, xsane_slider_hold_event, 0); ++ xsane.slider_timer = g_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, xsane_slider_hold_event, 0); + } + else + { +@@ -687,10 +687,10 @@ static gint xsane_slider_callback(GtkWid + { + if (xsane.slider_timer) /* hold timer active? then remove it, we had a motion */ + { +- gtk_timeout_remove(xsane.slider_timer); ++ g_source_remove(xsane.slider_timer); + } + /* call xsane_slider_hold_event if mouse is not moved for ??? ms */ +- xsane.slider_timer = gtk_timeout_add(XSANE_HOLD_TIME, xsane_slider_hold_event, 0); ++ xsane.slider_timer = g_timeout_add(XSANE_HOLD_TIME, xsane_slider_hold_event, 0); + } + } + +@@ -1961,9 +1961,9 @@ void xsane_enhancement_by_gamma(void) + + if (xsane.batch_scan_gamma_timer) + { +- gtk_timeout_remove(xsane.batch_scan_gamma_timer); ++ g_source_remove(xsane.batch_scan_gamma_timer); + } +- xsane.batch_scan_gamma_timer = gtk_timeout_add(XSANE_CONTINUOUS_HOLD_TIME * 4, xsane_batch_scan_gamma_event, 0); ++ xsane.batch_scan_gamma_timer = g_timeout_add(XSANE_CONTINUOUS_HOLD_TIME * 4, xsane_batch_scan_gamma_event, 0); + } + + /* ---------------------------------------------------------------------------------------------------------------------- */ +diff -up xsane-0.999/src/xsane-preview.c.replace-gtk-timeout xsane-0.999/src/xsane-preview.c +--- xsane-0.999/src/xsane-preview.c.replace-gtk-timeout 2025-01-27 10:31:25.216795678 +0100 ++++ xsane-0.999/src/xsane-preview.c 2025-01-27 10:35:08.656216012 +0100 +@@ -159,7 +159,7 @@ static int preview_make_image_path(Previ + static void preview_restore_image(Preview *p); + static gint preview_expose_event_handler_start(GtkWidget *window, GdkEvent *event, gpointer data); + static gint preview_expose_event_handler_end(GtkWidget *window, GdkEvent *event, gpointer data); +-static gint preview_hold_event_handler(gpointer data); ++static gboolean preview_hold_event_handler(gpointer data); + static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpointer data); + static gint preview_button_press_event_handler(GtkWidget *window, GdkEvent *event, gpointer data); + static gint preview_button_release_event_handler(GtkWidget *window, GdkEvent *event, gpointer data); +@@ -2978,7 +2978,7 @@ static void preview_display_color_compon + + /* ---------------------------------------------------------------------------------------------------------------------- */ + +-static gint preview_hold_event_handler(gpointer data) ++static gboolean preview_hold_event_handler(gpointer data) + { + Preview *p = data; + +@@ -2989,7 +2989,7 @@ static gint preview_hold_event_handler(g + preview_establish_selection(p); + p->gamma_functions_interruptable = FALSE; + +- gtk_timeout_remove(p->hold_timer); ++ g_source_remove(p->hold_timer); + p->hold_timer = 0; + + return FALSE; +@@ -3192,7 +3192,7 @@ static gint preview_motion_event_handler + { + if (!p->hold_timer) /* hold timer active? then remove it, we had a motion */ + { +- p->hold_timer = gtk_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, preview_hold_event_handler, (gpointer *) p); ++ p->hold_timer = g_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, preview_hold_event_handler, (gpointer) p); + } + preview_update_maximum_output_size(p); + preview_draw_selection(p); +@@ -3202,10 +3202,10 @@ static gint preview_motion_event_handler + /* call preview_hold_event_hanlder if mouse is not moved for ??? ms */ + if (p->hold_timer) /* hold timer active? then remove it, we had a motion */ + { +- gtk_timeout_remove(p->hold_timer); ++ g_source_remove(p->hold_timer); + p->hold_timer = 0; + } +- p->hold_timer = gtk_timeout_add(XSANE_HOLD_TIME, preview_hold_event_handler, (gpointer *) p); ++ p->hold_timer = g_timeout_add(XSANE_HOLD_TIME, preview_hold_event_handler, (gpointer) p); + preview_update_maximum_output_size(p); + preview_draw_selection(p); + } +@@ -3376,7 +3376,7 @@ static gint preview_motion_event_handler + { + if (!p->hold_timer) /* hold timer active? then remove it, we had a motion */ + { +- p->hold_timer = gtk_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, preview_hold_event_handler, (gpointer *) p); ++ p->hold_timer = g_timeout_add(XSANE_CONTINUOUS_HOLD_TIME, preview_hold_event_handler, (gpointer) p); + } + preview_update_maximum_output_size(p); + preview_draw_selection(p); +@@ -3385,10 +3385,10 @@ static gint preview_motion_event_handler + { + if (p->hold_timer) /* hold timer active? then remove it, we had a motion */ + { +- gtk_timeout_remove(p->hold_timer); ++ g_source_remove(p->hold_timer); + p->hold_timer = 0; + } +- p->hold_timer = gtk_timeout_add (XSANE_HOLD_TIME, preview_hold_event_handler, (gpointer *) p); ++ p->hold_timer = g_timeout_add (XSANE_HOLD_TIME, preview_hold_event_handler, (gpointer) p); + preview_update_maximum_output_size(p); + preview_draw_selection(p); + } +diff -up xsane-0.999/src/xsane-scan.c.replace-gtk-timeout xsane-0.999/src/xsane-scan.c +--- xsane-0.999/src/xsane-scan.c.replace-gtk-timeout 2025-01-27 10:31:25.217795676 +0100 ++++ xsane-0.999/src/xsane-scan.c 2025-01-27 10:31:25.227795650 +0100 +@@ -53,7 +53,7 @@ static int xsane_test_multi_scan(void); + void xsane_scan_done(SANE_Status status); + void xsane_cancel(void); + static void xsane_start_scan(void); +-gint xsane_scan_dialog(gpointer *data); ++gboolean xsane_scan_dialog(gpointer data); + static void xsane_create_internal_gamma_tables(void); + + /* ---------------------------------------------------------------------------------------------------------------------- */ +@@ -1598,7 +1598,7 @@ void xsane_scan_done(SANE_Status status) + + DBG(DBG_info, "ADF mode end of scan: increment page counter and restart scan\n"); + xsane.adf_page_counter += 1; +- gtk_timeout_add(100, (GtkFunction)xsane_scan_dialog, NULL); /* wait 100ms then call xsane_scan_dialog(); */ ++ g_timeout_add(100, xsane_scan_dialog, NULL); /* wait 100ms then call xsane_scan_dialog(); */ + } + else if ( ( (status == SANE_STATUS_GOOD) || (status == SANE_STATUS_EOF) ) && (xsane.batch_loop == BATCH_MODE_LOOP) ) + { +@@ -1876,7 +1876,7 @@ static void xsane_start_scan(void) + /* or by scan_done if automatic document feeder is selected */ + /* always returns 0 beacause ADF function calls it as timeout function */ + /* and return value 0 is used to tell the timeout handler to stop timer */ +-gint xsane_scan_dialog(gpointer *data) ++gboolean xsane_scan_dialog(gpointer data) + { + char buf[TEXTBUFSIZE]; + const SANE_Option_Descriptor *opt; +diff -up xsane-0.999/src/xsane-scan.h.replace-gtk-timeout xsane-0.999/src/xsane-scan.h +--- xsane-0.999/src/xsane-scan.h.replace-gtk-timeout 2007-01-05 19:15:25.000000000 +0100 ++++ xsane-0.999/src/xsane-scan.h 2025-01-27 10:31:25.228795647 +0100 +@@ -28,6 +28,6 @@ + + extern void xsane_scan_done(SANE_Status status); + extern void xsane_cancel(void); +-extern gint xsane_scan_dialog(gpointer *data); ++extern gboolean xsane_scan_dialog(gpointer data); + + /* ---------------------------------------------------------------------------------------------------------------------- */ diff --git a/xsane-gcc15-c23.patch b/xsane-gcc15-c23.patch new file mode 100644 index 0000000..bda0d33 --- /dev/null +++ b/xsane-gcc15-c23.patch @@ -0,0 +1,13 @@ +diff --git a/src/xsane-save.h b/src/xsane-save.h +index 64db676..0ebade7 100644 +--- a/src/xsane-save.h ++++ b/src/xsane-save.h +@@ -50,7 +50,7 @@ struct pdf_xref + + + extern int xsane_create_secure_file(const char *filename); +-extern void xsane_cancel_save(); ++extern void xsane_cancel_save(int *cancel_save); + extern void xsane_convert_text_to_filename(char **filename); + extern int xsane_get_filesize(char *filename); + extern void xsane_ensure_counter_in_filename(char **filename, int counter_len); diff --git a/xsane.spec b/xsane.spec index 2b8ec98..63471cf 100644 --- a/xsane.spec +++ b/xsane.spec @@ -78,6 +78,10 @@ Patch14: xsane-0.999-snprintf-update.patch Patch15: xsane-0.999-signal-handling.patch # https://gitlab.com/sane-project/frontend/xsane/-/commit/96424e369f67 Patch16: 0001-Follow-new-convention-for-registering-gimp-plugin.patch +# https://gitlab.com/sane-project/frontend/xsane/-/commit/bf9ef48ab57 +Patch17: 0001-replace-gtk_timeout-with-g_timeout.patch +# https://gitlab.com/sane-project/frontend/xsane/-/merge_requests/32 +Patch18: xsane-gcc15-c23.patch # autoconf-generated files Patch100: xsane-0.999-7-autoconf.patch.bz2 @@ -168,6 +172,8 @@ done %patch -P 14 -p1 -b .snprintf-update %patch -P 15 -p1 -b .signal-handling %patch -P 16 -p1 -b .use-register +%patch -P 17 -p1 -b .replace-gtk-timeout +%patch -P 18 -p1 -b .gcc15-c23 %patch -P 100 -p1 -b .autoconf %patch -P 101 -p1 -b .c99 From f0b616c13413673dcb1bdeef8c9d76591a2fb990 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:04:40 +0000 Subject: [PATCH 38/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 563b33d00674e1b0d9c7e2ddce55e652decdc780 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:53:53 +0000 Subject: [PATCH 39/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 8c676a182b1540754a93c2fb8d405444554ad0d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:26:34 +0000 Subject: [PATCH 40/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild