Date: Thursday, May 2, 2013 @ 17:35:10
Author: svenstaro
Revision: 89817
archrelease: copy trunk to community-i686
Added:
wine/repos/community-i686/30-win32-aliases.conf
(from rev 89816, wine/trunk/30-win32-aliases.conf)
wine/repos/community-i686/PKGBUILD
(from rev 89816, wine/trunk/PKGBUILD)
wine/repos/community-i686/wine.install
(from rev 89816, wine/trunk/wine.install)
Deleted:
wine/repos/community-i686/30-win32-aliases.conf
wine/repos/community-i686/PKGBUILD
wine/repos/community-i686/wine.install
-----------------------+
30-win32-aliases.conf | 40 ++---
PKGBUILD | 357 +++++++++++++++++++++++-------------------------
wine.install | 24 +--
3 files changed, 210 insertions(+), 211 deletions(-)
Deleted: 30-win32-aliases.conf
===================================================================
--- 30-win32-aliases.conf 2013-05-02 15:34:56 UTC (rev 89816)
+++ 30-win32-aliases.conf 2013-05-02 15:35:10 UTC (rev 89817)
@@ -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 89816,
wine/trunk/30-win32-aliases.conf)
===================================================================
--- 30-win32-aliases.conf (rev 0)
+++ 30-win32-aliases.conf 2013-05-02 15:35:10 UTC (rev 89817)
@@ -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 2013-05-02 15:34:56 UTC (rev 89816)
+++ PKGBUILD 2013-05-02 15:35:10 UTC (rev 89817)
@@ -1,179 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com>
-# Contributor: Eduardo Romero <edua...@archlinux.org>
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-
-pkgname=wine
-pkgver=1.5.29
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}
- 30-win32-aliases.conf)
-md5sums=('4a7dc9dad3c3c7710c202458374ed21c'
- 'SKIP'
- '1ff4e467f59409272088d92173a0f801')
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com";
-arch=(i686 x86_64)
-license=(LGPL)
-install=wine.install
-
-_depends=(
- fontconfig lib32-fontconfig
- 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
- desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
- '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
- libxml2 lib32-libxml2
- libldap lib32-libldap
- lcms lib32-lcms
- 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
- oss
- samba
- opencl-headers
-)
-
-optdepends=(
- giflib lib32-giflib
- libpng lib32-libpng
- libldap lib32-libldap
- gnutls lib32-gnutls
- lcms lib32-lcms
- libxml2 lib32-libxml2
- 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
- oss cups
- samba
-)
-
-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
-
-build() {
- cd "$srcdir"
-
- # Allow ccache to work
- mv $pkgname-$_pkgbasever $pkgname
-
- # ncurses fix
- sed -i 's|libncurses|libncursesw|g' "$srcdir/$pkgname/configure"
- sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
-
- # Get rid of old build dirs
- rm -rf $pkgname-{32,64}-build
- mkdir $pkgname-32-build
-
- # These additional CFLAGS solve FS#27662 and FS#34195
- export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
- export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
- 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 \
- --without-gstreamer \
- --enable-win64
- # Gstreamer was disabled for FS#33655
-
- # These additional flags solve FS#34819
- make CFLAGS+="-fno-builtin-memcpy" CXXFLAGS+="-fno-builtin-memcpy"
-
- _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 \
- --without-gstreamer \
- "${_wine32opts[@]}"
-
- # These additional flags solve FS#23277
- make CFLAGS+="-mincoming-stack-boundary=2"
CXXFLAGS+="-mincoming-stack-boundary=2"
-}
-
-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 89816, wine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-05-02 15:35:10 UTC (rev 89817)
@@ -0,0 +1,178 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com>
+# Contributor: Eduardo Romero <edua...@archlinux.org>
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+
+pkgname=wine
+pkgver=1.5.29
+pkgrel=2
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}
+ 30-win32-aliases.conf)
+md5sums=('4a7dc9dad3c3c7710c202458374ed21c'
+ 'SKIP'
+ '1ff4e467f59409272088d92173a0f801')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com";
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+_depends=(
+ fontconfig lib32-fontconfig
+ 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
+ desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+ '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
+ libxml2 lib32-libxml2
+ libldap lib32-libldap
+ lcms lib32-lcms
+ 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
+ oss
+ samba
+ opencl-headers
+)
+
+optdepends=(
+ giflib lib32-giflib
+ libpng lib32-libpng
+ libldap lib32-libldap
+ gnutls lib32-gnutls
+ lcms lib32-lcms
+ libxml2 lib32-libxml2
+ 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
+ oss cups
+ samba
+)
+
+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
+
+build() {
+ cd "$srcdir"
+
+ # Allow ccache to work
+ mv $pkgname-$_pkgbasever $pkgname
+
+ # ncurses fix
+ sed -i 's|libncurses|libncursesw|g' "$srcdir/$pkgname/configure"
+ sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
+
+ # Get rid of old build dirs
+ rm -rf $pkgname-{32,64}-build
+ mkdir $pkgname-32-build
+
+ # These additional CPPFLAGS solve FS#27662 and FS#34195
+ export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+
+ 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 \
+ --without-gstreamer \
+ --enable-win64
+ # Gstreamer was disabled for FS#33655
+
+ # These additional flags solve FS#34819
+ make CFLAGS+="-fno-builtin-memcpy" CXXFLAGS+="-fno-builtin-memcpy"
+
+ _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 \
+ --without-gstreamer \
+ "${_wine32opts[@]}"
+
+ # These additional flags solve FS#23277
+ make CFLAGS+="-mincoming-stack-boundary=2"
CXXFLAGS+="-mincoming-stack-boundary=2"
+}
+
+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: wine.install
===================================================================
--- wine.install 2013-05-02 15:34:56 UTC (rev 89816)
+++ wine.install 2013-05-02 15:35:10 UTC (rev 89817)
@@ -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 89816,
wine/trunk/wine.install)
===================================================================
--- wine.install (rev 0)
+++ wine.install 2013-05-02 15:35:10 UTC (rev 89817)
@@ -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
+}
