From 21e0cec15ce12a0b561a2bfa2b55e3f9e739a92e Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Fri, 23 Mar 2012 15:12:20 -0600
Subject: [PATCH 1/4] wine-unstable: update to version 1.5.0

---
 .../wine-unstable/libwine-unstable.template   |  2 +-
 srcpkgs/wine-unstable/template                | 19 +++++++++----------
 .../wine-unstable-devel.template              |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index b9c13a47c4e..2ee780cf573 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the wine runtime."
 
 only_for_archs=i686
-replaces="libwine>=0 libwine-unstable>=1.4-rc4"
+replaces="libwine>=0"
 provides="libwine-$version"
 conflicts="libwine>=0"
 
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index fb589992c83..89083c648cd 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -1,19 +1,16 @@
 # Template file for 'wine-unstable'
 __pkgname=wine
 pkgname=${__pkgname}-unstable
-__majminver=1.4
-__rcver=rc4
-__otherversion=${__majminver}-${__rcver}
-version=${__majminver}.${__rcver}
-wrksrc=${__pkgname}-${__otherversion}
+version=1.5.0
+wrksrc=${__pkgname}-${version}
 build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
-distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${__otherversion}.tar.bz2"
+distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${version}.tar.bz2"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
-checksum=3105c4f7e0a3c326c3dc82257b6af96dd5db6cc2afbe4b8a936563d2da04d1ec
+checksum=ad15143d2f8b38e2b5b8569b46efd09f9d13ce558dad431e17c471ca1412742b
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
  you can install and run these applications just like you would in
@@ -21,7 +18,7 @@ long_desc="
 
 only_for_archs=i686
 build_requires=11
-replaces="wine>=0 wine-unstable>=1.4-rc4"
+replaces="wine>=0"
 provides="wine-$version"
 conflicts="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
@@ -29,16 +26,17 @@ subpackages="lib$pkgname $pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 # XXX OpenCL
-# XXX dbus (dynamic device support) - I cannot make this work.
 # XXX libsane (scanner support)
-# XXX libcapi20 (ISDN support)
 # XXX libcups (printing support)
+# XXX libcapi20 (ISDN support)
 
 Add_dependency run libwine-unstable
 
 Add_dependency build flex
+Add_dependency build gettext-devel
 Add_dependency build lcms-devel
 Add_dependency build zlib-devel
+Add_dependency build ncurses-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libSM-devel
 Add_dependency build libXext-devel
@@ -68,6 +66,7 @@ Add_dependency build libpng-devel
 Add_dependency build v4l-utils-devel
 Add_dependency build fontconfig-devel
 Add_dependency build gnutls-devel
+Add_dependency build dbus-devel
 
 
 Add_dependency build prelink	# WINE only needs it to build the DLLs,
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index e70d7a7cab9..456ca4b891a 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 only_for_archs=i686
-replaces="wine-devel>=0 wine-unstable-devel>=1.4-rc4"
+replaces="wine-devel>=0"
 provides="wine-devel-$version"
 conflicts="wine-devel>=0"
 

From ccc3f3fbcc5ff9fe7babb2f8d930cc7b57cd42f4 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Fri, 23 Mar 2012 16:40:07 -0600
Subject: [PATCH 2/4] wine: update to version 1.4 (stable version)

---
 srcpkgs/wine/libwine.rshlibs     |  6 +++++
 srcpkgs/wine/libwine.template    |  2 --
 srcpkgs/wine/template            | 46 +++++++++++++++++++++-----------
 srcpkgs/wine/wine-devel.template |  2 --
 srcpkgs/wine/wine.rshlibs        |  1 +
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/wine/libwine.rshlibs b/srcpkgs/wine/libwine.rshlibs
index 9bd38d18d68..f4fbb965b37 100644
--- a/srcpkgs/wine/libwine.rshlibs
+++ b/srcpkgs/wine/libwine.rshlibs
@@ -18,3 +18,9 @@ liblber-2.4.so.2
 libpthread.so.0
 libopenal.so.1
 liblcms.so.1
+libgstapp-0.10.so.0
+libgstreamer-0.10.so.0
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+libglib-2.0.so.0
diff --git a/srcpkgs/wine/libwine.template b/srcpkgs/wine/libwine.template
index 713834220a6..8bcf2099903 100644
--- a/srcpkgs/wine/libwine.template
+++ b/srcpkgs/wine/libwine.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the wine runtime."
 
-revision=6
-
 only_for_archs=i686
 replaces="libwine>=0"
 
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 63cd15b304e..1b1eb83d22c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,14 +1,14 @@
 # Template file for 'wine'
 pkgname=wine
-version=1.2.3
-revision=5
+version=1.4
 build_style=gnu-configure
+configure_args="--with-x"
 homepage="http://www.winehq.org/"
 distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
-checksum=3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f
+checksum=99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
  you can install and run these applications just like you would in
@@ -19,42 +19,58 @@ replaces="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
+# XXX OpenCL
+# XXX libsane (scanner support)
+# XXX libcups (printing support)
+# XXX libcapi20 (ISDN support)
+
 
 Add_dependency build flex
+Add_dependency build gettext-devel
 Add_dependency build lcms-devel
 Add_dependency build zlib-devel
+Add_dependency build ncurses-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libSM-devel
 Add_dependency build libXext-devel
 Add_dependency build libX11-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXrandr-devel
+Add_dependency build libXpm-devel
 Add_dependency build libXinerama-devel
 Add_dependency build libXcomposite-devel
-Add_dependency build libXrender-devel
+Add_dependency build libXmu-devel
+Add_dependency build libXxf86vm-devel
+Add_dependency build libXcursor-devel
+Add_dependency build libXrandr-devel
+Add_dependency build libXdamage-devel
 Add_dependency build libXi-devel
 Add_dependency build libldap-devel
 Add_dependency build alsa-lib-devel
