[arch-commits] Commit in wine/repos/community-i686 (7 files)
Felix Yan
fyan at archlinux.org
Fri Mar 18 15:55:35 UTC 2016
Date: Friday, March 18, 2016 @ 16:55:35
Author: fyan
Revision: 167592
archrelease: copy trunk to community-i686
Added:
wine/repos/community-i686/30-win32-aliases.conf
(from rev 167591, wine/trunk/30-win32-aliases.conf)
wine/repos/community-i686/PKGBUILD
(from rev 167591, wine/trunk/PKGBUILD)
wine/repos/community-i686/wine.install
(from rev 167591, wine/trunk/wine.install)
Deleted:
wine/repos/community-i686/30-win32-aliases.conf
wine/repos/community-i686/PKGBUILD
wine/repos/community-i686/bug40253.patch
wine/repos/community-i686/wine.install
-----------------------+
30-win32-aliases.conf | 40 ++---
PKGBUILD | 364 +++++++++++++++++++++++-------------------------
bug40253.patch | 87 -----------
wine.install | 24 +--
4 files changed, 211 insertions(+), 304 deletions(-)
Deleted: 30-win32-aliases.conf
===================================================================
--- 30-win32-aliases.conf 2016-03-18 15:40:33 UTC (rev 167591)
+++ 30-win32-aliases.conf 2016-03-18 15:55:35 UTC (rev 167592)
@@ -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/repos/community-i686/30-win32-aliases.conf (from rev 167591, wine/trunk/30-win32-aliases.conf)
===================================================================
--- 30-win32-aliases.conf (rev 0)
+++ 30-win32-aliases.conf 2016-03-18 15:55:35 UTC (rev 167592)
@@ -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 2016-03-18 15:40:33 UTC (rev 167591)
+++ PKGBUILD 2016-03-18 15:55:35 UTC (rev 167592)
@@ -1,185 +0,0 @@
-# $Id$
-# Maintainer: 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
-pkgver=1.9.5
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(https://dl.winehq.org/wine/source/1.9/$pkgname-$_pkgbasever.tar.bz2{,.sign}
- 30-win32-aliases.conf
- bug40253.patch)
-sha1sums=('a37f61c22b48b195361a234c9e91e49070b50a99'
- 'SKIP'
- '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
- 'af4d84a92e33f0a1d6c1bfd32a5c9d8cfb74eb6d')
-validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
- DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-options=(staticlibs)
-license=(LGPL)
-install=wine.install
-
-_depends=(
- 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
- libpulse lib32-libpulse
- alsa-lib lib32-alsa-lib
- libxcomposite lib32-libxcomposite
- mesa lib32-mesa
- mesa-libgl lib32-mesa-libgl
- libcl lib32-libcl
- libxslt lib32-libxslt
- 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
- 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-*/})
-else
- makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
- conflicts=('bin32-wine' 'wine-wow64')
- replaces=('bin32-wine')
-fi
-
-prepare() {
- # Allow ccache to work
- mv $pkgname-$_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
-
- cd $pkgname
- # https://bugs.winehq.org/show_bug.cgi?id=40253
- patch -p1 -i ../bug40253.patch
-}
-
-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
- # Gstreamer was disabled for FS#33655
-
- 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 \
- "${_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/repos/community-i686/PKGBUILD (from rev 167591, wine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-03-18 15:55:35 UTC (rev 167592)
@@ -0,0 +1,179 @@
+# $Id$
+# Maintainer: 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
+pkgver=1.9.6
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(https://dl.winehq.org/wine/source/1.9/$pkgname-$_pkgbasever.tar.bz2{,.sign}
+ 30-win32-aliases.conf)
+sha1sums=('862ffaa2e3d125c8f1d29ed397becaf19ec3fd52'
+ 'SKIP'
+ '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
+ DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+options=(staticlibs)
+license=(LGPL)
+install=wine.install
+
+_depends=(
+ 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
+ libpulse lib32-libpulse
+ alsa-lib lib32-alsa-lib
+ libxcomposite lib32-libxcomposite
+ mesa lib32-mesa
+ mesa-libgl lib32-mesa-libgl
+ libcl lib32-libcl
+ libxslt lib32-libxslt
+ 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
+ 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-*/})
+else
+ makedepends=(${makedepends[@]} ${_depends[@]})
+ provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+ conflicts=('bin32-wine' 'wine-wow64')
+ replaces=('bin32-wine')
+fi
+
+prepare() {
+ # Allow ccache to work
+ mv $pkgname-$_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
+ # Gstreamer was disabled for FS#33655
+
+ 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 \
+ "${_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: bug40253.patch
===================================================================
--- bug40253.patch 2016-03-18 15:40:33 UTC (rev 167591)
+++ bug40253.patch 2016-03-18 15:55:35 UTC (rev 167592)
@@ -1,87 +0,0 @@
-From c6d6dcee47eb97fd75e389434d4136de2f31414c Mon Sep 17 00:00:00 2001
-From: Alexandre Julliard <julliard at winehq.org>
-Date: Mon, 7 Mar 2016 16:26:42 +0900
-Subject: [PATCH 1/1] configure: Don't create makefiles in directories that are
- symlinks in a Wow64 build.
-
-Signed-off-by: Alexandre Julliard <julliard at winehq.org>
----
- aclocal.m4 | 4 ++++
- configure | 9 ++++++---
- configure.ac | 6 +++---
- 3 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 00eeb98..41eb7f6 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -299,6 +299,10 @@ wine_fn_config_makefile ()
- ac_enable=$[2]
- ac_flags=$[3]
-
-+ case $ac_dir in
-+ dnl These are created as symlinks for wow64 builds
-+ fonts|server) test -z "$with_wine64" || return ;;
-+ esac
- AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return])
- wine_fn_all_rules
- wine_fn_install_rules
-diff --git a/configure b/configure
-index 14b4082..bee8e6b 100755
---- a/configure
-+++ b/configure
-@@ -7511,6 +7511,9 @@ wine_fn_config_makefile ()
- ac_enable=$2
- ac_flags=$3
-
-+ case $ac_dir in
-+ fonts|server) test -z "$with_wine64" || return ;;
-+ esac
- if eval test \"x\$"$ac_enable"\" = x"no"; then :
- wine_fn_disabled_rules; return
- fi
-@@ -18263,15 +18266,15 @@ fi
-
- if test -n "$with_wine64"
- then
-- wine_fn_append_rule "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
--fonts server tools:
-+ wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-+fonts server:
- \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
- $with_wine64/loader/wine:
- \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
- $with_wine64/loader/wine-preloader:
- \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
- clean::
-- \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
-+ \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
- else
- WINELOADER_INSTALL="wine.inf"
-
-diff --git a/configure.ac b/configure.ac
-index b57ff6a..09e0f53 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3596,15 +3596,15 @@ fi
- if test -n "$with_wine64"
- then
- WINE_APPEND_RULE(
--[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
--fonts server tools:
-+[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-+fonts server:
- \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
- $with_wine64/loader/wine:
- \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
- $with_wine64/loader/wine-preloader:
- \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
- clean::
-- \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
-+ \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
- else
- AC_SUBST(WINELOADER_INSTALL,"wine.inf")
- WINE_APPEND_RULE(
---
-1.9.1
-
Deleted: wine.install
===================================================================
--- wine.install 2016-03-18 15:40:33 UTC (rev 167591)
+++ wine.install 2016-03-18 15:55:35 UTC (rev 167592)
@@ -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
-}
Copied: wine/repos/community-i686/wine.install (from rev 167591, wine/trunk/wine.install)
===================================================================
--- wine.install (rev 0)
+++ wine.install 2016-03-18 15:55:35 UTC (rev 167592)
@@ -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
+}
More information about the arch-commits
mailing list