Date: Tuesday, August 26, 2014 @ 11:22:57 Author: bluewind Revision: 117898
archrelease: copy trunk to multilib-x86_64 Added: wine/repos/multilib-x86_64/30-win32-aliases.conf (from rev 117897, wine/trunk/30-win32-aliases.conf) wine/repos/multilib-x86_64/PKGBUILD (from rev 117897, wine/trunk/PKGBUILD) wine/repos/multilib-x86_64/wine.install (from rev 117897, wine/trunk/wine.install) Deleted: wine/repos/multilib-x86_64/30-win32-aliases.conf wine/repos/multilib-x86_64/PKGBUILD wine/repos/multilib-x86_64/wine.install -----------------------+ 30-win32-aliases.conf | 40 ++--- PKGBUILD | 366 ++++++++++++++++++++++++------------------------ wine.install | 24 +-- 3 files changed, 215 insertions(+), 215 deletions(-) Deleted: 30-win32-aliases.conf =================================================================== --- 30-win32-aliases.conf 2014-08-26 09:22:54 UTC (rev 117897) +++ 30-win32-aliases.conf 2014-08-26 09:22:57 UTC (rev 117898) @@ -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/multilib-x86_64/30-win32-aliases.conf (from rev 117897, wine/trunk/30-win32-aliases.conf) =================================================================== --- 30-win32-aliases.conf (rev 0) +++ 30-win32-aliases.conf 2014-08-26 09:22:57 UTC (rev 117898) @@ -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 2014-08-26 09:22:54 UTC (rev 117897) +++ PKGBUILD 2014-08-26 09:22:57 UTC (rev 117898) @@ -1,183 +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.7.24 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign} - 30-win32-aliases.conf) -sha1sums=('821fbf2d1d9acbc3e0cb023f4e673f87df7f86fb' - 'SKIP' - '023a5c901c6a091c56e76b6a62d141d87cce9fdb') - -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 - 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 - lcms2 lib32-lcms2 - 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 - samba - opencl-headers -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - lcms2 lib32-lcms2 - 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 - libxslt lib32-libxslt - 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() { - cd $pkgname-$_pkgbasever -} - -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 - - 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 \ - --without-gstreamer \ - "${_wine32opts[@]}" - - # These additional flags solve FS#23277 - make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -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/multilib-x86_64/PKGBUILD (from rev 117897, wine/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-08-26 09:22:57 UTC (rev 117898) @@ -0,0 +1,183 @@ +# $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.7.25 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign} + 30-win32-aliases.conf) +sha1sums=('ec112b956bbd40e78736f19f491a6770057773dd' + 'SKIP' + '023a5c901c6a091c56e76b6a62d141d87cce9fdb') + +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 + 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 + lcms2 lib32-lcms2 + 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 + samba + opencl-headers +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + gnutls lib32-gnutls + lcms2 lib32-lcms2 + 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 + libxslt lib32-libxslt + 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() { + cd $pkgname-$_pkgbasever +} + +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 + + 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 \ + --without-gstreamer \ + "${_wine32opts[@]}" + + # These additional flags solve FS#23277 + make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -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 2014-08-26 09:22:54 UTC (rev 117897) +++ wine.install 2014-08-26 09:22:57 UTC (rev 117898) @@ -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/multilib-x86_64/wine.install (from rev 117897, wine/trunk/wine.install) =================================================================== --- wine.install (rev 0) +++ wine.install 2014-08-26 09:22:57 UTC (rev 117898) @@ -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 +}