[arch-commits] Commit in racket/trunk (PKGBUILD racket-libpng16.patch)

[Eric Bélanger]

    Date: Saturday, May 18, 2013 @ 04:29:32
  Author: eric
Revision: 185731

upgpkg: racket 5.3.4-1

Upstream update

Added:
  racket/trunk/racket-libpng16.patch
Modified:
  racket/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   20 ++++++++++++------
 racket-libpng16.patch |   52 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-17 18:59:05 UTC (rev 185730)
+++ PKGBUILD	2013-05-18 02:29:32 UTC (rev 185731)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=racket
-pkgver=5.3.3
+pkgver=5.3.4
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64')
@@ -13,19 +13,25 @@
 options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
-        drracket.desktop)
-sha1sums=('96995fe20b332c4644dd51668851193b16976071'
-          'a20808f6b250225704856f82a544681a962a299d')
+        drracket.desktop racket-libpng16.patch)
+sha1sums=('7e37738e34c73a25bc7d51aeb53cf3dc5b0d533d'
+          'a20808f6b250225704856f82a544681a962a299d'
+          '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/racket-libpng16.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC"
+  cd ${pkgname}-${pkgver}/src
+  [ "$CARCH" == "x86_64" ] && export CFLAGS+=" -fPIC"
   ./configure --prefix=/usr --enable-shared
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  cd ${pkgname}-${pkgver}/src
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm"

Added: racket-libpng16.patch
===================================================================
--- racket-libpng16.patch	                        (rev 0)
+++ racket-libpng16.patch	2013-05-18 02:29:32 UTC (rev 185731)
@@ -0,0 +1,52 @@
+From 5629a6156a5720e51a277849f75b3135cb93664f Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt at racket-lang.org>
+Date: Wed, 15 May 2013 20:28:05 -0600
+Subject: [PATCH] support libpng16
+
+---
+ collects/racket/draw/unsafe/png.rkt | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt
+index 596fcb4..a6b028d 100644
+--- a/collects/racket/draw/unsafe/png.rkt
++++ b/collects/racket/draw/unsafe/png.rkt
+@@ -10,11 +10,15 @@
+   [(unix)
+    ;; Most Linux distros supply "libpng12", while other Unix
+    ;; variants often have just "libpng", etc.
+-   (ffi-lib "libpng15" '("15" "")
+-	    #:fail (lambda ()
+-		     (ffi-lib "libpng12" '("0" "")
+-			      #:fail (lambda ()
+-				       (ffi-lib "libpng")))))]
++   (let loop ([alts '(("libpng16" ("16" ""))
++                      ("libpng15" ("15" ""))
++                      ("libpng12" ("0" ""))
++                      ("libpng"))])
++     (cond
++      [(null? alts) #f]
++      [else (apply ffi-lib (car alts)
++                   #:fail (lambda ()
++                            (loop (cdr alts))))]))]
+   [(macosx) (ffi-lib "libpng15.15.dylib")]
+   [(windows)
+    (ffi-lib "zlib1.dll")
+@@ -29,9 +33,12 @@
+ ;;  assume that other versions are also ok
+ (define PNG_LIBPNG_VER_STRING (string->bytes/latin-1
+                                (let ([v (png_access_version_number)])
+-                                 (format "~s.~s"
++                                 (format "~s.~s~a"
+                                          (quotient v 10000)
+-                                         (quotient (remainder v 10000) 100)))))
++                                         (quotient (remainder v 10000) 100)
++                                         (if (zero? (remainder v 100))
++                                             ""
++                                             (format ".~a" (remainder v 100)))))))
+ 
+ (define _png_structp (_cpointer 'png_structp))
+ (define _png_infop (_cpointer 'png_infop))
+-- 
+1.8.1.6
+