[arch-commits] Commit in wine-staging-nine/repos/community-i686 (5 files)

Laurent Carlier lcarlier at archlinux.org
Fri Oct 6 03:38:47 UTC 2017


    Date: Friday, October 6, 2017 @ 03:38:45
  Author: lcarlier
Revision: 261811

archrelease: copy trunk to community-i686

Added:
  wine-staging-nine/repos/community-i686/30-win32-aliases.conf
    (from rev 261810, wine-staging-nine/trunk/30-win32-aliases.conf)
  wine-staging-nine/repos/community-i686/PKGBUILD
    (from rev 261810, wine-staging-nine/trunk/PKGBUILD)
  wine-staging-nine/repos/community-i686/steam.patch
    (from rev 261810, wine-staging-nine/trunk/steam.patch)
Deleted:
  wine-staging-nine/repos/community-i686/30-win32-aliases.conf
  wine-staging-nine/repos/community-i686/PKGBUILD

-----------------------+
 30-win32-aliases.conf |   40 ++--
 PKGBUILD              |  411 ++++++++++++++++++++++++------------------------
 steam.patch           |   39 ++++
 3 files changed, 268 insertions(+), 222 deletions(-)

Deleted: 30-win32-aliases.conf
===================================================================
--- 30-win32-aliases.conf	2017-10-06 03:38:37 UTC (rev 261810)
+++ 30-win32-aliases.conf	2017-10-06 03:38:45 UTC (rev 261811)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias binding="same">
-    <family>MS Shell Dlg</family>
-    <accept><family>Microsoft Sans Serif</family></accept>
-    <default><family>sans-serif</family></default>
-  </alias>
-  <alias binding="same">
-    <family>MS Shell Dlg 2</family>
-    <accept><family>Tahoma</family></accept>
-    <default><family>sans-serif</family></default>
-  </alias>
-
-  <alias binding="same">
-    <family>MS Sans Serif</family>
-    <prefer><family>Microsoft Sans Serif</family></prefer>
-    <default><family>sans-serif</family></default>
-  </alias>
-</fontconfig>

