From 20e5b6b1e6dd28887207450b79d870bee72077f5 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Mon, 27 Mar 2006 09:08:24 +0000
Subject: [PATCH] Stefan Fiedler: 	kde-3.conf,kdelibs: move
 --enable-dnotify option to kdelibs, enable inotify support, 	
 disable .desktop file auto-processing 
 misc/desktop/parse-config,scripts/Build-Pkg: introduce 'desktopauto' build
 variable

	Note: this is untested

Index: package/kde/kde-3.conf
===================================================================

[2006032501240010454] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7358 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/PKG-BUILD-VARS | 1 +
 misc/desktop/parse-config               | 6 ++----
 package/kde/kde-3.conf                  | 5 ++++-
 package/kde/kdelibs/kdelibs.conf        | 3 +++
 scripts/Build-Pkg                       | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Documentation/Developers/PKG-BUILD-VARS b/Documentation/Developers/PKG-BUILD-VARS
index 909299ad9..d8434ef3d 100644
--- a/Documentation/Developers/PKG-BUILD-VARS
+++ b/Documentation/Developers/PKG-BUILD-VARS
@@ -59,6 +59,7 @@ autopatch ..... '0' = skip automatic patching
 chownsrcdir ... '0' = don't make a chown to root after extracting the $srctar
 desktopfiles .. filenames of the desktop files to install ($confdir/*.desktop)
 		set to an empty string to deactivate desktop file installation
+desktopauto ... '0' = disable automatic changes to .desktop files
 nocvsinsrcdir . '0' = don't remove CVS and .svn directories in $srcdir
 srctar ........ filename of source tar file ('auto' = autodetect)
 srcdir ........ directory in source tar file ('auto' = autodetect)
diff --git a/misc/desktop/parse-config b/misc/desktop/parse-config
index 6a108fe53..be5fcbeab 100644
--- a/misc/desktop/parse-config
+++ b/misc/desktop/parse-config
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,7 +21,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-#!/bin/bash
+[ $desktopauto = 1 ] || continue
 
 postflist_desktop_rock2desktop() {
 
@@ -92,9 +93,6 @@ postflist_desktop() {
 
 	grep \\.desktop\$ ${builddir}/flist.txt | while read desktop ; do
 		[ ! -f "${desktop}" ] && continue
-		# this is dirty!
-		[ "${desktop/konqueror\.desktop/}" != "${desktop}" ] && continue
-		[ "${desktop/System\/ScreenSavers/}" != "${desktop}" ] && continue
 
 		echo "Checking ${desktop} ... "
 		rm -f "${tmp}"
diff --git a/package/kde/kde-3.conf b/package/kde/kde-3.conf
index 0ad5a2595..6be4961cc 100644
--- a/package/kde/kde-3.conf
+++ b/package/kde/kde-3.conf
@@ -25,10 +25,13 @@ var_append confopt " " "--with-qt-dir=$QTDIR \
 # some feature and optimization settings ...
 
 pkginstalled openldap && var_append confopt ' ' "--with-ldap=$root/$pkg_openldap_prefix"
-var_append confopt " " "--with-xinerama --enable-dnotify"
+var_append confopt " " "--with-xinerama"
 
 [ "$arch" = "x86" -a "ROCKCFG_X86_BITS" = "32" ] && \
 	var_append confopt " " "--enable-fast-malloc=full"
 
+# disable auto-processing of .desktop files
+desktopauto=0
+
 # keep .la files in the main packages, kde needs them at runtime
 splitreg 45 . '/.*\.la$'
diff --git a/package/kde/kdelibs/kdelibs.conf b/package/kde/kdelibs/kdelibs.conf
index 7e7370af4..b14aa69a5 100644
--- a/package/kde/kdelibs/kdelibs.conf
+++ b/package/kde/kdelibs/kdelibs.conf
@@ -39,5 +39,8 @@ EOP
 
 }
 
+# 2.4 kernels only support dnotify, 2.6 supports both dnotify and inotify
+var_append confopt " " "--enable-dnotify --enable-inotify"
+
 hook_add postmake 3 kde_pm
 
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 9dc245ab3..85f4fbf2b 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -46,6 +46,7 @@ chroot=0
 root=""
 id=''
 desktopfiles=''
+desktopauto=1
 
 stagelevel=9
 this_is_the_2nd_run=0