Merge remote-tracking branch 'origin/3.1' into 3.2

This commit is contained in:
Juergen Daubert 2015-08-22 12:37:05 +02:00
commit 8c200c0d18
14 changed files with 19 additions and 57 deletions

View File

@ -26,6 +26,7 @@ drwxr-xr-x root/root usr/include/fontembed/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/cups/
drwxr-xr-x root/root usr/lib/cups/backend/
-rwxr-xr-x root/root usr/lib/cups/backend/implicitclass
-rwxr-xr-x root/root usr/lib/cups/backend/parallel
-rwxr-xr-x root/root usr/lib/cups/backend/serial
drwxr-xr-x root/root usr/lib/cups/filter/

View File

@ -1,3 +1,2 @@
7540a6989be0042429f41770b1cdf215 cups-browsed
f1e11dfe5fa52eb65aa0bdd3a7ee0117 cups-filters-1.0.71.tar.xz
3b5258c23d3ebeb8ea733e5114a947c6 poppler-034.patch
7c8d792eb872be5a5b596409e5f05f40 cups-filters-1.0.73.tar.xz

View File

@ -4,17 +4,14 @@
# Depends on: cups ghostscript poppler qpdf
name=cups-filters
version=1.0.71
release=2
version=1.0.73
release=1
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed
poppler-034.patch)
cups-browsed)
build () {
cd $name-$version
patch -p0 -i $SRC/poppler-034.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/man \

View File

@ -1,38 +0,0 @@
# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000
+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:22:49 +0000
@@ -1811,10 +1811,14 @@
#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
maskSplash->drawImage(&imageSrc, &imgMaskData,
splashModeMono8, gFalse, maskWidth, maskHeight, mat);
-#else
+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
maskSplash->drawImage(&imageSrc, &imgMaskData,
splashModeMono8, gFalse, maskWidth, maskHeight,
mat,gFalse);
+#else
+ maskSplash->drawImage(&imageSrc, 0, &imgMaskData,
+ splashModeMono8, gFalse, maskWidth, maskHeight,
+ mat,gFalse);
#endif
delete imgMaskData.imgStr;
maskStr->close();
=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
--- filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000
+++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:22:49 +0000
@@ -240,8 +240,10 @@
if (rasterMode) {
#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
-#else
+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
+#else
+ return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
#endif
} else {
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);

View File

@ -1,3 +1,3 @@
d2dd952ec5806cf4330b2e4a486484b4 deadwood
7dcb8c131c12bd14fbec8ee741d74b22 deadwood-3.2.07.tar.bz2
b9e61120fc76e8d80bdb4745ff668ecf deadwood-3.2.08.tar.xz
0a2d736d8043d5cae0c5e41d2110c6a9 dwood3rc

View File

@ -3,9 +3,9 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=deadwood
version=3.2.07
version=3.2.08
release=1
source=(http://maradns.samiam.org/deadwood/stable/$name-$version.tar.bz2 \
source=(http://maradns.samiam.org/deadwood/stable/$name-$version.tar.xz \
dwood3rc deadwood)
build () {

View File

@ -5,6 +5,8 @@ drwx------ root/root etc/lvm/backup/
-rw-r--r-- root/root etc/lvm/lvm.conf
-rw-r--r-- root/root etc/lvm/lvmlocal.conf
drwxr-xr-x root/root etc/lvm/profile/
-r--r--r-- root/root etc/lvm/profile/cache-mq.profile
-r--r--r-- root/root etc/lvm/profile/cache-smq.profile
-r--r--r-- root/root etc/lvm/profile/command_profile_template.profile
-r--r--r-- root/root etc/lvm/profile/metadata_profile_template.profile
-r--r--r-- root/root etc/lvm/profile/thin-generic.profile

View File

@ -1 +1 @@
f262c825a4a16498482759a194cc02f5 LVM2.2.02.127.tgz
b3f4c273a30b316678755cec2a129718 LVM2.2.02.128.tgz

View File

@ -4,7 +4,7 @@
# Depends on: libdevmapper
name=lvm2
version=2.02.127
version=2.02.128
release=1
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.$version.tgz)

View File

@ -1,4 +1,4 @@
6e2f5cfb258b8955fa345a2070b6c4b0 db.localhost
0dce90ec6ee5c8a368ec692ec9d5ccc5 maradns
829334629f591e84fb4c5dd126b80ec2 maradns-2.0.11.tar.bz2
5d5a8176fc78a6d2e456974c9cf2de6b maradns-2.0.12.tar.bz2
8205d9a6cdeba454d173847fd44168a3 mararc

View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=maradns
version=2.0.11
version=2.0.12
release=1
source=(http://maradns.samiam.org/download/2.0/$version/$name-$version.tar.bz2 \
mararc maradns db.localhost)

View File

@ -1 +1 @@
dbce9b9d79d90f213ba8d448b0b6ed86 ruby-2.2.2.tar.xz
2a8bc1f46aba8938add70f742e8af1ff ruby-2.2.3.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: gdbm libgmp openssl readline zlib libffi libyaml
name=ruby
version=2.2.2
version=2.2.3
release=1
source=(http://cache.ruby-lang.org/pub/$name/${version%.*}/$name-$version.tar.xz)

View File

@ -5,7 +5,7 @@
name=sqlite3
version=3.8.11.1
release=1
release=2
_version=$(printf "%i%.2i%.2i%.2i" ${version//./ })
source=(http://www.sqlite.org/2015/sqlite-autoconf-${_version}.tar.gz)
@ -14,7 +14,8 @@ build () {
cd sqlite-autoconf-${_version}
CFLAGS="-DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 $CFLAGS" \
-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
$CFLAGS" \
./configure --prefix=/usr --mandir=/usr/man
make -j1