From b37a2e6b2b41b07079791007ecd57ee843d37cde Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 12 Jan 2025 19:52:00 +0300 Subject: [PATCH] import xsane-0.999-76.el10 --- .gitignore | 3 +- .xsane.metadata | 5 +- ...nvention-for-registering-gimp-plugin.patch | 72 ++++++++ SOURCES/xsane-256x256.png | Bin 0 -> 18478 bytes SOURCES/xsane-configure-c99.patch | 36 ++++ SPECS/xsane.spec | 173 +++++++++++++----- 6 files changed, 236 insertions(+), 53 deletions(-) create mode 100644 SOURCES/0001-Follow-new-convention-for-registering-gimp-plugin.patch create mode 100644 SOURCES/xsane-256x256.png create mode 100644 SOURCES/xsane-configure-c99.patch diff --git a/.gitignore b/.gitignore index 322f372..b117f32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -SOURCES/xsane-0.999-7-autoconf.patch.bz2 SOURCES/xsane-0.999.tar.gz -SOURCES/xsane-256x256.png +SOURCES/xsane-0.999-7-autoconf.patch.bz2 diff --git a/.xsane.metadata b/.xsane.metadata index fcafcb3..295a9df 100644 --- a/.xsane.metadata +++ b/.xsane.metadata @@ -1,3 +1,2 @@ -8984dbb732b8b0f98d9bd50fdb16d3510d7d2eef SOURCES/xsane-0.999-7-autoconf.patch.bz2 -633150e4e690c1e8c18d6b82886c2fb4daba4bc9 SOURCES/xsane-0.999.tar.gz -ab0517cb7fa9a7fc30499f56f7e9aac628d9bc40 SOURCES/xsane-256x256.png +633150e4e690c1e8c18d6b82886c2fb4daba4bc9 SOURCES/xsane-0.999.tar.gz +8984dbb732b8b0f98d9bd50fdb16d3510d7d2eef SOURCES/xsane-0.999-7-autoconf.patch.bz2 diff --git a/SOURCES/0001-Follow-new-convention-for-registering-gimp-plugin.patch b/SOURCES/0001-Follow-new-convention-for-registering-gimp-plugin.patch new file mode 100644 index 0000000..23be0d2 --- /dev/null +++ b/SOURCES/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/SOURCES/xsane-256x256.png b/SOURCES/xsane-256x256.png new file mode 100644 index 0000000000000000000000000000000000000000..608d63aca2866af0ef058d4254394341d7983765 GIT binary patch literal 18478 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 literal 0 HcmV?d00001 diff --git a/SOURCES/xsane-configure-c99.patch b/SOURCES/xsane-configure-c99.patch new file mode 100644 index 0000000..75e6cff --- /dev/null +++ b/SOURCES/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/SPECS/xsane.spec b/SPECS/xsane.spec index 2eddcee..ac6589c 100644 --- a/SPECS/xsane.spec +++ b/SPECS/xsane.spec @@ -1,7 +1,27 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.7.2) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 76; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%if ! 0%{?fedora} || 0%{?fedora} >= 41 +%bcond gimp 0 +%bcond pixbuf_extra_modules 1 +%else +%bcond gimp 1 +%bcond pixbuf_extra_modules 0 +%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 %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins +%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 @@ -10,7 +30,7 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.999 -Release: 42%{?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 @@ -66,17 +86,25 @@ 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 -License: GPLv2+ and LGPLv2+ + +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 AND LGPL-3.0-or-later URL: http://www.xsane.org/ # gcc is no longer in buildroot by default BuildRequires: gcc # uses make BuildRequires: make -%if 0%{?rhel} <= 8 || 0%{?fedora} +%if %{with gimp} BuildRequires: gimp-devel %endif BuildRequires: gtk2-devel @@ -89,6 +117,12 @@ BuildRequires: libtiff-devel BuildRequires: gettext-devel Requires: xsane-common 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) @@ -96,11 +130,14 @@ 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} +%if %{with gimp} %package gimp Summary: GIMP plug-in providing the SANE scanner interface Requires: gimp >= 2:2.2.12-4 Requires: xsane-common +%if %{with pixbuf_extra_modules} +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description gimp This package provides the regular XSane frontend for the SANE scanner @@ -124,24 +161,26 @@ 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 - -%patch100 -p1 -b .autoconf +%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 -P 16 -p1 -b .use-register + +%patch -P 100 -p1 -b .autoconf +%patch -P 101 -p1 -b .c99 # in-root config.h breaks off-root building rm include/config.h @@ -153,9 +192,13 @@ mkdir build-without-gimp CFLAGS='%optflags -fno-strict-aliasing -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"' export CFLAGS -%if 0%{?rhel} <= 8 || 0%{?fedora} +%if %{with gimp} 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 %endif @@ -173,10 +216,10 @@ pushd build-without-gimp %make_install popd -%if 0%{?rhel} <= 8 || 0%{?fedora} +%if %{with gimp} # install GIMP plugin install -m 0755 -d %{buildroot}%{gimpplugindir} -install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir} +install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}/%{name} %endif # install customized desktop file @@ -230,32 +273,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} +%if %{with gimp} %files gimp -%{gimpplugindir}/xsane +%{gimpplugindir}/%{name} %endif %files common @@ -265,12 +295,57 @@ fi %{_datadir}/sane/xsane %changelog -* Tue Aug 10 2021 Mohan Boddu - 0.999-42 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Sun Jan 12 2025 Arkady L. Shane - 0.999-76 +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Mohan Boddu - 0.999-41 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +## START: Generated by rpmautospec +* Sun Oct 13 2024 Nils Philippsen - 0.999-75 +- Drop GIMP plugin for Fedora >= 41 + +* Thu Aug 29 2024 Nils Philippsen - 0.999-73 +- Use https bugzilla URL + +* Tue Aug 27 2024 Zdenek Dohnal - 0.999-70 +- Use procedure registration for the plugin + +* Mon Aug 19 2024 Nils Philippsen - 0.999-69 +- Rebuild against new gimp + +* 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 @@ -358,7 +433,7 @@ fi - 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 +- update to newer snprintf implementation from LPRng that resolves license issue (#1102523) * Thu Apr 03 2014 Nils Philippsen - 0.999-12 @@ -850,3 +925,5 @@ fi * Thu Apr 22 1999 Preston Brown - initial RPM for PowerTools 6.0 + +## END: Generated by rpmautospec