Commit ebcf0e14 authored by Fabian's avatar Fabian

Merge remote-tracking branch 'origin/testing' into testing

parents 1eaf7981 fd0bffb5
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer: abveritas[at]chakra-project[dog]org>
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer abveritas@chakra-project.org
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
...@@ -33,7 +32,6 @@ md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` ...@@ -33,7 +32,6 @@ md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
build() { build() {
cd ${srcdir}/${_pkgname}-${pkgver} cd ${srcdir}/${_pkgname}-${pkgver}
# Fixme: addapt this patch to 4.9
patch -p1 -i ${srcdir}/Shell_new.diff patch -p1 -i ${srcdir}/Shell_new.diff
msg "starting build ..." msg "starting build ..."
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer: abveritas[at]chakra-project[dog]org>
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer abveritas@chakra-project.org
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
...@@ -24,6 +23,7 @@ groups=("kde" "kde-minimal" "kde-uninstall") ...@@ -24,6 +23,7 @@ groups=("kde" "kde-minimal" "kde-uninstall")
# also add some obvious dependencies here, as there are users out there who dont update such stuff # also add some obvious dependencies here, as there are users out there who dont update such stuff
depends=("${_qtpkg}>=${_qtver}" 'pinentry' 'openssh' 'bash>=4.2' 'glibc>=2.15') depends=("${_qtpkg}>=${_qtver}" 'pinentry' 'openssh' 'bash>=4.2' 'glibc>=2.15')
provides=('tcp_wrappers')
install=kde-common.install install=kde-common.install
...@@ -40,7 +40,6 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem ...@@ -40,7 +40,6 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem
Chakra-Homepage.desktop Chakra-Homepage.desktop
Chakra.directory Chakra.directory
chakra-config-updater.sh chakra-config-updater.sh
chakra-fix-configs.sh
chakra-update-icons.sh chakra-update-icons.sh
chakra-update-mime.sh chakra-update-mime.sh
chakra-update-sycoca.sh chakra-update-sycoca.sh
...@@ -52,7 +51,6 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem ...@@ -52,7 +51,6 @@ source=(http://www.kde-apps.org/CONTENT/content-files/48411-rootactions_servicem
chakra-icons.tar.gz chakra-icons.tar.gz
agent-startup.sh agent-startup.sh
agent-shutdown.sh) agent-shutdown.sh)
md5sums=('2afd86671ad0db31718157aecd46d528' md5sums=('2afd86671ad0db31718157aecd46d528'
'0fe13835c8d796c9973cda670860ce19' '0fe13835c8d796c9973cda670860ce19'
'630ffe7118eef8608a9e5e393a0b1e12' '630ffe7118eef8608a9e5e393a0b1e12'
...@@ -66,7 +64,6 @@ md5sums=('2afd86671ad0db31718157aecd46d528' ...@@ -66,7 +64,6 @@ md5sums=('2afd86671ad0db31718157aecd46d528'
'b88ceca59e3ef046ac21fb612977dd43' 'b88ceca59e3ef046ac21fb612977dd43'
'0a25b19c8493dae1b5a18cc57125ce6b' '0a25b19c8493dae1b5a18cc57125ce6b'
'535501ac9f3ad05ddd18f8cfee4a2e06' '535501ac9f3ad05ddd18f8cfee4a2e06'
'1cad70fdf0306e5590899865bbfb430b'
'78a20a4ccaf943f5a2089f4d436fdf32' '78a20a4ccaf943f5a2089f4d436fdf32'
'd3fcef1c7affa098683a09f26415d8ef' 'd3fcef1c7affa098683a09f26415d8ef'
'aaa1958b14518e9b0193afe497da830e' 'aaa1958b14518e9b0193afe497da830e'
...@@ -78,7 +75,7 @@ md5sums=('2afd86671ad0db31718157aecd46d528' ...@@ -78,7 +75,7 @@ md5sums=('2afd86671ad0db31718157aecd46d528'
'08e25ad7487a913ea5fe03ebe5f495cd' '08e25ad7487a913ea5fe03ebe5f495cd'
'7daec96c125e1e238a35f31ea4a476f0' '7daec96c125e1e238a35f31ea4a476f0'
'18e8d01124b19f7df2937c06e177bf7f') '18e8d01124b19f7df2937c06e177bf7f')
build() { build() {
# install scripts for gpg/ssh-agent # install scripts for gpg/ssh-agent
install -D -m 755 -o root -g root $srcdir/agent-startup.sh $pkgdir/etc/kde/env/agent-startup.sh install -D -m 755 -o root -g root $srcdir/agent-startup.sh $pkgdir/etc/kde/env/agent-startup.sh
...@@ -89,7 +86,6 @@ build() { ...@@ -89,7 +86,6 @@ build() {
# install config updater scripts # install config updater scripts
install -D -m755 -o root -g root ${srcdir}/chakra-config-updater.sh ${pkgdir}/usr/bin/chakra-config-updater install -D -m755 -o root -g root ${srcdir}/chakra-config-updater.sh ${pkgdir}/usr/bin/chakra-config-updater
install -D -m755 -o root -g root ${srcdir}/chakra-fix-configs.sh ${pkgdir}/usr/bin/chakra-fix-configs
install -D -m755 -o root -g root ${srcdir}/chakra-update-icons.sh ${pkgdir}/usr/bin/chakra-update-icons install -D -m755 -o root -g root ${srcdir}/chakra-update-icons.sh ${pkgdir}/usr/bin/chakra-update-icons
install -D -m755 -o root -g root ${srcdir}/chakra-update-mime.sh ${pkgdir}/usr/bin/chakra-update-mime install -D -m755 -o root -g root ${srcdir}/chakra-update-mime.sh ${pkgdir}/usr/bin/chakra-update-mime
install -D -m755 -o root -g root ${srcdir}/chakra-update-sycoca.sh ${pkgdir}/usr/bin/chakra-update-sycoca install -D -m755 -o root -g root ${srcdir}/chakra-update-sycoca.sh ${pkgdir}/usr/bin/chakra-update-sycoca
......
#!/bin/bash
fix_configs() {
echo -e -n " > Adjusting paths in config files ..."
KDE_dir=".kde4"
pushd ~/$KDE_dir/share/config/ &> /dev/null
find ./ -type f -exec sed -i "s/\/.kdemod4/\/.kde4/g" {} \; &> /dev/null
popd &> /dev/null
echo " DONE"
}
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
post_install() { post_install() {
echo " " echo " "
echo " > KDE Software Compilation 4.10.1" echo " > KDE Software Compilation 4.10.4"
echo " > packaged by The Chakra Project" echo " > packaged by The Chakra Project"
echo " " echo " "
echo " Installation Prefix : /usr" echo " Installation Prefix : /usr"
...@@ -16,7 +16,6 @@ post_install() { ...@@ -16,7 +16,6 @@ post_install() {
echo " Forums : http://chakra-project.org/bbs/" echo " Forums : http://chakra-project.org/bbs/"
echo " Bugtracker: http://chakra-project.org/bugs/" echo " Bugtracker: http://chakra-project.org/bugs/"
echo " CCR : http://chakra-project.org/ccr/" echo " CCR : http://chakra-project.org/ccr/"
echo " Bundles : http://chakra-project.org/bundles.html"
echo " ChangeLogs: http://gitorious.org/chakra-packages" echo " ChangeLogs: http://gitorious.org/chakra-packages"
echo " " echo " "
} }
......
This diff is collapsed.
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer abveritas@chakra-project.org
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
...@@ -14,7 +13,7 @@ pkgname=('kdeadmin-kcron' ...@@ -14,7 +13,7 @@ pkgname=('kdeadmin-kcron'
arch=('x86_64') arch=('x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org/" url="http://www.kde.org/"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
......
--- a/pykde4-4.9.97/CMakeLists.txt 2013-01-04 15:47:40.000000000 -0500
+++ b/pykde4-4.9.97/CMakeLists.txt 2013-01-04 13:59:38.571700297 -0500
@@ -1,14 +1,8 @@
project(pykde4)
-cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
-
# search packages used by KDE
find_package(KDE4 4.9.4 REQUIRED)
-# Match what's used in the main macros
-cmake_policy(SET CMP0002 OLD)
-find_package(PythonLibrary)
-
include(KDE4Defaults)
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer: abveritas[at]chakra-project[dog]org>
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
...@@ -15,7 +14,7 @@ pkgdesc="KDE bindings for python" ...@@ -15,7 +14,7 @@ pkgdesc="KDE bindings for python"
url="http://kde.org/" url="http://kde.org/"
arch=('x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=('pyqt' 'qscintilla' 'boost-libs' "kdepim-runtime>=${_kdever}") depends=('pyqt4-python2' 'qscintilla-python2' 'boost-libs' "kdepim-runtime>=${_kdever}")
makedepends=('cmake' 'automoc4' 'polkit-qt' 'boost') makedepends=('cmake' 'automoc4' 'polkit-qt' 'boost')
source=("$_mirror/${_pkgname}-$_kdever.tar.xz") source=("$_mirror/${_pkgname}-$_kdever.tar.xz")
md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
......
--- a/pykde4-4.9.97/tools/pykdeuic4/CMakeLists.txt 2012-12-30 10:05:50.465108547 +0100
+++ b/pykde4-4.9.97/tools/pykdeuic4/CMakeLists.txt 2013-01-04 14:15:52.468438186 +0100
@@ -10,7 +10,7 @@
if (NOT PYKDEUIC4_ALTINSTALL)
# Step 2: Make a the generated symlink a link to "pykdeuic4"
- install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" )
+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
endif()
unset(_uic_name)
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer abveritas@chakra-project.org
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
...@@ -17,9 +16,10 @@ screenshot="http://www.kde.org/images/screenshots/marble.png" ...@@ -17,9 +16,10 @@ screenshot="http://www.kde.org/images/screenshots/marble.png"
arch=('x86_64') arch=('x86_64')
url='http://www.kde.org' url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kde-runtime>=${_kdever}" "gpsd" 'shapelib') depends=("kde-runtime>=${_kdever}" 'shapelib')
makedepends=('cmake' 'automoc4' 'qt-mobility') makedepends=('cmake' 'automoc4' 'qt-mobility' 'gpsd')
optdepends=('qt-mobility: enable QtMobility Location Provider') optdepends=('qt-mobility: enable QtMobility Location Provider'
'gpsd: support for gps devices')
provides=('marble') provides=('marble')
groups=("kde" "kdeedu" "kde-uninstall") groups=("kde" "kdeedu" "kde-uninstall")
categories=('education') categories=('education')
...@@ -29,18 +29,6 @@ install=${pkgname}.install ...@@ -29,18 +29,6 @@ install=${pkgname}.install
source=("$_mirror/${_pkgname}-$_kdever.tar.xz") source=("$_mirror/${_pkgname}-$_kdever.tar.xz")
md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
# create tarball: source PKGBUILD && mksource
mksource() {
rm -vRf ${_pkgname}-${pkgver}
git clone git://anongit.kde.org/marble ${_pkgname}-${pkgver}
rm -vRf ${_pkgname}-${pkgver}/.git
pushd ${_pkgname}-${pkgver}
popd
tar -cvJf ${_pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver}/*
md5sum ${_pkgname}-${pkgver}.tar.xz
}
build() { build() {
cd ${srcdir}/${_pkgname}-${pkgver} cd ${srcdir}/${_pkgname}-${pkgver}
cmake . -DCMAKE_INSTALL_PREFIX=/usr \ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
......
...@@ -15,7 +15,7 @@ url='http://kde.org/applications/multimedia/kmix/' ...@@ -15,7 +15,7 @@ url='http://kde.org/applications/multimedia/kmix/'
arch=('x86_64') arch=('x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=("kde-runtime>=${_kdever}" 'libcanberra') depends=("kde-runtime>=${_kdever}" 'libcanberra')
makedepends=('cmake' 'automoc4' 'pulseaudio') makedepends=('cmake' 'automoc4' 'libpulse')
source=("$_mirror/${_pkgname}-$_kdever.tar.xz") source=("$_mirror/${_pkgname}-$_kdever.tar.xz")
md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
groups=("kde" "kdemultimedia" "kde-uninstall") groups=("kde" "kdemultimedia" "kde-uninstall")
......
...@@ -16,7 +16,7 @@ pkgname=('kdenetwork-filesharing' ...@@ -16,7 +16,7 @@ pkgname=('kdenetwork-filesharing'
arch=('x86_64') arch=('x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=3 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
...@@ -27,14 +27,11 @@ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qc ...@@ -27,14 +27,11 @@ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qc
'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'libgadu' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'libgadu'
'mediastreamer' 'msilbc' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'docbook-xsl') 'mediastreamer' 'msilbc' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'docbook-xsl')
source=("$_mirror/${pkgbase}-$_kdever.tar.xz" source=("$_mirror/${pkgbase}-$_kdever.tar.xz")
'kget-fix-delete-homedir.diff') md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'4a85d8fbe81a8a034b278daacba0b2c4')
build() { build() {
cd ${srcdir}/${pkgbase}-${pkgver} cd ${srcdir}/${pkgbase}-${pkgver}
patch -p3 -i "${srcdir}/kget-fix-delete-homedir.diff"
msg "starting build ..." msg "starting build ..."
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
......
Index: transfer-plugins/multisegmentkio/transfermultisegkio.cpp
===================================================================
--- a/src/kdenetwork-4.10.1/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp (Revision 1342971)
+++ b/src/kdenetwork-4.10.1/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp (Arbeitskopie)
@@ -166,6 +166,8 @@
if (change & Tc_FileName) {
QList<KUrl> urls = m_dataSourceFactory->mirrors().keys();
QString filename = urls.first().fileName();
+ if (filename.isEmpty())
+ return;
foreach (const KUrl url, urls) {
if (filename != url.fileName())
return;
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer abveritas@chakra-project.org
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
...@@ -32,7 +31,7 @@ pkgname=('kdesdk-cervisia' ...@@ -32,7 +31,7 @@ pkgname=('kdesdk-cervisia'
arch=('x86_64') arch=('x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="KDE Standard Development Toolkit" pkgdesc="KDE Standard Development Toolkit"
url="http://www.kde.org" url="http://www.kde.org"
......
...@@ -15,7 +15,7 @@ pkgdesc="Archiver for various compression formats" ...@@ -15,7 +15,7 @@ pkgdesc="Archiver for various compression formats"
url="http://www.kde.org" url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr' 'splitdbg' 'log') options=('docs' '!splithdr' 'splitdbg' 'log')
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}" 'libarchive' 'qjson') depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}" 'libarchive=3.1.2-1' 'qjson')
optdepends=('p7zip' 'zip' 'unzip' 'unrar') optdepends=('p7zip' 'zip' 'unzip' 'unrar')
conflicts=("kdeutils-common" "kdeutils-doc") conflicts=("kdeutils-common" "kdeutils-doc")
groups=("kde" "kdeutils" "kde-uninstall") groups=("kde" "kdeutils" "kde-uninstall")
......
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer: abveritas[at]chakra-project[dog]org>
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
......
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