[packages/xsane] - rel 4 - disable gimp plugin (broken with gimp 3) - fix configure and build
baggins
baggins at pld-linux.org
Wed Jan 29 23:14:36 CET 2025
commit d06c4889bd94e780eab826a1ee1228e060cdd7b0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jan 30 00:13:40 2025 +0100
- rel 4
- disable gimp plugin (broken with gimp 3)
- fix configure and build
replace-gtk_timeout-with-g_timeout.patch | 273 +++++++++++++++++++++++++++++++
xsane-configure-c99.patch | 25 +++
xsane.spec | 67 +++++---
3 files changed, 339 insertions(+), 26 deletions(-)
---
diff --git a/xsane.spec b/xsane.spec
index 3d44bc8..c13a2dd 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -1,9 +1,13 @@
+#
+# Conditional build:
+%bcond_with gimp # build gimp plugin
+
Summary: Improved SANE frontend
Summary(pl.UTF-8): Ulepszony frontend do SANE
Summary(zh_CN.UTF-8): xsane - 一个图形扫描程序
Name: xsane
Version: 0.999
-Release: 3
+Release: 4
License: GPL v2+
Group: X11/Applications/Graphics
# Source0Download: http://www.xsane.org/cgi-bin/sitexplorer.cgi?/download/
@@ -28,6 +32,8 @@ Patch12: %{name}-0.999-lcms2.patch
Patch13: %{name}-0.999-coverity.patch
Patch14: %{name}-0.999-snprintf-update.patch
Patch15: %{name}-0.999-signal-handling.patch
+Patch16: %{name}-configure-c99.patch
+Patch17: replace-gtk_timeout-with-g_timeout.patch
# PLD
Patch50: %{name}-datadir.patch
Patch51: %{name}-pl.po-update.patch
@@ -37,7 +43,7 @@ URL: http://www.xsane.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-tools
-BuildRequires: gimp-devel >= 1:2.0.0
+%{?with_gimp:BuildRequires: gimp-devel >= 1:2.0.0}
BuildRequires: gtk+2-devel >= 1:2.0.0
BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
@@ -60,42 +66,48 @@ do komunikacji ze skanerem.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
+%patch -P 11 -p1
+%patch -P 12 -p1
+%patch -P 13 -p1
+%patch -P 14 -p1
+%patch -P 15 -p1
+%patch -P 16 -p1
+%patch -P 17 -p1
+
+%patch -P 50 -p1
+%patch -P 51 -p1
+%patch -P 52 -p1
+%patch -P 53 -p1
mv -f po/{zh,zh_TW}.po
%{__sed} -i -e 's/ zh/ zh_TW/' configure.in
%build
+cp -f %{_datadir}/automake/config.guess .
+cp -f %{_datadir}/automake/config.sub .
%{__gettextize}
%{__aclocal} -I m4
%{__autoconf}
-%configure
+%configure \
+ %{__enable_disable gimp gimp}
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_gimpplugindir},%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -103,7 +115,10 @@ install -d $RPM_BUILD_ROOT{%{_gimpplugindir},%{_desktopdir},%{_pixmapsdir}}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+%if %{with gimp}
+install -d $RPM_BUILD_ROOT%{_gimpplugindir}
ln -sf %{_bindir}/xsane $RPM_BUILD_ROOT%{_gimpplugindir}/xsane
+%endif
%find_lang %{name}
@@ -114,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ICM.TODO xsane.{ACCELKEYS,AUTHOR,BUGS,CHANGES,LOGO,NEWS,ONLINEHELP,PROBLEMS,ROOT,TODO}
%attr(755,root,root) %{_bindir}/xsane
-%attr(755,root,root) %{_gimpplugindir}/xsane
+%{?with_gimp:%attr(755,root,root) %{_gimpplugindir}/xsane}
%{_datadir}/xsane
%{_mandir}/man1/xsane.1*
%{_desktopdir}/xsane.desktop
diff --git a/replace-gtk_timeout-with-g_timeout.patch b/replace-gtk_timeout-with-g_timeout.patch
new file mode 100644
index 0000000..2821891
--- /dev/null
+++ b/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-configure-c99.patch b/xsane-configure-c99.patch
new file mode 100644
index 0000000..1c8c517
--- /dev/null
+++ b/xsane-configure-c99.patch
@@ -0,0 +1,25 @@
+Avoid implicit function declarations, for improved compatibility with
+future compilers.
+
+Fixed upstream via:
+
+commit 562008027f343127d70bae44457cf8f06c666428
+Author: Ralph Little <littlesincanada at yahoo.co.uk>
+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/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 <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+
+ int
+ main ()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xsane.git/commitdiff/d06c4889bd94e780eab826a1ee1228e060cdd7b0
More information about the pld-cvs-commit
mailing list