Merge branch '3.1' into 3.2
This commit is contained in:
Fredrik Rinnestam
commit
c578e2b1a3
@ -1 +1 @@
|
||||
110b35abebf8ebc1331a78976897dfed flash-plugin-11.2.202.540-release.x86_64.rpm
|
||||
c99d368656c5ad08eb79f374053a14c4 flash-plugin-11.2.202.548-release.x86_64.rpm
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on:
|
||||
|
||||
name=flash-player-plugin
|
||||
version=11.2.202.540
|
||||
version=11.2.202.548
|
||||
release=1
|
||||
source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash-plugin-$version-release.x86_64.rpm)
|
||||
|
||||
|
||||
@ -56,13 +56,13 @@ drwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
|
||||
drwxr-xr-x root/root usr/lib/girepository-1.0/
|
||||
-rw-r--r-- root/root usr/lib/girepository-1.0/GdkPixbuf-2.0.typelib
|
||||
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.3200.1
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.3200.1
|
||||
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.3200.1
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.3200.2
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.3200.2
|
||||
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.3200.2
|
||||
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.3200.1
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.3200.1
|
||||
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.3200.1
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.3200.2
|
||||
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.3200.2
|
||||
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.3200.2
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
b1590189a2e89fab9f871959c168508c gdk-pixbuf-2.32.1.tar.xz
|
||||
bbd9b471c60d11ab8ce133a5f04310af gdk-pixbuf-2.32.2.tar.xz
|
||||
d5311640870a5de1dc8aefcb4509a99d gdk-pixbuf-register.sh
|
||||
dc40466528a22507e347b3f27193160c gdk-pixbuf.loaders
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: gobject-introspection libpng libtiff xorg-libx11
|
||||
|
||||
name=gdk-pixbuf
|
||||
version=2.32.1
|
||||
version=2.32.2
|
||||
release=1
|
||||
source=(http://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz \
|
||||
gdk-pixbuf.loaders gdk-pixbuf-register.sh)
|
||||
|
||||
@ -34,6 +34,7 @@ drwxr-xr-x root/root usr/bin/
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/ghostscript/
|
||||
-rw-r--r-- root/root usr/include/ghostscript/gdevdsp.h
|
||||
-rw-r--r-- root/root usr/include/ghostscript/gserrors.h
|
||||
-rw-r--r-- root/root usr/include/ghostscript/iapi.h
|
||||
-rw-r--r-- root/root usr/include/ghostscript/ierrors.h
|
||||
drwxr-xr-x root/root usr/include/ijs/
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
aa125af368d89b3dbd15fc379f13375f ghostscript-9.18.tar.bz2
|
||||
6865682b095f8c4500c54b285ff05ef6 ghostscript-fonts-std-8.11.tar.gz
|
||||
22357972c680f6556b8038ed751ba94e ghostscript-gpl-9.18-gserrors.h-backport.patch
|
||||
|
||||
@ -5,13 +5,17 @@
|
||||
|
||||
name=ghostscript
|
||||
version=9.18
|
||||
release=1
|
||||
release=2
|
||||
source=(http://downloads.ghostscript.com/public/$name-$version.tar.bz2
|
||||
http://downloads.sourceforge.net/sourceforge/gs-fonts/$name-fonts-std-8.11.tar.gz)
|
||||
http://downloads.sourceforge.net/sourceforge/gs-fonts/$name-fonts-std-8.11.tar.gz
|
||||
ghostscript-gpl-9.18-gserrors.h-backport.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
||||
# required for gimp
|
||||
patch -p1 -i $SRC/ghostscript-gpl-9.18-gserrors.h-backport.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-cups \
|
||||
|
||||
43
ghostscript/ghostscript-gpl-9.18-gserrors.h-backport.patch
Normal file
43
ghostscript/ghostscript-gpl-9.18-gserrors.h-backport.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From feafe5e540a0545ec5d28f3f66bb542056bba495 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Fri, 23 Oct 2015 10:16:11 +0100
|
||||
Subject: [PATCH] Bug 696301: add gserrors.h to the installed files
|
||||
|
||||
for the so-install target.
|
||||
|
||||
Also remove a spurious (copy'n'paste error) comment.
|
||||
|
||||
No cluster differences
|
||||
---
|
||||
base/gserrors.h | 2 +-
|
||||
base/unix-dll.mak | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/base/gserrors.h b/base/gserrors.h
|
||||
index 5f18081..cdebb38 100644
|
||||
--- a/base/gserrors.h
|
||||
+++ b/base/gserrors.h
|
||||
@@ -25,7 +25,7 @@
|
||||
/* We don't use a typedef internally to avoid a lot of casting. */
|
||||
|
||||
enum gs_error_type {
|
||||
- gs_error_ok = 0, /* unknown error */
|
||||
+ gs_error_ok = 0,
|
||||
gs_error_unknownerror = -1, /* unknown error */
|
||||
gs_error_dictfull = -2,
|
||||
gs_error_dictstackoverflow = -3,
|
||||
diff --git a/base/unix-dll.mak b/base/unix-dll.mak
|
||||
index 7b67aa1..73b4fa9 100644
|
||||
--- a/base/unix-dll.mak
|
||||
+++ b/base/unix-dll.mak
|
||||
@@ -186,6 +186,7 @@ install-so-subtarget: so-subtarget
|
||||
ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
|
||||
$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
|
||||
$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
|
||||
+ $(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h
|
||||
$(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
|
||||
|
||||
soinstall:
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -265,10 +265,6 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/modules/
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-gamma.so
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-high-contrast.la
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-high-contrast.so
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-lcms.la
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-lcms.so
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-proof.la
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/modules/libdisplay-filter-proof.so
|
||||
drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/alien-map
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/align-layers
|
||||
@ -336,7 +332,6 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-html-table
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-ico
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-jpeg
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-mng
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pat
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pcx
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pdf-save
|
||||
@ -376,7 +371,6 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/imagemap
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/iwarp
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/jigsaw
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/lcms
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/lens-apply
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/lens-distortion
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/lens-flare
|
||||
@ -385,7 +379,6 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/map-object
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/max-rgb
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/maze
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/metadata
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/mosaic
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/newsprint
|
||||
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/nl-filter
|
||||
@ -481,6 +474,7 @@ drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/gimp-2.8.1.gz
|
||||
lrwxrwxrwx root/root usr/man/man1/gimp-console-2.8.1.gz -> gimp-2.8.1.gz
|
||||
lrwxrwxrwx root/root usr/man/man1/gimp-console.1.gz -> gimp-console-2.8.1.gz
|
||||
lrwxrwxrwx root/root usr/man/man1/gimp.1.gz -> gimp-2.8.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/gimptool-2.0.1.gz
|
||||
drwxr-xr-x root/root usr/man/man5/
|
||||
|
||||
@ -433,13 +433,13 @@ lrwxrwxrwx root/root usr/lib/libgailutil-3.so -> libgailutil-3.so.0.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libgailutil-3.so.0 -> libgailutil-3.so.0.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libgailutil-3.so.0.0.0
|
||||
-rw-r--r-- root/root usr/lib/libgdk-3.la
|
||||
lrwxrwxrwx root/root usr/lib/libgdk-3.so -> libgdk-3.so.0.1800.2
|
||||
lrwxrwxrwx root/root usr/lib/libgdk-3.so.0 -> libgdk-3.so.0.1800.2
|
||||
-rwxr-xr-x root/root usr/lib/libgdk-3.so.0.1800.2
|
||||
lrwxrwxrwx root/root usr/lib/libgdk-3.so -> libgdk-3.so.0.1800.3
|
||||
lrwxrwxrwx root/root usr/lib/libgdk-3.so.0 -> libgdk-3.so.0.1800.3
|
||||
-rwxr-xr-x root/root usr/lib/libgdk-3.so.0.1800.3
|
||||
-rw-r--r-- root/root usr/lib/libgtk-3.la
|
||||
lrwxrwxrwx root/root usr/lib/libgtk-3.so -> libgtk-3.so.0.1800.2
|
||||
lrwxrwxrwx root/root usr/lib/libgtk-3.so.0 -> libgtk-3.so.0.1800.2
|
||||
-rwxr-xr-x root/root usr/lib/libgtk-3.so.0.1800.2
|
||||
lrwxrwxrwx root/root usr/lib/libgtk-3.so -> libgtk-3.so.0.1800.3
|
||||
lrwxrwxrwx root/root usr/lib/libgtk-3.so.0 -> libgtk-3.so.0.1800.3
|
||||
-rwxr-xr-x root/root usr/lib/libgtk-3.so.0.1800.3
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gail-3.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-3.0.pc
|
||||
|
||||
@ -1 +1 @@
|
||||
230fd78e42419d35ff790784b457e5f2 gtk+-3.18.2.tar.xz
|
||||
e172049e8c40ad03c4ac864b9a2e9bf4 gtk+-3.18.3.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: gdk-pixbuf, pango, at-spi2-atk, libepoxy
|
||||
|
||||
name=gtk3
|
||||
version=3.18.2
|
||||
version=3.18.3
|
||||
release=1
|
||||
source=(http://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz)
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
fbdaddb9edcf8925dcf3231331a8720b mc-4.8.14.tar.xz
|
||||
7c1935433866fdf59a3c2d9b7dae81ad mc-4.8.15.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: util-linux ncurses glib
|
||||
|
||||
name=mc
|
||||
version=4.8.14
|
||||
version=4.8.15
|
||||
release=1
|
||||
source=(http://ftp.osuosl.org/pub/midnightcommander/$name-$version.tar.xz)
|
||||
|
||||
|
||||
@ -35,9 +35,9 @@ drwxr-xr-x root/root usr/include/qpdf/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libqpdf.a
|
||||
-rwxr-xr-x root/root usr/lib/libqpdf.la
|
||||
lrwxrwxrwx root/root usr/lib/libqpdf.so -> libqpdf.so.13.2.0
|
||||
lrwxrwxrwx root/root usr/lib/libqpdf.so.13 -> libqpdf.so.13.2.0
|
||||
-rwxr-xr-x root/root usr/lib/libqpdf.so.13.2.0
|
||||
lrwxrwxrwx root/root usr/lib/libqpdf.so -> libqpdf.so.13.3.0
|
||||
lrwxrwxrwx root/root usr/lib/libqpdf.so.13 -> libqpdf.so.13.3.0
|
||||
-rwxr-xr-x root/root usr/lib/libqpdf.so.13.3.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libqpdf.pc
|
||||
drwxr-xr-x root/root usr/man/
|
||||
|
||||
@ -1 +1 @@
|
||||
aafbf3950230f84d7998b700b12428f4 qpdf-5.1.3.tar.gz
|
||||
cde0d7a7410bad77c62350c13e32df65 qpdf-5.2.0.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: libpcre zlib
|
||||
|
||||
name=qpdf
|
||||
version=5.1.3
|
||||
version=5.2.0
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user