Sun Aug 11 01:21:31 PDT 2013

3 files changed, 15 insertions, 69 deletions

diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index c5f3b91ac..333aa390b 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,27 +1,21 @@
-# $Id: PKGBUILD 188741 2013-06-19 03:52:40Z eric $
+# $Id: PKGBUILD 192411 2013-08-10 21:15:00Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.3.5
+pkgver=5.3.6
 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')
 url="http://racket-lang.org/"
 license=('LGPL')
-depends=('gtk2' 'desktop-file-utils')
+depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('gsfonts' 'sqlite')
 options=('!libtool' '!strip')
 install=racket.install
-source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
-        drracket.desktop racket-libpng16.patch)
-sha1sums=('8a895454a9e0fdf689368fa54ce63ba88d432c5e'
-          'a20808f6b250225704856f82a544681a962a299d'
-          '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/racket-libpng16.patch"
-}
+source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz
+        drracket.desktop)
+sha1sums=('783485416359f4fc22da41c5a1a89103e7cb9d95'
+          'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
   cd ${pkgname}-${pkgver}/src
@@ -34,6 +28,9 @@ package() {
   cd ${pkgname}-${pkgver}/src
   make DESTDIR="${pkgdir}" install
 
-  install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm"
+  install -d "${pkgdir}"/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
+  ln -s /usr/lib/racket/collects/icons/plt-16x16.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/drracket.png"
+  ln -s /usr/lib/racket/collects/icons/plt-32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/drracket.png"
+  ln -s /usr/lib/racket/collects/icons/plt-48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/drracket.png"
   install -D -m644 "${srcdir}/drracket.desktop" "${pkgdir}/usr/share/applications/drracket.desktop"
 }
diff --git a/extra/racket/racket-libpng16.patch b/extra/racket/racket-libpng16.patch
deleted file mode 100644
index 8e4b605f2..000000000
--- a/extra/racket/racket-libpng16.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5629a6156a5720e51a277849f75b3135cb93664f Mon Sep 17 00:00:00 2001
-From: Matthew Flatt <mflatt@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
-
diff --git a/extra/racket/racket.install b/extra/racket/racket.install
index 660593cf5..c317fbaca 100644
--- a/extra/racket/racket.install
+++ b/extra/racket/racket.install
@@ -1,11 +1,12 @@
 post_install() {
-    update-desktop-database -q
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }