mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 12:47:18 +08:00
Pt. 2: Let's nuke Wine from here. It's at 1.3.15, here and in [lib32] is at 1.5.31
This commit is contained in:
Ernesto
parent
75bc71c154
commit
5a28dda0d5
140
wine/PKGBUILD
140
wine/PKGBUILD
@ -1,140 +0,0 @@
|
||||
#
|
||||
# Chakra Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=wine
|
||||
pkgver=1.3.15
|
||||
pkgrel=1
|
||||
|
||||
_pkgbasever=${pkgver/rc/-rc}
|
||||
|
||||
source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
|
||||
|
||||
pkgdesc="A compatibility layer for running Windows programs"
|
||||
url="http://www.winehq.com"
|
||||
arch=(i686 x86_64)
|
||||
license=(LGPL)
|
||||
|
||||
depends=(
|
||||
fontconfig lib32-fontconfig
|
||||
mesa lib32-mesa
|
||||
libxcursor lib32-libxcursor
|
||||
libxrandr lib32-libxrandr
|
||||
libxdamage lib32-libxdamage
|
||||
libxxf86dga lib32-libxxf86dga
|
||||
alsa-lib lib32-alsa-lib
|
||||
)
|
||||
|
||||
makedepends=(autoconf ncurses bison perl fontforge flex prelink
|
||||
'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
|
||||
giflib lib32-giflib
|
||||
libxpm lib32-libxpm
|
||||
libpng lib32-libpng
|
||||
libxinerama lib32-libxinerama
|
||||
libxcomposite lib32-libxcomposite
|
||||
libxmu lib32-libxmu
|
||||
libxxf86vm lib32-libxxf86vm
|
||||
libxml2 lib32-libxml2
|
||||
libxslt lib32-libxslt
|
||||
libldap lib32-libldap
|
||||
lcms lib32-lcms
|
||||
mpg123 lib32-mpg123
|
||||
openal lib32-openal
|
||||
jack lib32-jack
|
||||
libcups lib32-libcups
|
||||
gnutls lib32-gnutls
|
||||
v4l-utils lib32-4vl-utils
|
||||
)
|
||||
|
||||
optdepends=(
|
||||
giflib lib32-giflib
|
||||
libpng lib32-libpng
|
||||
libldap lib32-libldap
|
||||
lcms lib32-lcms
|
||||
libxml2 lib32-libxml2
|
||||
openal lib32-openal
|
||||
jack lib32-jack
|
||||
libcups lib32-libcups
|
||||
gnutls lib32-gnutls
|
||||
v4l-utils lib32-4vl-utils
|
||||
)
|
||||
|
||||
if [[ $CARCH == i686 ]]; then
|
||||
# Strip lib32 etc. on i686
|
||||
depends=(${depends[@]/*32-*/})
|
||||
makedepends=(${makedepends[@]/*32-*/})
|
||||
makedepends=(${makedepends[@]/*-multilib*/})
|
||||
optdepends=(${optdepends[@]/*32-*/})
|
||||
else
|
||||
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
|
||||
|
||||
# Get rid of old build dirs
|
||||
rm -rf $pkgname-{32,64}-build
|
||||
mkdir $pkgname-32-build
|
||||
|
||||
if [[ $CARCH == x86_64 ]]; then
|
||||
msg2 "Building Wine-64..."
|
||||
|
||||
mkdir $pkgname-64-build
|
||||
cd "$srcdir/$pkgname-64-build"
|
||||
../$pkgname/configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--libdir=/usr/lib \
|
||||
--with-x \
|
||||
--enable-win64
|
||||
|
||||
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 \
|
||||
--sysconfdir=/etc \
|
||||
--with-x \
|
||||
"${_wine32opts[@]}"
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
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
|
||||
}
|
||||
|
||||
# vim:set ts=8 sts=2 sw=2 et:
|
||||
md5sums=('5ddc07f0a1c7b05f4cf52292aafc98e3')
|
||||
|
||||
@ -1,114 +0,0 @@
|
||||
From 2761b8de0e2e5b0fa219041bb9b4482e97a0c20b Mon Sep 17 00:00:00 2001
|
||||
From: Jan Steffens <jan.steffens@gmail.com>
|
||||
Date: Sat, 31 Jul 2010 00:27:38 +0200
|
||||
Subject: [PATCH] Revert "configure: Build the import libraries without recursing when possible."
|
||||
|
||||
This reverts commit b0e48e1e2bb285fe9dd31c6c77505f0b51819178.
|
||||
---
|
||||
aclocal.m4 | 20 +++++---------------
|
||||
configure | 18 ++++--------------
|
||||
2 files changed, 9 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index 4bf7229..f67e938 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -224,11 +224,6 @@ wine_fn_config_dll ()
|
||||
ac_implibsrc=$[4]
|
||||
ac_file="dlls/$ac_dir/lib$ac_implib"
|
||||
ac_deps="tools/widl tools/winebuild tools/winegcc include"
|
||||
- ac_implibflags=""
|
||||
-
|
||||
- case $ac_dir in
|
||||
- *16) ac_implibflags=" -m16" ;;
|
||||
- esac
|
||||
|
||||
wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
|
||||
|
||||
@@ -270,18 +265,16 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
|
||||
then
|
||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
||||
"__builddeps__: $ac_file.$IMPLIBEXT
|
||||
-$ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
|
||||
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
|
||||
-$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
|
||||
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
|
||||
+$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
|
||||
+ @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT
|
||||
install-dev:: dlls/$ac_dir/Makefile __builddeps__
|
||||
@cd dlls/$ac_dir && \$(MAKE) install-dev"
|
||||
if test "x$CROSSTEST_DISABLE" = x
|
||||
then
|
||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
||||
"__builddeps__: $ac_file.cross.a
|
||||
-$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
|
||||
- \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
|
||||
+$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
|
||||
+ @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a"
|
||||
fi
|
||||
|
||||
if test "$ac_dir" != "$ac_implib"
|
||||
@@ -397,10 +390,7 @@ install-dev:: $ac_dir
|
||||
all __tooldeps__: $ac_dir
|
||||
.PHONY: $ac_dir
|
||||
$ac_dir: $ac_dir/Makefile libs/port dummy
|
||||
- @cd $ac_dir && \$(MAKE)"
|
||||
- case $ac_dir in
|
||||
- tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
|
||||
- esac])
|
||||
+ @cd $ac_dir && \$(MAKE)"])
|
||||
}
|
||||
|
||||
wine_fn_config_makerules ()
|
||||
diff --git a/configure b/configure
|
||||
index d8a14fb..8be5cfa 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -14091,11 +14091,6 @@ wine_fn_config_dll ()
|
||||
ac_implibsrc=$4
|
||||
ac_file="dlls/$ac_dir/lib$ac_implib"
|
||||
ac_deps="tools/widl tools/winebuild tools/winegcc include"
|
||||
- ac_implibflags=""
|
||||
-
|
||||
- case $ac_dir in
|
||||
- *16) ac_implibflags=" -m16" ;;
|
||||
- esac
|
||||
|
||||
wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
|
||||
|
||||
@@ -14139,18 +14134,16 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
|
||||
then
|
||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
||||
"__builddeps__: $ac_file.$IMPLIBEXT
|
||||
-$ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
|
||||
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
|
||||
-$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
|
||||
- \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
|
||||
+$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
|
||||
+ @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT
|
||||
install-dev:: dlls/$ac_dir/Makefile __builddeps__
|
||||
@cd dlls/$ac_dir && \$(MAKE) install-dev"
|
||||
if test "x$CROSSTEST_DISABLE" = x
|
||||
then
|
||||
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
|
||||
"__builddeps__: $ac_file.cross.a
|
||||
-$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
|
||||
- \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
|
||||
+$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
|
||||
+ @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a"
|
||||
fi
|
||||
|
||||
if test "$ac_dir" != "$ac_implib"
|
||||
@@ -14277,9 +14270,6 @@ all __tooldeps__: $ac_dir
|
||||
.PHONY: $ac_dir
|
||||
$ac_dir: $ac_dir/Makefile libs/port dummy
|
||||
@cd $ac_dir && \$(MAKE)"
|
||||
- case $ac_dir in
|
||||
- tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
|
||||
- esac
|
||||
fi
|
||||
}
|
||||
|
||||
--
|
||||
1.7.2.1
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
post_upgrade() {
|
||||
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."
|
||||
}
|
||||
|
||||
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."
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
update-desktop-database -q
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user