From d530d974a7f7255afd14c9f56ae930faedf702dd Mon Sep 17 00:00:00 2001 From: amnon Date: Fri, 18 Jun 2010 12:07:23 +0000 Subject: [PATCH] kdebase: disable user-image-from-webcam feature (dep. opencv/gtk2) --- kdebase/PKGBUILD | 17 +++++++++-------- ...ature_user-image-from-webcam.patch-disabled} | 0 2 files changed, 9 insertions(+), 8 deletions(-) rename kdebase/{feature_user-image-from-webcam.patch => feature_user-image-from-webcam.patch-disabled} (100%) diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD index ddc342dd0..140143dab 100644 --- a/kdebase/PKGBUILD +++ b/kdebase/PKGBUILD @@ -27,7 +27,7 @@ pkgname=('kdebase' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" @@ -35,23 +35,23 @@ license=('GPL' 'LGPL' 'FDL') options=('docs' '!splithdr') -makedepends=("kdebase-workspace>=${_kdever}" 'pkgconfig' 'cmake' 'automoc4' 'libraw1394' 'ruby' 'opencv') +makedepends=("kdebase-workspace>=${_kdever}" 'pkgconfig' 'cmake' 'automoc4' 'libraw1394' 'ruby') # 'opencv' source=($_mirror/${_origname}-$_kdever.tar.bz2 http://kde-apps.org/CONTENT/content-files/99752-kde_cdemu-0.3.tar.gz 01_dolphin_add_toolbar_buttons.patch 02_dolphin_properties.patch 03_konsole_defaults.patch - 04_konq_scan_nsplugins_at_startup.patch - feature_user-image-from-webcam.patch) + 04_konq_scan_nsplugins_at_startup.patch) +# feature_user-image-from-webcam.patch) md5sums=('3e759b5ba2dbc350560c3a4316bfec71' # kdebase-4.4.4.tar.bz2 'f98c26deff86b32a26e0238896d49382' # 99752-kde_cdemu-0.3.tar.gz '12d902dd5d090b146676231c5163bc4f' # 01_dolphin_add_toolbar_buttons.patch '92a47ed820a541b34dd220e1da5649b7' # 02_dolphin_properties.patch '8ab6f508a4e04517dd51ac3ab2eb01ef' # 03_konsole_defaults.patch - 'a8dc0bddce464af5846ac722007e0b59' # 04_konq_scan_nsplugins_at_startup.patch - '52cfd4456f8ec830b8d49c8aaa40b539') # feature_user-image-from-webcam.patch + 'a8dc0bddce464af5846ac722007e0b59') # 04_konq_scan_nsplugins_at_startup.patch +# '52cfd4456f8ec830b8d49c8aaa40b539') # feature_user-image-from-webcam.patch @@ -79,7 +79,8 @@ build() patch -Np1 -i ${startdir}/02_dolphin_properties.patch || return 1 patch -Np1 -i ${startdir}/03_konsole_defaults.patch || return 1 patch -Np1 -i ${startdir}/04_konq_scan_nsplugins_at_startup.patch || return 1 - patch -Np1 -i ${startdir}/feature_user-image-from-webcam.patch || return 1 +# disabled - needs opencv which depends on gtk2 +# patch -Np1 -i ${startdir}/feature_user-image-from-webcam.patch || return 1 msg "starting build ..." cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ @@ -98,7 +99,7 @@ build() package_kdebase() { pkgdesc="KDE Base Applications" - depends=("kdebase-runtime>=${_kdever}" 'libraw1394' 'opencv') + depends=("kdebase-runtime>=${_kdever}" 'libraw1394') # 'opencv' optdepends=("cdemu-client: Support transparent CD/DVD image mounting in KDE") replaces=('kdebase-devel') conflicts=("kdemod-${_origname}") diff --git a/kdebase/feature_user-image-from-webcam.patch b/kdebase/feature_user-image-from-webcam.patch-disabled similarity index 100% rename from kdebase/feature_user-image-from-webcam.patch rename to kdebase/feature_user-image-from-webcam.patch-disabled