Update to 0.2.1 upstream release
This commit is contained in:
Tom Hughes
parent
65f2cbcac3
commit
85dc27a577
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/libgxps-0.2.0.tar.bz2
|
||||
/libgxps-0.2.1.tar.xz
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
commit 7bc33181d7e44aab35db01d4ac1560dcf408d5d9
|
||||
Author: Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Date: Mon Nov 21 08:51:54 2011 +0100
|
||||
|
||||
Build: link with libm. Fixes bgo#664439.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b7d38c6..7ef4310 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -47,6 +47,7 @@ AC_ISC_POSIX
|
||||
AC_PROG_CC_STDC
|
||||
AC_STDC_HEADERS
|
||||
AC_C_BIGENDIAN
|
||||
+LT_LIB_M
|
||||
|
||||
GNOME_MAINTAINER_MODE_DEFINES
|
||||
GNOME_COMPILE_WARNINGS
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index ccb7e05..0bf1538 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -54,6 +54,7 @@ xpstopng_CFLAGS = \
|
||||
|
||||
xpstopng_LDADD = \
|
||||
libgxpstools.la \
|
||||
+ $(LIBM) \
|
||||
$(LIBPNG_LIBS)
|
||||
endif # HAVE_LIBPNG
|
||||
|
||||
@@ -77,6 +78,7 @@ xpstojpeg_CFLAGS = \
|
||||
|
||||
xpstojpeg_LDADD = \
|
||||
libgxpstools.la \
|
||||
+ $(LIBM) \
|
||||
$(LIBJPEG)
|
||||
endif # HAVE_LIBJPEG
|
||||
|
||||
@@ -99,6 +101,7 @@ xpstopdf_CFLAGS = \
|
||||
|
||||
xpstopdf_LDADD = \
|
||||
libgxpstools.la \
|
||||
+ $(LIBM) \
|
||||
$(CAIRO_PDF_LIBS)
|
||||
endif # HAVE_CAIRO_PDF
|
||||
|
||||
@@ -121,6 +124,7 @@ xpstops_CFLAGS = \
|
||||
|
||||
xpstops_LDADD = \
|
||||
libgxpstools.la \
|
||||
+ $(LIBM) \
|
||||
$(CAIRO_PS_LIBS)
|
||||
endif # HAVE_CAIRO_PS
|
||||
|
||||
@@ -143,5 +147,6 @@ xpstosvg_CFLAGS = \
|
||||
|
||||
xpstosvg_LDADD = \
|
||||
libgxpstools.la \
|
||||
+ $(LIBM) \
|
||||
$(CAIRO_SVG_LIBS)
|
||||
-endif # HAVE_CAIRO_SVG
|
||||
\ No newline at end of file
|
||||
+endif # HAVE_CAIRO_SVG
|
||||
@ -1,24 +0,0 @@
|
||||
commit 5a63ac53db13fe75b9105ee7b4c03dfeaac54247
|
||||
Author: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Wed Nov 23 13:24:50 2011 -0500
|
||||
|
||||
Fix building with libpng15
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=664666
|
||||
|
||||
diff --git a/tools/gxps-png-writer.c b/tools/gxps-png-writer.c
|
||||
index 7d78ec9..369e0e0 100644
|
||||
--- a/tools/gxps-png-writer.c
|
||||
+++ b/tools/gxps-png-writer.c
|
||||
@@ -23,6 +23,11 @@
|
||||
#include <png.h>
|
||||
#include <stdint.h>
|
||||
|
||||
+/* starting with libpng15, png.h no longer #includes zlib.h */
|
||||
+#ifndef Z_BEST_COMPRESSION
|
||||
+#define Z_BEST_COMPRESSION 9
|
||||
+#endif
|
||||
+
|
||||
struct _GXPSPngWriter {
|
||||
GObject parent;
|
||||
|
||||
22
libgxps.spec
22
libgxps.spec
@ -1,18 +1,12 @@
|
||||
Name: libgxps
|
||||
Version: 0.2.0
|
||||
Release: 2%{?dist}
|
||||
Version: 0.2.1
|
||||
Release: 1%{?dist}
|
||||
Summary: GObject based library for handling and rendering XPS documents
|
||||
Group: System Environment/Libraries
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://live.gnome.org/libgxps
|
||||
Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
|
||||
# Patch from upstream to link with libm
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=664439
|
||||
Patch0: libgxps-0.2.0-libm.patch
|
||||
# Patch from upstream for libpng15 support
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=664666
|
||||
Patch1: libgxps-0.2.0-libpng15.patch
|
||||
Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/0.2/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: glib2-devel
|
||||
@ -24,8 +18,7 @@ BuildRequires: freetype-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: lcms2-devel
|
||||
# Required temporarily for libm patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: chrpath
|
||||
|
||||
%description
|
||||
libgxps is a GObject based library for handling and rendering XPS
|
||||
@ -52,9 +45,6 @@ documents using the %{name} library.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .libm
|
||||
%patch1 -p1 -b .libpng15
|
||||
autoreconf -i
|
||||
|
||||
|
||||
%build
|
||||
@ -66,6 +56,7 @@ make %{?_smp_mflags}
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/xpsto*
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@ -91,6 +82,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jan 21 2012 Tom Hughes <tom@compton.nu> - 0.2.1-1
|
||||
- Update to 0.2.1 upstream release.
|
||||
|
||||
* Wed Jan 4 2012 Tom Hughes <tom@compton.nu> - 0.2.0-2
|
||||
- Rebuilt for gcc 4.7 mass rebuild.
|
||||
- Run autoreconf to update libtool.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user