consolidate patches with git patch branches
This commit is contained in:
Nils Philippsen
parent
2274f561ca
commit
c1618aba05
@ -1,6 +1,23 @@
|
||||
diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
|
||||
--- xsane-0.995/src/xsane.c.close-fds 2007-09-28 17:24:56.000000000 +0200
|
||||
+++ xsane-0.995/src/xsane.c 2008-07-18 16:10:30.000000000 +0200
|
||||
From 6dee7eadd1b7352ec503ea04fa1639d4a93f370b Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 11:18:31 +0200
|
||||
Subject: [PATCH] patch: close-fds
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit 4fdedd3a8b66fb42b2d4dde62df28c78571c1c5d
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:15:58 2010 +0100
|
||||
|
||||
don't leak file descriptors to help browser process (#455450)
|
||||
---
|
||||
src/xsane.c | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 43 insertions(+)
|
||||
|
||||
diff --git a/src/xsane.c b/src/xsane.c
|
||||
index 775610e..1c5d61d 100644
|
||||
--- a/src/xsane.c
|
||||
+++ b/src/xsane.c
|
||||
@@ -48,6 +48,8 @@
|
||||
|
||||
#include <sys/wait.h>
|
||||
@ -10,7 +27,7 @@ diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
|
||||
/* ---------------------------------------------------------------------------------------------------------------------- */
|
||||
|
||||
struct option long_options[] =
|
||||
@@ -3673,6 +3675,41 @@ static void xsane_show_gpl(GtkWidget *wi
|
||||
@@ -3684,6 +3686,41 @@ static void xsane_show_gpl(GtkWidget *widget, gpointer data)
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------------------------------- */
|
||||
|
||||
@ -52,7 +69,7 @@ diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
|
||||
static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via netscape remote */
|
||||
{
|
||||
char *name = (char *) data;
|
||||
@@ -3725,6 +3762,8 @@ static void xsane_show_doc_via_nsr(GtkWi
|
||||
@@ -3736,6 +3773,8 @@ static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via
|
||||
ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
|
||||
}
|
||||
|
||||
@ -61,7 +78,7 @@ diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
|
||||
DBG(DBG_info, "trying to change user id for new subprocess:\n");
|
||||
DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
|
||||
setuid(getuid());
|
||||
@@ -3767,6 +3806,8 @@ static void xsane_show_doc_via_nsr(GtkWi
|
||||
@@ -3778,6 +3817,8 @@ static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via
|
||||
ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
|
||||
}
|
||||
|
||||
@ -70,7 +87,7 @@ diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
|
||||
DBG(DBG_info, "trying to change user id for new subprocess:\n");
|
||||
DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
|
||||
setuid(getuid());
|
||||
@@ -3888,6 +3929,8 @@ static void xsane_show_doc(GtkWidget *wi
|
||||
@@ -3899,6 +3940,8 @@ static void xsane_show_doc(GtkWidget *widget, gpointer data)
|
||||
ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
|
||||
}
|
||||
|
||||
@ -79,3 +96,6 @@ diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
|
||||
DBG(DBG_info, "trying to change user id for new subprocess:\n");
|
||||
DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
|
||||
setuid(getuid());
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,6 +1,23 @@
|
||||
diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
|
||||
--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200
|
||||
+++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100
|
||||
From 813d7063e3d265ba7e625766a040b8ba9bb130a9 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 11:18:00 +0200
|
||||
Subject: [PATCH] patch: xdg-open
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit 55380b90cece459e20d14e6da552abcf5ca54621
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:14:17 2010 +0100
|
||||
|
||||
use "xdg-open" instead of "netscape" to launch help browser
|
||||
---
|
||||
src/xsane.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/xsane.h b/src/xsane.h
|
||||
index cf6111f..3d8caaa 100644
|
||||
--- a/src/xsane.h
|
||||
+++ b/src/xsane.h
|
||||
@@ -251,7 +251,7 @@
|
||||
# elif defined(HAVE_OS2_H)
|
||||
# define DEFAULT_BROWSER "netscape"
|
||||
@ -10,3 +27,6 @@ diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
|
||||
# endif
|
||||
#endif
|
||||
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,7 +1,39 @@
|
||||
diff -up xsane-0.996/src/xsane.c.no-eula xsane-0.996/src/xsane.c
|
||||
--- xsane-0.996/src/xsane.c.no-eula 2009-07-21 15:33:00.927455229 +0200
|
||||
+++ xsane-0.996/src/xsane.c 2009-07-21 15:39:28.661456472 +0200
|
||||
@@ -3524,10 +3524,13 @@ static void xsane_about_dialog(GtkWidget
|
||||
From 7018206ea45db2e8bdfeb67d33f3387c9678a407 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 11:19:16 +0200
|
||||
Subject: [PATCH] patch: no-eula
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit d13f1ccfdf4c150cab91105e9b8542ecbb048a9b
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:20:52 2010 +0100
|
||||
|
||||
don't show EULA, mention bugzilla in about dialog (#504344)
|
||||
---
|
||||
src/xsane-text.h | 2 ++
|
||||
src/xsane.c | 16 ++++++----------
|
||||
src/xsane.h | 3 +++
|
||||
3 files changed, 11 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/xsane-text.h b/src/xsane-text.h
|
||||
index fc6bbeb..ee4a222 100644
|
||||
--- a/src/xsane-text.h
|
||||
+++ b/src/xsane-text.h
|
||||
@@ -230,6 +230,8 @@
|
||||
"This program is distributed in the hope that it will be useful, but\n" \
|
||||
"WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
|
||||
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
|
||||
+#define TEXT_MODIFIED_BLURB _("This package is modified from the original version.\n" \
|
||||
+ "Please contact your vendor or report problems at")
|
||||
#define TEXT_EMAIL_ADR _("E-mail:")
|
||||
#define TEXT_HOMEPAGE _("Homepage:")
|
||||
#define TEXT_FILE _("File:")
|
||||
diff --git a/src/xsane.c b/src/xsane.c
|
||||
index 1c5d61d..8b24b0c 100644
|
||||
--- a/src/xsane.c
|
||||
+++ b/src/xsane.c
|
||||
@@ -3533,10 +3533,13 @@ static void xsane_about_dialog(GtkWidget *widget, gpointer data)
|
||||
snprintf(buf, sizeof(buf), "XSane %s %s\n"
|
||||
"%s %s\n"
|
||||
"\n"
|
||||
@ -15,7 +47,7 @@ diff -up xsane-0.996/src/xsane.c.no-eula xsane-0.996/src/xsane.c
|
||||
TEXT_HOMEPAGE, XSANE_HOMEPAGE,
|
||||
TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
|
||||
|
||||
@@ -5714,6 +5717,7 @@ static int xsane_init(int argc, char **a
|
||||
@@ -5733,6 +5736,7 @@ static int xsane_init(int argc, char **argv)
|
||||
|
||||
case 'v': /* --version */
|
||||
g_print("%s-%s %s %s\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
|
||||
@ -23,7 +55,7 @@ diff -up xsane-0.996/src/xsane.c.no-eula xsane-0.996/src/xsane.c
|
||||
g_print(" %s %s\n", TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
|
||||
g_print(" %s %s\n", TEXT_PACKAGE, XSANE_PACKAGE_VERSION);
|
||||
g_print(" %s%d.%d.%d\n", TEXT_GTK_VERSION, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
||||
@@ -5840,17 +5844,9 @@ static int xsane_init(int argc, char **a
|
||||
@@ -5859,17 +5863,9 @@ static int xsane_init(int argc, char **argv)
|
||||
}
|
||||
|
||||
|
||||
@ -43,9 +75,10 @@ diff -up xsane-0.996/src/xsane.c.no-eula xsane-0.996/src/xsane.c
|
||||
}
|
||||
|
||||
xsane_pref_restore_media();
|
||||
diff -up xsane-0.996/src/xsane.h.no-eula xsane-0.996/src/xsane.h
|
||||
--- xsane-0.996/src/xsane.h.no-eula 2009-07-21 15:33:00.921470546 +0200
|
||||
+++ xsane-0.996/src/xsane.h 2009-07-21 16:08:01.398707123 +0200
|
||||
diff --git a/src/xsane.h b/src/xsane.h
|
||||
index 3d8caaa..6c7568e 100644
|
||||
--- a/src/xsane.h
|
||||
+++ b/src/xsane.h
|
||||
@@ -98,6 +98,9 @@
|
||||
#define XSANE_EMAIL_ADR "Oliver.Rauch@xsane.org"
|
||||
#define XSANE_HOMEPAGE "http://www.xsane.org"
|
||||
@ -56,15 +89,6 @@ diff -up xsane-0.996/src/xsane.h.no-eula xsane-0.996/src/xsane.h
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------------------------------- */
|
||||
|
||||
diff -up xsane-0.996/src/xsane-text.h.no-eula xsane-0.996/src/xsane-text.h
|
||||
--- xsane-0.996/src/xsane-text.h.no-eula 2007-08-13 09:16:43.000000000 +0200
|
||||
+++ xsane-0.996/src/xsane-text.h 2009-07-21 15:42:00.609707360 +0200
|
||||
@@ -230,6 +230,8 @@
|
||||
"This program is distributed in the hope that it will be useful, but\n" \
|
||||
"WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
|
||||
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
|
||||
+#define TEXT_MODIFIED_BLURB _("This package is modified from the original version.\n" \
|
||||
+ "Please contact your vendor or report problems at")
|
||||
#define TEXT_EMAIL_ADR _("E-mail:")
|
||||
#define TEXT_HOMEPAGE _("Homepage:")
|
||||
#define TEXT_FILE _("File:")
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,6 +1,23 @@
|
||||
diff -up xsane-0.997/src/xsane-save.c.ipv6 xsane-0.997/src/xsane-save.c
|
||||
--- xsane-0.997/src/xsane-save.c.ipv6 2008-09-20 22:48:29.000000000 +0200
|
||||
+++ xsane-0.997/src/xsane-save.c 2010-06-29 17:05:03.853290307 +0200
|
||||
From a2ef22d59904d5e53c3d58093b561fa1ab7127a6 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 10:58:54 +0200
|
||||
Subject: [PATCH] patch: ipv6
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit 9f9d5c46fdef5ba7baccb81ab8170cfc24797de6
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:27:42 2010 +0100
|
||||
|
||||
support IPv6 (#198422)
|
||||
---
|
||||
src/xsane-save.c | 96 ++++++++++++++++++++++++++++++++++++--------------------
|
||||
1 file changed, 62 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/src/xsane-save.c b/src/xsane-save.c
|
||||
index 84f5d59..87ef685 100644
|
||||
--- a/src/xsane-save.c
|
||||
+++ b/src/xsane-save.c
|
||||
@@ -29,6 +29,8 @@
|
||||
#include <time.h>
|
||||
#include <sys/wait.h>
|
||||
@ -10,7 +27,7 @@ diff -up xsane-0.997/src/xsane-save.c.ipv6 xsane-0.997/src/xsane-save.c
|
||||
/* the following test is always false */
|
||||
#ifdef _native_WIN32
|
||||
# include <winsock.h>
|
||||
@@ -7462,55 +7464,81 @@ void write_email_attach_file(int fd_sock
|
||||
@@ -7488,55 +7490,81 @@ void write_email_attach_file(int fd_socket, char *boundary, FILE *infile, char *
|
||||
/* returns fd_socket if sucessfull, < 0 when error occured */
|
||||
int open_socket(char *server, int port)
|
||||
{
|
||||
@ -126,3 +143,6 @@ diff -up xsane-0.997/src/xsane-save.c.ipv6 xsane-0.997/src/xsane-save.c
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------------------------------- */
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,7 +1,25 @@
|
||||
diff -up xsane-0.997/src/xsane-back-gtk.c.no-file-selected xsane-0.997/src/xsane-back-gtk.c
|
||||
--- xsane-0.997/src/xsane-back-gtk.c.no-file-selected 2002-10-02 13:05:52.000000000 +0200
|
||||
+++ xsane-0.997/src/xsane-back-gtk.c 2010-07-13 10:02:09.468118791 +0200
|
||||
@@ -1111,6 +1111,11 @@ static void xsane_back_gtk_filetype2_cal
|
||||
From 705415aeae0117a8df984701ad39606439b39a65 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 10:58:07 +0200
|
||||
Subject: [PATCH] patch: no-file-selected
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit da2140208e30e87f4779593071b60654dcc187eb
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:25:54 2010 +0100
|
||||
|
||||
don't crash if no files are selected (#608047)
|
||||
---
|
||||
src/xsane-back-gtk.c | 20 ++++++++++++++++----
|
||||
src/xsane-front-gtk.c | 6 +++++-
|
||||
2 files changed, 21 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/xsane-back-gtk.c b/src/xsane-back-gtk.c
|
||||
index 4701dc6..91b5804 100644
|
||||
--- a/src/xsane-back-gtk.c
|
||||
+++ b/src/xsane-back-gtk.c
|
||||
@@ -1111,6 +1111,11 @@ static void xsane_back_gtk_filetype2_callback(GtkWidget *widget, gpointer data)
|
||||
|
||||
chooser_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
|
||||
|
||||
@ -13,7 +31,7 @@ diff -up xsane-0.997/src/xsane-back-gtk.c.no-file-selected xsane-0.997/src/xsane
|
||||
if ((new_filetype) && (*new_filetype))
|
||||
{
|
||||
extension = strrchr(chooser_filename, '.');
|
||||
@@ -1501,12 +1506,19 @@ int xsane_back_gtk_get_filename(const ch
|
||||
@@ -1501,12 +1506,19 @@ int xsane_back_gtk_get_filename(const char *label, const char *default_name, siz
|
||||
#endif
|
||||
|
||||
chooser_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
|
||||
@ -37,10 +55,11 @@ diff -up xsane-0.997/src/xsane-back-gtk.c.no-file-selected xsane-0.997/src/xsane
|
||||
}
|
||||
|
||||
gtk_widget_destroy(filechooser);
|
||||
diff -up xsane-0.997/src/xsane-front-gtk.c.no-file-selected xsane-0.997/src/xsane-front-gtk.c
|
||||
--- xsane-0.997/src/xsane-front-gtk.c.no-file-selected 2002-10-02 13:04:33.000000000 +0200
|
||||
+++ xsane-0.997/src/xsane-front-gtk.c 2010-07-13 09:59:31.005868940 +0200
|
||||
@@ -1339,7 +1339,11 @@ static void xsane_browse_filename_callba
|
||||
diff --git a/src/xsane-front-gtk.c b/src/xsane-front-gtk.c
|
||||
index 35aa89d..08761a0 100644
|
||||
--- a/src/xsane-front-gtk.c
|
||||
+++ b/src/xsane-front-gtk.c
|
||||
@@ -1333,7 +1333,11 @@ static void xsane_browse_filename_callback(GtkWidget *widget, gpointer data)
|
||||
snprintf(windowname, sizeof(windowname), "%s %s %s", xsane.prog_name, WINDOW_OUTPUT_FILENAME, xsane.device_text);
|
||||
|
||||
umask((mode_t) preferences.directory_umask); /* define new file permissions */
|
||||
@ -53,3 +72,6 @@ diff -up xsane-0.997/src/xsane-front-gtk.c.no-file-selected xsane-0.997/src/xsan
|
||||
umask(XSANE_DEFAULT_UMASK); /* define new file permissions */
|
||||
|
||||
if (preferences.filename)
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,15 +1,36 @@
|
||||
diff -up xsane-0.997/configure.in.off-root-build xsane-0.997/configure.in
|
||||
--- xsane-0.997/configure.in.off-root-build 2009-07-21 20:37:20.000000000 +0200
|
||||
+++ xsane-0.997/configure.in 2010-06-23 10:52:32.072734684 +0200
|
||||
@@ -312,4 +312,4 @@ echo "* --------------------------------
|
||||
From 7f43255972b741ff178f94233ffff67c9779c247 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 10:57:38 +0200
|
||||
Subject: [PATCH] patch: off-root-build
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit f88d28c807667f618b3b1cf91c12b823f3853983
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:23:57 2010 +0100
|
||||
|
||||
enable off-root builds
|
||||
---
|
||||
configure.in | 2 +-
|
||||
doc/Makefile.in | 12 ++++++------
|
||||
lib/Makefile.in | 4 ++--
|
||||
src/Makefile.in | 8 ++++----
|
||||
4 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index a770253..770077b 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -312,4 +312,4 @@ echo "* ------------------------------------------------------------ *"
|
||||
echo "* ... PLEASE READ SANE DOCUMENTATION BEFORE STARTING XSANE ... *"
|
||||
echo "* ------------------------------------------------------------ *"
|
||||
echo "****************************************************************"
|
||||
-cat xsane.NEWS
|
||||
+cat ${srcdir}/xsane.NEWS
|
||||
diff -up xsane-0.997/doc/Makefile.in.off-root-build xsane-0.997/doc/Makefile.in
|
||||
--- xsane-0.997/doc/Makefile.in.off-root-build 2006-01-01 14:08:11.000000000 +0100
|
||||
+++ xsane-0.997/doc/Makefile.in 2010-06-23 11:07:26.792736949 +0200
|
||||
diff --git a/doc/Makefile.in b/doc/Makefile.in
|
||||
index 59b022b..4038a6b 100644
|
||||
--- a/doc/Makefile.in
|
||||
+++ b/doc/Makefile.in
|
||||
@@ -57,14 +57,14 @@ install: $(MANPAGES)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(datadir)
|
||||
|
||||
@ -44,11 +65,10 @@ diff -up xsane-0.997/doc/Makefile.in.off-root-build xsane-0.997/doc/Makefile.in
|
||||
echo uninstalling $${image} in $(DESTDIR)$(xsanedocdir)/$${image}...; \
|
||||
rm -f $(DESTDIR)$(xsanedocdir)/$${image} || exit 1; \
|
||||
done
|
||||
diff -up xsane-0.997/include/Makefile.in.off-root-build xsane-0.997/include/Makefile.in
|
||||
diff -up xsane-0.997/intl/Makefile.in.off-root-build xsane-0.997/intl/Makefile.in
|
||||
diff -up xsane-0.997/lib/Makefile.in.off-root-build xsane-0.997/lib/Makefile.in
|
||||
--- xsane-0.997/lib/Makefile.in.off-root-build 2003-11-22 10:51:42.000000000 +0100
|
||||
+++ xsane-0.997/lib/Makefile.in 2010-06-23 11:03:23.760737284 +0200
|
||||
diff --git a/lib/Makefile.in b/lib/Makefile.in
|
||||
index 7567d54..6be1eeb 100644
|
||||
--- a/lib/Makefile.in
|
||||
+++ b/lib/Makefile.in
|
||||
@@ -30,7 +30,7 @@ RANLIB = @RANLIB@
|
||||
|
||||
CC = @CC@
|
||||
@ -67,11 +87,10 @@ diff -up xsane-0.997/lib/Makefile.in.off-root-build xsane-0.997/lib/Makefile.in
|
||||
|
||||
clean:
|
||||
rm -f *.out *.o *.lo *~ *.a *.bak $(TESTPROGRAMS)
|
||||
diff -up xsane-0.997/Makefile.in.off-root-build xsane-0.997/Makefile.in
|
||||
diff -up xsane-0.997/po/Makefile.in.off-root-build xsane-0.997/po/Makefile.in
|
||||
diff -up xsane-0.997/src/Makefile.in.off-root-build xsane-0.997/src/Makefile.in
|
||||
--- xsane-0.997/src/Makefile.in.off-root-build 2008-03-29 10:51:00.000000000 +0100
|
||||
+++ xsane-0.997/src/Makefile.in 2010-06-23 11:01:27.031779998 +0200
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 905ef93..2b246db 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -77,10 +77,10 @@ install: $(PROGRAMS)
|
||||
$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-eula.txt
|
||||
$(INSTALL_DATA) $(srcdir)/xsane.desktop $(DESTDIR)$(desktopappdir)/xsane.desktop
|
||||
@ -103,3 +122,6 @@ diff -up xsane-0.997/src/Makefile.in.off-root-build xsane-0.997/src/Makefile.in
|
||||
|
||||
.PHONY: all install depend clean distclean
|
||||
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
From 1834f4a87438153c1e8ca8c175719f22585af497 Mon Sep 17 00:00:00 2001
|
||||
From f1b8fba60a7b02c17a3cc0a0f773fd11a4de4e93 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri, 19 Nov 2010 12:42:18 +0100
|
||||
Date: Fri, 2 Sep 2011 11:54:03 +0200
|
||||
Subject: [PATCH] patch: desktop-file
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit c59edca6b96613f59cd4c08350b64a46b5992ddc
|
||||
commit 4a7ec671855e739649a06dc5c0a050bb6fd651ce
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri Nov 19 12:41:23 2010 +0100
|
||||
|
||||
customize desktop file
|
||||
---
|
||||
src/xsane.desktop | 9 +++++++--
|
||||
1 files changed, 7 insertions(+), 2 deletions(-)
|
||||
src/xsane.desktop | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/xsane.desktop b/src/xsane.desktop
|
||||
index d5161e5..efb2011 100644
|
||||
@ -36,5 +36,5 @@ index d5161e5..efb2011 100644
|
||||
+Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
|
||||
+StartupNotify=true
|
||||
--
|
||||
1.7.3.2
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,7 +1,24 @@
|
||||
diff -up xsane-0.998/src/xsane-save.c.libpng xsane-0.998/src/xsane-save.c
|
||||
--- xsane-0.998/src/xsane-save.c.libpng 2011-11-21 13:29:05.468000002 +0100
|
||||
+++ xsane-0.998/src/xsane-save.c 2011-11-21 13:50:38.522004958 +0100
|
||||
@@ -4912,7 +4912,7 @@ int xsane_save_png(FILE *outfile, int co
|
||||
From bd29bb933cf80f397dd28286635da2aec58e6e6c Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Thu, 16 Aug 2012 11:26:54 +0200
|
||||
Subject: [PATCH] patch: libpng
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit 9df6d60274c95b5081faf5b398aa27cde969c649
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Mon Nov 21 13:50:38 2011 +0100
|
||||
|
||||
support libpng-1.5
|
||||
---
|
||||
src/xsane-save.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/xsane-save.c b/src/xsane-save.c
|
||||
index 87ef685..5461bf1 100644
|
||||
--- a/src/xsane-save.c
|
||||
+++ b/src/xsane-save.c
|
||||
@@ -4912,7 +4912,7 @@ int xsane_save_png(FILE *outfile, int compression, FILE *imagefile, Image_info *
|
||||
return -1; /* error */
|
||||
}
|
||||
|
||||
@ -10,7 +27,7 @@ diff -up xsane-0.998/src/xsane-save.c.libpng xsane-0.998/src/xsane-save.c
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
|
||||
xsane_back_gtk_error(buf, TRUE);
|
||||
@@ -5102,7 +5102,7 @@ int xsane_save_png_16(FILE *outfile, int
|
||||
@@ -5102,7 +5102,7 @@ int xsane_save_png_16(FILE *outfile, int compression, FILE *imagefile, Image_inf
|
||||
return -1; /* error */
|
||||
}
|
||||
|
||||
@ -19,3 +36,6 @@ diff -up xsane-0.998/src/xsane-save.c.libpng xsane-0.998/src/xsane-save.c
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
|
||||
xsane_back_gtk_error(buf, TRUE);
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
From 81782eb74370afd321dbd394ca1aa60c01bead7f Mon Sep 17 00:00:00 2001
|
||||
From d8bf0d3f0af16e208b52084f19a9a1287acbcea0 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Wed, 1 Jun 2011 14:30:14 +0200
|
||||
Date: Fri, 2 Sep 2011 11:56:26 +0200
|
||||
Subject: [PATCH] patch: preview-selection
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit 3a238ff28cf8c57d11f41624cf340d2fdbe15c83
|
||||
commit e7c03a6de0c76256810b6340e0a954e88c3448e9
|
||||
Author: Reinhard Fössmeier <info@ais-sanmarino.org>
|
||||
Date: Wed May 12 20:23:18 2010 +0200
|
||||
|
||||
@ -17,8 +17,8 @@ Date: Wed May 12 20:23:18 2010 +0200
|
||||
Fixed a problem in mouse event processing that interfered with selecting
|
||||
the scan rectangle in the preview window.
|
||||
---
|
||||
src/xsane-preview.c | 9 ++++-----
|
||||
1 files changed, 4 insertions(+), 5 deletions(-)
|
||||
src/xsane-preview.c | 9 ++++-----
|
||||
1 file changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/xsane-preview.c b/src/xsane-preview.c
|
||||
index f089dd1..264c775 100644
|
||||
@ -56,5 +56,5 @@ index f089dd1..264c775 100644
|
||||
|
||||
if (p->selection_drag)
|
||||
--
|
||||
1.7.5.2
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 27f6119af76011d6cbc2e40468a804b6bef31651 Mon Sep 17 00:00:00 2001
|
||||
From a0b23d7e1991b23e2b9ab78bf382c55b9e24cfb9 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Fri, 25 May 2012 11:47:39 +0200
|
||||
Subject: [PATCH] patch: wmclass
|
||||
@ -11,14 +11,14 @@ Date: Fri May 25 11:45:48 2012 +0200
|
||||
|
||||
set program name -> wmclass to match desktop file name
|
||||
---
|
||||
src/xsane.c | 3 +++
|
||||
src/xsane.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/xsane.c b/src/xsane.c
|
||||
index 775610e..5177758 100644
|
||||
index 8b24b0c..eee76ff 100644
|
||||
--- a/src/xsane.c
|
||||
+++ b/src/xsane.c
|
||||
@@ -6169,6 +6169,9 @@ int main(int argc, char **argv)
|
||||
@@ -6208,6 +6208,9 @@ int main(int argc, char **argv)
|
||||
xsane.ipc_pipefd[1] = 0;
|
||||
}
|
||||
|
||||
@ -29,5 +29,5 @@ index 775610e..5177758 100644
|
||||
bindtextdomain(PACKAGE, STRINGIFY(LOCALEDIR));
|
||||
textdomain(PACKAGE);
|
||||
--
|
||||
1.7.10.2
|
||||
1.7.11.4
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
From 173a9a51f4d79a9d76987a9e425a64038c887b3e Mon Sep 17 00:00:00 2001
|
||||
From 938a34622a88064b3803a67967de143ba3c01e9f Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@redhat.com>
|
||||
Date: Mon, 4 Apr 2011 11:16:16 +0200
|
||||
Date: Fri, 2 Sep 2011 11:55:59 +0200
|
||||
Subject: [PATCH] patch: xsane_update_param-crash
|
||||
|
||||
Squashed commit of the following:
|
||||
|
||||
commit 4b2f69d1b51db7160a33764a4f68ab3c4fc43678
|
||||
commit 74add0ef72c6c510220679751e5770eaff8710fd
|
||||
Author: Nils Philippsen <nils@redhat.com>
|
||||
Date: Mon Apr 4 11:13:20 2011 +0200
|
||||
|
||||
don't dereference xsane.preview if it is NULL
|
||||
---
|
||||
src/xsane-front-gtk.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
src/xsane-front-gtk.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/xsane-front-gtk.c b/src/xsane-front-gtk.c
|
||||
index 08761a0..66a3177 100644
|
||||
@ -28,5 +28,5 @@ index 08761a0..66a3177 100644
|
||||
double dx, dy;
|
||||
|
||||
--
|
||||
1.7.4.2
|
||||
1.7.11.4
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user