kdebase: added patches pulled form kdemod3, cleaned up

5 files changed, 23 insertions, 49 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index d3e2b2ec6..47f42aaf7 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -24,29 +24,27 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
 confilicts=('kdemod3-kdebase')
 options=('libtool')
 source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 
-        'docpath.patch' 
-        'dbusfix.patch' 
-        'kdm-trinity' 
-        'trinity.desktop' 
+        'patches.tar.bz2'
         'Xsession.patch'
         'arch-kdeshutdown.png'
         'kdm-default-face.png'
         'agent-shutdown.sh'
-        'agent-startup.sh')
+        'agent-startup.sh'
+        'kdm-trinity' 
+        'trinity.desktop')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
-         'fc9cdbe6779bb3860e222dafa744c94e'
-         'c9ce810c281002440a6de8cfd8735d07'
-         '376d85d213cf3c04cb0912e5cccd68bd'
-         '1418e45fea5a9738544cbd264c36373b'
+         'bf0cc14276148d5f6bd46828367825a6'
          '895f5d7351aa73ba1f57b0ad27081d69'
          'bb3004513d703d6b72ce70aa240af3a3'
          'e6afdd7ca60c4c59b851135785347e75'
          '18e8d01124b19f7df2937c06e177bf7f'
-         'c963ef6e37c9051119972a58c67f05fb')
+         'c963ef6e37c9051119972a58c67f05fb'
+         '376d85d213cf3c04cb0912e5cccd68bd'
+         '1418e45fea5a9738544cbd264c36373b')
 install='trinity-kdebase.install'
 
 build() {
-   cd $srcdir
+   cd $srcdir/kdebase
 
    msg "Setting PATH, CMAKE and Trinity Environment variables"
    # Source the QT and TDE profile
@@ -58,9 +56,15 @@ build() {
    #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH
    #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
 
-   patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < dbusfix.patch
-   # change doc installation path, we need this to build i18n packages.
-   patch -N -d ${srcdir} -p0 < docpath.patch
+   msg "Patching..."
+   for patch in $srcdir/patches/*.patch; do
+      _p=`basename $patch`
+      msg "Applying patch $_p.."
+      patch -Np0 -i $patch
+   done
+
+   #Compatibility with kde3 and kde4
+   #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
 
    msg "Creating out-of-source build directory: ${srcdir}/build"
    mkdir -p build
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch
deleted file mode 100644
index 8e37b4148..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- halbackend.h	2010-08-12 18:37:24.000000000 -0400
-+++ halbackend.h~	2011-11-03 22:15:02.002228291 -0400
-@@ -40,7 +40,7 @@
- /* We acknowledge the the dbus API is unstable */
- #define DBUS_API_SUBJECT_TO_CHANGE
- /* DBus-Qt bindings */
--#include <dbus/connection.h>
-+#include "/opt/trinity/include/dbus-1.0/dbus/connection.h"
- /* HAL libraries */
- #include <libhal.h>
- #include <libhal-storage.h>
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch
deleted file mode 100644
index 2fd45a7ab..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r src/kdebase/admin/debianrules kdebase/admin/debianrules
---- src/kdebase/admin/debianrules	2012-01-05 17:41:56.000000000 +0100
-+++ kdebase/admin/debianrules	2011-08-21 09:08:23.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- $kde_cgidir	=	"$kde_prefix/lib/cgi-bin";
- $kde_confdir	=	"$sysconfdir/trinity";
--$kde_htmldir	=	"$kde_prefix/share/doc/kde/HTML";
-+$kde_htmldir	=	"$kde_prefix/share/doc/HTML";
- 
- if (defined $ENV{DEB_BUILD_OPTIONS} &&
-     $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
-diff -u -r src/kdebase/cmake/modules/TDESetupPaths.cmake kdebase/cmake/modules/TDESetupPaths.cmake
---- src/kdebase/cmake/modules/TDESetupPaths.cmake	2012-01-05 17:42:06.000000000 +0100
-+++ kdebase/cmake/modules/TDESetupPaths.cmake	2011-08-21 09:08:24.000000000 +0200
-@@ -41,7 +41,7 @@
-   _tde_internal_setup_path( PLUGIN_INSTALL_DIR        "${LIB_INSTALL_DIR}/trinity"                     "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" )
-   _tde_internal_setup_path( CONFIG_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/config"              "The config file install dir" )
-   _tde_internal_setup_path( DATA_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/apps"                "The parent directory where applications can install their data" )
--  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/kde/HTML"        "The HTML install dir for documentation" )
-+  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/HTML"        "The HTML install dir for documentation" )
-   _tde_internal_setup_path( ICON_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/icons"               "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" )
-   _tde_internal_setup_path( KCFG_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/config.kcfg"         "The install dir for kconfig files" )
-   _tde_internal_setup_path( LOCALE_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/locale"              "The install dir for translations" )
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
new file mode 100644
index 000000000..2e74ade35
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
index 57ec77cc3..fa5fdeea2 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
@@ -1,6 +1,11 @@
 post_install() {
    ldconfig &> /dev/null
    mkpamserv trinity
+   echo "Please remember that you can change your kdesu backend"
+   echo "from su to sudo by adding following lines to your"
+   echo "~/.trinity/share/kdesurc or to $TDEDIR/share/config/kdesurc:"
+   echo "[super-user-command]"
+   echo "super-user-command=sudo"
 }
 
 post_upgrade() {