Copied: wine-staging-nine/repos/community-i686/30-win32-aliases.conf (from rev 261810, wine-staging-nine/trunk/30-win32-aliases.conf)
===================================================================
--- 30-win32-aliases.conf	                        (rev 0)
+++ 30-win32-aliases.conf	2017-10-06 03:38:45 UTC (rev 261811)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias binding="same">
+    <family>MS Shell Dlg</family>
+    <accept><family>Microsoft Sans Serif</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+  <alias binding="same">
+    <family>MS Shell Dlg 2</family>
+    <accept><family>Tahoma</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+
+  <alias binding="same">
+    <family>MS Sans Serif</family>
+    <prefer><family>Microsoft Sans Serif</family></prefer>
+    <default><family>sans-serif</family></default>
+  </alias>
+</fontconfig>

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-06 03:38:37 UTC (rev 261810)
+++ PKGBUILD	2017-10-06 03:38:45 UTC (rev 261811)
@@ -1,202 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: 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-nine
-pkgver=2.16
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-_ninepatchver=${pkgver}
-
-source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
-        "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_ninepatchver.tar.gz"
-        30-win32-aliases.conf)
-sha512sums=('f375c74b3c5fd2a0d46de0e4f371c1fe58059da776851e4f9854d288b0d9a97bd9c5432fdd713d0bfdb77b7d6a43a8d7c1c8ae5adc29d637ab30b87788de336f'
-            'f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08'
-            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb')
-
-pkgdesc="A compatibility layer for running Windows programs - Staging branch with the gallium-nine patches"
-url="http://www.wine-staging.com"
-arch=(i686 x86_64)
-options=(staticlibs)
-license=(LGPL)
-
-_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
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  libpulse              lib32-libpulse
-  libva                 lib32-libva
-  gtk3                  lib32-gtk3
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  samba
-  opencl-headers
-  xorg-server-devel
-)
-  
-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
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  libva                 lib32-libva
-  gtk3                  lib32-gtk3
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vulkan-icd-loader     lib32-vulkan-icd-loader
-  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" "wine-staging=$pkgver")
-  conflicts=('wine' 'wine-staging')
-else
-  makedepends=(${makedepends[@]} ${_depends[@]})
-  provides=("wine=$pkgver" "wine-wow64=$pkgver" "wine-staging=$pkgver")
-  conflicts=('wine' 'wine-wow64' 'wine-staging')
-fi
-
-prepare() {
-  # Allow ccache to work
-  mv wine-patched-staging-$_pkgbasever $pkgname
-
-  # https://bugs.winehq.org/show_bug.cgi?id=43530
-  export CFLAGS="${CFLAGS/-fno-plt/}"
-  export LDFLAGS="${LDFLAGS/,-z,now/}"
-
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
-
-  # Apply the nine patchset
-  pushd $pkgname
-  patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/staging-helper.patch
-  patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/wine-d3d9.patch
-  autoreconf -f
-  popd
-
-  # 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 \
-      --with-d3d9-nine \
-      --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-d3d9-nine \
-    --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:

Copied: wine-staging-nine/repos/community-i686/PKGBUILD (from rev 261810, wine-staging-nine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-10-06 03:38:45 UTC (rev 261811)
@@ -0,0 +1,209 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: 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-nine
+pkgver=2.18
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+_ninepatchver=${pkgver}
+
+source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
+        "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_ninepatchver.tar.gz"
+        30-win32-aliases.conf
+        steam.patch)
+sha512sums=('13a1d76b496774dfa2f9d59379a1074e77f56cc480e9862069428bcac0d4ab6221e39099f14c4a3ba3eb64e01f9eab75b2020b21a36398cff37ebe7dec6f90f7'
+            '0e66c51e1957b27ccb9f326b0aaf2b0d09b7bbc9d03e1d321aa1789d2560b8e60fd83c4e86999d96a03aa73a37c96f34d93245763969a314150900741aa03933'
+            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
+            'f3e42a0720777256ca583f96044f6482aae8f4c707189104216f86f6c7a1b68a186c5124c72866229d46eb66c20c555ba9f32a230ec50f968faa8a12b8372b0a')
+
+pkgdesc="A compatibility layer for running Windows programs - Staging branch with the gallium-nine patches"
+url="http://www.wine-staging.com"
+arch=(i686 x86_64)
+options=(staticlibs)
+license=(LGPL)
+
+_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
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  libpulse              lib32-libpulse
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  samba
+  opencl-headers
+  xorg-server-devel
+)
+  
+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
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vulkan-icd-loader     lib32-vulkan-icd-loader
+  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" "wine-staging=$pkgver")
+  conflicts=('wine' 'wine-staging')
+else
+  makedepends=(${makedepends[@]} ${_depends[@]})
+  provides=("wine=$pkgver" "wine-wow64=$pkgver" "wine-staging=$pkgver")
+  conflicts=('wine' 'wine-wow64' 'wine-staging')
+fi
+
+prepare() {
+  # Allow ccache to work
+  mv wine-patched-staging-$_pkgbasever $pkgname
+
+  # https://bugs.winehq.org/show_bug.cgi?id=43530
+  export CFLAGS="${CFLAGS/-fno-plt/}"
+  export LDFLAGS="${LDFLAGS/,-z,now/}"
+
+  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+
+  # steam fix
+  #pushd $pkgname
+  #patch -Np1 -i ../steam.patch
+  #popd
+
+  # Apply the nine patchset
+  pushd $pkgname
+  patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/staging-helper.patch
+  patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/wine-d3d9.patch
+  autoreconf -f
+  popd
+
+  # 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 \
+      --with-d3d9-nine \
+      --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-d3d9-nine \
+    --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:

Copied: wine-staging-nine/repos/community-i686/steam.patch (from rev 261810, wine-staging-nine/trunk/steam.patch)
===================================================================
--- steam.patch	                        (rev 0)
+++ steam.patch	2017-10-06 03:38:45 UTC (rev 261811)
@@ -0,0 +1,39 @@
+diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
+index 6e7b23e..63eda34 100644
+--- a/dlls/kernel32/process.c
++++ b/dlls/kernel32/process.c
+@@ -2429,6 +2429,33 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
+         return FALSE;
+     if (hFile == INVALID_HANDLE_VALUE) goto done;
+
++    /* CROSSOVER HACK: bug 13322 (winehq bug 39403)
++     * Insert --no-sandbox in command line of Steam's web helper process to
++     * work around problems hooking our ntdll exports. */
++    {
++        static const WCHAR steamwebhelperexeW[] = {'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0};
++        static const WCHAR nosandboxW[] = {' ','-','-','n','o','-','s','a','n','d','b','o','x',0};
++
++        if (strstrW(name, steamwebhelperexeW))
++        {
++            LPWSTR new_command_line;
++
++            new_command_line = HeapAlloc(GetProcessHeap(), 0,
++                sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) + 1));
++
++            if (!new_command_line) return FALSE;
++
++            strcpyW(new_command_line, tidy_cmdline);
++            strcatW(new_command_line, nosandboxW);
++
++            TRACE("CrossOver hack changing command line to %s\n", debugstr_w(new_command_line));
++
++            if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline );
++            tidy_cmdline = new_command_line;
++        }
++    }
++    /* end CROSSOVER HACK */
++
+     /* Warn if unsupported features are used */
+
+     if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS |
+



More information about the arch-commits mailing list