update wine 1.7.22

wine/PKGBUILD

@@ -1,15 +1,14 @@
 # maintainer: Giuseppe Cala' <gcala[at]chakra-project[dot]org>
 
 pkgname=wine
-pkgver=1.7.21
+pkgver=1.7.22
-pkgrel=2
+pkgrel=1
 _pkgbasever=${pkgver/rc/-rc}
-_pulsepatches=1.7.21
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
         30-win32-aliases.conf
-        http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-$_pulsepatches.tar.bz2)
+	winemultimedia_1.7.22_20140712.patch)
 
-md5sums=('ee43e69f135c46ad544bc35cd7e6681c'
+md5sums=('519319364b0845ffcbeade4a5b98c0d4'
          '1ff4e467f59409272088d92173a0f801'
          'c975b349bce41992905891e267ed61a6')
 
@@ -23,61 +22,64 @@ install=wine.install
 
 depends=(
   fontconfig            lib32-fontconfig
-  mesa                  lib32-mesa
-  libglapi              lib32-libglapi
   libxcursor            lib32-libxcursor
   libxrandr             lib32-libxrandr
   libxdamage            lib32-libxdamage
-  libxxf86dga           lib32-libxxf86dga
-  alsa-lib              lib32-alsa-lib
-  lcms                  lib32-lcms
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  libxml2               lib32-libxml2
   libxi                 lib32-libxi
   gettext               lib32-gettext
-  gstreamer0.10-base    lib32-gstreamer0.10-base
+  freetype2             lib32-freetype2
-  libpulse              lib32-libpulse
+  glu                   lib32-glu
+  libsm                 lib32-libsm
+  gcc-libs              lib32-gcc-libs
   desktop-file-utils
 )
 
-
-
 makedepends=(autoconf ncurses bison perl fontforge flex prelink
   'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
   giflib         lib32-giflib
-  libxpm         lib32-libxpm
   libpng         lib32-libpng
+  gnutls         lib32-gnutls
   libxinerama    lib32-libxinerama
   libxcomposite  lib32-libxcomposite
   libxmu         lib32-libxmu
   libxxf86vm     lib32-libxxf86vm
   libxml2        lib32-libxml2
-  libxslt        lib32-libxslt
   libldap        lib32-libldap
   lcms2          lib32-lcms2
   mpg123         lib32-mpg123
   openal         lib32-openal
-  jack           lib32-jack
-  libcups        lib32-libcups
-  gnutls         lib32-gnutls
   v4l-utils      lib32-v4l-utils
   alsa-lib       lib32-alsa-lib
+  mesa            lib32-mesa
+  mesa-libgl      lib32-mesa-libgl
+  libcl           lib32-libcl
+  libxslt        lib32-libxslt
+  jack           lib32-jack
   samba
   opencl-headers
 )
 
 optdepends=(
-  giflib        lib32-giflib
+  giflib          lib32-giflib
-  libpng        lib32-libpng
+  libpng          lib32-libpng
-  libldap       lib32-libldap
+  libldap         lib32-libldap
-  jack          lib32-jack
+  gnutls          lib32-gnutls
-  libcups       lib32-libcups
+  lcms2           lib32-lcms2
-  gnutls        lib32-gnutls
+  libxml2         lib32-libxml2
-  v4l-utils     lib32-v4l-utils
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  v4l-utils       lib32-v4l-utils
+  libpulse        lib32-libpulse
+  alsa-plugins    lib32-alsa-plugins
+  alsa-lib        lib32-alsa-lib
+  libjpeg-turbo   lib32-libjpeg-turbo
+  libxcomposite   lib32-libxcomposite
+  libxinerama     lib32-libxinerama
+  ncurses         lib32-ncurses
+  libcl           lib32-libcl
+  libxslt         lib32-libxslt
   cups
-  samba
+  samba           dosbox
-  dosbox
 )
 
 prepare() {
@@ -97,9 +99,7 @@ prepare() {
   sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
 
   cd $pkgname
-  for _patch in $(ls $srcdir/winepulse-patches-$_pulsepatches/*.patch) ; do
+  patch -Np1 -i ../winemultimedia_1.7.22_20140712.patch
-    patch -Np1 -i $_patch
-  done
   
   # These additional CPPFLAGS solve FS#27662 and FS#34195
   export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
@@ -163,3 +163,6 @@ package() {
   ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
 }
 
+md5sums=('519319364b0845ffcbeade4a5b98c0d4'
+         '1ff4e467f59409272088d92173a0f801'
+         '3ef55a8345325b15144e2062b627b91f')

wine/wine.install

@@ -1,23 +1,12 @@
-post_upgrade() {
-	update-desktop-database -q
-	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	echo "If you are on x86_64, the default WINEARCH will be win64."
-	echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	echo "See the Arch wiki on wine for more information."
-	echo ""
-}
-
 post_install() {
 	update-desktop-database -q
-	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	echo "If you are on x86_64, the default WINEARCH will be win64."
+	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	echo "See the Arch wiki on wine for more information."
+	#echo "See the Arch wiki on wine for more information."
-	echo ""
 }
 
 post_remove() {
 	update-desktop-database -q
-}
+}