Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/libgxps/files: libgxps-0.2.0-libm.patch libgxps-0.2.0-libpng15.patch
Date: Wed, 23 Nov 2011 20:26:04
Message-Id: 20111123202551.3FD302004C@flycatcher.gentoo.org
1 tetromino 11/11/23 20:25:51
2
3 Added: libgxps-0.2.0-libm.patch
4 libgxps-0.2.0-libpng15.patch
5 Log:
6 Bump. Improves support for bezier curves and opacity, and adds utilities for converting XPS to other formats.
7
8 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 app-text/libgxps/files/libgxps-0.2.0-libm.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libgxps/files/libgxps-0.2.0-libm.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libgxps/files/libgxps-0.2.0-libm.patch?rev=1.1&content-type=text/plain
15
16 Index: libgxps-0.2.0-libm.patch
17 ===================================================================
18 From 7bc33181d7e44aab35db01d4ac1560dcf408d5d9 Mon Sep 17 00:00:00 2001
19 From: Dominique Leuenberger <dimstar@××××××××.org>
20 Date: Mon, 21 Nov 2011 08:51:54 +0100
21 Subject: [PATCH] Build: link with libm. Fixes bgo#664439.
22
23 ---
24 configure.ac | 1 +
25 tools/Makefile.am | 7 ++++++-
26 2 files changed, 7 insertions(+), 1 deletions(-)
27
28 diff --git a/configure.ac b/configure.ac
29 index b7d38c6..7ef4310 100644
30 --- a/configure.ac
31 +++ b/configure.ac
32 @@ -47,6 +47,7 @@ AC_ISC_POSIX
33 AC_PROG_CC_STDC
34 AC_STDC_HEADERS
35 AC_C_BIGENDIAN
36 +LT_LIB_M
37
38 GNOME_MAINTAINER_MODE_DEFINES
39 GNOME_COMPILE_WARNINGS
40 diff --git a/tools/Makefile.am b/tools/Makefile.am
41 index ccb7e05..0bf1538 100644
42 --- a/tools/Makefile.am
43 +++ b/tools/Makefile.am
44 @@ -54,6 +54,7 @@ xpstopng_CFLAGS = \
45
46 xpstopng_LDADD = \
47 libgxpstools.la \
48 + $(LIBM) \
49 $(LIBPNG_LIBS)
50 endif # HAVE_LIBPNG
51
52 @@ -77,6 +78,7 @@ xpstojpeg_CFLAGS = \
53
54 xpstojpeg_LDADD = \
55 libgxpstools.la \
56 + $(LIBM) \
57 $(LIBJPEG)
58 endif # HAVE_LIBJPEG
59
60 @@ -99,6 +101,7 @@ xpstopdf_CFLAGS = \
61
62 xpstopdf_LDADD = \
63 libgxpstools.la \
64 + $(LIBM) \
65 $(CAIRO_PDF_LIBS)
66 endif # HAVE_CAIRO_PDF
67
68 @@ -121,6 +124,7 @@ xpstops_CFLAGS = \
69
70 xpstops_LDADD = \
71 libgxpstools.la \
72 + $(LIBM) \
73 $(CAIRO_PS_LIBS)
74 endif # HAVE_CAIRO_PS
75
76 @@ -143,5 +147,6 @@ xpstosvg_CFLAGS = \
77
78 xpstosvg_LDADD = \
79 libgxpstools.la \
80 + $(LIBM) \
81 $(CAIRO_SVG_LIBS)
82 -endif # HAVE_CAIRO_SVG
83 \ No newline at end of file
84 +endif # HAVE_CAIRO_SVG
85 --
86 1.7.8.rc3
87
88
89
90
91 1.1 app-text/libgxps/files/libgxps-0.2.0-libpng15.patch
92
93 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libgxps/files/libgxps-0.2.0-libpng15.patch?rev=1.1&view=markup
94 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libgxps/files/libgxps-0.2.0-libpng15.patch?rev=1.1&content-type=text/plain
95
96 Index: libgxps-0.2.0-libpng15.patch
97 ===================================================================
98 From 1b8587d4abe24a4416628638f54e58d52287551a Mon Sep 17 00:00:00 2001
99 From: Alexandre Rostovtsev <tetromino@g.o>
100 Date: Wed, 23 Nov 2011 13:24:50 -0500
101 Subject: [PATCH] Fix building with libpng15
102
103 https://bugzilla.gnome.org/show_bug.cgi?id=664666
104 ---
105 tools/gxps-png-writer.c | 5 +++++
106 1 files changed, 5 insertions(+), 0 deletions(-)
107
108 diff --git a/tools/gxps-png-writer.c b/tools/gxps-png-writer.c
109 index 7d78ec9..369e0e0 100644
110 --- a/tools/gxps-png-writer.c
111 +++ b/tools/gxps-png-writer.c
112 @@ -23,6 +23,11 @@
113 #include <png.h>
114 #include <stdint.h>
115
116 +/* starting with libpng15, png.h no longer #includes zlib.h */
117 +#ifndef Z_BEST_COMPRESSION
118 +#define Z_BEST_COMPRESSION 9
119 +#endif
120 +
121 struct _GXPSPngWriter {
122 GObject parent;
123
124 --
125 1.7.8.rc3