From 006e56536baaa54297ae095a8b0567752eb25e11 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 30 Apr 2011 14:24:58 +0000 Subject: [PATCH] Remove upstream patches --- kdebase-workspace/PKGBUILD | 17 ++++++++--------- kdegraphics/PKGBUILD | 2 +- kdegraphics/fix-kruler-docs.diff | 9 --------- kdegraphics/fix-ksnapshot-docs.diff | 9 --------- kdepim-runtime/PKGBUILD | 2 +- 5 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 kdegraphics/fix-kruler-docs.diff delete mode 100644 kdegraphics/fix-ksnapshot-docs.diff diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD index 69442a0b6..f8f9f0a81 100644 --- a/kdebase-workspace/PKGBUILD +++ b/kdebase-workspace/PKGBUILD @@ -41,8 +41,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}" "kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba' - 'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl') -# 'google-gadgets-qt>=0.11.2') + 'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2') source=($_mirror/${_origname}-$_kdever.tar.bz2 mishaaq-kcm_touchpad-00370b5.tar.gz @@ -96,7 +95,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 # feature_history-notifications-enable-disable-kde#119207.patch # feature_kdm-plymouth.patch - shutdown-fix.patch +# shutdown-fix.patch sensors-fix.patch ) @@ -134,7 +133,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` # '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch # '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch # '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch - 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch +# 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch 'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch ) @@ -172,8 +171,8 @@ build() patch -Np0 -i ${srcdir}/fix_terminate-server.patch # patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch - patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch - patch -Np1 -i ${srcdir}/shutdown-fix.patch + patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch +# patch -Np1 -i ${srcdir}/shutdown-fix.patch # FIXME: update feature patches # msg "applying feature patches ..." @@ -183,8 +182,8 @@ build() # patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch # patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch - msg "applying upstream patches ..." - patch -Np1 -i ${srcdir}/sensors-fix.patch +# msg "applying upstream patches ..." +# patch -Np1 -i ${srcdir}/sensors-fix.patch msg "starting workspace build ..." @@ -241,7 +240,7 @@ package_kdebase-workspace() optdepends=("kdebindings-python : Python Support for Plasma" "kdeedu-marble : Marble Wallpaper Plugin" -# "google-gadgets-qt : Plasma Support for Google Gadgets" + "google-gadgets-qt : Plasma Support for Google Gadgets" "qedje : Plasma Support for Edje Files" "gpsd : Plasma geolocation support" "(open)ntp : Time/Date sync support") diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD index 4e3956daa..71a3282cc 100644 --- a/kdegraphics/PKGBUILD +++ b/kdegraphics/PKGBUILD @@ -147,7 +147,7 @@ package_kdegraphics-kamera() make DESTDIR=${pkgdir} install || return 1 done - # Fix duplicated docs in 4.6.2 + # Fix duplicated docs in 4.6.3 sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/common sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.cache.bz2 sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.docbook diff --git a/kdegraphics/fix-kruler-docs.diff b/kdegraphics/fix-kruler-docs.diff deleted file mode 100644 index 66bfd05a2..000000000 --- a/kdegraphics/fix-kruler-docs.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- src/kdegraphics-4.6.2/kruler/doc/CMakeLists.txt 2011-04-01 21:38:16.000000000 +0200 -+++ Desenvolupament/CMakeLists.txt 2011-04-03 02:00:59.073215641 +0200 -@@ -1,4 +1,4 @@ - ########### install files ############### - # - # --kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) -+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kruler) -\ No newline at end of file diff --git a/kdegraphics/fix-ksnapshot-docs.diff b/kdegraphics/fix-ksnapshot-docs.diff deleted file mode 100644 index c60fa2088..000000000 --- a/kdegraphics/fix-ksnapshot-docs.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- src/kdegraphics-4.6.2/ksnapshot/doc/CMakeLists.txt 2011-04-01 21:38:15.000000000 +0200 -+++ Desenvolupament/CMakeLists.txt 2011-04-03 02:03:59.134359450 +0200 -@@ -1,4 +1,4 @@ - ########### install files ############### - # - # --kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) -+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksnapshot) -\ No newline at end of file diff --git a/kdepim-runtime/PKGBUILD b/kdepim-runtime/PKGBUILD index 6c8d58bdd..d73b24c3a 100644 --- a/kdepim-runtime/PKGBUILD +++ b/kdepim-runtime/PKGBUILD @@ -18,7 +18,7 @@ pkgname=${_origname} arch=('i686' 'x86_64') #pkgver=${_kdever} pkgver=4.4.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Pim Runtime" url="http://www.kde.org" -- GitLab