control: tags -1 patch pending Dear maintainer,
I've prepared an NMU for netsurf (versioned as 3.6-3.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. Sebastian
diff -Nru netsurf-3.6/debian/changelog netsurf-3.6/debian/changelog --- netsurf-3.6/debian/changelog 2017-02-08 21:10:34.000000000 +0100 +++ netsurf-3.6/debian/changelog 2018-07-18 23:25:47.000000000 +0200 @@ -1,3 +1,11 @@ +netsurf (3.6-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Depend on libssl-dev (Closes: #859230). + * Get it build again new gperf (Closes: #869600). + + -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Wed, 18 Jul 2018 23:25:47 +0200 + netsurf (3.6-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru netsurf-3.6/debian/control netsurf-3.6/debian/control --- netsurf-3.6/debian/control 2017-02-08 21:08:27.000000000 +0100 +++ netsurf-3.6/debian/control 2017-02-08 21:10:34.000000000 +0100 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Vincent Sanders <vi...@debian.org> Uploaders: Daniel Silverstone <dsilv...@digital-scurf.org> -Build-Depends: debhelper (>= 9~), libcurl3-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl1.0-dev | libssl-dev (<< 1.1), gperf +Build-Depends: debhelper (>= 9~), libcurl3-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf Standards-Version: 3.9.8 Homepage: http://www.netsurf-browser.org Vcs-Browser: http://source.netsurf-browser.org/packaging/debian.git/ diff -Nru netsurf-3.6/debian/patches/Build-Include-gperf-generated-code-directly.patch netsurf-3.6/debian/patches/Build-Include-gperf-generated-code-directly.patch --- netsurf-3.6/debian/patches/Build-Include-gperf-generated-code-directly.patch 1970-01-01 01:00:00.000000000 +0100 +++ netsurf-3.6/debian/patches/Build-Include-gperf-generated-code-directly.patch 2017-02-08 21:10:34.000000000 +0100 @@ -0,0 +1,92 @@ +From: Michael Drake <michael.dr...@codethink.co.uk> +Date: Thu, 20 Apr 2017 09:51:07 +0000 +Subject: [PATCH] Build: Include gperf-generated code directly. + +Previously we built the generated code separatly and then linked to +it. However, this caused problems with certain compilers and gperf +versions. This change includes the generated code directly in +svgtiny.c instead, which is the only place its used. + +Source: http://source.netsurf-browser.org/libsvgtiny.git/commit/?id=4390f1c84e8fee51fc22468821e6fc158e783053 +--- + libsvgtiny/src/Makefile | 13 +++++++------ + libsvgtiny/src/colors.gperf | 8 -------- + libsvgtiny/src/svgtiny.c | 3 +++ + libsvgtiny/src/svgtiny_internal.h | 5 ----- + 4 files changed, 10 insertions(+), 19 deletions(-) + +diff --git a/libsvgtiny/src/Makefile b/libsvgtiny/src/Makefile +index a97972023257..fb8a72f9c2ff 100644 +--- a/libsvgtiny/src/Makefile ++++ b/libsvgtiny/src/Makefile +@@ -1,13 +1,14 @@ + # Sources + DIR_SOURCES := svgtiny.c svgtiny_gradient.c svgtiny_list.c + +-SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c ++SOURCES := $(SOURCES) + +-$(BUILDDIR)/src_colors.c: src/colors.gperf ++$(DIR)autogenerated_colors.c: src/colors.gperf + $(VQ)$(ECHO) " GPERF: $<" +- $(Q)gperf --output-file=$@.tmp $< +-# Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly) +- $(Q)$(SED) -e 's/#ifdef __GNUC_STDC_INLINE__/#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/' $@.tmp >$@ +- $(Q)$(RM) $@.tmp ++ $(Q)gperf --output-file=$@ $< ++ ++PRE_TARGETS := $(DIR)autogenerated_colors.c ++ ++CLEAN_ITEMS := $(DIR)autogenerated_colors.c + + include $(NSBUILD)/Makefile.subdir +diff --git a/libsvgtiny/src/colors.gperf b/libsvgtiny/src/colors.gperf +index 96d5b9e5debf..a836787bf306 100644 +--- a/libsvgtiny/src/colors.gperf ++++ b/libsvgtiny/src/colors.gperf +@@ -17,14 +17,6 @@ + #include "svgtiny.h" + #include "svgtiny_internal.h" + +-/* This unusual define shennanigan is to try and prevent the gperf +- * generated function from being inlined. This is pointless given +- * it (a) is in a separate .c file and (b) has external linkage. +- */ +-#ifdef __inline +-#undef __inline +-#define __inline +-#endif + %} + + struct svgtiny_named_color; +diff --git a/libsvgtiny/src/svgtiny.c b/libsvgtiny/src/svgtiny.c +index 4661a58a2dff..bbefb888a263 100644 +--- a/libsvgtiny/src/svgtiny.c ++++ b/libsvgtiny/src/svgtiny.c +@@ -20,6 +20,9 @@ + #include "svgtiny.h" + #include "svgtiny_internal.h" + ++/* Source file generated by `gperf`. */ ++#include "autogenerated_colors.c" ++ + #ifndef M_PI + #define M_PI 3.14159265358979323846 + #endif +diff --git a/libsvgtiny/src/svgtiny_internal.h b/libsvgtiny/src/svgtiny_internal.h +index 158d23059c60..6bf5d64d9927 100644 +--- a/libsvgtiny/src/svgtiny_internal.h ++++ b/libsvgtiny/src/svgtiny_internal.h +@@ -102,9 +102,4 @@ void *svgtiny_list_get(struct svgtiny_list *list, + void *svgtiny_list_push(struct svgtiny_list *list); + void svgtiny_list_free(struct svgtiny_list *list); + +-/* colors.gperf */ +-const struct svgtiny_named_color * +- svgtiny_color_lookup(register const char *str, +- register unsigned int len); +- + #endif +-- +2.18.0 + diff -Nru netsurf-3.6/debian/patches/series netsurf-3.6/debian/patches/series --- netsurf-3.6/debian/patches/series 2016-11-27 15:54:31.000000000 +0100 +++ netsurf-3.6/debian/patches/series 2017-02-08 21:10:34.000000000 +0100 @@ -2,3 +2,4 @@ remove-favicon-link.patch openssl-1.1.0.patch set-netsurf-config.patch +Build-Include-gperf-generated-code-directly.patch
