merge

2025-01-24 18:42:12 +08:00 · 2014-07-30 15:33:07 +00:00 · 2014-07-30 15:33:07 +00:00 · 171a068d5c
commit 171a068d5c
parent 08c90f2ece 250f66c3d1
24 changed files with 242 additions and 108 deletions
--- a/frameworks.conf
+++ b/frameworks.conf
@ -6,7 +6,7 @@ KFServer="http://download.kde.org/stable/frameworks/"
 # Frameworks version
 KFVersion="5.0.0"
 # Build type; can be one of Debug,Release and RelWithDebInfo
-KFBuildType="RelWithDebInfo -DQML_INSTALL_DIR=/usr/lib/qt5/qml -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules -DPLUGIN_INSTALL_DIR=/usr/lib/kf5/plugins -DQT_PLUGIN_INSTALL_DIR=/usr/lib/qt5/plugins"
+KFBuildType="RelWithDebInfo -DQML_INSTALL_DIR=/usr/lib/qt5/qml -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules -DPLUGIN_INSTALL_DIR=/usr/lib/kf5/plugins -DQT_PLUGIN_INSTALL_DIR=/usr/lib/qt5/plugins -DSYSCONF_INSTALL_DIR=/etc"

 function getSum() {
  awk "\$2 ~ /${1}-/ {print \$1}" ../frameworks.sums ;
--- a/kactivities-frameworks-git/PKGBUILD
+++ b/kactivities-frameworks-git/PKGBUILD
@ -1,44 +0,0 @@
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-source ../frameworks.conf
-
-pkgname=kactivities-frameworks-git
-pkgver=r589.3a63096
-pkgrel=1
-pkgdesc="Core components for the KDE's Activities"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
-license=('LGPL')
-depends=('qt5-declarative' 'boost-libs' 'kf5umbrella' 'kdbusaddons' 'kwindowsystem' 'kservice')
-makedepends=('extra-cmake-modules' 'git' 'boost')
-options=("debug")
-source=("git://anongit.kde.org/kactivities.git#tag=v$pkgver")
-md5sums=('SKIP')
-
-pkgver() {
-  cd kactivities
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../kactivities \
-    -DCMAKE_BUILD_TYPE=${KFBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${KFInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib
-  make
-}
-
-check() {
-  cd build
-  make test
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
--- a/kdeconnect/PKGBUILD
+++ b/kdeconnect/PKGBUILD
@ -8,7 +8,7 @@
 _buildtype='Release'
  
 pkgname=kdeconnect
-pkgver=0.7.1
+pkgver=0.7.2
 _pkgver=${pkgver}
 pkgrel=1
 pkgdesc='KDE Connect - kded and kcm'
@ -20,7 +20,7 @@ makedepends=('automoc4' 'cmake')
 install=kdeconnect.install
 screenshot=('http://albertvaka.files.wordpress.com/2013/08/kcm.png')
 source=("http://download.kde.org/unstable/kdeconnect/${_pkgver}/src/${pkgname}-kde-${pkgver}.tar.xz")
-md5sums=('bcf4525e8967a10771534e8b7a5b22d8')
+md5sums=('1cd10d54bb3dc6e5b854ec110f63cecb')
 
 if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then
  options=(debug)
--- a/kdelibs4support/PKGBUILD
+++ b/kdelibs4support/PKGBUILD
@ -4,7 +4,7 @@ source ../frameworks.conf

 pkgname=kdelibs4support
 pkgver=${KFVersion}
-pkgrel=4
+pkgrel=5
 pkgdesc='Library providing Job- and Qeueinterfaces'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/threadweaver'
--- a/kf5-baloo-widgets/PKGBUILD
+++ b/kf5-baloo-widgets/PKGBUILD
@ -0,0 +1,48 @@
+
+source ../plasma.conf
+
+pkgname=kf5-baloo-widgets
+_pkgname=baloo-widgets
+#pkgver=${PVersion}
+pkgver=4.98.0
+pkgrel=1
+pkgdesc='Widgets for the baloo framework for searching and managing metadata'
+arch=('x86_64')
+url='community.kde.org/Baloo'
+license=('LGPL')
+depends=('kf5-baloo' 'kdelibs4support' 'kemoticons')
+makedepends=('extra-cmake-modules' 'kdoctools' 'git')
+checkdepends=("cmake")
+conflicts=('baloo-widgets')
+groups=('plasma')
+options=("debug")
+#source=("${PServer}/${pkgver}/${_pkgname}-${pkgver}.tar.xz")
+source=("git://anongit.kde.org/baloo-widgets#branch=frameworks")
+#sha256sums=( $(getSum ${_pkgname}) )
+md5sums=('SKIP')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  #cmake ../${_pkgname}-${pkgver} \
+  cmake ../${_pkgname} \
+    -DCMAKE_BUILD_TYPE=${PBuildType} \
+    -DCMAKE_INSTALL_PREFIX=${PInstallPrefix} \
+    -DLIB_INSTALL_DIR=lib \
+    -DKDEPIM_SUPPORT_BUILD=FALSE
+  make
+}
+
+check() {
+  cd build
+  make test || return 0
+  return 0
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
--- a/kf5-baloo/PKGBUILD
+++ b/kf5-baloo/PKGBUILD
@ -2,12 +2,12 @@

 source ../plasma.conf

-pkgname=baloo5
+pkgname=kf5-baloo
 _pkgname=baloo
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=1
 pkgdesc='Library providing Job- and Qeueinterfaces'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='community.kde.org/Baloo'
 license=('LGPL')
 depends=('qt5-base' 'solid' 'akonadi-qt5' 'krunner' 'kauth' 'kdelibs4support' 'kcmutils' 'kemoticons' 'kfilemetadata5' 'xapian-core')
@ -15,6 +15,9 @@ makedepends=('extra-cmake-modules')
 checkdepends=("cmake")
 groups=('plasma')
 options=("debug")
+replaces=('baloo5')
+provides=('baloo5')
+conflics=('baloo5' 'baloo')
 source=("${PServer}/${pkgver}/${_pkgname}-${pkgver}.tar.xz")
 sha256sums=( $(getSum ${_pkgname}) )

--- a/kf5-kde-baseapps/PKGBUILD
+++ b/kf5-kde-baseapps/PKGBUILD
@ -0,0 +1,45 @@
+
+source ../frameworks.conf
+
+pkgname=kf5-kde-baseapps
+_pkgname=kde-baseapps
+pkgver=4.98.0
+#pkgver=${KFVersion}
+pkgrel=1
+pkgdesc="Collection of applications used for file and Internet browsing"
+arch=('x86_64')
+url='https://projects.kde.org/projects/kde/applications/kde-baseapps'
+license=('LGPL')
+depends=('kdelibs4support' 'kdesu' 'kf5-baloo-widgets' 'kactivities-frameworks' 'knewstuff')
+makedepends=('extra-cmake-modules' 'kdoctools' 'git')
+groups=('kf5')
+conflicts=('kde-basapps')
+#source=("${KFServer}/${pkgver}/${_pkgname}-${pkgver}.tar.xz")
+source=("git://anongit.kde.org/kde-baseapps#branch=frameworks")
+md5sums=('SKIP')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  #cmake ../${_pkgname}-${pkgver} \
+  cmake ../${_pkgname} \
+    -DCMAKE_BUILD_TYPE=${KFBuildType} \
+    -DCMAKE_INSTALL_PREFIX=${KFInstallPrefix} \
+    -DQT4_BUILD=OFF \
+    -DLIB_INSTALL_DIR=lib 
+  make
+}
+
+check() {
+  cd build
+  msg "currently not working"
+  make test || return 0
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
--- a/kf5-rekonq/PKGBUILD
+++ b/kf5-rekonq/PKGBUILD
@ -0,0 +1,47 @@
+
+source ../frameworks.conf
+
+pkgname=kf5-rekonq
+_pkgname=rekonq
+pkgver=2.9.93
+pkgrel=1
+pkgdesc='A WebKit based web browser for KDE'
+arch=('x86_64')
+url='http://rekonq.sourceforge.net/'
+license=('GPL')
+depends=('kauth' 'kbookmarks' 'kcmutils' 'kcodecs' 'kcompletion' 'kconfig' 'kconfigwidgets' 'kcoreaddons' 
+         'kdbusaddons' 'kdewebkit' 'kglobalaccel' 'kguiaddons' 'ki18n' 'kiconthemes' 'kinit'  'kio' 
+         'kjobwidgets' 'knotifications' 'kparts' 'kservice' 'ktextwidgets' 'kwallet'
+         'kwidgetsaddons' 'kwindowsystem' 'kxmlgui' 'qt5-webkit' 'sonnet') #'qca-qt5'
+makedepends=('extra-cmake-modules' 'git' 'kdoctools')
+conflicts=('rekonq')
+source=("git://anongit.kde.org/rekonq.git#branch=frameworks")
+md5sums=('SKIP')
+
+
+prepare() {
+  mkdir -p build
+  sed -i -e 's/KF5 CONFIG REQUIRED/KF5 REQUIRED/' ${srcdir}/${_pkgname}/CMakeLists.txt
+}
+
+build() {
+  cd build
+  #cmake ../${_pkgname}-${pkgver} \
+  cmake ../${_pkgname} \
+    -DCMAKE_BUILD_TYPE=${KFBuildType} \
+    -DCMAKE_INSTALL_PREFIX=${KFInstallPrefix} \
+    -DQT4_BUILD=OFF \
+    -DLIB_INSTALL_DIR=lib 
+  make
+}
+
+check() {
+  cd build
+  make test || return 0
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
+ 
--- a/kf5umbrella/PKGBUILD
+++ b/kf5umbrella/PKGBUILD
@ -1,40 +0,0 @@
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-source ../frameworks.conf
-
-pkgname=kf5umbrella
-pkgver=${KFVersion}
-pkgrel=1
-pkgdesc='KF5 Umbrella'
-arch=('any')
-url='https://projects.kde.org/projects/frameworks/kf5umbrella'
-license=('LGPL')
-depends=('qt5-base')
-makedepends=('extra-cmake-modules')
-groups=('kf5')
-options=("debug")
-source=("${KFServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('8751db282da92ff6ada3c5136c21966c')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=${KFBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${KFInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib
-  make
-}
-
-check() {
-  cd build
-  make test
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
--- a/khtml/PKGBUILD
+++ b/khtml/PKGBUILD
@ -4,7 +4,7 @@ source ../frameworks.conf

 pkgname=khtml
 pkgver=${KFVersion}
-pkgrel=4
+pkgrel=5
 pkgdesc='KHtml'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/khtml'
--- a/kinfocenter/PKGBUILD
+++ b/kinfocenter/PKGBUILD
@ -4,7 +4,7 @@ source ../plasma.conf

 pkgname=kinfocenter
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=3
 pkgdesc='kinfocenter'
 arch=('i686' 'x86_64')
 url='projects.kde.org/'
--- a/konsole/PKGBUILD
+++ b/konsole/PKGBUILD
@ -0,0 +1,46 @@
+
+source ../frameworks.conf
+
+pkgname=konsole
+pkgver=4.98.0
+#pkgver=${KFVersion}
+pkgrel=1
+pkgdesc="KDE's terminal emulator"
+arch=('x86_64')
+url='https://projects.kde.org/projects/kde/applications/kde-baseapps'
+license=('LGPL')
+depends=('kio' 'kdelibs4support' 'kiconthemes' 'knotifyconfig' 'knotifications' 'kparts' 'kpty'
+         'kinit' 'kemoticons' 'kitemmodels')
+makedepends=('extra-cmake-modules' 'kdoctools' 'git')
+groups=('kf5')
+conflicts=('kde-baseapps-konsole')
+#source=("${KFServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
+source=("git://anongit.kde.org/${pkgname}#branch=frameworks")
+md5sums=('SKIP')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  #cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname} \
+    -DCMAKE_BUILD_TYPE=${KFBuildType} \
+    -DCMAKE_INSTALL_PREFIX=${KFInstallPrefix} \
+    -DQT4_BUILD=OFF \
+    -DLIB_INSTALL_DIR=lib 
+  make
+}
+
+check() {
+  cd build
+  msg "currently not working"
+  make test || return 0
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
+ 
--- a/ksysguard/PKGBUILD
+++ b/ksysguard/PKGBUILD
@ -2,7 +2,7 @@ source ../plasma.conf

 pkgname=ksysguard
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=4
 pkgdesc="KSysguard"
 arch=('i686' 'x86_64')
 url='http://projects.kde.org'
--- a/ktexteditor/PKGBUILD
+++ b/ktexteditor/PKGBUILD
@ -4,7 +4,7 @@ source ../frameworks.conf

 pkgname=ktexteditor
 pkgver=${KFVersion}
-pkgrel=4
+pkgrel=5
 pkgdesc='Library providing Job- and Qeueinterfaces'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/threadweaver'
--- a/kwin/PKGBUILD
+++ b/kwin/PKGBUILD
@ -4,7 +4,7 @@ source ../plasma.conf

 pkgname=kwin
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=4
 pkgdesc="A versative window manager"
 arch=('i686' 'x86_64')
 url='projects.kde.org/'
--- a/kwrited/PKGBUILD
+++ b/kwrited/PKGBUILD
@ -4,7 +4,7 @@ source ../plasma.conf

 pkgname=kwrited
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=3
 pkgdesc="KWrited"
 arch=('i686' 'x86_64')
 url='projects.kde.org/'
--- a/milou/PKGBUILD
+++ b/milou/PKGBUILD
@ -9,7 +9,7 @@ pkgdesc='KRunner alternative with focus on searching'
 arch=('i686' 'x86_64')
 url='projects.kde.org/'
 license=('LGPL')
-depends=('qt5-base' 'qt5-script' 'qt5-declarative' 'qt5-webkit' 'krunner' 'baloo5')
+depends=('qt5-base' 'qt5-script' 'qt5-declarative' 'qt5-webkit' 'krunner' 'kf5-baloo')
 makedepends=('extra-cmake-modules')
 checkdepends=("cmake")
 groups=('plasma')
--- a/oxygen/PKGBUILD
+++ b/oxygen/PKGBUILD
@ -4,12 +4,12 @@ source ../plasma.conf

 pkgname=oxygen
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=3
 pkgdesc="Oxygen"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='projects.kde.org/'
 license=('LGPL')
-depends=('qt5-base' 'frameworkintegration' 'kwindowsystem' 'kwidgetsaddons' 'kcompletion' 'kservice' 'kguiaddons')
+depends=('qt5-base' 'frameworkintegration' 'kwindowsystem' 'kwidgetsaddons' 'kcompletion' 'kservice' 'kguiaddons' 'kwin')
 makedepends=('extra-cmake-modules')
 checkdepends=("cmake")
 groups=('plasma')
--- a/plasma-desktop/PKGBUILD
+++ b/plasma-desktop/PKGBUILD
@ -2,7 +2,7 @@ source ../plasma.conf

 pkgname=plasma-desktop
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=4
 pkgdesc="Plasma Desktop"
 arch=('i686' 'x86_64')
 url='http://projects.kde.org'
--- a/plasma-workspace/PKGBUILD
+++ b/plasma-workspace/PKGBUILD
@ -2,12 +2,12 @@ source ../plasma.conf

 pkgname=plasma-workspace
 pkgver=${PVersion}
-pkgrel=3
+pkgrel=5
 pkgdesc="Plasma Workspace"
 arch=('x86_64')
 url='http://projects.kde.org'
 license=('LGPL')
-depends=('qt5-base' 'qt5-declarative' 'qt5-script' 'plasma-framework' 'kdelibs4support' 'kemoticons' 'kdesu' 'knewstuff' 'krunner' 'kcmutils' 'kjs' 'kjsembed' 'knotifyconfig' 'ksysguard' 'libkscreen2' 'kwin' 'ktexteditor' 'akonadi-qt5' 'baloo5')
+depends=('qt5-base' 'qt5-declarative' 'qt5-script' 'plasma-framework' 'kdelibs4support' 'kemoticons' 'kdesu' 'knewstuff' 'krunner' 'kcmutils' 'kjs' 'kjsembed' 'knotifyconfig' 'ksysguard' 'libkscreen2' 'kwin' 'ktexteditor' 'akonadi-qt5' 'kf5-baloo')
 makedepends=('extra-cmake-modules' 'kapidox')
 checkdepends=("cmake")
 groups=('plasma')
@ -44,6 +44,6 @@ package() {
  cd build
  make DESTDIR="${pkgdir}" install
  
-  sed 's|qtpaths|qtpaths-qt5|' -i "$pkgdir/usr/bin/startkde"
+  sed 's|qtpaths|qtpaths-qt5|g' -i "$pkgdir/usr/bin/startkde"
  install -Dm755 "${srcdir}/10-kf5" "${pkgdir}/etc/X11/xinit/xinitrc.d/10-kf5"
 }
--- a/plasma-workspace/startkde.patch
+++ b/plasma-workspace/startkde.patch
@ -0,0 +1,29 @@
+--- src/plasma-workspace-4.98.0/startkde/startkde.cmake	2014-07-03 14:10:59.000000000 +0000
+++ src/plasma-workspace-4.98.0/startkde/startkde.cmake	2014-07-06 15:06:02.543357638 +0000
+@@ -19,14 +19,14 @@
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+  qbindir=`qtpaths-qt5 --binaries-dir`
+  qdbus=$qbindir/qdbus-qt5
+   case $PATH in
+     $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+     *) PATH=$bindir:$PATH; export PATH;;
+   esac
+ else
+-  qdbus=qdbus
+  qdbus=qdbus-qt5
+ fi
+ 
+ # Check if a KDE session already is running and whether it's possible to connect to X
+@@ -207,7 +207,7 @@
+ done
+ 
+ # Set the path for Qt plugins provided by KDE
+-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths-qt5 --plugin-dir`
+ # TODO: Do we really need this?
+ QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+ export QT_PLUGIN_PATH
--- a/plasma.conf
+++ b/plasma.conf
@ -5,7 +5,7 @@ PServer="http://download.kde.org/stable/plasma/"
 # Frameworks version
 PVersion="5.0.0"
 # Build type; can be one of Debug,Release and RelWithDebInfo
-PBuildType="RelWithDebInfo -DQML_INSTALL_DIR=/usr/lib/qt5/qml -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules -DPLUGIN_INSTALL_DIR=/usr/lib/kf5/plugins -DQT_PLUGIN_INSTALL_DIR=/usr/lib/qt5/plugins"
+PBuildType="RelWithDebInfo -DQML_INSTALL_DIR=/usr/lib/qt5/qml -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules -DPLUGIN_INSTALL_DIR=/usr/lib/kf5/plugins -DQT_PLUGIN_INSTALL_DIR=/usr/lib/qt5/plugins -DSYSCONF_INSTALL_DIR=/etc"

 function getSum() {
  awk "\$2 ~ /${1}-/ {print \$1}" ../plasma.sums ;
--- a/powerdevil/PKGBUILD
+++ b/powerdevil/PKGBUILD
@ -2,7 +2,7 @@ source ../plasma.conf

 pkgname=powerdevil
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=3
 pkgdesc="KSysguard"
 arch=('i686' 'x86_64')
 url='http://projects.kde.org'
--- a/systemsettings/PKGBUILD
+++ b/systemsettings/PKGBUILD
@ -4,7 +4,7 @@ source ../plasma.conf

 pkgname=systemsettings
 pkgver=${PVersion}
-pkgrel=2
+pkgrel=3
 pkgdesc='Systemsettings'
 arch=('i686' 'x86_64')
 url='projects.kde.org/'