ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

wine: 1.7.54 -> 1.7.55

Browse Source 
(cherry picked from commit 9e3b3d61e4)
This commit is contained in:
Danny Rawlins 2015-11-18 11:46:30 +11:00 committed by Juergen Daubert
parent c83ade7bbf
commit 2238879363
4 changed files with 143 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wine/.footprint
View File

@ -209,6 +209,7 @@ drwxr-xr-x root/root usr/include/wine/windows/
-rw-r--r-- root/root usr/include/wine/windows/d3drmwin.h
-rw-r--r-- root/root usr/include/wine/windows/d3dtypes.h
-rw-r--r-- root/root usr/include/wine/windows/d3dvec.inl
-rw-r--r-- root/root usr/include/wine/windows/d3dx10.h
-rw-r--r-- root/root usr/include/wine/windows/d3dx10core.h
-rw-r--r-- root/root usr/include/wine/windows/d3dx10core.idl
-rw-r--r-- root/root usr/include/wine/windows/d3dx9.h
@ -850,7 +851,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/xmllite.idl
-rw-r--r-- root/root usr/include/wine/windows/zmouse.h
drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libwine.so -> libwine.so.1.0
lrwxrwxrwx root/root usr/lib/libwine.so -> libwine.so.1
lrwxrwxrwx root/root usr/lib/libwine.so.1 -> libwine.so.1.0
-rwxr-xr-x root/root usr/lib/libwine.so.1.0
drwxr-xr-x root/root usr/lib/wine/
@ -968,7 +969,9 @@ drwxr-xr-x root/root usr/lib/wine/
-rwxr-xr-x root/root usr/lib/wine/avifil32.dll.so
-rwxr-xr-x root/root usr/lib/wine/avrt.dll.so
-rwxr-xr-x root/root usr/lib/wine/bcrypt.dll.so
-rwxr-xr-x root/root usr/lib/wine/bluetoothapis.dll.so
-rwxr-xr-x root/root usr/lib/wine/browseui.dll.so
-rwxr-xr-x root/root usr/lib/wine/bthprops.cpl.so
-rwxr-xr-x root/root usr/lib/wine/cabarc.exe.so
-rwxr-xr-x root/root usr/lib/wine/cabinet.dll.so
-rwxr-xr-x root/root usr/lib/wine/cacls.exe.so
@ -1218,7 +1221,9 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/fakedlls/avifil32.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/avrt.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/bcrypt.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/bluetoothapis.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/browseui.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/bthprops.cpl
-rw-r--r-- root/root usr/lib/wine/fakedlls/cabarc.exe
-rw-r--r-- root/root usr/lib/wine/fakedlls/cabinet.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/cacls.exe
@ -1679,6 +1684,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/fakedlls/wmic.exe
-rw-r--r-- root/root usr/lib/wine/fakedlls/wmiutils.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/wmp.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/wmplayer.exe
-rw-r--r-- root/root usr/lib/wine/fakedlls/wmvcore.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/wnaspi32.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/wordpad.exe
@ -2230,6 +2236,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rwxr-xr-x root/root usr/lib/wine/wmic.exe.so
-rwxr-xr-x root/root usr/lib/wine/wmiutils.dll.so
-rwxr-xr-x root/root usr/lib/wine/wmp.dll.so
-rwxr-xr-x root/root usr/lib/wine/wmplayer.exe.so
-rwxr-xr-x root/root usr/lib/wine/wmvcore.dll.so
-rwxr-xr-x root/root usr/lib/wine/wnaspi32.dll.so
-rwxr-xr-x root/root usr/lib/wine/wordpad.exe.so
@ -2275,7 +2282,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rwxr-xr-x root/root usr/lib/wine/xpsprint.dll.so
-rwxr-xr-x root/root usr/lib/wine/xpssvcs.dll.so
drwxr-xr-x root/root usr/lib32/
lrwxrwxrwx root/root usr/lib32/libwine.so -> libwine.so.1.0
lrwxrwxrwx root/root usr/lib32/libwine.so -> libwine.so.1
lrwxrwxrwx root/root usr/lib32/libwine.so.1 -> libwine.so.1.0
-rwxr-xr-x root/root usr/lib32/libwine.so.1.0
drwxr-xr-x root/root usr/lib32/wine/
@ -2394,7 +2401,9 @@ drwxr-xr-x root/root usr/lib32/wine/
-rwxr-xr-x root/root usr/lib32/wine/avifile.dll16.so
-rwxr-xr-x root/root usr/lib32/wine/avrt.dll.so
-rwxr-xr-x root/root usr/lib32/wine/bcrypt.dll.so
-rwxr-xr-x root/root usr/lib32/wine/bluetoothapis.dll.so
-rwxr-xr-x root/root usr/lib32/wine/browseui.dll.so
-rwxr-xr-x root/root usr/lib32/wine/bthprops.cpl.so
-rwxr-xr-x root/root usr/lib32/wine/cabarc.exe.so
-rwxr-xr-x root/root usr/lib32/wine/cabinet.dll.so
-rwxr-xr-x root/root usr/lib32/wine/cacls.exe.so
@ -2653,7 +2662,9 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/fakedlls/avifile.dll16
-rw-r--r-- root/root usr/lib32/wine/fakedlls/avrt.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/bcrypt.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/bluetoothapis.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/browseui.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/bthprops.cpl
-rw-r--r-- root/root usr/lib32/wine/fakedlls/cabarc.exe
-rw-r--r-- root/root usr/lib32/wine/fakedlls/cabinet.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/cacls.exe
@ -3175,6 +3186,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wmic.exe
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wmiutils.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wmp.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wmplayer.exe
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wmvcore.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wnaspi32.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/wordpad.exe
@ -3782,6 +3794,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rwxr-xr-x root/root usr/lib32/wine/wmic.exe.so
-rwxr-xr-x root/root usr/lib32/wine/wmiutils.dll.so
-rwxr-xr-x root/root usr/lib32/wine/wmp.dll.so
-rwxr-xr-x root/root usr/lib32/wine/wmplayer.exe.so
-rwxr-xr-x root/root usr/lib32/wine/wmvcore.dll.so
-rwxr-xr-x root/root usr/lib32/wine/wnaspi32.dll.so
-rwxr-xr-x root/root usr/lib32/wine/wordpad.exe.so

3
wine/.md5sum
View File

@ -1,4 +1,5 @@
155bbbed0465e8d56d5e6cb14a51fb6e wine-1.7.54.tar.bz2
0fa4d4580a9e3738a39f0bdc94f33564 wine-1.7.55-configure_fix.patch
161b37f57ed21508d9171df664ff5e13 wine-1.7.55.tar.bz2
6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi
66fa7ceca8c0aa84c6a2db8672a743b6 wine_gecko-2.40-x86.msi
5e5d242e52e885190a0fe02a2e38a987 wine_gecko-2.40-x86_64.msi

9
wine/Pkgfile
View File

@ -2,19 +2,22 @@
# URL: http://www.winehq.com/
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Daniel Walpole, daniel at walpole dot id dot au
# 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
# 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.54
version=1.7.55
release=1
source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
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)
http://downloads.sourceforge.net/wine/wine-mono-4.5.6.msi
wine-1.7.55-configure_fix.patch)
build() {
install -d wine32 wine64
patch -d $name-$version -p1 -i $SRC/wine-1.7.55-configure_fix.patch
cd wine64
../$name-$version/configure \

120
wine/wine-1.7.55-configure_fix.patch Normal file
View File

@ -0,0 +1,120 @@
https://github.com/wine-mirror/wine/commit/480e95ae97f298d2e894a3a943617f88703676fd?diff=unified
makefiles: Generate makefiles and po rules only for disabled dlls.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
diff -pruN wine-1.7.55.orig/aclocal.m4 wine-1.7.55/aclocal.m4
--- wine-1.7.55.orig/aclocal.m4 2015-11-17 23:54:27.000000000 +0000
+++ wine-1.7.55/aclocal.m4 2015-11-17 23:54:51.000000000 +0000
@@ -330,9 +330,11 @@ wine_fn_disabled_rules ()
ac_extraclean="$ac_dir/Makefile"
test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore"
- wine_fn_depend_rules
- wine_fn_clean_rules $ac_clean
- wine_fn_pot_rules
+ wine_fn_append_rule \
+"__clean__: $ac_dir/clean
+.PHONY: $ac_dir/clean
+$ac_dir/clean: dummy
+ \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean"
}
wine_fn_config_makefile ()
@@ -397,7 +399,7 @@ wine_fn_config_dll ()
AS_VAR_IF([$ac_enable],[no],
dnl enable_win16 is special in that it disables import libs too
- [if wine_fn_has_flag implib && test "$ac_enable" != enable_win16
+ [if test "$ac_enable" != enable_win16
then
wine_fn_depend_rules
wine_fn_clean_rules $ac_clean
diff -pruN wine-1.7.55.orig/configure wine-1.7.55/configure
--- wine-1.7.55.orig/configure 2015-11-17 23:54:27.000000000 +0000
+++ wine-1.7.55/configure 2015-11-17 23:55:40.000000000 +0000
@@ -7520,9 +7520,11 @@ wine_fn_disabled_rules ()
ac_extraclean="$ac_dir/Makefile"
test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore"
- wine_fn_depend_rules
- wine_fn_clean_rules $ac_clean
- wine_fn_pot_rules
+ wine_fn_append_rule \
+"__clean__: $ac_dir/clean
+.PHONY: $ac_dir/clean
+$ac_dir/clean: dummy
+ \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean"
}
wine_fn_config_makefile ()
@@ -7596,7 +7598,7 @@ fi
test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll"
if eval test \"x\$"$ac_enable"\" = x"no"; then :
- if wine_fn_has_flag implib && test "$ac_enable" != enable_win16
+ if test "$ac_enable" != enable_win16
then
wine_fn_depend_rules
wine_fn_clean_rules $ac_clean
@@ -8241,7 +8243,6 @@ fi
linux-android*)
DLLFLAGS="$DLLFLAGS -fPIC"
- dlldir="\${libdir}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
@@ -8350,36 +8351,31 @@ $as_echo "$ac_cv_cflags__Wl___enable_new
if test "x$ac_cv_cflags__Wl___enable_new_dtags" = xyes; then :
LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"
fi
-
- case $host_cpu in
- *i[3456789]86* | x86_64)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5
-$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; }
-if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5
+$as_echo_n "checking whether the compiler supports -Wl,-pie... " >&6; }
+if ${ac_cv_cflags__Wl__pie+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400"
+CFLAGS="$CFLAGS -Wl,-pie"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int main(int argc, char **argv) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes
+ ac_cv_cflags__Wl__pie=yes
else
- ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no
+ ac_cv_cflags__Wl__pie=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS=$ac_wine_try_cflags_saved
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5
-$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; }
-if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then :
- LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5
+$as_echo "$ac_cv_cflags__Wl__pie" >&6; }
+if test "x$ac_cv_cflags__Wl__pie" = xyes; then :
+ LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie"
fi
- ;;
- esac
LIBWINE_SHAREDLIB="libwine.so"
@@ -14943,6 +14939,7 @@ case $build_os in
esac
case $host_os in
+ linux-android*) ;;
linux*)
case $host_cpu in
*i[3456789]86*|x86_64*)