parent
9ae17bfa26
commit
b37a2e6b2b
GPG Key ID:
1EC08A25C9DB2503
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 _("<Toolbox>/File/Acquire/XSane: Device dialog...")
|
||||
#define XSANE_GIMP_MENU _("<Toolbox>/File/Acquire/XSane: ")
|
||||
#define XSANE_GIMP_MENU_DIALOG_OLD _("<Toolbox>/Xtns/XSane/Device dialog...")
|
||||
|
After Width: | Height: | Size: 18 KiB |
@ -0,0 +1,36 @@
|
||||
Avoid implicit function declarations, for improved compatibility with
|
||||
future compilers.
|
||||
|
||||
Fixed upstream via:
|
||||
|
||||
commit 562008027f343127d70bae44457cf8f06c666428
|
||||
Author: Ralph Little <littlesincanada@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/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 <sane/sane.h>
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
|
||||
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 <sane/sane.h>
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
Loading…
Reference in new issue