Hello community, here is the log from the commit of package evince for openSUSE:Factory checked in at 2019-11-10 22:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evince (Old) and /work/SRC/openSUSE:Factory/.evince.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evince" Sun Nov 10 22:01:24 2019 rev:143 rq:746225 version:3.34.1 Changes: -------- --- /work/SRC/openSUSE:Factory/evince/evince.changes 2019-10-17 12:57:40.845549736 +0200 +++ /work/SRC/openSUSE:Factory/.evince.new.2990/evince.changes 2019-11-10 22:01:35.790240867 +0100 @@ -1,0 +2,14 @@ +Tue Nov 5 15:26:27 UTC 2019 - Antonio Larrosa <[email protected]> + +- Add patches to reverse the upstream requirement of at least + synctex 1.19 since that requires texlive 2019 and we have 2017 in + SLE 15. The patches are only applied when building evince with + synctex < 1.19: + * 0001-reversed-synctex-Move-_GNU_SOURCE-to-the-top-of-the-source-code.patch + * 0002-reversed-synctex-Remove-unused-labels.patch + * 0003-reversed-synctex-Silence-error-when-no-synctex-file-is-present.patch + * 0004-reversed-synctex-Annotate-functions-that-wrap-vfprintf.patch + * 0005-reversed-synctex-Fix-compilation.patch + * 0006-reversed-synctex-Update-from-version-1.18-to-1.21.patch + +------------------------------------------------------------------- New: ---- 0001-reversed-synctex-Move-_GNU_SOURCE-to-the-top-of-the-source-code.patch 0002-reversed-synctex-Remove-unused-labels.patch 0003-reversed-synctex-Silence-error-when-no-synctex-file-is-present.patch 0004-reversed-synctex-Annotate-functions-that-wrap-vfprintf.patch 0005-reversed-synctex-Fix-compilation.patch 0006-reversed-synctex-Update-from-version-1.18-to-1.21.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evince.spec ++++++ --- /var/tmp/diff_new_pack.GdmckC/_old 2019-11-10 22:01:36.598241917 +0100 +++ /var/tmp/diff_new_pack.GdmckC/_new 2019-11-10 22:01:36.598241917 +0100 @@ -27,6 +27,13 @@ Group: Productivity/Office/Other URL: https://wiki.gnome.org/Apps/Evince Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-SLE [email protected] - Reverse upstream bump of synctex required version to build with texlive 2017 +Patch0: 0001-reversed-synctex-Move-_GNU_SOURCE-to-the-top-of-the-source-code.patch +Patch1: 0002-reversed-synctex-Remove-unused-labels.patch +Patch2: 0003-reversed-synctex-Silence-error-when-no-synctex-file-is-present.patch +Patch3: 0004-reversed-synctex-Annotate-functions-that-wrap-vfprintf.patch +Patch4: 0005-reversed-synctex-Fix-compilation.patch +Patch5: 0006-reversed-synctex-Update-from-version-1.18-to-1.21.patch BuildRequires: c++_compiler BuildRequires: fdupes @@ -61,7 +68,7 @@ BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0 BuildRequires: pkgconfig(poppler-glib) >= 0.76.0 BuildRequires: pkgconfig(sm) >= 1.0.0 -BuildRequires: pkgconfig(synctex) >= 1.19 +BuildRequires: pkgconfig(synctex) >= 1.18 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(zlib) # Disable the browser plugin and package, and make main package provide-obsolete plugin package for upgrade; see bgo#738270 @@ -201,7 +208,15 @@ %lang_package %prep -%autosetup -p1 +%setup +%if %{pkg_vcmp pkgconfig(synctex) < 1.19} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%endif translation-update-upstream po %{name} %build ++++++ 0001-reversed-synctex-Move-_GNU_SOURCE-to-the-top-of-the-source-code.patch ++++++ --- b/cut-n-paste/synctex/synctex_parser.c +++ a/cut-n-paste/synctex/synctex_parser.c @@ -83,11 +83,6 @@ * First level objects are sheets and forms, containing boxes, glues, kerns... * The third tree allows to browse leaves according to tag and line. */ -/* Declare _GNU_SOURCE for accessing vasprintf. For MSC compiler, vasprintf is - * defined in this file - */ -#define _GNU_SOURCE - # if defined(SYNCTEX_USE_LOCAL_HEADER) # include "synctex_parser_local.h" # else @@ -100,6 +95,7 @@ # endif # endif +#define _GNU_SOURCE #include <stdlib.h> #include <stdarg.h> #include <stdio.h> ++++++ 0002-reversed-synctex-Remove-unused-labels.patch ++++++ --- b/cut-n-paste/synctex/synctex_parser.c +++ a/cut-n-paste/synctex/synctex_parser.c @@ -754,6 +754,7 @@ (char *)_synctex_malloc(reader->size+1); /* one more character for null termination */ if (NULL == reader->start) { _synctex_error("! malloc error in synctex_reader_init_with_output_file."); + bailey: #ifdef SYNCTEX_DEBUG return reader; #else @@ -5458,6 +5459,7 @@ # pragma mark + SCAN KERN # endif ns = _synctex_parse_new_kern(scanner); + continue_scan: if (ns.status == SYNCTEX_STATUS_OK) { if (child) { _synctex_node_set_sibling(child,ns.node); ++++++ 0003-reversed-synctex-Silence-error-when-no-synctex-file-is-present.patch ++++++ --- b/cut-n-paste/synctex/synctex_parser.c +++ a/cut-n-paste/synctex/synctex_parser.c @@ -6030,6 +6030,7 @@ if ((scanner->reader = synctex_reader_init_with_output_file(scanner->reader, output, build_directory))) { return parse? synctex_scanner_parse(scanner):scanner; } + _synctex_error("No file?"); return NULL; } ++++++ 0004-reversed-synctex-Annotate-functions-that-wrap-vfprintf.patch ++++++ --- b/cut-n-paste/synctex/synctex_parser_utils.c +++ a/cut-n-paste/synctex/synctex_parser_utils.c @@ -87,8 +87,7 @@ # include <syslog.h> #endif +int _synctex_log(int level, const char * prompt, const char * reason,va_list arg); -int _synctex_error(const char * reason, ...) __attribute__((__format__ (__printf__, 1, 2))); -int _synctex_log(int level, const char * prompt, const char * reason, va_list arg) __attribute__((__format__ (__printf__, 3, 0))); int _synctex_log(int level, const char * prompt, const char * reason,va_list arg) { int result; ++++++ 0005-reversed-synctex-Fix-compilation.patch ++++++ --- b/cut-n-paste/synctex/synctex_parser.c +++ a/cut-n-paste/synctex/synctex_parser.c @@ -95,7 +95,6 @@ # endif # endif -#define _GNU_SOURCE #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -263,8 +262,6 @@ # pragma mark Abstract OBJECTS and METHODS # endif -void synctex_node_free(synctex_node_p node); - /** * \def SYNCTEX_MSG_SEND * \brief Takes care of sending the given message if possible. @@ -536,10 +533,6 @@ synctex_io_mode_t io_mode; } synctex_open_s; -void synctex_reader_free(synctex_reader_p reader); -synctex_reader_p synctex_reader_init_with_output_file(synctex_reader_p reader, const char * output, const char * build_directory); -synctex_node_p _synctex_node_next(synctex_node_p node); - /* This functions opens the file at the "output" given location. * It manages the problem of quoted filenames that appear with pdftex and filenames containing the space character. * In TeXLive 2008, the synctex file created with pdftex did contain unexpected quotes. --- b/cut-n-paste/synctex/synctex_parser_utils.c +++ a/cut-n-paste/synctex/synctex_parser_utils.c @@ -87,8 +87,6 @@ # include <syslog.h> #endif -int _synctex_log(int level, const char * prompt, const char * reason,va_list arg); - int _synctex_log(int level, const char * prompt, const char * reason,va_list arg) { int result; # ifdef SYNCTEX_RECENT_WINDOWS ++++++ 0006-reversed-synctex-Update-from-version-1.18-to-1.21.patch ++++++ ++++ 15040 lines (skipped)
