From d8b8d0bbf70e3b08fda39f4088f277ed8013e5b8 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 4 May 2014 12:34:59 +0200 Subject: Don't run the insanely long test-rastertogutenprint build-test that lets sbuild timeout on all architectures Gbp-Pq: Name 0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch --- src/cups/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am index 2f70701..90a9453 100644 --- a/src/cups/Makefile.am +++ b/src/cups/Makefile.am @@ -100,7 +100,7 @@ endif AM_TESTS_ENVIRONMENT=$(STP_ENV) test-rastertogutenprint: min-pagesize test-rastertogutenprint.check: test-rastertogutenprint -TESTS= test-ppds test-rastertogutenprint.check +TESTS= test-ppds noinst_SCRIPTS=test-ppds \ test-rastertogutenprint \ test-rastertogutenprint.check \ -- cgit v1.2.3 From cf5f431a886c657a12116ee540340e6500385580 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Tue, 25 Sep 2018 13:48:47 -0400 Subject: Fix format warning Gbp-Pq: Name 0002-Fix-format-warning.patch --- configure.ac | 2 +- src/cups/gutenprint.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0ae13ba..b7c5497 100644 --- a/configure.ac +++ b/configure.ac @@ -710,7 +710,7 @@ AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"]) dnl Compiler flags if test x$ac_compiler_gnu = "xyes"; then - STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072],, [GNUCFLAGS]) + STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 -Wformat -Werror=format-security -Wmissing-prototypes],, [GNUCFLAGS]) if test x${USE_MAINTAINER_MODE} = xyes ; then STP_ADD_COMPILER_ARGS([-D_POSIX_C_SOURCE=200809L -std=c99 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS]) fi diff --git a/src/cups/gutenprint.c b/src/cups/gutenprint.c index 6ab2194..56b5599 100644 --- a/src/cups/gutenprint.c +++ b/src/cups/gutenprint.c @@ -122,7 +122,7 @@ cat_ppd(const char *uri) /* I - Driver URI */ const char *lang = NULL; char *s; char filename[1024], /* Filename */ - ppd_location[1024]; /* Installed location */ + ppd_location[2048]; /* Installed location */ const char *infix = ""; ppd_type_t ppd_type = PPD_STANDARD; gpfile outFD; -- cgit v1.2.3 From 0ae94c222f866da7b418a0f886d36a1921eefdb8 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 28 Sep 2018 11:03:53 -0400 Subject: backend: Fix a compile warning that popped up on Debian 9 Gbp-Pq: Name 0003-backend-Fix-a-compile-warning-that-popped-up-on-Debi.patch --- src/cups/backend_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c index 09ea078..09406f8 100644 --- a/src/cups/backend_common.c +++ b/src/cups/backend_common.c @@ -1354,7 +1354,7 @@ void dump_markers(struct marker *markers, int marker_count, int full) ATTR("marker-colors="); for (i = 0 ; i < marker_count; i++) { - DEBUG2(markers[i].color); + DEBUG2("%s", markers[i].color); if ((i+1) < marker_count) DEBUG2(","); } -- cgit v1.2.3 From 07e80093d566f362fdfda3f60c0b0fba3e7e1332 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Fri, 28 Sep 2018 09:45:14 -0400 Subject: Need to increment current_interface as well as binary_age. Gbp-Pq: Name 0004-Need-to-increment-current_interface-as-well-as-binar.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b7c5497..be142e9 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ pushdef([GUTENPRINT_MAJOR_VERSION], [5]) pushdef([GUTENPRINT_MINOR_VERSION], [3]) pushdef([GUTENPRINT_MICRO_VERSION], [1]) pushdef([GUTENPRINT_EXTRA_VERSION], []) -pushdef([GUTENPRINT_CURRENT_INTERFACE], [9]) +pushdef([GUTENPRINT_CURRENT_INTERFACE], [10]) pushdef([GUTENPRINT_BINARY_AGE], [1]) pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) -- cgit v1.2.3 From 7927f7e1f792f1d85b69aba87250d940049c98e3 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Sun, 30 Sep 2018 10:49:11 -0400 Subject: Also need to fix gutenprintui2_current_interface. Gbp-Pq: Name 0005-Also-need-to-fix-gutenprintui2_current_interface.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index be142e9..c61f06e 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,7 @@ pushdef([GUTENPRINT_MICRO_VERSION], [1]) pushdef([GUTENPRINT_EXTRA_VERSION], []) pushdef([GUTENPRINT_CURRENT_INTERFACE], [10]) pushdef([GUTENPRINT_BINARY_AGE], [1]) -pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) +pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [3]) pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.GUTENPRINT_MICRO_VERSION[]GUTENPRINT_EXTRA_VERSION) -- cgit v1.2.3 From 003753f6e19329042e402bea8b3c4c746bcf9c29 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sat, 1 Dec 2018 01:39:17 +0100 Subject: Mirror doc/developer/cleanwarnings.pl from upstream Taken from upstream's master; it is needed to rebuild the doc PDFs from source Gbp-Pq: Name 0006-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch --- doc/developer/cleanwarnings.pl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 doc/developer/cleanwarnings.pl diff --git a/doc/developer/cleanwarnings.pl b/doc/developer/cleanwarnings.pl new file mode 100644 index 0000000..42df778 --- /dev/null +++ b/doc/developer/cleanwarnings.pl @@ -0,0 +1,41 @@ +# -*- Mode: Perl -*- +## Copyright (C) 2013 Robert Krawitz +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . + +# Remove annoying TeX warnings from db2pdf. + +$nc=""; +while (<>) { + next if /^$/; + chomp; + LINE: + if (/^Overfull \\hbox|^LaTeX Font Warning:|^LaTeX Warning: Reference.*undefined on input line|^Package hyperref Warning:/) { + $nc=" "; + $_=<>; + $_=<>; + while (<>) { + if (! /^ *$/) { + chomp; + goto LINE; + } + } + } else { + print "${nc}$_"; + $nc="\n"; + } +} +if ($nc ne "") { + print "\n"; +} -- cgit v1.2.3 From 5352acb4056fa10d9d494880ed0f06d23fdf847c Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 4 May 2014 12:34:59 +0200 Subject: Run tests with custom verbose log driver This avoids timing out on slow architectures Closes: #868743 Gbp-Pq: Name 0007-Run-tests-with-custom-verbose-log-driver.patch --- scripts/global.mk | 4 ++ scripts/test-driver-verbose | 151 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 scripts/test-driver-verbose diff --git a/scripts/global.mk b/scripts/global.mk index c405482..3c55e55 100644 --- a/scripts/global.mk +++ b/scripts/global.mk @@ -8,6 +8,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +# Use a verbose script to avoid timing out +LOG_DRIVER = $(top_srcdir)/scripts/test-driver-verbose + + LIBS = $(INTLLIBS) @LIBS@ # Libraries diff --git a/scripts/test-driver-verbose b/scripts/test-driver-verbose new file mode 100644 index 0000000..221fa9e --- /dev/null +++ b/scripts/test-driver-verbose @@ -0,0 +1,151 @@ +#! /bin/sh +# test-driver - testsuite driver script inherited from Automake's basic, but with verbose output. +# Verbosity patch by Didier Raboud + +scriptversion=2018-03-07.03; # UTC + +# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <&1 | tee -a $log_file +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: -- cgit v1.2.3