add final 0.3.50

This commit is contained in:
philm 2011-01-09 14:40:47 +00:00
parent d30fcd714e
commit 718deb179c
3 changed files with 32 additions and 44 deletions

View File

@ -40,16 +40,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
'qca-ossl' "kdebase-workspace>=${_kdever}"
"kdebase>=${_kdever}" 'libvncserver' 'libmsn'
'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage'
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.4')
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5')
source=($_mirror/${_origname}-$_kdever.tar.bz2 \
'lisa.daemon'
'kdenetwork-4.5.80-libktorrent-stable.patch')
'lisa.daemon')
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
'66069c83fd5fa0df5d743d4486799033' # lisa.daemon
'2a8101ce78abd99565a796e620877098')
'66069c83fd5fa0df5d743d4486799033') # lisa.daemon
#
@ -59,9 +56,6 @@ build()
{
cd ${srcdir}/${_origname}-${pkgver}
msg "applying patches ..."
patch -Np1 -i ${srcdir}/kdenetwork-4.5.80-libktorrent-stable.patch || return 1
msg "starting build ..."
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_INSTALL_PREFIX=${_installprefix} \

View File

@ -1,22 +0,0 @@
--- kdenetwork-4.5.90-libktorrent-stable/kget/transfer-plugins/bittorrent/bttransferfactory.cpp.orig 2010-12-10 16:18:46.000000000 +0100
+++ kdenetwork-4.5.90-libktorrent-stable/kget/transfer-plugins/bittorrent/bttransferfactory.cpp 2010-12-24 23:38:25.853333340 +0100
@@ -19,7 +19,6 @@
#include "advanceddetails/btadvanceddetailswidget.h"
#include <kdebug.h>
-#include <util/functions.h>
#include <version.h>
#include <torrent/job.h>
@@ -28,11 +27,6 @@ KGET_EXPORT_PLUGIN(BTTransferFactory)
BTTransferFactory::BTTransferFactory(QObject *parent, const QVariantList &args)
: TransferFactory(parent, args)
{
- if (!bt::InitLibKTorrent())
- {
- kError(5001) << "Failed to initialize libktorrent";
- KGet::showNotification(0, "error", i18n("Cannot initialize libktorrent. Torrent support might not work."));
- }
#if LIBKTORRENT_VERSION >= 0x010100
bt::Job::setJobTracker(new BTJobTracker(this));
#endif

View File

@ -14,40 +14,51 @@ pkgdesc="Tribe - Chakra LiveCD Installer"
url="http://git.chakra-project.org/chakra/"
license="GPL"
arch=('i686' 'x86_64')
depends=('kdelibs' 'kdeedu-marble>=4.5.4' 'squashfs-tools' 'partitionmanager>=1196188' 'cinstall>=0.3' 'rsync' 'burg' 'os-prober')
makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.4' 'kdebase-workspace')
depends=('kdelibs' 'kdeedu-marble>=4.5.95' 'squashfs-tools' 'partitionmanager>=1196188' 'cinstall>=0.3' 'rsync')
makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.95' 'kdebase-workspace')
provides=('tribe')
replaces=('kdemod-tribe-svn' 'kdemod-tribe')
conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
options=('!splithdr' '!splitdbg')
source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}.tar.gz")
source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
"http://chakra-project.org/sources/tribe/RELEASE_NOTES_0350.html")
md5sums=('bc0f5b8528159d6c46a4e26ba38e4cd2')
md5sums=('d7d07bca28c1b1632753ffb1b4a47670'
'11cca06c219d7ed6604c04918a51d23b')
groups=('kde-uninstall')
install=tools-tribe.install
# create tarball: source PKGBUILD && mksource
mksource() {
rm -vRf tribe
git clone git://gitorious.org/chakra/tribe.git
rm -vRf tribe/.git
pushd ${pkgname}
popd
tar -cvJf ${pkgname}-${pkgver}-${pkgrel}.tar.xz ${pkgname}/*
md5sum ${pkgname}-${pkgver}-${pkgrel}.tar.xz
}
#
# build function
#
build()
{
cd "${srcdir}/chakra-$pkgname"
# 4.5 backports
#patch -Np0 -i ${srcdir}/tribe_4.5.patch || return 1
cd "${srcdir}/$pkgname"
# remove unsupported pkgs for x64
if [ "${CARCH}" = "x86_64" ]; then
rm -v ${srcdir}/chakra-$pkgname/data/appIcons/wine.png
rm -v ${srcdir}/chakra-$pkgname/data/appIcons/skype.png
sed -i -e '/wine/d' ${srcdir}/chakra-$pkgname/data/configPagePkgData
sed -i -e '/skype/d' ${srcdir}/chakra-$pkgname/data/configPagePkgData
rm -v ${srcdir}/$pkgname/data/appIcons/wine.png
rm -v ${srcdir}/$pkgname/data/appIcons/skype.png
sed -i -e '/wine/d' ${srcdir}/$pkgname/data/configPagePkgData
sed -i -e '/skype/d' ${srcdir}/$pkgname/data/configPagePkgData
fi
# add pkgver to tribe
sed -i -e "s~source build/from git~Build: ${pkgver}-${pkgrel} (Chakra)~g" config-tribe.h.cmake
sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/chakra-$pkgname/scripts/postinstall-functions/job-initialize-target"
sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target"
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
@ -55,9 +66,14 @@ build()
msg "Starting make..."
make || return 1
}
package()
{
cd "${srcdir}/$pkgname"
msg "Make successful, installing..."
make DESTDIR=$startdir/pkg install || return 1
cp -vf ${srcdir}/RELEASE_NOTES_0350.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
# remove nasty files
find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +