From 8afdd30b32b43654fb8f00f04459048c8e8a1193 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 31 Jan 2012 00:30:08 +0100 Subject: [PATCH] kdebase: added patches pulled form kdemod3, cleaned up --- .../trinity-base/trinity-kdebase/PKGBUILD | 32 ++++++++++-------- .../trinity-kdebase/dbusfix.patch | 11 ------ .../trinity-kdebase/docpath.patch | 24 ------------- .../trinity-kdebase/patches.tar.bz2 | Bin 0 -> 5013 bytes .../trinity-kdebase/trinity-kdebase.install | 5 +++ 5 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch delete mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 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 -+#include "/opt/trinity/include/dbus-1.0/dbus/connection.h" - /* HAL libraries */ - #include - #include 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 0000000000000000000000000000000000000000..2e74ade359065354ac701d217cf8ba81cd766690 GIT binary patch literal 5013 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 fVIU*nC literal 0 HcmV?d00001 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() {