3 files changed, 72 insertions, 0 deletions
diff --git a/debian/patches/deb_non_working_help_menu.patch b/debian/patches/deb_non_working_help_menu.patch
new file mode 100644
index 0000000..f5b8e54
--- /dev/null
+++ b/debian/patches/deb_non_working_help_menu.patch
@@ -0,0 +1,36 @@
+Description: Remove not working items in Help menu
+Origin: other, https://build.opensuse.org/package/view_file?expand=1&file=remove-non-working-help.patch&package=xsane&project=devel%3AopenSUSE%3AFactory
+Forwarded: no
+
+Index: xsane-0.998/src/xsane.c
+===================================================================
+--- xsane-0.998.orig/src/xsane.c	2013-01-27 01:44:39.000000000 +0100
++++ xsane-0.998/src/xsane.c	2013-01-29 01:14:28.983590459 +0100
+@@ -4260,27 +4260,6 @@
+   gtk_widget_show(item);
+ 
+ 
+-  /* Backend doc -> html viewer */
+-
+-  if (xsane.backend)
+-  {
+-    item = gtk_menu_item_new_with_label(MENU_ITEM_BACKEND_DOC);
+-    gtk_menu_append(GTK_MENU(menu), item);
+-    g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) xsane.backend);
+-    gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F2, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
+-    gtk_widget_show(item);
+-  }
+-
+-
+-  /* available backends -> html viewer */
+-
+-  item = gtk_menu_item_new_with_label(MENU_ITEM_AVAILABLE_BACKENDS);
+-  gtk_menu_append(GTK_MENU(menu), item);
+-  g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) "sane-backends");
+-  gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F3, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
+-  gtk_widget_show(item);
+-
+-  
+   /* problems -> html viewer */
+ 
+   item = gtk_menu_item_new_with_label(MENU_ITEM_PROBLEMS);
diff --git a/debian/patches/fix_png15.patch b/debian/patches/fix_png15.patch
new file mode 100644
index 0000000..bffc9ee
--- /dev/null
+++ b/debian/patches/fix_png15.patch
@@ -0,0 +1,34 @@
+Description: Build with libpng15.
+Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+Bug-Debian: http://bugs.debian.org/649800
+Forwarded: no
+
+Index: xsane-0.998/src/xsane-save.c
+===================================================================
+--- xsane-0.998.orig/src/xsane-save.c	2013-01-27 01:44:39.000000000 +0100
++++ xsane-0.998/src/xsane-save.c	2013-01-29 00:17:56.934234295 +0100
+@@ -4928,8 +4928,11 @@
+     xsane_back_gtk_error(buf, TRUE);
+     return -1; /* error */
+   }
+-
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
+@@ -5119,7 +5122,11 @@
+     return -1; /* error */
+   }
+ 
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
diff --git a/debian/patches/series b/debian/patches/series
index 7842754..f59f1fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,5 @@ i18n_po_update_fr.patch
 fix_preview_mouse_events.patch
 fix_spin_button_pagesize.patch
 fix_tighten_default_umask.patch
+fix_png15.patch
+deb_non_working_help_menu.patch