From 65885cfec6054bf5a707c2f00b4afee8a7f4a041 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 18 Nov 2012 09:58:34 +0000 Subject: [PATCH] Clean-up --- kdegraphics-gwenview/PKGBUILD | 12 +++--------- kdenetwork/PKGBUILD | 19 +++---------------- kdenetwork/lisa.daemon | 35 ----------------------------------- kdesdk/PKGBUILD | 15 +-------------- kdesdk/fixbuild.patch | 20 -------------------- kdesdk/fixdoc.patch | 27 --------------------------- 6 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 kdenetwork/lisa.daemon delete mode 100644 kdesdk/fixbuild.patch delete mode 100644 kdesdk/fixdoc.patch diff --git a/kdegraphics-gwenview/PKGBUILD b/kdegraphics-gwenview/PKGBUILD index 0f851d948..74bbd2e74 100644 --- a/kdegraphics-gwenview/PKGBUILD +++ b/kdegraphics-gwenview/PKGBUILD @@ -1,25 +1,21 @@ # # KDE SC Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Manuel Tortosa # include global config source ../_buildscripts/${current_repo}-${_arch}-cfg.conf -# -# package info -# pkgname=kdegraphics-gwenview _pkgname=gwenview pkgver=${_kdever} pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://kde.org/applications/graphics/gwenview/" license=('GPL' 'LGPL' 'FDL') depends=("kde-runtime>=${_kdever}" "kdegraphics-libkipi>=${_kdever}") -makedepends=('cmake' 'automoc4' "kde-baseapps-konqueror>=${_kdever}") +makedepends=('cmake' 'automoc4' "kde-baseapps-konqueror>=${_kdever}" 'pkg-config') opdepends=('kdegraphics-kamera: to work directly with cameras') source=("$_mirror/${_pkgname}-$_kdever.tar.xz") md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) @@ -35,11 +31,9 @@ build() { -DCMAKE_INSTALL_PREFIX=${_installprefix} \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - } package() { cd ${srcdir}/${_pkgname}-${pkgver} make DESTDIR=${pkgdir} install || return 1 - } diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD index b2821da12..ee8868467 100644 --- a/kdenetwork/PKGBUILD +++ b/kdenetwork/PKGBUILD @@ -5,9 +5,6 @@ # include global config source ../_buildscripts/${current_repo}-${_arch}-cfg.conf -# -# package info -# pkgbase=('kdenetwork') pkgname=('kdenetwork-filesharing' 'kdenetwork-kdnssd' @@ -17,7 +14,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') -arch=('i686' 'x86_64') +arch=('x86_64') pkgver=${_kdever} pkgrel=1 pkgdesc="split package" @@ -30,16 +27,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'libgadu' 'mediastreamer' 'msilbc' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'docbook-xsl') -source=("$_mirror/${pkgbase}-$_kdever.tar.xz" - 'lisa.daemon') +source=("$_mirror/${pkgbase}-$_kdever.tar.xz") +md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) -md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` - '66069c83fd5fa0df5d743d4486799033') # lisa.daemon - - -# -# build function -# build() { cd ${srcdir}/${pkgbase}-${pkgver} msg "starting build ..." @@ -54,9 +44,6 @@ build() { make || return 1 } -# -# split-install functions -# package_kdenetwork-filesharing() { pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' depends=("kdelibs>=${_kdever}" 'smbclient') diff --git a/kdenetwork/lisa.daemon b/kdenetwork/lisa.daemon deleted file mode 100644 index 106ac81ee..000000000 --- a/kdenetwork/lisa.daemon +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - - . /etc/rc.conf - . /etc/rc.d/functions - - case "$1" in - - start) - stat_busy "Starting LISa" - /usr/bin/lisa &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon lisa - stat_done - fi - ;; - - stop) - stat_busy "Stopping LISa" - kill -9 `pidof /usr/bin/lisa` &>/dev/null - rm_daemon lisa - stat_done - ;; - - restart) - stat_busy "Restarting LISa ..." - $0 stop - $0 start - stat_done - ;; - - *) - echo "usage: $0 {start|stop|restart}" - esac \ No newline at end of file diff --git a/kdesdk/PKGBUILD b/kdesdk/PKGBUILD index a56bf9b48..71d28af31 100644 --- a/kdesdk/PKGBUILD +++ b/kdesdk/PKGBUILD @@ -7,10 +7,6 @@ # include global config source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -# -# package info -# pkgbase=('kdesdk') pkgname=('kdesdk-cervisia' 'kdesdk-dolphin-plugins' @@ -34,7 +30,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-thumbnailers' 'kdesdk-umbrello') -arch=('i686' 'x86_64') +arch=('x86_64') pkgver=${_kdever} pkgrel=1 @@ -50,15 +46,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kde-runtime>=${_kdever}" 'a source=("$_mirror/${pkgbase}-$_kdever.tar.xz") md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) -# -# build function -# build() { cd ${srcdir}/${pkgbase}-${pkgver} - #patch -p0 -i ${startdir}/fixdoc.patch - #patch -p0 -i ${startdir}/fixbuild.patch - msg "starting build ..." cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ -DCMAKE_INSTALL_PREFIX=${_installprefix} \ @@ -67,9 +57,6 @@ build() { } -# -# split-install functions -# package_kdesdk-dolphin-plugins() { pkgdesc='Extra Dolphin plugins' depends=("kde-baseapps-dolphin>=${_kdever}" 'subversion' 'git' "kdesdk-kompare>=${_kdever}") diff --git a/kdesdk/fixbuild.patch b/kdesdk/fixbuild.patch deleted file mode 100644 index 947c1e14a..000000000 --- a/kdesdk/fixbuild.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt (revision 1299643) -+++ CMakeLists.txt (working copy) -@@ -29,6 +29,9 @@ - ENDIF(EXISTS ${_fullPath}/CMakeLists.txt) - ENDMACRO (KDESDK_OPTIONAL_ADD_SUBDIRECTORY) - -+cmake_minimum_required(VERSION 2.6) -+project(kdesdk) -+ - # list of self-contained submodules - kdesdk_optional_add_subdirectory(kapptemplate) - kdesdk_optional_add_subdirectory(dolphin-plugins) -@@ -43,9 +46,6 @@ - - ############################ - # START OF OLD MODULE SETUP --cmake_minimum_required(VERSION 2.6) --project(kdesdk) -- - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) diff --git a/kdesdk/fixdoc.patch b/kdesdk/fixdoc.patch deleted file mode 100644 index fe10a174a..000000000 --- a/kdesdk/fixdoc.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: kapptemplate/templates/C++/kapp4-qml/src/CMakeLists.txt -=================================================================== ---- kapptemplate/templates/C++/kapp4-qml/src/CMakeLists.txt (revision 1299497) -+++ kapptemplate/templates/C++/kapp4-qml/src/CMakeLists.txt (working copy) -@@ -1,4 +1,4 @@ --set(%{APPNAMELC}_SRCS -+set(%{APPNAMELC}_SRCS - %{APPNAMELC}.cpp - main.cpp - %{APPNAMELC}view.cpp -Index: doc/CMakeLists.txt -=================================================================== ---- doc/CMakeLists.txt (revision 1299497) -+++ doc/CMakeLists.txt (working copy) -@@ -28,8 +28,7 @@ - add_subdirectory(scripts) - endif() - --if(LIBXSLT_FOUND AND LIBXML2_FOUND) -- if(BUILD_umbrello) -- add_subdirectory(umbrello) -- endif() --endif(LIBXSLT_FOUND AND LIBXML2_FOUND) -+if(BUILD_umbrello) -+ add_subdirectory(umbrello) -+endif() -+