[arch-commits] Commit in wine/trunk (PKGBUILD libpng14.patch)
Date: Friday, February 19, 2010 @ 16:57:32
Author: ibiru
Revision: 69299
upgpkg: wine 1.1.39-1
update to 1.1.39
Modified:
wine/trunk/PKGBUILD
Deleted:
wine/trunk/libpng14.patch
+
PKGBUILD | 11 ++-
libpng14.patch | 76 ---
2 files changed, 3 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-19 21:33:11 UTC (rev 69298)
+++ PKGBUILD2010-02-19 21:57:32 UTC (rev 69299)
@@ -3,7 +3,7 @@
# Contributor: Giovanni Scafora giova...@archlinux.org
pkgname=wine
-pkgver=1.1.38
+pkgver=1.1.39
pkgrel=1
pkgdesc=A compatibility layer for running Windows programs
url=http://www.winehq.com;
@@ -15,16 +15,11 @@
'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
- libpng14.patch)
-md5sums=('ef5947bcb9667b75b8de4a2ce16d0ec2'
- '51f78b18168d5abd78411e9e66458d55')
-
+source=(http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('cbde85e50db653f54fe9da34be4a6de5')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/libpng14.patch || return 1
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-x
Deleted: libpng14.patch
===
--- libpng14.patch 2010-02-19 21:33:11 UTC (rev 69298)
+++ libpng14.patch 2010-02-19 21:57:32 UTC (rev 69299)
@@ -1,76 +0,0 @@
-diff --git a/programs/winemenubuilder/winemenubuilder.c
b/programs/winemenubuilder/winemenubuilder.c
-index e14fe81..62165f6 100644
a/programs/winemenubuilder/winemenubuilder.c
-+++ b/programs/winemenubuilder/winemenubuilder.c
-@@ -188,8 +188,10 @@ static void *libpng_handle;
- MAKE_FUNCPTR(png_create_info_struct);
- MAKE_FUNCPTR(png_create_write_struct);
- MAKE_FUNCPTR(png_destroy_write_struct);
-+MAKE_FUNCPTR(png_get_error_ptr);
- MAKE_FUNCPTR(png_init_io);
- MAKE_FUNCPTR(png_set_bgr);
-+MAKE_FUNCPTR(png_set_error_fn);
- MAKE_FUNCPTR(png_set_text);
- MAKE_FUNCPTR(png_set_IHDR);
- MAKE_FUNCPTR(png_write_end);
-@@ -209,8 +211,10 @@ static void *load_libpng(void)
- LOAD_FUNCPTR(png_create_info_struct);
- LOAD_FUNCPTR(png_create_write_struct);
- LOAD_FUNCPTR(png_destroy_write_struct);
-+LOAD_FUNCPTR(png_get_error_ptr);
- LOAD_FUNCPTR(png_init_io);
- LOAD_FUNCPTR(png_set_bgr);
-+LOAD_FUNCPTR(png_set_error_fn);
- LOAD_FUNCPTR(png_set_IHDR);
- LOAD_FUNCPTR(png_set_text);
- LOAD_FUNCPTR(png_write_end);
-@@ -221,6 +225,23 @@ static void *load_libpng(void)
- return libpng_handle;
- }
-
-+static void user_error_fn(png_structp png_ptr, png_const_charp error_message)
-+{
-+jmp_buf *pjmpbuf;
-+
-+/* This uses setjmp/longjmp just like the default. We can't use the
-+ * default because there's no way to access the jmp buffer in the
png_struct
-+ * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */
-+WINE_ERR(PNG error: %s\n, wine_dbgstr_an(error_message, -1));
-+pjmpbuf = ppng_get_error_ptr(png_ptr);
-+longjmp(*pjmpbuf, 1);
-+}
-+
-+static void user_warning_fn(png_structp png_ptr, png_const_charp
warning_message)
-+{
-+WINE_WARN(PNG warning: %s\n, wine_dbgstr_an(warning_message, -1));
-+}
-+
- static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char
*png_filename, LPCWSTR commentW)
- {
- static const char comment_key[] = Created from;
-@@ -234,6 +255,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon,
const char *png_filename,
- int nWidth = pIcon-bmiHeader.biWidth;
- int nHeight = pIcon-bmiHeader.biHeight;
- int nBpp= pIcon-bmiHeader.biBitCount;
-+jmp_buf jmpbuf;
-
- switch (nBpp)
- {
-@@ -306,12 +328,12 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon,
const char *png_filename,
- !(info_ptr = ppng_create_info_struct(png_ptr)))
- goto error;
-
--if (setjmp(png_jmpbuf(png_ptr)))
-+if (setjmp(jmpbuf))
- {
- /* All future errors jump here */
--WINE_ERR(png error\n);
- goto error;
- }
-+ppng_set_error_fn(png_ptr, jmpbuf, user_error_fn, user_warning_fn);
-
- ppng_init_io(png_ptr, fp);
- ppng_set_IHDR(png_ptr, info_ptr, nWidth, nHeight, 8,
---
-1.6.3.3
-
[arch-commits] Commit in wine/trunk (PKGBUILD libpng14.patch)
Date: Sunday, February 7, 2010 @ 18:36:12
Author: ibiru
Revision: 67536
upgpkg: wine 1.1.38-1
update to 1.1.38
Modified:
wine/trunk/PKGBUILD
wine/trunk/libpng14.patch
+
PKGBUILD |8 +--
libpng14.patch | 120 ---
2 files changed, 75 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-07 22:14:42 UTC (rev 67535)
+++ PKGBUILD2010-02-07 23:36:12 UTC (rev 67536)
@@ -3,8 +3,8 @@
# Contributor: Giovanni Scafora giova...@archlinux.org
pkgname=wine
-pkgver=1.1.37
-pkgrel=2
+pkgver=1.1.38
+pkgrel=1
pkgdesc=A compatibility layer for running Windows programs
url=http://www.winehq.com;
arch=('i686')
@@ -17,8 +17,8 @@
optdepends=(cups sane libgphoto2 alsa-lib giflib libpng)
source=(http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${pkgver}.tar.bz2
libpng14.patch)
-md5sums=('a9144360723c8276dffdbcea9c1028d5'
- '39874686bbd26e9690c64133d10e496a')
+md5sums=('ef5947bcb9667b75b8de4a2ce16d0ec2'
+ '51f78b18168d5abd78411e9e66458d55')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
Modified: libpng14.patch
===
--- libpng14.patch 2010-02-07 22:14:42 UTC (rev 67535)
+++ libpng14.patch 2010-02-07 23:36:12 UTC (rev 67536)
@@ -1,54 +1,76 @@
-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.0 +0200
-+++ wine-1.1.37/dlls/windowscodecs/Makefile.in 2010-02-03 18:45:58.0
+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.0 +0200
-+++ wine-1.1.37/dlls/windowscodecs/pngformat.c 2010-02-03 18:48:53.0
+0200
-@@ -59,7 +59,7 @@
- MAKE_FUNCPTR(png_get_tRNS);
+diff --git a/programs/winemenubuilder/winemenubuilder.c
b/programs/winemenubuilder/winemenubuilder.c
+index e14fe81..62165f6 100644
+--- a/programs/winemenubuilder/winemenubuilder.c
b/programs/winemenubuilder/winemenubuilder.c
+@@ -188,8 +188,10 @@ static void *libpng_handle;
+ MAKE_FUNCPTR(png_create_info_struct);
+ MAKE_FUNCPTR(png_create_write_struct);
+ MAKE_FUNCPTR(png_destroy_write_struct);
++MAKE_FUNCPTR(png_get_error_ptr);
+ MAKE_FUNCPTR(png_init_io);
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_error_fn);
+ MAKE_FUNCPTR(png_set_text);
MAKE_FUNCPTR(png_set_IHDR);
- MAKE_FUNCPTR(png_set_pHYs);
-@@ -100,7 +100,7 @@
- LOAD_FUNCPTR(png_get_tRNS);
+ MAKE_FUNCPTR(png_write_end);
+@@ -209,8 +211,10 @@ static void *load_libpng(void)
+ LOAD_FUNCPTR(png_create_info_struct);
+ LOAD_FUNCPTR(png_create_write_struct);
+ LOAD_FUNCPTR(png_destroy_write_struct);
++LOAD_FUNCPTR(png_get_error_ptr);
+ LOAD_FUNCPTR(png_init_io);
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_error_fn);
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.0 +0200
-+++ wine-1.1.37/programs/winemenubuilder/Makefile.in 2010-02-03
18:46:21.0 +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@
+ LOAD_FUNCPTR(png_set_text);
+ LOAD_FUNCPTR(png_write_end);
+@@ -221,6 +225,23 @@ static void *load_libpng(void)
+ return libpng_handle;
+ }
- C_SRCS = \
++static void user_error_fn(png_structp png_ptr, png_const_charp error_message)
++{
++jmp_buf *pjmpbuf;
++
++/* This uses setjmp/longjmp just like the
[arch-commits] Commit in wine/trunk (PKGBUILD libpng14.patch)
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
===
--- PKGBUILD2010-02-03 17:32:32 UTC (rev 67119)
+++ PKGBUILD2010-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.0 +0200
wine-1.1.37/dlls/windowscodecs/Makefile.in 2010-02-03 18:45:58.0
+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.0 +0200
wine-1.1.37/dlls/windowscodecs/pngformat.c 2010-02-03 18:48:53.0
+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.0 +0200
wine-1.1.37/programs/winemenubuilder/Makefile.in 2010-02-03
18:46:21.0 +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 = \
