From 09f4a989f8dc6b7fa200eaff253373ccf4b784a98ed3af35f8ff42ac2b6175ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 11 Jan 2016 16:46:42 +0000 Subject: [PATCH 1/2] Accepting request 351283 from home:StefanBruens:branches:graphics the gphoto backend needs manual configuration to be usable at all, it is quite shoehorned into the sane API. On the other hand, gphoto2 has quite some dependencies, mostly via libgd3, which can be avoided. OBS-URL: https://build.opensuse.org/request/show/351283 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=80 --- sane-backends.changes | 6 ++++++ sane-backends.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sane-backends.changes b/sane-backends.changes index f1934ae..864dd92 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 29 22:32:37 UTC 2015 - stefan.bruens@rwth-aachen.de + +- remove gphoto2 backend, as is usefulness is highly questionable, + but adds many (indirect) build and runtime dependencies + ------------------------------------------------------------------- Tue Oct 6 10:55:10 CEST 2015 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index ae16c90..e2b79ca 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -17,7 +17,6 @@ Name: sane-backends -BuildRequires: libgphoto2-devel %if 0%{?suse_version} > 1130 BuildRequires: libieee1284-devel %else @@ -223,7 +222,6 @@ export LDFLAGS="-L/%_lib $LDFLAGS" --sbindir=%{_sbindir} \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ - --with-gphoto2 \ --with-docdir=%{_defaultdocdir}/sane-backends \ --enable-pthread \ --enable-libusb_1_0 \ From ce6cd2ce4a23b5dbf9bc6f9edf146f48e2d2862077bdfe3e67548a5cea8b4a08 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 12 Jan 2016 07:11:40 +0000 Subject: [PATCH 2/2] Accepting request 353065 from home:olh:branches:graphics - sane-backends.builttime.patch: reduce build-compare noise OBS-URL: https://build.opensuse.org/request/show/353065 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=81 --- sane-backends.builttime.patch | 76 +++++++++++++++++++++++++++++++++++ sane-backends.changes | 5 +++ sane-backends.spec | 5 ++- 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 sane-backends.builttime.patch diff --git a/sane-backends.builttime.patch b/sane-backends.builttime.patch new file mode 100644 index 0000000..119f3f0 --- /dev/null +++ b/sane-backends.builttime.patch @@ -0,0 +1,76 @@ +--- + tools/sane-desc.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +Index: sane-backends-1.0.25/tools/sane-desc.c +=================================================================== +--- sane-backends-1.0.25.orig/tools/sane-desc.c ++++ sane-backends-1.0.25/tools/sane-desc.c +@@ -2816,8 +2816,8 @@ html_print_footer (void) + "
\n" + "Contact\n" "
\n" "\n"); +- printf ("This page was last updated on %s by sane-desc %s from %s\n", +- asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING); ++ printf ("This page was last updated by sane-desc %s from %s\n", ++ SANE_DESC_VERSION, PACKAGE_STRING); + printf ("\n"); + printf (" \n"); + } +@@ -3326,10 +3326,10 @@ print_usermap_header (void) + + printf + ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s" ++ "# by sane-desc %s from %s" + "#\n" + , +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ SANE_DESC_VERSION, PACKAGE_STRING); + + printf + ("# The entries below are used to detect a USB device and change owner\n" +@@ -3398,8 +3398,8 @@ print_db_header (void) + { + time_t current_time = time (0); + printf ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s", +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ "# by sane-desc %s from %s", ++ SANE_DESC_VERSION, PACKAGE_STRING); + printf + ("#\n" + "# The entries below are used to detect a USB device when it's plugged in\n" +@@ -3463,8 +3463,8 @@ print_udev_header (void) + { + time_t current_time = time (0); + printf ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s", +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ "# by sane-desc %s from %s", ++ SANE_DESC_VERSION, PACKAGE_STRING); + + printf + ("#\n" +@@ -3656,8 +3656,8 @@ print_udevhwdb_header (void) + { + time_t current_time = time (0); + printf ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s", +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ "# by sane-desc %s from %s", ++ SANE_DESC_VERSION, PACKAGE_STRING); + + printf + ("#\n" +@@ -3766,8 +3766,8 @@ print_hwdb_header (void) + { + time_t current_time = time (0); + printf ("# This file was automatically created based on description files (*.desc)\n" +- "# by sane-desc %s from %s on %s", +- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time))); ++ "# by sane-desc %s from %s", ++ SANE_DESC_VERSION, PACKAGE_STRING); + + printf + ("#\n" diff --git a/sane-backends.changes b/sane-backends.changes index 864dd92..a29e11e 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 11 11:44:28 UTC 2016 - olaf@aepfle.de + +- sane-backends.builttime.patch: reduce build-compare noise + ------------------------------------------------------------------- Tue Dec 29 22:32:37 UTC 2015 - stefan.bruens@rwth-aachen.de diff --git a/sane-backends.spec b/sane-backends.spec index e2b79ca..a5430e6 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ # # spec file for package sane-backends # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -72,6 +72,8 @@ Source201: create_sane-backends-autoconfig.rules # GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1): # see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 Patch1: dell1600n_net-fix-strncat.patch +# Patch2 sane-backends.builttime.patch avoids build-compare noise +Patch2: sane-backends.builttime.patch # Patch100... is SUSE specific stuff: # Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: @@ -167,6 +169,7 @@ package or remove it when it is already installed. # GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) # see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 %patch1 +%patch2 -p1 # Patch100... is SUSE specific stuff: # Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: