From 4127f0dea37ba17cec08a799915c20674b55f7e1d5f5c428e1661fbfeb283ff8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 7 Jun 2015 10:17:56 +0000 Subject: [PATCH 1/4] - buildrequire new dependency libunwind-devel. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=284 --- wine.changes | 5 +++++ wine.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/wine.changes b/wine.changes index de10b82..b52d9f8 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 7 10:17:40 UTC 2015 - meissner@suse.com + +- buildrequire new dependency libunwind-devel. + ------------------------------------------------------------------- Sun May 31 14:48:25 UTC 2015 - hillwood@opensuse.org diff --git a/wine.spec b/wine.spec index a5a4460..fc2896c 100644 --- a/wine.spec +++ b/wine.spec @@ -40,6 +40,7 @@ BuildRequires: liblcms2-devel BuildRequires: libpcap-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: libunwind-devel BuildRequires: libv4l-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel From 03b69faef2154f5f1b708d66d9b7032ab8657790d8d8582030af2c7102473653 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 12 Jun 2015 21:03:56 +0000 Subject: [PATCH 2/4] - Updated to 1.7.45 development snapshot - Better debugging support on 64-bit Mac OS X. - Some more progress on DirectWrite implementation. - A number of RichEdit control fixes. - Beginning implementation of the old MSVCIRT C++ runtime. - Various bug fixes. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=286 --- wine-1.7.44.tar.bz2 | 3 --- wine-1.7.44.tar.bz2.sign | 7 ------- wine-1.7.45.tar.bz2 | 3 +++ wine-1.7.45.tar.bz2.sign | 7 +++++++ wine.changes | 10 ++++++++++ wine.spec | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 wine-1.7.44.tar.bz2 delete mode 100644 wine-1.7.44.tar.bz2.sign create mode 100644 wine-1.7.45.tar.bz2 create mode 100644 wine-1.7.45.tar.bz2.sign diff --git a/wine-1.7.44.tar.bz2 b/wine-1.7.44.tar.bz2 deleted file mode 100644 index cdd952b..0000000 --- a/wine-1.7.44.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2e3290d4b312d235ab8ac214eaae8f81c751fb610b15b40c2620904bd38d8bb -size 22308686 diff --git a/wine-1.7.44.tar.bz2.sign b/wine-1.7.44.tar.bz2.sign deleted file mode 100644 index fc649d6..0000000 --- a/wine-1.7.44.tar.bz2.sign +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlVoU/IACgkQ9ebp7rlGHdcqWACgzxO5Ot/0eGhgp+ZOO0QVodnQ -a7MAoLu/9y/3q2J2p9qRcXXbUjJz9z53 -=hLqf ------END PGP SIGNATURE----- diff --git a/wine-1.7.45.tar.bz2 b/wine-1.7.45.tar.bz2 new file mode 100644 index 0000000..4573439 --- /dev/null +++ b/wine-1.7.45.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a30cef1ee4ceaee4b6c9c2ad96df3b8a8847278246e7727624db314c68adaa23 +size 22312840 diff --git a/wine-1.7.45.tar.bz2.sign b/wine-1.7.45.tar.bz2.sign new file mode 100644 index 0000000..171afe5 --- /dev/null +++ b/wine-1.7.45.tar.bz2.sign @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlV60fgACgkQ9ebp7rlGHdd0igCgiLU0K89df0xsrwP9MJ0JufDu +10oAoLoDtdNjXnPV6qeZ3h3oD64gIZDy +=UvDf +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index b52d9f8..b44f28a 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jun 12 13:45:03 UTC 2015 - meissner@suse.com + +- Updated to 1.7.45 development snapshot + - Better debugging support on 64-bit Mac OS X. + - Some more progress on DirectWrite implementation. + - A number of RichEdit control fixes. + - Beginning implementation of the old MSVCIRT C++ runtime. + - Various bug fixes. + ------------------------------------------------------------------- Sun Jun 7 10:17:40 UTC 2015 - meissner@suse.com diff --git a/wine.spec b/wine.spec index fc2896c..ed82b45 100644 --- a/wine.spec +++ b/wine.spec @@ -57,7 +57,7 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.44 +Version: 1.7.45 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ From b99849cf22c0c19801b82a6f56923e32d2fd086759a30e661278ed44ef21cfcf Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 13 Jun 2015 10:26:03 +0000 Subject: [PATCH 3/4] - buildrequire libunwind-devel OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=287 --- susepatches.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++++ wine.changes | 5 +++ wine.spec | 4 +-- 3 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 susepatches.patch diff --git a/susepatches.patch b/susepatches.patch new file mode 100644 index 0000000..483dfea --- /dev/null +++ b/susepatches.patch @@ -0,0 +1,86 @@ +From aa7698f55186eb974cf974398198bc63d4fd3c02 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Sat, 13 Jun 2015 12:15:39 +0200 +Subject: [PATCH] ntdll: link libunwind if present + +On openSUSE 13.1/13.2 otherwise ntdll x86_64 build will fail with: + +../../tools/winegcc/winegcc -o ntdll.dll.so -B../../tools/winebuild -m64 -fasynchronous-unwind-tables -shared /home/marcus/projects/wine/dlls/ntdll/ntdll.spec \ + -nodefaultlibs -Wl,--image-base,0x7bc00000 actctx.o atom.o cdrom.o critsection.o debugbuffer.o \ + debugtools.o directory.o env.o error.o exception.o file.o handletable.o heap.o large_int.o \ + loader.o loadorder.o misc.o nt.o om.o path.o printf.o process.o reg.o relay.o resource.o rtl.o \ + rtlbitmap.o rtlstr.o sec.o serial.o server.o signal_arm.o signal_arm64.o signal_i386.o \ + signal_powerpc.o signal_x86_64.o string.o sync.o tape.o thread.o threadpool.o time.o version.o \ + virtual.o wcstring.o version.res -lwinecrt0 -lwine ../../libs/port/libwine_port.a -lpthread \ + +signal_x86_64.o: In function `libunwind_virtual_unwind': +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1554: undefined reference to `_Ux86_64_getcontext' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1556: undefined reference to `_ULx86_64_init_local' +signal_x86_64.o: In function `libunwind_set_cursor_from_context': +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1442: undefined reference to `_ULx86_64_set_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1444: undefined reference to `_ULx86_64_set_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1446: undefined reference to `_ULx86_64_set_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1448: undefined reference to `_ULx86_64_set_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1450: undefined reference to `_ULx86_64_set_reg' +signal_x86_64.o:/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1452: more undefined references to `_ULx86_64_set_reg' follow +signal_x86_64.o: In function `libunwind_virtual_unwind': +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1565: undefined reference to `_ULx86_64_get_proc_info' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1581: undefined reference to `_ULx86_64_step' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' +/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' +signal_x86_64.o:/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: more undefined references to `_ULx86_64_get_reg' follow +collect2: error: ld returned 1 exit status + +(probably on x86 it all is inlined, but this is not the case for x86_64) +--- + configure.ac | 3 +++ + dlls/ntdll/Makefile.in | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index df28b27..97b335d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1974,6 +1974,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])], + ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) + ++UNWIND_LIBS= + asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t" + asm_func_trailer="" + if test "$ac_cv_c_dot_previous" = "yes" +@@ -1986,6 +1987,7 @@ then + asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" + AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op]) + AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) ++ AC_CHECK_LIB(unwind,_U_dyn_register,[UNWIND_LIBS="-lunwind"]) + else + AC_DEFINE([__ASM_CFI(str)],[""]) + if test "x$enable_win64" = "xyes" +@@ -1993,6 +1995,7 @@ else + WINE_WARNING([building 64-bit Wine without support for CFI directives; exception handling will not work properly.]) + fi + fi ++AC_SUBST(UNWIND_LIBS) + + asm_func_code="$asm_func_header\" code \"$asm_func_trailer" + +diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in +index ed4bb94..08f094a 100644 +--- a/dlls/ntdll/Makefile.in ++++ b/dlls/ntdll/Makefile.in +@@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_ + MODULE = ntdll.dll + IMPORTLIB = ntdll + IMPORTS = winecrt0 +-EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) ++EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) + EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 + + C_SRCS = \ +-- +1.8.4.5 + diff --git a/wine.changes b/wine.changes index b44f28a..6d8a47a 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 13 10:24:09 UTC 2015 - meissner@suse.com + +- susepatches.patch: fix build on x86_64 + ------------------------------------------------------------------- Fri Jun 12 13:45:03 UTC 2015 - meissner@suse.com diff --git a/wine.spec b/wine.spec index ed82b45..5d08d41 100644 --- a/wine.spec +++ b/wine.spec @@ -76,7 +76,7 @@ Source5: ubuntuwine.tar.bz2 Source7: baselibs.conf # SUSE specific patches # - currently none, but add them here -#Patch0: susepatches.patch +Patch0: susepatches.patch Recommends: wine-gecko >= 2.24 Recommends: wine-mp3 # not packaged in distro... @@ -121,7 +121,7 @@ libraries. %prep %setup -q -#%patch0 -p1 +%patch0 -p1 # cp %{S:3} . # From 24a5c0dc42f1dec2da75de8633cc2ef0893520f4d6fbfa4559cab57ea7a7eb46 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jun 2015 15:14:18 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=288 --- susepatches.patch | 86 ----------------------------------------------- wine.spec | 5 ++- 2 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 susepatches.patch diff --git a/susepatches.patch b/susepatches.patch deleted file mode 100644 index 483dfea..0000000 --- a/susepatches.patch +++ /dev/null @@ -1,86 +0,0 @@ -From aa7698f55186eb974cf974398198bc63d4fd3c02 Mon Sep 17 00:00:00 2001 -From: Marcus Meissner -Date: Sat, 13 Jun 2015 12:15:39 +0200 -Subject: [PATCH] ntdll: link libunwind if present - -On openSUSE 13.1/13.2 otherwise ntdll x86_64 build will fail with: - -../../tools/winegcc/winegcc -o ntdll.dll.so -B../../tools/winebuild -m64 -fasynchronous-unwind-tables -shared /home/marcus/projects/wine/dlls/ntdll/ntdll.spec \ - -nodefaultlibs -Wl,--image-base,0x7bc00000 actctx.o atom.o cdrom.o critsection.o debugbuffer.o \ - debugtools.o directory.o env.o error.o exception.o file.o handletable.o heap.o large_int.o \ - loader.o loadorder.o misc.o nt.o om.o path.o printf.o process.o reg.o relay.o resource.o rtl.o \ - rtlbitmap.o rtlstr.o sec.o serial.o server.o signal_arm.o signal_arm64.o signal_i386.o \ - signal_powerpc.o signal_x86_64.o string.o sync.o tape.o thread.o threadpool.o time.o version.o \ - virtual.o wcstring.o version.res -lwinecrt0 -lwine ../../libs/port/libwine_port.a -lpthread \ - -signal_x86_64.o: In function `libunwind_virtual_unwind': -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1554: undefined reference to `_Ux86_64_getcontext' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1556: undefined reference to `_ULx86_64_init_local' -signal_x86_64.o: In function `libunwind_set_cursor_from_context': -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1442: undefined reference to `_ULx86_64_set_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1444: undefined reference to `_ULx86_64_set_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1446: undefined reference to `_ULx86_64_set_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1448: undefined reference to `_ULx86_64_set_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1450: undefined reference to `_ULx86_64_set_reg' -signal_x86_64.o:/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1452: more undefined references to `_ULx86_64_set_reg' follow -signal_x86_64.o: In function `libunwind_virtual_unwind': -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1565: undefined reference to `_ULx86_64_get_proc_info' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1581: undefined reference to `_ULx86_64_step' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' -/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: undefined reference to `_ULx86_64_get_reg' -signal_x86_64.o:/home/marcus/projects/wine/dlls/ntdll/signal_x86_64.c:1488: more undefined references to `_ULx86_64_get_reg' follow -collect2: error: ld returned 1 exit status - -(probably on x86 it all is inlined, but this is not the case for x86_64) ---- - configure.ac | 3 +++ - dlls/ntdll/Makefile.in | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index df28b27..97b335d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1974,6 +1974,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])], - ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) - -+UNWIND_LIBS= - asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t" - asm_func_trailer="" - if test "$ac_cv_c_dot_previous" = "yes" -@@ -1986,6 +1987,7 @@ then - asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" - AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op]) - AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) -+ AC_CHECK_LIB(unwind,_U_dyn_register,[UNWIND_LIBS="-lunwind"]) - else - AC_DEFINE([__ASM_CFI(str)],[""]) - if test "x$enable_win64" = "xyes" -@@ -1993,6 +1995,7 @@ else - WINE_WARNING([building 64-bit Wine without support for CFI directives; exception handling will not work properly.]) - fi - fi -+AC_SUBST(UNWIND_LIBS) - - asm_func_code="$asm_func_header\" code \"$asm_func_trailer" - -diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in -index ed4bb94..08f094a 100644 ---- a/dlls/ntdll/Makefile.in -+++ b/dlls/ntdll/Makefile.in -@@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_ - MODULE = ntdll.dll - IMPORTLIB = ntdll - IMPORTS = winecrt0 --EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) -+EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) - EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 - - C_SRCS = \ --- -1.8.4.5 - diff --git a/wine.spec b/wine.spec index 5d08d41..353cb50 100644 --- a/wine.spec +++ b/wine.spec @@ -40,7 +40,6 @@ BuildRequires: liblcms2-devel BuildRequires: libpcap-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libunwind-devel BuildRequires: libv4l-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel @@ -76,7 +75,7 @@ Source5: ubuntuwine.tar.bz2 Source7: baselibs.conf # SUSE specific patches # - currently none, but add them here -Patch0: susepatches.patch +#Patch0: susepatches.patch Recommends: wine-gecko >= 2.24 Recommends: wine-mp3 # not packaged in distro... @@ -121,7 +120,7 @@ libraries. %prep %setup -q -%patch0 -p1 +#%patch0 -p1 # cp %{S:3} . #