Commit 006e5653 authored by Manuel's avatar Manuel

Remove upstream patches

parent f184d7de
...@@ -41,8 +41,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever ...@@ -41,8 +41,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever
makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}" makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}"
"kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba' "kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba'
'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl') 'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2')
# 'google-gadgets-qt>=0.11.2')
source=($_mirror/${_origname}-$_kdever.tar.bz2 source=($_mirror/${_origname}-$_kdever.tar.bz2
mishaaq-kcm_touchpad-00370b5.tar.gz mishaaq-kcm_touchpad-00370b5.tar.gz
...@@ -96,7 +95,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 ...@@ -96,7 +95,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
# feature_history-notifications-enable-disable-kde#119207.patch # feature_history-notifications-enable-disable-kde#119207.patch
# feature_kdm-plymouth.patch # feature_kdm-plymouth.patch
shutdown-fix.patch # shutdown-fix.patch
sensors-fix.patch sensors-fix.patch
) )
...@@ -134,7 +133,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` ...@@ -134,7 +133,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
# '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch # '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch
# '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch # '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch
# '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch # '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch
'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch # 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch
'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch 'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch
) )
...@@ -172,8 +171,8 @@ build() ...@@ -172,8 +171,8 @@ build()
patch -Np0 -i ${srcdir}/fix_terminate-server.patch patch -Np0 -i ${srcdir}/fix_terminate-server.patch
# patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch # patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch
patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
patch -Np1 -i ${srcdir}/shutdown-fix.patch # patch -Np1 -i ${srcdir}/shutdown-fix.patch
# FIXME: update feature patches # FIXME: update feature patches
# msg "applying feature patches ..." # msg "applying feature patches ..."
...@@ -183,8 +182,8 @@ build() ...@@ -183,8 +182,8 @@ build()
# patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch # patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch
# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch # patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch
msg "applying upstream patches ..." # msg "applying upstream patches ..."
patch -Np1 -i ${srcdir}/sensors-fix.patch # patch -Np1 -i ${srcdir}/sensors-fix.patch
msg "starting workspace build ..." msg "starting workspace build ..."
...@@ -241,7 +240,7 @@ package_kdebase-workspace() ...@@ -241,7 +240,7 @@ package_kdebase-workspace()
optdepends=("kdebindings-python : Python Support for Plasma" optdepends=("kdebindings-python : Python Support for Plasma"
"kdeedu-marble : Marble Wallpaper Plugin" "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" "qedje : Plasma Support for Edje Files"
"gpsd : Plasma geolocation support" "gpsd : Plasma geolocation support"
"(open)ntp : Time/Date sync support") "(open)ntp : Time/Date sync support")
......
...@@ -147,7 +147,7 @@ package_kdegraphics-kamera() ...@@ -147,7 +147,7 @@ package_kdegraphics-kamera()
make DESTDIR=${pkgdir} install || return 1 make DESTDIR=${pkgdir} install || return 1
done 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/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.cache.bz2
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.docbook sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.docbook
......
--- 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
--- 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
...@@ -18,7 +18,7 @@ pkgname=${_origname} ...@@ -18,7 +18,7 @@ pkgname=${_origname}
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
#pkgver=${_kdever} #pkgver=${_kdever}
pkgver=4.4.11.1 pkgver=4.4.11.1
pkgrel=1 pkgrel=2
pkgdesc="KDE Pim Runtime" pkgdesc="KDE Pim Runtime"
url="http://www.kde.org" url="http://www.kde.org"
......
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