[arch-commits] Commit in wine/repos (3 files)

Giovanni Scafora giovanni at archlinux.org
Sun Sep 27 00:21:01 UTC 2009


    Date: Saturday, September 26, 2009 @ 20:21:00
  Author: giovanni
Revision: 53209

Merged revisions 53208 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/wine/trunk

........
  r53208 | giovanni | 2009-09-26 17:20:21 -0700 (sab, 26 set 2009) | 2 lines
  
  upgpkg: wine 1.1.30-1
      Upstream release
........

Modified:
  wine/repos/extra-i686/	(properties)
  wine/repos/extra-i686/PKGBUILD
Deleted:
  wine/repos/extra-i686/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch

-----------------------------------------------------------------+
 0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch |   39 ----------
 PKGBUILD                                                        |   11 +-
 2 files changed, 4 insertions(+), 46 deletions(-)


Property changes on: wine/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /wine/trunk:1-52228
   + /wine/trunk:1-53208

Deleted: extra-i686/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch
===================================================================
--- extra-i686/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch	2009-09-27 00:20:21 UTC (rev 53208)
+++ extra-i686/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch	2009-09-27 00:21:00 UTC (rev 53209)
@@ -1,39 +0,0 @@
-From 0454ace14774654c3670a2a29613bed5039991c5 Mon Sep 17 00:00:00 2001
-From: Roderick Colenbrander <thunderbird2k at gmail.com>
-Date: Thu, 3 Sep 2009 13:51:44 +0200
-Subject: [PATCH] Always adjust the color_shifts pointer when SelectBitmap is called. This fixes a regression in Steam (bug 19916).
-
----
- dlls/winex11.drv/bitmap.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c
-index 4d635aa..fee2dbc 100644
---- a/dlls/winex11.drv/bitmap.c
-+++ b/dlls/winex11.drv/bitmap.c
-@@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
-     if (physDev->depth != physBitmap->pixmap_depth)
-     {
-         physDev->depth = physBitmap->pixmap_depth;
--        if(physDev->depth == 1)
--            physDev->color_shifts = NULL;
--        else
--            physDev->color_shifts = &physBitmap->pixmap_color_shifts;
-         wine_tsx11_lock();
-         XFreeGC( gdi_display, physDev->gc );
-         physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL );
-@@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
-         XFlush( gdi_display );
-         wine_tsx11_unlock();
-     }
-+
-+    if(physDev->depth == 1)
-+        physDev->color_shifts = NULL;
-+    else
-+        physDev->color_shifts = &physBitmap->pixmap_color_shifts;
-+
-     return hbitmap;
- }
- 
--- 
-1.6.0.4

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-27 00:20:21 UTC (rev 53208)
+++ extra-i686/PKGBUILD	2009-09-27 00:21:00 UTC (rev 53209)
@@ -3,8 +3,8 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine
-pkgver=1.1.29
-pkgrel=2
+pkgver=1.1.30
+pkgrel=1
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 arch=('i686')
@@ -15,14 +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
-        0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch)
-md5sums=('c3a9218840a80b29932cee49f2d45d9d'
-         '63c4a6aee199039d35e6b57fa505e887')
+source=(http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('3b78497f71cf6f112bac6de74e5cb29f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
 	      --with-x




More information about the arch-commits mailing list