[arch-commits] Commit in wine-staging/trunk (4 files)
Felix Yan
fyan at archlinux.org
Thu Feb 11 14:00:53 UTC 2016
Date: Thursday, February 11, 2016 @ 15:00:53
Author: fyan
Revision: 161219
upgpkg: wine-staging 1.9.3-1
Added:
wine-staging/trunk/wine-staging.install
(from rev 161218, wine-staging/trunk/wine.install)
Modified:
wine-staging/trunk/PKGBUILD
Deleted:
wine-staging/trunk/bug40032.patch
wine-staging/trunk/wine.install
----------------------+
PKGBUILD | 15 +----
bug40032.patch | 141 -------------------------------------------------
wine-staging.install | 12 ++++
wine.install | 12 ----
4 files changed, 17 insertions(+), 163 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-11 13:55:56 UTC (rev 161218)
+++ PKGBUILD 2016-02-11 14:00:53 UTC (rev 161219)
@@ -6,17 +6,15 @@
# Contributor: Giovanni Scafora <giovanni at archlinux.org>
pkgname=wine-staging
-pkgver=1.9.2
+pkgver=1.9.3
pkgrel=1
_pkgbasever=${pkgver/rc/-rc}
source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
- 30-win32-aliases.conf
- bug40032.patch)
-sha1sums=('0caaea9075d73c2432aa7e91d77aaf79fcc3268a'
- '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
- '0b6fed0e922ea72e7f3e4b0672e07131448cb207')
+ 30-win32-aliases.conf)
+sha1sums=('6c523dce596b07c1d714ec362b6b8a8e973036eb'
+ '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
pkgdesc="A compatibility layer for running Windows programs - Staging branch"
url="http://www.wine-staging.com"
@@ -23,7 +21,7 @@
arch=(i686 x86_64)
options=(staticlibs)
license=(LGPL)
-install=wine.install
+install=wine-staging.install
_depends=(
attr lib32-attr
@@ -112,9 +110,6 @@
# Allow ccache to work
mv wine-patched-staging-$_pkgbasever $pkgname
- # https://bugs.winehq.org/show_bug.cgi?id=40032
- (cd $pkgname; patch -p1 -i ../bug40032.patch)
-
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
# Get rid of old build dirs
Deleted: bug40032.patch
===================================================================
--- bug40032.patch 2016-02-11 13:55:56 UTC (rev 161218)
+++ bug40032.patch 2016-02-11 14:00:53 UTC (rev 161219)
@@ -1,141 +0,0 @@
-From f84cb2913cb755152d98c278f3ed6927167c9b2b Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian at fds-team.de>
-Date: Sun, 24 Jan 2016 16:06:47 +0100
-Subject: shcore: Add SetProcessDpiAwareness stub.
-
----
- dlls/shcore/Makefile.in | 3 +++
- dlls/shcore/main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++
- dlls/shcore/shcore.spec | 2 +-
- include/Makefile.in | 1 +
- include/shellscalingapi.h | 29 ++++++++++++++++++++++++++++
- 5 files changed, 83 insertions(+), 1 deletion(-)
- create mode 100644 dlls/shcore/main.c
- create mode 100644 include/shellscalingapi.h
-
-diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in
-index dd5f08f..ec2e95f 100644
---- a/dlls/shcore/Makefile.in
-+++ b/dlls/shcore/Makefile.in
-@@ -1 +1,4 @@
- MODULE = shcore.dll
-+
-+C_SRCS = \
-+ main.c
-diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c
-new file mode 100644
-index 0000000..0e59d38
---- /dev/null
-+++ b/dlls/shcore/main.c
-@@ -0,0 +1,49 @@
-+/*
-+ * Copyright 2016 Sebastian Lackner
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include "config.h"
-+#include <stdarg.h>
-+
-+#include "windef.h"
-+#include "winbase.h"
-+#include "shellscalingapi.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(shcore);
-+
-+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-+{
-+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-+
-+ switch (reason)
-+ {
-+ case DLL_WINE_PREATTACH:
-+ return FALSE; /* prefer native version */
-+ case DLL_PROCESS_ATTACH:
-+ DisableThreadLibraryCalls(instance);
-+ break;
-+ }
-+
-+ return TRUE;
-+}
-+
-+HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value)
-+{
-+ FIXME("(%u): stub\n", value);
-+ return E_NOTIMPL;
-+}
-diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec
-index 12a4ef3..1624319 100644
---- a/dlls/shcore/shcore.spec
-+++ b/dlls/shcore/shcore.spec
-@@ -78,6 +78,6 @@
- @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi
- @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode
- @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID
--@ stub SetProcessDpiAwareness
-+@ stdcall SetProcessDpiAwareness(long)
- @ stub SetProcessReference
- @ stub UnregisterScaleChangeEvent
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 199de7a..c907afe4 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -570,6 +570,7 @@ HEADER_SRCS = \
- sfc.h \
- shdispid.h \
- shellapi.h \
-+ shellscalingapi.h \
- shlguid.h \
- shlobj.h \
- shlwapi.h \
-diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h
-new file mode 100644
-index 0000000..6d7a167
---- /dev/null
-+++ b/include/shellscalingapi.h
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright 2016 Sebastian Lackner
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#ifndef __WINE_SHELLSCALINGAPI_H
-+#define __WINE_SHELLSCALINGAPI_H
-+
-+typedef enum PROCESS_DPI_AWARENESS
-+{
-+ PROCESS_DPI_UNAWARE = 0,
-+ PROCESS_SYSTEM_DPI_AWARE = 1,
-+ PROCESS_PER_MONITOR_DPI_AWARE = 2,
-+} PROCESS_DPI_AWARENESS;
-+
-+#endif /* __WINE_SHELLSCALINGAPI_H */
---
-2.6.4
-
Copied: wine-staging/trunk/wine-staging.install (from rev 161218, wine-staging/trunk/wine.install)
===================================================================
--- wine-staging.install (rev 0)
+++ wine-staging.install 2016-02-11 14:00:53 UTC (rev 161219)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+ #echo "If you are on x86_64, the default WINEARCH will be win64."
+ #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+ #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+ #echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Deleted: wine.install
===================================================================
--- wine.install 2016-02-11 13:55:56 UTC (rev 161218)
+++ wine.install 2016-02-11 14:00:53 UTC (rev 161219)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
- #echo "If you are on x86_64, the default WINEARCH will be win64."
- #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
- #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
- #echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
- update-desktop-database -q
-}
More information about the arch-commits
mailing list