From 99caf1250af2a7fceb79be8bb57eba213ec398ba Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 18 Apr 2011 22:22:57 +0000 Subject: [PATCH] Backports from testing --- kde-plasma-themes/PKGBUILD | 8 ++++---- tools-pkg-appset-qt/PKGBUILD | 36 ++++++++++++++++++------------------ tools-pkg-tribe/PKGBUILD | 15 +++++++-------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/kde-plasma-themes/PKGBUILD b/kde-plasma-themes/PKGBUILD index 67af47aad..ba3ee316e 100644 --- a/kde-plasma-themes/PKGBUILD +++ b/kde-plasma-themes/PKGBUILD @@ -15,9 +15,9 @@ pkgrel=1 arch=('any') source=('http://chakra-project.org/sources/neda/NEDA.tar.gz' - 'http://chakra-project.org/sources/kneda/Kneda-0.5.0-2.tar.gz') + 'http://chakra-project.org/sources/kneda/Kneda-0.5.1.tar.gz') md5sums=('83686866b1e7313b77b3cf98c5c4ddc3' - 'ace8adc40cc8312e432598e88f9590fc') + '44792cfa790c136c9cec9de7b10bf2f7') package_kde-plasma-themes-neda() { pkgver=1.0 @@ -31,8 +31,8 @@ license=('GPL') } package_kde-plasma-themes-kneda() { -pkgver=0.5.0 -pkgrel=2 +pkgver=0.5.1 +pkgrel=1 pkgdesc="Chakra KNEDA Plasma theme" url="http://www.chakra-project.org" license=('GPL') diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 7cdbef1cb..7bbe6b713 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,7 +3,7 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') @@ -12,25 +12,25 @@ license=('GPL2') depends=('qt>=4.7') optdepends=('ccr: For Community Repository support') install=${pkgname}.install -source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz +source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/0.4.1/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - http://chakra-project.org/sources/$pkgname/$pkgname-0.4.0-chakra.patch - http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/$pkgname-0.4.1-chakra.patch + #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz ) -md5sums=(4d0500ae33c8250dfa24c9b696ba7e30 +md5sums=(279ec69590b9d275cf9aaddbb407c888 87f5f278e3fe67ed2cd6165c2835d81b - 724e4cea62d3b95dd63573e75dffe783 - 44ba1b52c438e05853fbaf202ae243b6 #appset-qt_ca-0.4.0.tar.gz - 3b5c5027609eef9b43ad0f98c137c094 #appset-qt_de-0.4.0.tar.gz - 84542e24121e93dc1c84b63c940c60e0 #appset-qt_el-0.4.0.tar.gz - ffb9f62a72805a1613a8847598e353ea #appset-qt_es-0.4.0.tar.gz - f64d3552553bf28d12358aba2db4ca2a #appset-qt_fr-0.4.0.tar.gz - b9238caf3c0bf3f7f2258c052d8addf6 #appset-qt_nl-0.4.0.tar.gz + cb627808490b84fb00bb4b710226b694 + #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz + #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz + #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz + #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz + #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz + 2acb9e2ac0e6d75f3d97148a621a5539 #appset-qt_nl-0.4.1.tar.gz ) build() { @@ -39,7 +39,7 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.0-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.1-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index e4786154a..201b25f01 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -8,8 +8,8 @@ # package info # pkgname=tribe -pkgver=2011.04_ms5 -pkgrel=2 +pkgver=2011.04_ms6 +pkgrel=1 _codename=Aida pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" @@ -23,10 +23,10 @@ replaces=('kdemod-tribe-svn' 'kdemod-tribe') conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager') options=('!splithdr' '!splitdbg' 'sign') source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz" - "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS5.html") + "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS6.html") -md5sums=('24987696cbe6946e6a2c04eacf73aadd' - '8365159d10aeed5f6cff4b7496496527') +md5sums=('fac311934faa10843ab06c263b8313e6' + '416c5c801e34113b48055fc24d395cd9') groups=('kde-uninstall') install=tools-tribe.install @@ -70,8 +70,7 @@ build() # add pkgver to tribe sed -i -e "s~source build/from git~Build: ${pkgver} ($_codename)~g" config-tribe.h.cmake - sed -i -e "s~git-checkout~${pkgver}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target" - sed -i -e "s~code-name~${_codename}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target" + sed -i -e "s~git-checkout~${pkgver}-${pkgrel}~g" "${srcdir}/$pkgname/scripts/postinstall-functions/job-initialize-target" cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -86,7 +85,7 @@ package() cd "${srcdir}/$pkgname" msg "Make successful, installing..." make DESTDIR=$startdir/pkg install || return 1 - cp -vf ${srcdir}/RELEASE_NOTES_201104MS5.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html + cp -vf ${srcdir}/RELEASE_NOTES_201104MS6.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html # remove nasty files find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +