[arch-commits] Commit in wine-staging/repos/community-i686 (7 files)
Felix Yan
fyan at archlinux.org
Thu Feb 11 15:01:59 UTC 2016
Date: Thursday, February 11, 2016 @ 16:01:59
Author: fyan
Revision: 161230
archrelease: copy trunk to community-i686
Added:
wine-staging/repos/community-i686/30-win32-aliases.conf
(from rev 161228, wine-staging/trunk/30-win32-aliases.conf)
wine-staging/repos/community-i686/PKGBUILD
(from rev 161228, wine-staging/trunk/PKGBUILD)
wine-staging/repos/community-i686/wine-staging.install
(from rev 161228, wine-staging/trunk/wine-staging.install)
Deleted:
wine-staging/repos/community-i686/30-win32-aliases.conf
wine-staging/repos/community-i686/PKGBUILD
wine-staging/repos/community-i686/bug40032.patch
wine-staging/repos/community-i686/wine.install
----------------------+
PKGBUILD | 371 ++++++++++++++++++++++++-------------------------
bug40032.patch | 141 ------------------
wine-staging.install | 12 +
wine.install | 12 -
4 files changed, 196 insertions(+), 340 deletions(-)
Deleted: 30-win32-aliases.conf
===================================================================
(Binary files differ)
Copied: wine-staging/repos/community-i686/30-win32-aliases.conf (from rev 161228, wine-staging/trunk/30-win32-aliases.conf)
===================================================================
(Binary files differ)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-11 15:01:51 UTC (rev 161229)
+++ PKGBUILD 2016-02-11 15:01:59 UTC (rev 161230)
@@ -1,187 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Eduardo Romero <eduardo at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=wine-staging
-pkgver=1.9.2
-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')
-
-pkgdesc="A compatibility layer for running Windows programs - Staging branch"
-url="http://www.wine-staging.com"
-arch=(i686 x86_64)
-options=(staticlibs)
-license=(LGPL)
-install=wine.install
-
-_depends=(
- attr lib32-attr
- fontconfig lib32-fontconfig
- lcms2 lib32-lcms2
- libxml2 lib32-libxml2
- libxcursor lib32-libxcursor
- libxrandr lib32-libxrandr
- libxdamage lib32-libxdamage
- libxi lib32-libxi
- gettext lib32-gettext
- freetype2 lib32-freetype2
- glu lib32-glu
- libsm lib32-libsm
- gcc-libs lib32-gcc-libs
- libpcap lib32-libpcap
- desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex
- 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
- giflib lib32-giflib
- libpng lib32-libpng
- gnutls lib32-gnutls
- libxinerama lib32-libxinerama
- libxcomposite lib32-libxcomposite
- libxmu lib32-libxmu
- libxxf86vm lib32-libxxf86vm
- libldap lib32-libldap
- mpg123 lib32-mpg123
- openal lib32-openal
- v4l-utils lib32-v4l-utils
- alsa-lib lib32-alsa-lib
- libxcomposite lib32-libxcomposite
- mesa lib32-mesa
- mesa-libgl lib32-mesa-libgl
- libcl lib32-libcl
- libxslt lib32-libxslt
- libpulse lib32-libpulse
- libva lib32-libva
- gtk3 lib32-gtk3
- gst-plugins-base-libs lib32-gst-plugins-base-libs
- samba
- opencl-headers
-)
-
-optdepends=(
- giflib lib32-giflib
- libpng lib32-libpng
- libldap lib32-libldap
- gnutls lib32-gnutls
- mpg123 lib32-mpg123
- openal lib32-openal
- v4l-utils lib32-v4l-utils
- libpulse lib32-libpulse
- alsa-plugins lib32-alsa-plugins
- alsa-lib lib32-alsa-lib
- libjpeg-turbo lib32-libjpeg-turbo
- libxcomposite lib32-libxcomposite
- libxinerama lib32-libxinerama
- ncurses lib32-ncurses
- libcl lib32-libcl
- libxslt lib32-libxslt
- libva lib32-libva
- gtk3 lib32-gtk3
- gst-plugins-base-libs lib32-gst-plugins-base
- cups
- samba dosbox
-)
-
-if [[ $CARCH == i686 ]]; then
- # Strip lib32 etc. on i686
- _depends=(${_depends[@]/*32-*/})
- makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
- makedepends=(${makedepends[@]/*-multilib*/})
- optdepends=(${optdepends[@]/*32-*/})
- provides=("wine=$pkgver")
- conflicts=('wine')
-else
- makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("wine=$pkgver" "wine-wow64=$pkgver")
- conflicts=('wine' 'wine-wow64')
-fi
-
-prepare() {
- # 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
- rm -rf $pkgname-{32,64}-build
- mkdir $pkgname-32-build
-}
-
-build() {
- cd "$srcdir"
-
- if [[ $CARCH == x86_64 ]]; then
- msg2 "Building Wine-64..."
-
- mkdir $pkgname-64-build
- cd "$srcdir/$pkgname-64-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --with-x \
- --with-gstreamer \
- --enable-win64 \
- --with-xattr
-
- make
-
- _wine32opts=(
- --libdir=/usr/lib32
- --with-wine64="$srcdir/$pkgname-64-build"
- )
-
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- fi
-
- msg2 "Building Wine-32..."
- cd "$srcdir/$pkgname-32-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --with-x \
- --with-gstreamer \
- --with-xattr \
- "${_wine32opts[@]}"
-}
-
-package() {
- depends=(${_depends[@]})
-
- msg2 "Packaging Wine-32..."
- cd "$srcdir/$pkgname-32-build"
-
- if [[ $CARCH == i686 ]]; then
- make prefix="$pkgdir/usr" install
- else
- make prefix="$pkgdir/usr" \
- libdir="$pkgdir/usr/lib32" \
- dlldir="$pkgdir/usr/lib32/wine" install
-
- msg2 "Packaging Wine-64..."
- cd "$srcdir/$pkgname-64-build"
- make prefix="$pkgdir/usr" \
- libdir="$pkgdir/usr/lib" \
- dlldir="$pkgdir/usr/lib/wine" install
- fi
-
- # Font aliasing settings for Win32 applications
- install -d "$pkgdir"/etc/fonts/conf.{avail,d}
- install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
- ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
Copied: wine-staging/repos/community-i686/PKGBUILD (from rev 161228, wine-staging/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-02-11 15:01:59 UTC (rev 161230)
@@ -0,0 +1,184 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Eduardo Romero <eduardo at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=wine-staging
+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)
+sha1sums=('6c523dce596b07c1d714ec362b6b8a8e973036eb'
+ '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+
+pkgdesc="A compatibility layer for running Windows programs - Staging branch"
+url="http://www.wine-staging.com"
+arch=(i686 x86_64)
+options=(staticlibs)
+license=(LGPL)
+install=wine-staging.install
+
+_depends=(
+ attr lib32-attr
+ fontconfig lib32-fontconfig
+ lcms2 lib32-lcms2
+ libxml2 lib32-libxml2
+ libxcursor lib32-libxcursor
+ libxrandr lib32-libxrandr
+ libxdamage lib32-libxdamage
+ libxi lib32-libxi
+ gettext lib32-gettext
+ freetype2 lib32-freetype2
+ glu lib32-glu
+ libsm lib32-libsm
+ gcc-libs lib32-gcc-libs
+ libpcap lib32-libpcap
+ desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex
+ 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
+ giflib lib32-giflib
+ libpng lib32-libpng
+ gnutls lib32-gnutls
+ libxinerama lib32-libxinerama
+ libxcomposite lib32-libxcomposite
+ libxmu lib32-libxmu
+ libxxf86vm lib32-libxxf86vm
+ libldap lib32-libldap
+ mpg123 lib32-mpg123
+ openal lib32-openal
+ v4l-utils lib32-v4l-utils
+ alsa-lib lib32-alsa-lib
+ libxcomposite lib32-libxcomposite
+ mesa lib32-mesa
+ mesa-libgl lib32-mesa-libgl
+ libcl lib32-libcl
+ libxslt lib32-libxslt
+ libpulse lib32-libpulse
+ libva lib32-libva
+ gtk3 lib32-gtk3
+ gst-plugins-base-libs lib32-gst-plugins-base-libs
+ samba
+ opencl-headers
+)
+
+optdepends=(
+ giflib lib32-giflib
+ libpng lib32-libpng
+ libldap lib32-libldap
+ gnutls lib32-gnutls
+ mpg123 lib32-mpg123
+ openal lib32-openal
+ v4l-utils lib32-v4l-utils
+ libpulse lib32-libpulse
+ alsa-plugins lib32-alsa-plugins
+ alsa-lib lib32-alsa-lib
+ libjpeg-turbo lib32-libjpeg-turbo
+ libxcomposite lib32-libxcomposite
+ libxinerama lib32-libxinerama
+ ncurses lib32-ncurses
+ libcl lib32-libcl
+ libxslt lib32-libxslt
+ libva lib32-libva
+ gtk3 lib32-gtk3
+ gst-plugins-base-libs lib32-gst-plugins-base-libs
+ cups
+ samba dosbox
+)
+
+if [[ $CARCH == i686 ]]; then
+ # Strip lib32 etc. on i686
+ _depends=(${_depends[@]/*32-*/})
+ makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
+ makedepends=(${makedepends[@]/*-multilib*/})
+ optdepends=(${optdepends[@]/*32-*/})
+ provides=("wine=$pkgver")
+ conflicts=('wine')
+else
+ makedepends=(${makedepends[@]} ${_depends[@]})
+ provides=("wine=$pkgver" "wine-wow64=$pkgver")
+ conflicts=('wine' 'wine-wow64')
+fi
+
+prepare() {
+ # Allow ccache to work
+ mv wine-patched-staging-$_pkgbasever $pkgname
+
+ sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+
+ # Get rid of old build dirs
+ rm -rf $pkgname-{32,64}-build
+ mkdir $pkgname-32-build
+}
+
+build() {
+ cd "$srcdir"
+
+ if [[ $CARCH == x86_64 ]]; then
+ msg2 "Building Wine-64..."
+
+ mkdir $pkgname-64-build
+ cd "$srcdir/$pkgname-64-build"
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --with-x \
+ --with-gstreamer \
+ --enable-win64 \
+ --with-xattr
+
+ make
+
+ _wine32opts=(
+ --libdir=/usr/lib32
+ --with-wine64="$srcdir/$pkgname-64-build"
+ )
+
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ fi
+
+ msg2 "Building Wine-32..."
+ cd "$srcdir/$pkgname-32-build"
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --with-x \
+ --with-gstreamer \
+ --with-xattr \
+ "${_wine32opts[@]}"
+
+ make
+}
+
+package() {
+ depends=(${_depends[@]})
+
+ msg2 "Packaging Wine-32..."
+ cd "$srcdir/$pkgname-32-build"
+
+ if [[ $CARCH == i686 ]]; then
+ make prefix="$pkgdir/usr" install
+ else
+ make prefix="$pkgdir/usr" \
+ libdir="$pkgdir/usr/lib32" \
+ dlldir="$pkgdir/usr/lib32/wine" install
+
+ msg2 "Packaging Wine-64..."
+ cd "$srcdir/$pkgname-64-build"
+ make prefix="$pkgdir/usr" \
+ libdir="$pkgdir/usr/lib" \
+ dlldir="$pkgdir/usr/lib/wine" install
+ fi
+
+ # Font aliasing settings for Win32 applications
+ install -d "$pkgdir"/etc/fonts/conf.{avail,d}
+ install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail"
+ ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf"
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
Deleted: bug40032.patch
===================================================================
--- bug40032.patch 2016-02-11 15:01:51 UTC (rev 161229)
+++ bug40032.patch 2016-02-11 15:01:59 UTC (rev 161230)
@@ -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/repos/community-i686/wine-staging.install (from rev 161228, wine-staging/trunk/wine-staging.install)
===================================================================
--- wine-staging.install (rev 0)
+++ wine-staging.install 2016-02-11 15:01:59 UTC (rev 161230)
@@ -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 15:01:51 UTC (rev 161229)
+++ wine.install 2016-02-11 15:01:59 UTC (rev 161230)
@@ -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