[arch-commits] Commit in drscheme/trunk (ChangeLog PKGBUILD libpng-1.4.patch)

[Eric Bélanger]

    Date: Monday, January 18, 2010 @ 02:20:43
  Author: eric
Revision: 63619

upgpkg: drscheme 4.2.3-3
    Built against libpng 1.4/libjpeg 8

Added:
  drscheme/trunk/libpng-1.4.patch
Modified:
  drscheme/trunk/ChangeLog
  drscheme/trunk/PKGBUILD

------------------+
 ChangeLog        |    5 +++++
 PKGBUILD         |   12 ++++++++----
 libpng-1.4.patch |   16 ++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-01-18 05:20:18 UTC (rev 63618)
+++ ChangeLog	2010-01-18 07:20:43 UTC (rev 63619)
@@ -1,3 +1,8 @@
+2010-01-17  Eric Belanger  <eric at archlinux.org>
+
+	* drscheme 4.2.3-3
+	* Rebuilt for libpng 1.4 and libjpeg 8
+
 2010-01-03  Ionut Biru <ionut at archlinux.ro>
 
 	* drscheme 4.2.3-2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-18 05:20:18 UTC (rev 63618)
+++ PKGBUILD	2010-01-18 07:20:43 UTC (rev 63619)
@@ -4,19 +4,23 @@
 
 pkgname=drscheme
 pkgver=4.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="PLT Scheme Environment"
 arch=('i686' 'x86_64')
 url="http://www.drscheme.org/"
 license=('LGPL')
-depends=('gcc-libs' 'cairo' 'desktop-file-utils' 'libjpeg>=7' 'mesa' 'openssl>=0.9.8h' 'libxaw' 'libxmu' 'libxft')
+depends=('gcc-libs' 'cairo' 'desktop-file-utils' 'libjpeg' 'mesa' 'openssl' 'libxaw' 'libxmu' 'libxft')
 options=('!makeflags')
 install=drscheme.install
-source=(http://download.plt-scheme.org/bundles/${pkgver}/plt/plt-${pkgver}-src-unix.tgz drscheme.desktop)
-sha1sums=('d6b401e0f1fbaedcfcd1c7ebc718f2c5d54b9832' '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5')
+source=(http://download.plt-scheme.org/bundles/${pkgver}/plt/plt-${pkgver}-src-unix.tgz drscheme.desktop libpng-1.4.patch)
+md5sums=('041ad51e17cf864e5d8771edae8e943a' '41ba9c74aa541308aa6f67b262387c6c'\
+         'ec18faef466c1f18047d14a50be0413c')
+sha1sums=('d6b401e0f1fbaedcfcd1c7ebc718f2c5d54b9832' '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5'\
+         '2280da2a2ce28b13530c9e749939b895c25fd22e')
 
 build() {
   cd "${srcdir}/plt-${pkgver}/src"
+  patch -p2 < ../../libpng-1.4.patch || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-18 07:20:43 UTC (rev 63619)
@@ -0,0 +1,16 @@
+diff -Naur plt-4.2.3-orig/src/wxcommon/wxJPEG.cxx plt-4.2.3/src/wxcommon/wxJPEG.cxx
+--- plt-4.2.3-orig/src/wxcommon/wxJPEG.cxx	2010-01-18 00:27:47.000000000 -0500
++++ plt-4.2.3/src/wxcommon/wxJPEG.cxx	2010-01-18 00:33:49.000000000 -0500
+@@ -726,7 +726,12 @@
+        png_set_strip_16(png_ptr);
+ 
+      /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
++#if PNG_LIBPNG_VER < 10400
+      png_set_gray_1_2_4_to_8(png_ptr);
++#else
++     png_set_expand_gray_1_2_4_to_8(png_ptr);
++#endif
++
+    }
+ 
+    /* Set the background color to draw transparent and alpha images over.