[packages/evince] - updated to 3.36.5 - added types patch (fixes compile time format checks with 32-bit long)
qboosh
qboosh at pld-linux.org
Wed Jun 17 17:53:08 CEST 2020
commit a40727cc684bd08b08de6cb7c3ef769c3c2ad823
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jun 17 17:54:08 2020 +0200
- updated to 3.36.5
- added types patch (fixes compile time format checks with 32-bit long)
evince-types.patch | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
evince.spec | 11 +++----
2 files changed, 95 insertions(+), 6 deletions(-)
---
diff --git a/evince.spec b/evince.spec
index 131f367..9bce9eb 100644
--- a/evince.spec
+++ b/evince.spec
@@ -10,14 +10,15 @@
Summary: Document viewer for multiple document formats
Summary(pl.UTF-8): Przeglądarka dokumentów w wielu formatach
Name: evince
-Version: 3.36.4
+Version: 3.36.5
Release: 1
License: GPL v2+
Group: X11/Applications/Graphics
Source0: http://ftp.gnome.org/pub/GNOME/sources/evince/3.36/%{name}-%{version}.tar.xz
-# Source0-md5: 3c2251554872ca6ae88645f951616d99
+# Source0-md5: 5d68c81a3d4c5d27754b97405451f04e
Patch0: %{name}-linking.patch
Patch1: icon-theme.patch
+Patch2: %{name}-types.patch
URL: https://wiki.gnome.org/Apps/Evince
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1:1.10
@@ -51,7 +52,6 @@ BuildRequires: pkgconfig
BuildRequires: poppler-glib-devel >= 0.33.0
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.592
-BuildRequires: sed >= 4.0
BuildRequires: synctex-devel >= 1.19
BuildRequires: t1lib-devel
BuildRequires: tar >= 1:1.22
@@ -235,8 +235,7 @@ Wtyczka Evince dla przegądarek WWW zgodnych z Mozillą.
%setup -q
%patch0 -p1
%patch1 -p1
-
-%{__sed} -i -e '/^po\/Makefile.in/d' configure.ac
+%patch2 -p1
%build
%{__gettextize}
@@ -305,7 +304,7 @@ fi
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS NEWS NEWS-security.md NOTES README.md TODO
+%doc AUTHORS MAINTAINERS NEWS README.md TODO
%attr(755,root,root) %{_bindir}/evince
%attr(755,root,root) %{_bindir}/evince-previewer
%attr(755,root,root) %{_bindir}/evince-thumbnailer
diff --git a/evince-types.patch b/evince-types.patch
new file mode 100644
index 0000000..948c74a
--- /dev/null
+++ b/evince-types.patch
@@ -0,0 +1,90 @@
+--- evince-3.36.5/backend/dvi/mdvi-lib/sysdeps.h.orig 2017-10-03 20:15:33.000000000 +0200
++++ evince-3.36.5/backend/dvi/mdvi-lib/sysdeps.h 2020-06-16 17:20:53.413539122 +0200
+@@ -45,10 +45,12 @@
+ #if SIZEOF_LONG == 4
+ typedef unsigned long Uint32;
+ typedef long Int32;
++#define PRIInt32 "ld"
+ #else /* SIZEOF_LONG != 4 */
+ #if SIZEOF_INT == 4
+ typedef unsigned int Uint32;
+ typedef int Int32;
++#define PRIInt32 "d"
+ #else /* SIZEOF_INT != 4 */
+ #ifdef __cplusplus
+ #include "No.appropriate.32bit.native.type.found.Fix.sysdeps.h"
+--- evince-3.36.5/backend/dvi/mdvi-lib/dviread.c.orig 2020-06-11 13:59:00.000000000 +0200
++++ evince-3.36.5/backend/dvi/mdvi-lib/dviread.c 2020-06-16 17:30:50.300305509 +0200
+@@ -1287,7 +1287,7 @@
+ } else {
+ h = dvi->pos.h + ch->tfmwidth;
+ hh = dvi->pos.hh + pixel_round(dvi, ch->tfmwidth);
+- SHOWCMD((dvi, "setchar", num, "(%d,%d) h:=%d%c%d=%d, hh:=%d (%s)\n",
++ SHOWCMD((dvi, "setchar", num, "(%d,%d) h:=%d%c%"PRIInt32"=%d, hh:=%d (%s)\n",
+ dvi->pos.hh, dvi->pos.vv,
+ DBGSUM(dvi->pos.h, ch->tfmwidth, h), hh,
+ font->fontname));
+@@ -1309,7 +1309,7 @@
+ if(a > 0 && b > 0) {
+ h = vrule_round(dvi, a);
+ SHOWCMD((dvi, opcode == DVI_SET_RULE ? "setrule" : "putrule", -1,
+- "width %d, height %d (%dx%d pixels)\n",
++ "width %"PRIInt32", height %"PRIInt32" (%dx%d pixels)\n",
+ b, a, w, h));
+ /* the `draw' functions expect the origin to be at the top left
+ * corner of the rule, not the bottom left, as in DVI files */
+@@ -1319,7 +1319,7 @@
+ }
+ } else {
+ SHOWCMD((dvi, opcode == DVI_SET_RULE ? "setrule" : "putrule", -1,
+- "(moving left only, by %d)\n", b));
++ "(moving left only, by %"PRIInt32")\n", b));
+ }
+
+ if(opcode == DVI_SET_RULE) {
+@@ -1380,7 +1380,7 @@
+ h = dvi->pos.h;
+ hh = move_horizontal(dvi, arg);
+ SHOWCMD((dvi, "right", opcode - DVI_RIGHT1 + 1,
+- "%d h:=%d%c%d=%d, hh:=%d\n",
++ "%"PRIInt32" h:=%d%c%"PRIInt32"=%d, hh:=%d\n",
+ arg, DBGSUM(h, arg, dvi->pos.h), hh));
+ dvi->pos.hh = hh;
+ return 0;
+@@ -1395,7 +1395,7 @@
+ v = dvi->pos.v;
+ vv = move_vertical(dvi, arg);
+ SHOWCMD((dvi, "down", opcode - DVI_DOWN1 + 1,
+- "%d v:=%d%c%d=%d, vv:=%d\n",
++ "%"PRIInt32" v:=%d%c%"PRIInt32"=%d, vv:=%d\n",
+ arg, DBGSUM(v, arg, dvi->pos.v), vv));
+ dvi->pos.vv = vv;
+ return 0;
+@@ -1494,11 +1494,11 @@
+ else
+ ref = dvi->findref(dvi, arg);
+ if(ref == NULL) {
+- dvierr(dvi, _("font %d is not defined\n"), arg);
++ dvierr(dvi, _("font %"PRIInt32" is not defined\n"), arg);
+ return -1;
+ }
+ SHOWCMD((dvi, "fnt", opcode - DVI_FNT1 + 1,
+- "current font is %s (id %d)\n",
++ "current font is %s (id %"PRIInt32")\n",
+ ref->ref->fontname, arg));
+ dvi->currfont = ref;
+ return 0;
+@@ -1538,11 +1538,11 @@
+ dskip(dvi, 12);
+ dskip(dvi, duget1(dvi) + duget1(dvi));
+ if(ref == NULL) {
+- dvierr(dvi, _("font %d is not defined in postamble\n"), arg);
++ dvierr(dvi, _("font %"PRIInt32" is not defined in postamble\n"), arg);
+ return -1;
+ }
+ SHOWCMD((dvi, "fntdef", opcode - DVI_FNT_DEF1 + 1,
+- "%d -> %s (%d links)\n",
++ "%"PRIInt32" -> %s (%d links)\n",
+ ref->fontid, ref->ref->fontname,
+ ref->ref->links));
+ return 0;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/evince.git/commitdiff/a40727cc684bd08b08de6cb7c3ef769c3c2ad823
More information about the pld-cvs-commit
mailing list