August 2015 - crux-commits

ports/opt (3.2): [notify] ruby: update to 2.1.7
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit 42073e1c9b09d74cc1593fa666d1fbbe6f509e71 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 21 17:54:22 2015 +0200 [notify] ruby: update to 2.1.7 update includes a security fix, see http://blog.rubygems.org/2015/05/14/CVE-2015-3900.html diff --git a/ruby/.footprint b/ruby/.footprint index a9cc0bb..f7e1e28 100644 --- a/ruby/.footprint +++ b/ruby/.footprint @@ -1045,9 +1045,9 @@ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/ -rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/rdoc -rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/ri -drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.6.0/ -drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.6.0/bin/ --rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.6.0/bin/testrb +drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.7.0/ +drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.7.0/bin/ +-rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.7.0/bin/testrb drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/default/ -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/bigdecimal-1.2.4.gemspec @@ -1057,7 +1057,7 @@ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/default/ -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/psych-2.0.5.gemspec -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/rake-10.1.0.gemspec -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/rdoc-4.1.0.gemspec --rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/test-unit-2.1.6.0.gemspec +-rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/test-unit-2.1.7.0.gemspec drwxr-xr-x root/root usr/lib/ruby/site_ruby/ drwxr-xr-x root/root usr/lib/ruby/site_ruby/2.1/ drwxr-xr-x root/root usr/lib/ruby/site_ruby/2.1/x86_64-linux/ diff --git a/ruby/.md5sum b/ruby/.md5sum index c1288c8..6dd5ecc 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1 +1 @@ -ec6f10ca331ce947802ede86259513a8 ruby-2.1.6.tar.xz +2e43a1d32cc16975a6b5d3ffce399199 ruby-2.1.7.tar.xz diff --git a/ruby/Pkgfile b/ruby/Pkgfile index a6fdb5d..71f3bc2 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gdbm libgmp openssl readline zlib libffi libyaml name=ruby -version=2.1.6 +version=2.1.7 release=1 source=(http://cache.ruby-lang.org/pub/$name/2.1/$name-$version.tar.xz)

1 0

ports/opt (3.1): deadwood: update to 3.2.08
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit ed0856dc9b4149fb837da937bafe8c12f8c753d6 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Aug 22 11:49:50 2015 +0200 deadwood: update to 3.2.08 diff --git a/deadwood/.md5sum b/deadwood/.md5sum index fd1b753..0c6786f 100644 --- a/deadwood/.md5sum +++ b/deadwood/.md5sum @@ -1,3 +1,3 @@ d2dd952ec5806cf4330b2e4a486484b4 deadwood -7dcb8c131c12bd14fbec8ee741d74b22 deadwood-3.2.07.tar.bz2 +b9e61120fc76e8d80bdb4745ff668ecf deadwood-3.2.08.tar.xz 0a2d736d8043d5cae0c5e41d2110c6a9 dwood3rc diff --git a/deadwood/Pkgfile b/deadwood/Pkgfile index f6d119b..05fa698 100644 --- a/deadwood/Pkgfile +++ b/deadwood/Pkgfile @@ -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 () {

1 0

ports/opt (3.1): [notify] maradns: update to 2.0.12
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit e1a363aef0dd131a83fb668f33c46cdb9b32fb29 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Aug 22 11:44:35 2015 +0200 [notify] maradns: update to 2.0.12 Security fix, see http://samiam.org/blog/2015-08-19.html diff --git a/maradns/.md5sum b/maradns/.md5sum index ac1b392..f7a2171 100644 --- a/maradns/.md5sum +++ b/maradns/.md5sum @@ -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 diff --git a/maradns/Pkgfile b/maradns/Pkgfile index ac51391..1795966 100644 --- a/maradns/Pkgfile +++ b/maradns/Pkgfile @@ -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.… \ mararc maradns db.localhost)

1 0

ports/opt (3.1): [notify] ruby: update to 2.1.7
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit 42073e1c9b09d74cc1593fa666d1fbbe6f509e71 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 21 17:54:22 2015 +0200 [notify] ruby: update to 2.1.7 update includes a security fix, see http://blog.rubygems.org/2015/05/14/CVE-2015-3900.html diff --git a/ruby/.footprint b/ruby/.footprint index a9cc0bb..f7e1e28 100644 --- a/ruby/.footprint +++ b/ruby/.footprint @@ -1045,9 +1045,9 @@ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/ -rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/rdoc -rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/ri -drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.6.0/ -drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.6.0/bin/ --rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.6.0/bin/testrb +drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.7.0/ +drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.7.0/bin/ +-rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.7.0/bin/testrb drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/default/ -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/bigdecimal-1.2.4.gemspec @@ -1057,7 +1057,7 @@ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/default/ -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/psych-2.0.5.gemspec -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/rake-10.1.0.gemspec -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/rdoc-4.1.0.gemspec --rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/test-unit-2.1.6.0.gemspec +-rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/test-unit-2.1.7.0.gemspec drwxr-xr-x root/root usr/lib/ruby/site_ruby/ drwxr-xr-x root/root usr/lib/ruby/site_ruby/2.1/ drwxr-xr-x root/root usr/lib/ruby/site_ruby/2.1/x86_64-linux/ diff --git a/ruby/.md5sum b/ruby/.md5sum index c1288c8..6dd5ecc 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1 +1 @@ -ec6f10ca331ce947802ede86259513a8 ruby-2.1.6.tar.xz +2e43a1d32cc16975a6b5d3ffce399199 ruby-2.1.7.tar.xz diff --git a/ruby/Pkgfile b/ruby/Pkgfile index a6fdb5d..71f3bc2 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gdbm libgmp openssl readline zlib libffi libyaml name=ruby -version=2.1.6 +version=2.1.7 release=1 source=(http://cache.ruby-lang.org/pub/$name/2.1/$name-$version.tar.xz)

1 0

ports/opt (3.1): sqlite3: build with SQLITE_ENABLE_DBSTAT_VTAB, FS#1215
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit 06492d24c9b9f97b8cb8d5cecd53c01ee23585f5 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 21 17:54:12 2015 +0200 sqlite3: build with SQLITE_ENABLE_DBSTAT_VTAB, FS#1215 diff --git a/sqlite3/Pkgfile b/sqlite3/Pkgfile index 9c5710b..0e329ba 100644 --- a/sqlite3/Pkgfile +++ b/sqlite3/Pkgfile @@ -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

1 0

ports/opt (3.1): cups-filters: update to 1.0.73
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit 12dc8f833461a33c90591e2b3cb04e63fa66afa2 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 21 17:38:52 2015 +0200 cups-filters: update to 1.0.73 diff --git a/cups-filters/.footprint b/cups-filters/.footprint index 002532f..a678a57 100644 --- a/cups-filters/.footprint +++ b/cups-filters/.footprint @@ -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/ diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 660483b..70058af 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -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 diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 3f18350..8806ee8 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -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 \ diff --git a/cups-filters/poppler-034.patch b/cups-filters/poppler-034.patch deleted file mode 100644 index de7ee10..0000000 --- a/cups-filters/poppler-034.patch +++ /dev/null @@ -1,38 +0,0 @@ -# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio… - -=== 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); -

1 0

ports/opt (3.1): lvm2: update to 2.02.128
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit 73c06f90f4cdcc7b8020226ecfbb8fde5bf48f22 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 21 17:11:17 2015 +0200 lvm2: update to 2.02.128 diff --git a/lvm2/.footprint b/lvm2/.footprint index 283a69e..eeeefc5 100644 --- a/lvm2/.footprint +++ b/lvm2/.footprint @@ -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 diff --git a/lvm2/.md5sum b/lvm2/.md5sum index 4782275..29ae582 100644 --- a/lvm2/.md5sum +++ b/lvm2/.md5sum @@ -1 +1 @@ -f262c825a4a16498482759a194cc02f5 LVM2.2.02.127.tgz +b3f4c273a30b316678755cec2a129718 LVM2.2.02.128.tgz diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile index 9849d0e..26229d5 100644 --- a/lvm2/Pkgfile +++ b/lvm2/Pkgfile @@ -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)

