[arch-commits] Commit in wine/trunk (PKGBUILD libpng14.patch)

[Ionut Biru]

    Date: Wednesday, February 3, 2010 @ 12:37:30
  Author: ibiru
Revision: 67120

upgpkg: wine 1.1.37-2
    rebuild against libpng14/libjpeg8

Added:
  wine/trunk/libpng14.patch
Modified:
  wine/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++++---
 libpng14.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-03 17:32:32 UTC (rev 67119)
+++ PKGBUILD	2010-02-03 17:37:30 UTC (rev 67120)
@@ -4,7 +4,7 @@
 
 pkgname=wine
 pkgver=1.1.37
-pkgrel=1
+pkgrel=2
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 arch=('i686')
@@ -15,12 +15,16 @@
              'libxinerama' 'esound' 'giflib' 'ncurses' 'libxcomposite' 'samba' \
              'libxpm' 'libxmu' 'libxxf86vm' 'perl' 'libxml2')
 optdepends=("cups" "sane" "libgphoto2" "alsa-lib" "giflib" "libpng")
-source=(http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a9144360723c8276dffdbcea9c1028d5')
+source=(http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	libpng14.patch)
+md5sums=('a9144360723c8276dffdbcea9c1028d5'
+         '39874686bbd26e9690c64133d10e496a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/libpng14.patch" || return 1
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
 	      --with-x

Added: libpng14.patch
===================================================================
--- libpng14.patch	                        (rev 0)
+++ libpng14.patch	2010-02-03 17:37:30 UTC (rev 67120)
@@ -0,0 +1,54 @@
+diff -Nur wine-1.1.37.old/dlls/windowscodecs/Makefile.in wine-1.1.37/dlls/windowscodecs/Makefile.in
+--- wine-1.1.37.old/dlls/windowscodecs/Makefile.in	2010-01-22 18:54:11.000000000 +0200
++++ wine-1.1.37/dlls/windowscodecs/Makefile.in	2010-02-03 18:45:58.000000000 +0200
+@@ -4,7 +4,7 @@
+ VPATH     = @srcdir@
+ MODULE    = windowscodecs.dll
+ IMPORTLIB = windowscodecs
+-IMPORTS   = uuid ole32 advapi32 kernel32
++IMPORTS   = uuid ole32 advapi32 kernel32 png
+ EXTRAINCL = @PNGINCL@
+ 
+ C_SRCS = \
+diff -Nur wine-1.1.37.old/dlls/windowscodecs/pngformat.c wine-1.1.37/dlls/windowscodecs/pngformat.c
+--- wine-1.1.37.old/dlls/windowscodecs/pngformat.c	2010-01-22 18:54:11.000000000 +0200
++++ wine-1.1.37/dlls/windowscodecs/pngformat.c	2010-02-03 18:48:53.000000000 +0200
+@@ -59,7 +59,7 @@
+ MAKE_FUNCPTR(png_get_tRNS);
+ MAKE_FUNCPTR(png_set_bgr);
+ MAKE_FUNCPTR(png_set_filler);
+-MAKE_FUNCPTR(png_set_gray_1_2_4_to_8);
++MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8);
+ MAKE_FUNCPTR(png_set_gray_to_rgb);
+ MAKE_FUNCPTR(png_set_IHDR);
+ MAKE_FUNCPTR(png_set_pHYs);
+@@ -100,7 +100,7 @@
+         LOAD_FUNCPTR(png_get_tRNS);
+         LOAD_FUNCPTR(png_set_bgr);
+         LOAD_FUNCPTR(png_set_filler);
+-        LOAD_FUNCPTR(png_set_gray_1_2_4_to_8);
++        LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8);
+         LOAD_FUNCPTR(png_set_gray_to_rgb);
+         LOAD_FUNCPTR(png_set_IHDR);
+         LOAD_FUNCPTR(png_set_pHYs);
+@@ -282,7 +282,7 @@
+         {
+             if (bit_depth < 8)
+             {
+-                ppng_set_gray_1_2_4_to_8(This->png_ptr);
++                ppng_set_expand_gray_1_2_4_to_8(This->png_ptr);
+                 bit_depth = 8;
+             }
+             ppng_set_gray_to_rgb(This->png_ptr);
+diff -Nur wine-1.1.37.old/programs/winemenubuilder/Makefile.in wine-1.1.37/programs/winemenubuilder/Makefile.in
+--- wine-1.1.37.old/programs/winemenubuilder/Makefile.in	2010-01-22 18:54:11.000000000 +0200
++++ wine-1.1.37/programs/winemenubuilder/Makefile.in	2010-02-03 18:46:21.000000000 +0200
+@@ -5,7 +5,7 @@
+ VPATH     = @srcdir@
+ MODULE    = winemenubuilder.exe
+ APPMODE   = -mwindows
+-IMPORTS   = uuid shell32 shlwapi ole32 user32 advapi32 kernel32
++IMPORTS   = uuid shell32 shlwapi ole32 user32 advapi32 kernel32 png
+ EXTRAINCL = @PNGINCL@
+ 
+ C_SRCS = \