Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-08-18 19:13:39 +02:00
commit 8a52760126
5 changed files with 31 additions and 4 deletions

View File

@ -327,6 +327,20 @@ drwxr-xr-x root/root usr/include/firefox/angle/KHR/
-rwxr-xr-x root/root usr/include/firefox/angle/KHR/khrplatform.h
-rw-r--r-- root/root usr/include/firefox/angle/ShaderLang.h
-rw-r--r-- root/root usr/include/firefox/angle/ShaderVars.h
drwxr-xr-x root/root usr/include/firefox/cairo/
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-deprecated.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-features.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-ft.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-pdf.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-platform.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-ps.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-rename.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-tee.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-version.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-xlib-xrender.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo-xlib.h
-rw-r--r-- root/root usr/include/firefox/cairo/cairo.h
-rw-r--r-- root/root usr/include/firefox/cairo/pixman-rename.h
-rw-r--r-- root/root usr/include/firefox/chromium_types.h
drwxr-xr-x root/root usr/include/firefox/cubeb/
-rw-r--r-- root/root usr/include/firefox/cubeb/cubeb-stdint.h

View File

@ -5,7 +5,7 @@
name=firefox
version=40.0
release=1
release=2
source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
firefox-install-dir.patch firefox.desktop)
@ -27,7 +27,7 @@ cat <<- EOF > .mozconfig
ac_add_options --enable-system-ffi
ac_add_options --enable-system-pixman
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-cairo
#ac_add_options --enable-system-cairo
ac_add_options --with-pthreads
ac_add_options --enable-optimize="$CFLAGS"
ac_add_options --enable-official-branding

View File

@ -461,6 +461,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/metahost.idl
-rw-r--r-- root/root usr/include/wine/windows/mfapi.h
-rw-r--r-- root/root usr/include/wine/windows/mferror.h
-rw-r--r-- root/root usr/include/wine/windows/mfobjects.h
-rw-r--r-- root/root usr/include/wine/windows/mfobjects.idl
-rw-r--r-- root/root usr/include/wine/windows/midles.h
-rw-r--r-- root/root usr/include/wine/windows/mimeinfo.h
-rw-r--r-- root/root usr/include/wine/windows/mimeinfo.idl
@ -739,6 +741,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/wbemdisp.idl
-rw-r--r-- root/root usr/include/wine/windows/wbemprov.h
-rw-r--r-- root/root usr/include/wine/windows/wbemprov.idl
-rw-r--r-- root/root usr/include/wine/windows/wct.h
-rw-r--r-- root/root usr/include/wine/windows/webservices.h
-rw-r--r-- root/root usr/include/wine/windows/werapi.h
-rw-r--r-- root/root usr/include/wine/windows/wfext.h
@ -757,6 +760,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/wincrypt.h
-rw-r--r-- root/root usr/include/wine/windows/windef.h
-rw-r--r-- root/root usr/include/wine/windows/windns.h
-rw-r--r-- root/root usr/include/wine/windows/windows.foundation.h
-rw-r--r-- root/root usr/include/wine/windows/windows.foundation.idl
-rw-r--r-- root/root usr/include/wine/windows/windows.h
-rw-r--r-- root/root usr/include/wine/windows/windowsx.h
-rw-r--r-- root/root usr/include/wine/windows/winerror.h
@ -1572,6 +1577,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/fakedlls/vbscript.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp100.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp110.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/vcomp90.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/vdmdbg.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/version.dll
@ -1646,6 +1652,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/fakedlls/xapofx1_4.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/xapofx1_5.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/xaudio2_7.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/xaudio2_8.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/xcopy.exe
-rw-r--r-- root/root usr/lib/wine/fakedlls/xinput1_1.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/xinput1_2.dll
@ -2105,6 +2112,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rwxr-xr-x root/root usr/lib/wine/vbscript.dll.so
-rwxr-xr-x root/root usr/lib/wine/vcomp.dll.so
-rwxr-xr-x root/root usr/lib/wine/vcomp100.dll.so
-rwxr-xr-x root/root usr/lib/wine/vcomp110.dll.so
-rwxr-xr-x root/root usr/lib/wine/vcomp90.dll.so
-rwxr-xr-x root/root usr/lib/wine/vdmdbg.dll.so
-rwxr-xr-x root/root usr/lib/wine/version.dll.so
@ -2179,6 +2187,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rwxr-xr-x root/root usr/lib/wine/xapofx1_4.dll.so
-rwxr-xr-x root/root usr/lib/wine/xapofx1_5.dll.so
-rwxr-xr-x root/root usr/lib/wine/xaudio2_7.dll.so
-rwxr-xr-x root/root usr/lib/wine/xaudio2_8.dll.so
-rwxr-xr-x root/root usr/lib/wine/xcopy.exe.so
-rwxr-xr-x root/root usr/lib/wine/xinput1_1.dll.so
-rwxr-xr-x root/root usr/lib/wine/xinput1_2.dll.so
@ -2981,6 +2990,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vbscript.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp100.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp110.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vcomp90.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vdhcp.vxd
-rw-r--r-- root/root usr/lib32/wine/fakedlls/vdmdbg.dll
@ -3077,6 +3087,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xapofx1_4.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xapofx1_5.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xaudio2_7.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xaudio2_8.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xcopy.exe
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xinput1_1.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/xinput1_2.dll
@ -3570,6 +3581,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rwxr-xr-x root/root usr/lib32/wine/vbscript.dll.so
-rwxr-xr-x root/root usr/lib32/wine/vcomp.dll.so
-rwxr-xr-x root/root usr/lib32/wine/vcomp100.dll.so
-rwxr-xr-x root/root usr/lib32/wine/vcomp110.dll.so
-rwxr-xr-x root/root usr/lib32/wine/vcomp90.dll.so
-rwxr-xr-x root/root usr/lib32/wine/vdhcp.vxd.so
-rwxr-xr-x root/root usr/lib32/wine/vdmdbg.dll.so
@ -3666,6 +3678,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rwxr-xr-x root/root usr/lib32/wine/xapofx1_4.dll.so
-rwxr-xr-x root/root usr/lib32/wine/xapofx1_5.dll.so
-rwxr-xr-x root/root usr/lib32/wine/xaudio2_7.dll.so
-rwxr-xr-x root/root usr/lib32/wine/xaudio2_8.dll.so
-rwxr-xr-x root/root usr/lib32/wine/xcopy.exe.so
-rwxr-xr-x root/root usr/lib32/wine/xinput1_1.dll.so
-rwxr-xr-x root/root usr/lib32/wine/xinput1_2.dll.so

View File

@ -1,4 +1,4 @@
41628444b77d1fd52b76f1797c95fe9b wine-1.7.48.tar.bz2
bb27879f267a20599cacbb4043ebd584 wine-1.7.49.tar.bz2
6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi
490668a7f1cb42ceba56208bfe51334f wine_gecko-2.36-x86.msi
7f0826b2592d35129c54bcbf612eea63 wine_gecko-2.36-x86_64.msi

View File

@ -5,7 +5,7 @@
# Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32
name=wine
version=1.7.48
version=1.7.49
release=1
source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
http://downloads.sourceforge.net/wine/wine_gecko-2.36-x86.msi