1 0

ports/opt (3.1): [notify] maradns: update to 2.0.12
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit e1a363aef0dd131a83fb668f33c46cdb9b32fb29 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Aug 22 11:44:35 2015 +0200 [notify] maradns: update to 2.0.12 Security fix, see http://samiam.org/blog/2015-08-19.html diff --git a/maradns/.md5sum b/maradns/.md5sum index ac1b392..f7a2171 100644 --- a/maradns/.md5sum +++ b/maradns/.md5sum @@ -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 diff --git a/maradns/Pkgfile b/maradns/Pkgfile index ac51391..1795966 100644 --- a/maradns/Pkgfile +++ b/maradns/Pkgfile @@ -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.… \ mararc maradns db.localhost)

1 0

ports/opt (3.1): deadwood: update to 3.2.08
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit ed0856dc9b4149fb837da937bafe8c12f8c753d6 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Aug 22 11:49:50 2015 +0200 deadwood: update to 3.2.08 diff --git a/deadwood/.md5sum b/deadwood/.md5sum index fd1b753..0c6786f 100644 --- a/deadwood/.md5sum +++ b/deadwood/.md5sum @@ -1,3 +1,3 @@ d2dd952ec5806cf4330b2e4a486484b4 deadwood -7dcb8c131c12bd14fbec8ee741d74b22 deadwood-3.2.07.tar.bz2 +b9e61120fc76e8d80bdb4745ff668ecf deadwood-3.2.08.tar.xz 0a2d736d8043d5cae0c5e41d2110c6a9 dwood3rc diff --git a/deadwood/Pkgfile b/deadwood/Pkgfile index f6d119b..05fa698 100644 --- a/deadwood/Pkgfile +++ b/deadwood/Pkgfile @@ -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 () {

1 0

ports/opt (3.1): cups-filters: update to 1.0.73
by crux＠crux.nu 22 Aug '15

22 Aug '15

commit 12dc8f833461a33c90591e2b3cb04e63fa66afa2 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 21 17:38:52 2015 +0200 cups-filters: update to 1.0.73 diff --git a/cups-filters/.footprint b/cups-filters/.footprint index 002532f..a678a57 100644 --- a/cups-filters/.footprint +++ b/cups-filters/.footprint @@ -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/ diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 660483b..70058af 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -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 diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 3f18350..8806ee8 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -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 \ diff --git a/cups-filters/poppler-034.patch b/cups-filters/poppler-034.patch deleted file mode 100644 index de7ee10..0000000 --- a/cups-filters/poppler-034.patch +++ /dev/null @@ -1,38 +0,0 @@ -# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio… - -=== 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); -

1 0