Merge branch '3.1' into 3.2

firefox/.md5sum

@@ -1,3 +1,3 @@
-62b9e6a4a46874a0be523fe41d3176e2  firefox-40.0.source.tar.bz2
+26a64a80cbd5b77d3b0d9734bff5bbad  firefox-40.0.3.source.tar.bz2
 1c53b819f800c61cd50e7c47bdb30bf0  firefox-install-dir.patch
 cf6971669f70b440cb6ff8df8b2722ae  firefox.desktop

firefox/Pkgfile

@@ -4,8 +4,8 @@
 # Depends on: nss, unzip, zip, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base
  
 name=firefox
-version=40.0
-release=2
+version=40.0.3
+release=1
 source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
 	firefox-install-dir.patch firefox.desktop)
  

wine/.footprint

@@ -3779,8 +3779,8 @@ drwxr-xr-x	root/root	usr/share/wine/fonts/
 -rw-r--r--	root/root	usr/share/wine/fonts/vgasyst.fon
 -rw-r--r--	root/root	usr/share/wine/fonts/wingding.ttf
 drwxr-xr-x	root/root	usr/share/wine/gecko/
--rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.36-x86.msi
--rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.36-x86_64.msi
+-rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.40-x86.msi
+-rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.40-x86_64.msi
 -rw-r--r--	root/root	usr/share/wine/l_intl.nls
 drwxr-xr-x	root/root	usr/share/wine/mono/
 -rwxr-xr-x	root/root	usr/share/wine/mono/wine-mono-4.5.6.msi

wine/.md5sum

@@ -1,4 +1,4 @@
 c8b30bf13c3d418688fd6fa1321edb8a  wine-1.7.50.tar.bz2
 6cec03fb81eb083c517c9bb2d70a1424  wine-mono-4.5.6.msi
-490668a7f1cb42ceba56208bfe51334f  wine_gecko-2.36-x86.msi
-7f0826b2592d35129c54bcbf612eea63  wine_gecko-2.36-x86_64.msi
+66fa7ceca8c0aa84c6a2db8672a743b6  wine_gecko-2.40-x86.msi
+5e5d242e52e885190a0fe02a2e38a987  wine_gecko-2.40-x86_64.msi

wine/Pkgfile

@@ -8,8 +8,8 @@ name=wine
 version=1.7.50
 release=1
 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
-	http://downloads.sourceforge.net/wine/wine_gecko-2.36-x86.msi
-	http://downloads.sourceforge.net/wine/wine_gecko-2.36-x86_64.msi
+	http://downloads.sourceforge.net/wine/wine_gecko-2.40-x86.msi
+	http://downloads.sourceforge.net/wine/wine_gecko-2.40-x86_64.msi
 	http://downloads.sourceforge.net/wine/wine-mono-4.5.6.msi)
 
 build() {
@@ -50,8 +50,8 @@ build() {
 	install -d $PKG/usr/share/wine/mono
 
 	install -t $PKG/usr/share/wine/gecko/ \
-		$SRC/wine_gecko-2.36-x86.msi \
-		$SRC/wine_gecko-2.36-x86_64.msi
+		$SRC/wine_gecko-2.40-x86.msi \
+		$SRC/wine_gecko-2.40-x86_64.msi
 
 	install $SRC/wine-mono-4.5.6.msi $PKG/usr/share/wine/mono/