rpm/texlive
SHA256
1
0
Fork 0
forked from pool/texlive
Code Pull Requests Activity

Add source-common.patch to avoid common variable (boo#1160417)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=339
This commit is contained in:
Dr. Werner Fink 2020-01-09 14:27:06 +00:00 committed by Git OBS Bridge
parent d35a1c10ae
commit 96b239ba9a
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source-common.patch Normal file
View File

@ -0,0 +1,25 @@
---
utils/autosp/autosp-src/utils.c | 1 +
utils/autosp/autosp-src/utils.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--- utils/autosp/autosp-src/utils.c
+++ utils/autosp/autosp-src/utils.c 2020-01-09 11:48:29.954763221 +0000
@@ -23,6 +23,7 @@
*/
# include "utils.h"
+int lineno;
void
warning (const char msg[]) /* output warning message msg to stderr */
--- utils/autosp/autosp-src/utils.h
+++ utils/autosp/autosp-src/utils.h 2020-01-09 11:48:01.819295851 +0000
@@ -61,6 +61,6 @@ extern size_t append (char *dst, char **
extern bool prefix (const char *cs, const char *ct); /* is string cs[] a prefix of ct[]? */
extern bool suffix (const char *cs, const char *ct); /* is string cs[] a suffix of ct[]? */
-int lineno;
+extern int lineno;
extern void error (const char msg[]); /* abort with stderr message msg */
extern void warning (const char msg[]); /* output warning message msg to stderr */

5
texlive.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 9 12:02:09 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add source-common.patch to avoid common variable (boo#1160417)
-------------------------------------------------------------------
Wed Dec 11 21:35:59 UTC 2019 - Michael Gorse <mgorse@suse.com>

5
texlive.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package texlive
#
# Copyright (c) 2019 SUSE LLC.
# Copyright (c) 2020 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -279,6 +279,8 @@ Patch59: 0001-Updated-tests-after-U-C-upgrade-changed-sortinit-hashes.pat
Patch60: source-fix-axohelp.patch
# PATCH-FIX-TEXLIVE
Patch61: source-poppler0.83.0.patch
# PATCH-FIX-SUSE Avoid common variable (boo#1160417)
Patch62: source-common.patch
Prefix: %{_bindir}
Provides: pdfjam = %{version}
Obsoletes: pdfjam < %{version}
@ -3688,6 +3690,7 @@ pver=$(pkg-config --modversion poppler)
cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler${pver}.cc
%endif
%patch60 -p0
%patch62 -p0 -b .cv
if pkg-config --atleast-version=0.59 poppler
then