vapier 15/07/08 10:45:04
Modified: sane-backends-1.0.24-automagic_systemd.patch
sane-backends-1.0.24-cross-compile.patch
sane-backends-1.0.24-kodakaio_avahi.patch
sane-backends-1.0.24-systemd_pkgconfig.patch
sane-backends-1.0.24-unused-cups.patch
Log:
Document provenance of the various patches we use.
Revision Changes Path
1.2
media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch?r1=1.1&r2=1.2
Index: sane-backends-1.0.24-automagic_systemd.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.24-automagic_systemd.patch 16 Oct 2013 01:21:17
-0000 1.1
+++ sane-backends-1.0.24-automagic_systemd.patch 8 Jul 2015 10:45:04
-0000 1.2
@@ -1,8 +1,21 @@
+sent upstream:
+https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033601.html
+
+From 867c8fcde5cf54afae7f9ae8f855605b891708a7 Mon Sep 17 00:00:00 2001
+From: Christopher Brannon <[email protected]>
+Date: Wed, 8 Jul 2015 06:37:14 -0400
+Subject: [PATCH] add a configure flag to control systemd support
+
+This way people can easily disable systemd support locally.
+---
+ configure.in | 29 ++++++++++++++++++-----------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
+
diff --git a/configure.in b/configure.in
-index 4365868..7413646 100644
+index 059058b..b539cda 100644
--- a/configure.in
+++ b/configure.in
-@@ -344,17 +344,24 @@ dnl $as_echo "in order to autodetect network
scanners in kodakaio."
+@@ -343,17 +343,24 @@ dnl $as_echo "in order to autodetect network
scanners in kodakaio."
dnl with_cups="no"
dnl fi
@@ -38,3 +51,6 @@
fi
dnl ***********
+--
+2.4.4
+
1.3
media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch?r1=1.2&r2=1.3
Index: sane-backends-1.0.24-cross-compile.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sane-backends-1.0.24-cross-compile.patch 15 May 2015 09:25:04 -0000
1.2
+++ sane-backends-1.0.24-cross-compile.patch 8 Jul 2015 10:45:04 -0000
1.3
@@ -1,7 +1,20 @@
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315060&group_id=30186&atid=410366
+sent upstream:
+https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033600.html
-do not hardcode /usr/local paths that break cross-compiles
+From c8df148e2b9784be1827e33224baa1cb5066a383 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Wed, 8 Jul 2015 06:31:12 -0400
+Subject: [PATCH] fix cross-compiling paths
+There's no reason to hardcode -I paths to /usr/local. Doing so breaks
+cross-compiling when incompatible headers live in there or the toolchain
+is set up to throw errors with those flags.
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 48953d2..059058b 100644
--- a/configure.in
+++ b/configure.in
@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling =
xyes)
@@ -12,3 +25,6 @@
AC_SUBST(INCLUDES)
SANE_SET_CFLAGS([$is_release])
SANE_SET_LDFLAGS
+--
+2.4.4
+
1.2
media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch?r1=1.1&r2=1.2
Index: sane-backends-1.0.24-kodakaio_avahi.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.24-kodakaio_avahi.patch 21 Feb 2014 19:46:35 -0000
1.1
+++ sane-backends-1.0.24-kodakaio_avahi.patch 8 Jul 2015 10:45:04 -0000
1.2
@@ -1,3 +1,21 @@
+taken from upstream
+
+From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001
+From: Paul Newall <[email protected]>
+Date: Mon, 14 Oct 2013 22:22:53 +0100
+Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners
+ return unexpected data via avahi auto discovery
+
+---
+ ChangeLog | 4 ++++
+ backend/kodakaio.c | 43 +++++++++++++++++++++++++++++++-----------
+ doc/descriptions/kodakaio.desc | 2 +-
+ 3 files changed, 37 insertions(+), 12 deletions(-)
+
+2013-10-14 Paul Newall <[email protected]>
+ * backend/kodakaio.c: fix bug #314301,
+ Segfault when unexpected data returned by avahi auto discovery.
+
diff --git a/backend/kodakaio.c b/backend/kodakaio.c
index 8c4583a..b442e50 100644
--- a/backend/kodakaio.c
@@ -82,3 +100,6 @@
:manpage "sane-kodakaio"
:comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent
AWL10"
:devicetype :scanner
+--
+2.4.4
+
1.3
media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?r1=1.2&r2=1.3
Index: sane-backends-1.0.24-systemd_pkgconfig.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sane-backends-1.0.24-systemd_pkgconfig.patch 3 Mar 2014 19:00:09
-0000 1.2
+++ sane-backends-1.0.24-systemd_pkgconfig.patch 8 Jul 2015 10:45:04
-0000 1.3
@@ -1,8 +1,22 @@
+sent upstream:
+https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033602.html
+
+From 1dcfb42608a27fbdebdaa721b4e48354850a7dcc Mon Sep 17 00:00:00 2001
+From: Christopher Brannon <[email protected]>
+Date: Wed, 8 Jul 2015 06:38:50 -0400
+Subject: [PATCH] use pkg-config to look up systemd paths
+
+Since systemd has always shipped pkg-config files, we should use them.
+This also fixes cross-compiling by not relying on hardcoded host paths.
+---
+ configure.in | 25 +++++++++++--------------
+ 1 file changed, 11 insertions(+), 14 deletions(-)
+
diff --git a/configure.in b/configure.in
-index 7413646..66828fc 100644
+index b539cda..5e703a8 100644
--- a/configure.in
+++ b/configure.in
-@@ -347,21 +347,18 @@ dnl fi
+@@ -346,21 +346,18 @@ dnl fi
AC_ARG_WITH(systemd,
AC_HELP_STRING([--with-systemd], [enable systemd support
@<:@default=yes@:>@]))
if test "x$with_systemd" != xno ; then
@@ -35,3 +49,6 @@
fi
dnl ***********
+--
+2.4.4
+
1.2
media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch?r1=1.1&r2=1.2
Index: sane-backends-1.0.24-unused-cups.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sane-backends-1.0.24-unused-cups.patch 22 Oct 2013 02:24:22 -0000
1.1
+++ sane-backends-1.0.24-unused-cups.patch 8 Jul 2015 10:45:04 -0000
1.2
@@ -1,3 +1,20 @@
+taken from upstream
+
+From efb04936b8ad3bf313c289a522ae5832e22c1b7e Mon Sep 17 00:00:00 2001
+From: Paul Newall <[email protected]>
+Date: Tue, 15 Oct 2013 22:20:15 +0100
+Subject: [PATCH] detection of cups commented out in configure.in it is no
+ longer used by kodakaio.
+
+---
+ ChangeLog | 4 ++++
+ configure.in | 24 ++++++++++++------------
+ 2 files changed, 16 insertions(+), 12 deletions(-)
+
+2013-10-15 Paul Newall <[email protected]>
+ * configue.in: detection of cups was commented out. Avahi is now used
+ for autodetection in kodakaio so the detection of cups is no longer
required.
+
diff --git a/configure.in b/configure.in
index e13888c..4365868 100644
--- a/configure.in
@@ -40,3 +57,6 @@
echo "-> The following backends will be built:"
for backend in ${BACKENDS} ; do
echo $ECHO_N "${backend} "
+--
+2.4.4
+
