From 8fba487182eec09efa646262ed7b53ebbc66f6ca Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike(a)cchtml.com>
Date: Sun, 31 May 2015 13:11:20 -0500
Subject: Update to 1.7.44
diff --git a/.gitignore b/.gitignore
index bfd18ea..839b4ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/wine-1.7.43.tar.bz2
-/wine-1.7.43.tar.bz2.sign
-/wine-staging-1.7.43.tar.gz
+/wine-1.7.44.tar.bz2
+/wine-1.7.44.tar.bz2.sign
+/wine-staging-1.7.44.tar.gz
diff --git a/sources b/sources
index 678d5b0..f8d1129 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-5158c559dedd9e7668a1fcb9d573b309 wine-1.7.43.tar.bz2
-44d8764ab47ba4f1371f1cd6421ee15b wine-1.7.43.tar.bz2.sign
-62c4e94265e068c064988bee2fc016e9 wine-staging-1.7.43.tar.gz
+62f30f7a6937eb213bcab6d0b94710bc wine-1.7.44.tar.bz2
+5dfad7db7a4a7469b478470b3fcce684 wine-1.7.44.tar.bz2.sign
+4c2c8b7c2c8f5ab3682ec52479a7502c wine-staging-1.7.44.tar.gz
diff --git a/wine-staging-rtlunwindex.patch b/wine-staging-rtlunwindex.patch
deleted file mode 100644
index ad00f08..0000000
--- a/wine-staging-rtlunwindex.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/debian/changelog b/debian/changelog
-index bf71cad..9293125 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,7 @@
-+wine-staging (1.7.36-1) UNRELEASED; urgency=low
-+ * Update patchset for RtlUnwindEx on x86_64 and fix a second bug.
-+ -- Sebastian Lackner <sebastian(a)fds-team.de> Sun, 15 Feb 2015 22:24:13 +0100
-+
- wine-staging (1.7.36) unstable; urgency=low
- * Fix an incompatibility of patchinstall.sh with non-bash shells under specific
situations.
- * Improve dinput-Events patch to be compatible with applications which do not
explicitly poll for input.
-diff --git
a/patches/ntdll-RtlUnwindEx/0001-ntdll-Fix-check-for-end_frame-in-RtlUnwindEx-on-x86_.patch
b/patches/ntdll-RtlUnwindEx/0001-ntdll-Fix-check-for-end_frame-in-RtlUnwindEx-on-x86_.patch
-index 455a7fc..c5e8903 100644
----
a/patches/ntdll-RtlUnwindEx/0001-ntdll-Fix-check-for-end_frame-in-RtlUnwindEx-on-x86_.patch
-+++
b/patches/ntdll-RtlUnwindEx/0001-ntdll-Fix-check-for-end_frame-in-RtlUnwindEx-on-x86_.patch
-@@ -1,18 +1,32 @@
--From 7dd7631b611976b237acc63386b26866e5b4b253 Mon Sep 17 00:00:00 2001
-+From 3c89d2a189c2cc869c7ce81293ab752e3fa57708 Mon Sep 17 00:00:00 2001
- From: Sebastian Lackner <sebastian(a)fds-team.de>
- Date: Sun, 25 Jan 2015 15:46:05 +0100
--Subject: ntdll: Fix check for end_frame in RtlUnwindEx on x86_64.
-+Subject: ntdll: Fix check for end_frame in RtlUnwindEx on x86_64. (rev 2)
-
-+Changes in v2:
-+* Calling wine internal handlers should not mess up the EstablisherFrame.
- ---
-- dlls/ntdll/signal_x86_64.c | 2 +-
-- 1 file changed, 1 insertion(+), 1 deletion(-)
-+ dlls/ntdll/signal_x86_64.c | 5 +++--
-+ 1 file changed, 3 insertions(+), 2 deletions(-)
-
- diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
--index 05581c2..e739cdb 100644
-+index 05581c2..7072569 100644
- --- a/dlls/ntdll/signal_x86_64.c
- +++ b/dlls/ntdll/signal_x86_64.c
--@@ -3178,7 +3178,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip,
EXCEPTION_RECORD *rec
-- dispatch.EstablisherFrame = new_context.Rsp;
-+@@ -3167,6 +3167,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip,
EXCEPTION_RECORD *rec
-+ }
-+ else /* hack: call builtin handlers registered in the tib list */
-+ {
-++ DWORD64 backup_frame = dispatch.EstablisherFrame;
-+ while ((ULONG64)teb_frame < new_context.Rsp &&
(ULONG64)teb_frame < (ULONG64)end_frame)
-+ {
-+ TRACE( "found builtin frame %p handler %p\n", teb_frame,
teb_frame->Handler );
-+@@ -3175,10 +3176,10 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip,
EXCEPTION_RECORD *rec
-+ teb_frame = __wine_pop_frame( teb_frame );
-+ }
-+ if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame
< new_context.Rsp) break;
-+- dispatch.EstablisherFrame = new_context.Rsp;
-++ dispatch.EstablisherFrame = backup_frame;
- }
-
- - if (context->Rsp == (ULONG64)end_frame) break;
-@@ -21,5 +35,5 @@ index 05581c2..e739cdb 100644
- }
-
- --
--2.2.1
-+2.2.2
-
-diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
-index b1ac228..9f8a0fa 100755
---- a/patches/patchinstall.sh
-+++ b/patches/patchinstall.sh
-@@ -2228,7 +2228,7 @@ fi
- if test "$enable_ntdll_RtlUnwindEx" -eq 1; then
- patch_apply
ntdll-RtlUnwindEx/0001-ntdll-Fix-check-for-end_frame-in-RtlUnwindEx-on-x86_.patch
- (
-- echo '+ { "Sebastian Lackner", "ntdll: Fix check for end_frame
in RtlUnwindEx on x86_64.", 1 },';
-+ echo '+ { "Sebastian Lackner", "ntdll: Fix check for end_frame
in RtlUnwindEx on x86_64.", 2 },';
- ) >> "$patchlist"
- fi
-
diff --git a/wine.spec b/wine.spec
index f773a0f..73f2c20 100644
--- a/wine.spec
+++ b/wine.spec
@@ -21,7 +21,7 @@
%endif
Name: wine
-Version: 1.7.43
+Version: 1.7.44
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
@@ -1143,6 +1143,7 @@ fi
%{_libdir}/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
%{_libdir}/wine/api-ms-win-core-memory-l1-1-0.dll.so
%{_libdir}/wine/api-ms-win-core-memory-l1-1-1.dll.so
+%{_libdir}/wine/api-ms-win-core-misc-l1-1-0.dll.so
%{_libdir}/wine/api-ms-win-core-namedpipe-l1-1-0.dll.so
%{_libdir}/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so
%{_libdir}/wine/api-ms-win-core-processenvironment-l1-1-0.dll.so
@@ -1353,6 +1354,7 @@ fi
%{_libdir}/wine/mscat32.dll.so
%{_libdir}/wine/mscoree.dll.so
%{_libdir}/wine/msctf.dll.so
+%{_libdir}/wine/msctfp.dll.so
%{_libdir}/wine/msdaps.dll.so
%{_libdir}/wine/msdmo.dll.so
%{_libdir}/wine/msftedit.dll.so
@@ -1423,7 +1425,6 @@ fi
%{_libdir}/wine/nvcuda.dll.so
%{_libdir}/wine/nvcuvid.dll.so
%endif
-%{_libdir}/wine/null.sys.so
%{_libdir}/wine/objsel.dll.so
%{_libdir}/wine/odbc32.dll.so
%{_libdir}/wine/odbccp32.dll.so
@@ -1866,6 +1867,9 @@ fi
%{_libdir}/wine/opencl.dll.so
%changelog
+* Sun May 31 2015 Michael Cronenworth <mike(a)cchtml.com> 1.7.44-1
+- version upgrade
+
* Mon May 18 2015 Michael Cronenworth <mike(a)cchtml.com> 1.7.43-1
- version upgrade
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/wine.git/commit/?h=f21&id=8fba4871...