Commit bfc7c387 authored by amnon's avatar amnon

update some pkgs to get sync with x86_64

parent 2e43881d
......@@ -4,14 +4,11 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ccr
pkgver=20100921
pkgver=20100927
pkgrel=1
pkgdesc="Bash wrapper for pacman and the CCR"
url="http://github.com/bruenig/packer"
url="http://github.com/bruenig/ccr"
license="GPL"
arch=('any')
makedepends=('git')
......@@ -19,20 +16,20 @@ depends=('grep' 'sed' 'coreutils' 'bash' 'wget' 'pacman')
optdepends=('sudo: install and update packages as non-root'
'pacman-color: colorized output'
'base-devel: for building packages from the ccr')
_gitroot='git://github.com/bruenig/packer.git'
_gitname='packer'
source=(http://chakra-project.org/sources/ccr/ccr-$pkgver-$pkgrel.tar.xz)
md5sums=(3b831830867ef58f186f8c1a97c59147)
# source PKGBUILD && _create-tarball
_create-tarball() {
mkdir -p "ccr"
git clone git://github.com/bruenig/packer.git "ccr"
tar -cJf ccr-$pkgver-$pkgrel.tar.xz "ccr"
md5sum "ccr-$pkgver-$pkgrel.tar.xz"
rm -rf "ccr"
}
build() {
cd "$startdir/src"
msg "Connecting to github GIT server...."
if [ -d "$startdir/src/$_gitname" ] ; then
cd $_gitname && git pull origin
else
git clone "$_gitroot"
cd $_gitname
fi
cd "$startdir/src/ccr"
# Change all the server references from http://aur.archlinux.org to http://chakra-project.org/ccr
cat packer | sed "s/aur\.archlinux\.org/chakra\-project\.org\/ccr/g" > step1
......@@ -42,4 +39,13 @@ build() {
cat step2 | sed "s/Aur/Ccr/g" > ccr
install -m 755 -D ccr "$startdir/pkg/usr/bin/ccr"
# Do some sed-magic
sed -i -e "s~AUR~CCR~g" packer.8
sed -i -e "s~aur~ccr~g" packer.8
sed -i -e "s~packer~ccr~g" packer.8
sed -i -e "s~Packer~CCR~g" packer.8
sed -i -e "s~PACKER~CCR~g" packer.8
install -m 644 -D packer.8 "$startdir/pkg/usr/share/man/man8/ccr.8"
}
......@@ -6,12 +6,12 @@
pkgname=clementine
pkgver=0.5.1
pkgrel=1
pkgrel=2
pkgdesc="A modern music player and library organiser and a port of Amarok 1.4, with some features rewritten to take advantage of Qt4. "
url="http://www.clementine-player.org/"
license="GPL"
arch=('i686' 'x86_64')
depends=('glew' 'liblastfm' 'taglib' 'gstreamer0.10' 'libmtp' 'libgpod' 'hicolor-icon-theme')
depends=('glew' 'liblastfm' 'taglib' 'gstreamer0.10' 'libmtp' 'libgpod>=0.7.94' 'hicolor-icon-theme')
makedepends=('mesa' 'cmake' 'boost')
optdepends=(
'gstreamer0.10-base-plugins: for more open formats'
......
#
# KDE SC 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>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kbluetooth
pkgver=0.4.2
pkgrel=2
pkgdesc="A collection of Bluetooth utilities and modules for KDE based on BlueZ"
arch=('i686' 'x86_64')
url="http://www.kde-apps.org/content/show.php/kbluetooth?content=112110"
license=('GPL2')
depends=('kdebase-workspace' 'bluez' 'obex-data-server')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'perl')
optdepends=('python')
replaces=('kdebluetooth')
conflicts=('kdebluetooth')
install=kbluetooth.install
source=(http://www.kde-apps.org/CONTENT/content-files/112110-${pkgname}-${pkgver}.tar.bz2)
md5sums=('f64e2c0133bc76aa119a5d453d760851')
build() {
cd ${srcdir}
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make || return 1
make DESTDIR=${pkgdir} install
}
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}
......@@ -8,7 +8,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=packer
pkgver=20100908
pkgver=20100927
pkgrel=1
pkgdesc="Bash wrapper for pacman and aur"
url="http://github.com/bruenig/packer"
......@@ -19,20 +19,20 @@ depends=('grep' 'sed' 'coreutils' 'bash' 'wget' 'pacman')
optdepends=('sudo: install and update packages as non-root'
'pacman-color: colorized output'
'base-devel: for building packages')
_gitroot='git://github.com/bruenig/packer.git'
_gitname='packer'
source=(http://chakra-project.org/sources/packer/packer-$pkgver-$pkgrel.tar.xz)
md5sums=(1e07a9dfa6b9b109efe5a8651f98f976)
# source PKGBUILD && _create-tarball
_create-tarball() {
mkdir -p "packer"
git clone git://github.com/bruenig/packer.git "packer"
tar -cJf packer-$pkgver-$pkgrel.tar.xz "packer"
md5sum "packer-$pkgver-$pkgrel.tar.xz"
rm -rf "packer"
}
build() {
cd "$startdir/src"
msg "Connecting to github GIT server...."
if [ -d "$startdir/src/$_gitname" ] ; then
cd $_gitname && git pull origin
else
git clone "$_gitroot"
cd $_gitname
fi
cd "$startdir/src/packer"
install -m 755 -D packer "$startdir/pkg/usr/bin/packer"
install -m 644 -D packer.8 "$startdir/pkg/usr/share/man/man8/packer.8"
......
......@@ -5,15 +5,13 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=wine
pkgver=1.3.0
pkgver=1.3.3
pkgrel=1
_pkgbasever=${pkgver/rc/-rc}
source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
unbreak-wow64.patch)
md5sums=('f266536a8096f6b705f2f802549dc0e5'
'c3118b7df69ad4e93b5ce98f6a592620')
source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
md5sums=('36fe53f4db6d5d98b01f5d5f2cd24d11')
pkgdesc="A compatibility layer for running Windows programs"
url="http://www.winehq.com"
......@@ -31,9 +29,7 @@ depends=(
)
makedepends=(autoconf ncurses bison perl fontforge flex prelink
'gcc>=4.5.0-2' cross32-gcc
'lib32-glibc>=2.12-5'
libgphoto2
'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
giflib lib32-giflib
libxpm lib32-libxpm
libpng lib32-libpng
......@@ -46,134 +42,100 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
libldap lib32-libldap
lcms lib32-lcms
openal lib32-openal
esound lib32-esound
jack lib32-jack
cups lib32-libcups
sane
samba
libcups lib32-libcups
gnutls lib32-gnutls
)
optdepends=(
libgphoto2
giflib lib32-giflib
libpng lib32-libpng
libldap lib32-libldap
lcms lib32-lcms
libxml2 lib32-libxml2
openal lib32-openal
esound lib32-esound
jack lib32-jack
cups lib32-libcups
sane
samba
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
)
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')
_libdir32=/opt/lib32/usr/lib
_libdir64=/usr/lib
fi
build() {
cd "$srcdir"
# Allow ccache to work
mv $pkgname-$_pkgbasever $pkgname
msg2 "Patching..."
(
cd $pkgname
patch -Np1 -i "$srcdir/unbreak-wow64.patch"
)
# (Re)create build dirs
# Get rid of old build dirs
rm -rf $pkgname-{32,64}-build
mkdir $pkgname-{32,64}-build
mkdir $pkgname-32-build
if [[ $CARCH == i686 ]]; then
msg2 "Building Wine..."
cd "$srcdir/$pkgname-32-build"
../$pkgname/configure \
--prefix=/usr \
--sysconfdir=/etc \
--with-x
make
else
msg2 "Building Wine-64..."
if [[ $CARCH == x86_64 ]]; then
msg2 "Building Wine-64..."
mkdir $pkgname-64-build
cd "$srcdir/$pkgname-64-build"
../$pkgname/configure \
--prefix=/usr \
--libdir="$_libdir64" \
--sysconfdir=/etc \
--libdir=/usr/lib \
--with-x \
--enable-win64
make
msg2 "Building Wine-32..."
# Wine32 build needs a patched ldd
# Do it here until it's patched in glibc
cp /usr/bin/ldd "$srcdir/ldd"
sed -i '/^RTLDLIST=/s:"$: /lib/ld-linux.so.2&:' "$srcdir/ldd"
cd "$srcdir/$pkgname-32-build"
../$pkgname/configure \
CFLAGS="${CFLAGS/x86-64/i686}" \
CXXFLAGS="${CXXFLAGS/x86-64/i686}" \
LDFLAGS="$LDFLAGS -L/opt/lib32/lib -L/opt/lib32/usr/lib" \
LDD=/usr/bin/ldd32 \
--host=i686-unknown-linux-gnu \
--prefix=/usr \
--libdir="$_libdir32" \
--sysconfdir=/etc \
--with-x \
--with-wine64="$srcdir/$pkgname-64-build"
_wine32opts=(
LDD="$srcdir/ldd"
--libdir=/usr/lib32
--with-wine64="$srcdir/$pkgname-64-build"
)
make
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
fi
}
package() {
if [[ $CARCH == i686 ]]; then
msg2 "Building Wine-32..."
cd "$srcdir/$pkgname-32-build"
../$pkgname/configure \
--prefix=/usr \
--sysconfdir=/etc \
--with-x \
"${_wine32opts[@]}"
msg2 "Packaging Wine..."
make
}
cd "$srcdir/$pkgname-32-build"
package() {
msg2 "Packaging Wine-32..."
cd "$srcdir/$pkgname-32-build"
if [[ $CARCH == i686 ]]; then
make prefix="$pkgdir/usr" install
else
msg2 "Packaging Wine-32..."
cd "$srcdir/$pkgname-32-build"
make prefix="$pkgdir/usr" \
libdir="$pkgdir$_libdir32" \
dlldir="$pkgdir$_libdir32/wine" install
msg2 "Packaging Wine-64..."
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$_libdir64" \
dlldir="$pkgdir$_libdir64/wine" install
libdir="$pkgdir/usr/lib" \
dlldir="$pkgdir/usr/lib/wine" install
fi
mkdir -p "$pkgdir/etc/wine"
}
# vim:set ts=8 sts=2 sw=2 et:
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment