kdelibs: Updated (3.5.10 -> 4.2.2)

kde/kdelibs/config.hlp

@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../kdelibs/config.hlp
+# Copyright (C) 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 #
@@ -13,13 +14,13 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-MENU_PKG_KDE3
-  Here you'll find options for KDE 3.
+MENU_PKG_KDE
+  Here you'll find options for KDE.
 
-SDECFG_PKG_KDE3_CORE_PREFIX
+SDECFG_PKG_KDE_CORE_PREFIX
   Please enter the prefix where you want KDE installed.
 
-SDECFG_PKG_KDE3_APIDOX
+SDECFG_PKG_KDE_APIDOX
   Generate documentation about the KDE library API (Application
   Programmers' Interface), especially useful to developers of KDE-based
   software. KDevelop can link to this documentation. This option

kde/kdelibs/config.in

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../kdelibs/config.in
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 #
@@ -15,13 +15,13 @@
 # --- SDE-COPYRIGHT-NOTE-END ---
 
 if pkgcheck kdelibs X ; then
- 	menu_begin MENU_PKG_KDE3 'KDE 3 Package Options'
-		text 'Install prefix for KDE 3 Packages' \
-			SDECFG_PKG_KDE3_CORE_PREFIX "opt/kde3"
+ 	menu_begin MENU_PKG_KDE 'KDE Package Options'
+		text 'Install prefix for KDE Packages' \
+			SDECFG_PKG_KDE_CORE_PREFIX "opt/kde"
 		bool 'Increase optimization possibilities (--enable-final)' \
-			SDECFG_PKG_KDE3_ENABLE_FINAL 0
+			SDECFG_PKG_KDE_ENABLE_FINAL 0
 		bool 'Generate KDE Library Documentation' \
-			SDECFG_PKG_KDE3_APIDOX 0
+			SDECFG_PKG_KDE_APIDOX 0
 	menu_end
 fi
 

kde/kdelibs/kdelibs.conf

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../kdelibs/kdelibs.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 #
@@ -14,7 +14,7 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-if [ "$SDECFG_PKG_KDE3_APIDOX" ] ; then
+if [ "$SDECFG_PKG_KDE_APIDOX" ] ; then
 	echo_status "KDE library documentation will be generated."
 	var_insert makeinstopt " " "apidox"
 fi
@@ -26,7 +26,7 @@ fi
 
 kde_pm() {
 
-	cat > $root/etc/profile.d/kde3 <<-EOP
+	cat > $root/etc/profile.d/kde <<-EOP
 KDEDIR=/$prefix
 PATH="\$PATH:\$KDEDIR/bin"
 MANPATH="\$MANPATH:\$KDEDIR/man"

kde/kdelibs/kdelibs.desc

@@ -1,9 +1,8 @@
-
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../kdelibs/kdelibs.desc
-[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY]
@@ -31,12 +30,11 @@
 [M] Nagy Karoly Gabriel <[email protected]>
 
 [C] extra/development extra/desktop/kde
-[F] FPIC-QUIRK KDE QT3-PLUGIN
+[F] FPIC-QUIRK KDE
 
 [L] GPL
 [S] Stable
-[V] 3.5.10
+[V] 4.2.2
 [P] X -----5---9 128.900
 
-[D] 2163838292 kdelibs-3.5.10.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/
-
+[D] 468733520 kdelibs-4.2.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/4.2.2/src/

kde/kdelibs/parse-config

@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../kdelibs/parse-config
+# Copyright (C) 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -14,23 +15,20 @@
 
 if hasflag KDE; then
 	if [ "$prefix_auto" = 1 ] ; then
-		if [ "$pkg" == "arts" ]; then
-			prefix="${SDECFG_PKG_KDE3_CORE_PREFIX:-opt/kde3}"
+		if [ "$pkg" == "kdelibs" ]; then
+			prefix="${SDECFG_PKG_KDE_CORE_PREFIX:-opt/kde}"
 		else
-			pkgprefix -t arts
-			prefix=`pkgprefix arts`
+			pkgprefix -t kdelibs
+			prefix=`pkgprefix kdelibs`
 		fi
 		set_confopt
 	fi
 
 	# make sure the right qt and kde libs are used
+	pkgprefix -t qt4
+	export PATH="$(pkgprefix bindir qt4):$PATH"
 	export LD_LIBRARY_PATH="$QTDIR/${libdir##*/}:/$prefix/${libdir##*/}:$LD_LIBRARY_PATH"
 
-	# KDE specific configure options
-	var_append confopt " " "--with-qt-dir=$QTDIR \
-        	                --with-qt-includes=$QTDIR/include \
-                	        --with-qt-libraries=$QTDIR/${libdir##*/}"
-
 	# some feature and optimization settings ...
 	if pkginstalled openldap; then
 		pkgprefix -t openldap
@@ -40,7 +38,7 @@ if hasflag KDE; then
 	# FIXME: no conditionals?
 	var_append confopt " " "--with-xinerama --enable-dnotify"
 
-	[ "$SDECFG_PKG_KDE3_ENABLE_FINAL" != "1" ] ||
+	[ "$SDECFG_PKG_KDE_ENABLE_FINAL" != "1" ] ||
 		var_append confopt " " "--enable-final"
 
 	if [ $arch = x86 ]; then
@@ -52,5 +50,5 @@ if hasflag KDE; then
 	fi
 
 	# HACK around test for kdelibs
-	hook_add preconf 3 '[ ! -f configure ] || sed -i "s,grep klineedit,grep KLineEdit," configure'
+	hook_add preconf 5 "mkdir build; cd build; .. $confopt $extraconfopt"
 fi