-Add_dependency build libgsm-devel
 Add_dependency build libgphoto2-devel
 Add_dependency build libxml2-devel
 Add_dependency build libxslt-devel
-Add_dependency build libpng-devel
-Add_dependency build mpg123-devel
-Add_dependency build libopenal-devel
+Add_dependency build glib-devel
+Add_dependency build gst-plugins-base-devel
 Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
+Add_dependency build mpg123-devel
+Add_dependency build libgsm-devel
+Add_dependency build libopenal-devel
+Add_dependency build giflib-devel
+Add_dependency build libpng-devel
 Add_dependency build v4l-utils-devel
+Add_dependency build fontconfig-devel
 Add_dependency build gnutls-devel
+Add_dependency build dbus-devel
+
+
+Add_dependency build prelink	# WINE only needs it to build the DLLs,
+				# Otherwise, throws a nasty warning.
 
 Add_dependency full desktop-file-utils
 Add_dependency full hicolor-icon-theme
-
-CPPFLAGS="-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
+Add_dependency full liberation-fonts-ttf # else stuff appears in hebrew
+Add_dependency full fontconfig
 
 pre_configure()
 {
 	sed -i 's/\(libncurses\)/\1w/g' configure
-	sed -i 's/\(libdbus\)/\1-1/g' configure
 }
-
diff --git a/srcpkgs/wine/wine-devel.template b/srcpkgs/wine/wine-devel.template
index e54692b2527..73024f7ec9b 100644
--- a/srcpkgs/wine/wine-devel.template
+++ b/srcpkgs/wine/wine-devel.template
@@ -8,8 +8,6 @@ long_desc="${long_desc}
 Add_dependency run glibc-devel
 Add_dependency run libwine
 
-revision=2
-
 only_for_archs=i686
 replaces="wine-unstable-devel>=0"
 provides="wine-devel-$version"
diff --git a/srcpkgs/wine/wine.rshlibs b/srcpkgs/wine/wine.rshlibs
index 5a89a864101..a8e8360750b 100644
--- a/srcpkgs/wine/wine.rshlibs
+++ b/srcpkgs/wine/wine.rshlibs
@@ -1,3 +1,4 @@
 libc.so.6
 libwine.so.1
 libpthread.so.0
+libgettextpo.so.0

From ce4eeefe4da351b1ce5df647a6f7249a35b117b9 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Fri, 23 Mar 2012 17:08:21 -0600
Subject: [PATCH 3/4] dssi-vst: revbump to build against new wine

---
 srcpkgs/dssi-vst/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template
index 77a25af470d..dfb74d9ca0f 100644
--- a/srcpkgs/dssi-vst/template
+++ b/srcpkgs/dssi-vst/template
@@ -1,7 +1,7 @@
 # Template file for 'dssi-vst'
 pkgname=dssi-vst
 version=0.9.2
-revision=2
+revision=3
 homepage="http://breakfastquay.com/dssi-vst/"
 distfiles="http://code.breakfastquay.com/attachments/download/10/${pkgname}-${version}.tar.bz2"
 short_desc="Run Windows VST plugins on Linux"
@@ -27,8 +27,8 @@ Add_dependency build libstdc++-devel
 Add_dependency build liblo-devel
 Add_dependency build dssi-devel
 Add_dependency build ladspa-sdk
-
-Add_dependency full wine # Needs wineg++ to build
+Add_dependency build wine-unstable		# Needs wineg++ to build
+Add_dependency build wine-unstable-devel	# Needs windows.h to build
 
 do_configure()
 {

From ea8d1f91c0911d51d1be95cba01f467db9e3630e Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Fri, 23 Mar 2012 17:16:57 -0600
Subject: [PATCH 4/4] qtractor: update to version 0.5.4

---
 srcpkgs/qtractor/qtractor.rshlibs | 1 +
 srcpkgs/qtractor/template         | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtractor/qtractor.rshlibs b/srcpkgs/qtractor/qtractor.rshlibs
index 55599de289c..238f5c84e0f 100644
--- a/srcpkgs/qtractor/qtractor.rshlibs
+++ b/srcpkgs/qtractor/qtractor.rshlibs
@@ -21,3 +21,4 @@ libstdc++.so.6
 libm.so.6
 libgcc_s.so.1
 libc.so.6
+libdl.so.2
diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 6e943ad1a6a..481ef13ca22 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,6 +1,6 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.5.3
+version=0.5.4
 homepage="http://qtractor.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -8,7 +8,7 @@ configure_args=" --enable-lilv"
 short_desc="Audio/MIDI multi-track sequencer application written in C++/Qt4"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
-checksum=952020719f1ee316863190f0fa304ce3183cae9bdf9a7efee190c6e4eb17eb9f
+checksum=b400e59018511838bf5a38f3c47be40facc82906375aa88b4ee41b4ea8dc7623
 long_desc="
  Qtractor is an Audio/MIDI multi-track sequencer application written in C++
  with the Qt4 framework. Target platform is Linux, where the Jack Audio
@@ -24,12 +24,14 @@ Add_dependency run dssi
 Add_dependency run lilv # need programs too
 
 Add_dependency build pkg-config
+Add_dependency build zlib-devel
 Add_dependency build jack-devel
 Add_dependency build alsa-lib-devel
 Add_dependency build libsndfile-devel
 Add_dependency build libvorbis-devel
 Add_dependency build libmad-devel
 Add_dependency build libsamplerate-devel
+Add_dependency build libX11-devel
 Add_dependency build qt-devel
 Add_dependency build liblo-devel
 Add_dependency build rubberband-devel