From 2e5d0cb212dab672c747f3841fd01323a078d101 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Sun, 28 Nov 2010 15:12:37 +0000
Subject: [PATCH] fix kdebindings - update build.sh for log-pkgs

---
 build.sh                       | 35 +++++++++++++++++++---------------
 clean-workdir.sh               |  2 +-
 kdeadmin/fix-syslog-path.patch | 11 -----------
 kdebindings/PKGBUILD           |  9 +++++++--
 kdebindings/perl-qtdbus.patch  | 22 +++++++++++++++++++++
 5 files changed, 50 insertions(+), 29 deletions(-)
 delete mode 100644 kdeadmin/fix-syslog-path.patch
 create mode 100644 kdebindings/perl-qtdbus.patch

diff --git a/build.sh b/build.sh
index f73eb0877..175f57d29 100755
--- a/build.sh
+++ b/build.sh
@@ -16,6 +16,9 @@
 #
 # setup
 #
+
+_build_sh_ver="0.5.1"
+
 _script_name="build(er)"
 _build_arch="$_arch"
 _cur_repo=`pwd | awk -F '/' '{print $NF}'`
@@ -27,7 +30,7 @@ do
     source _buildscripts/functions/${subroutine}
 done
 # load makepkg.conf
-source _buildscripts/${current_repo}-${_arch}-makepkg.conf
+source _buildscripts/${_cur_repo}-${_arch}-makepkg.conf
 
 current_repo="$_cur_repo"
 
@@ -97,11 +100,13 @@ build_it()
 				exit 1	
 			fi
 	
-			# Create log packages
+			# Create log package
 			ls *.log
 			mkdir -p log/var/log/chakra/$module
 			mv -v *.log log/var/log/chakra/$module
-			# Create log/.PKGINFO
+			cd log
+			# Create .PKGINFO
+			source ../PKGBUILD
 			local builddate=$(date -u "+%s")
 			if [[ -n $PACKAGER ]]; then
 			  local packager="$PACKAGER"
@@ -111,20 +116,20 @@ build_it()
 			local size="$(du -sk)"
 			size="$(( ${size%%[^0-9]*} * 1024 ))"
 
-			echo "# Generated by makepkg $myver" >log/log/.PKGINFO
-			echo "# $(LC_ALL=C date -u)" >>log/.PKGINFO
-			echo "pkgname = $module" >>log/.PKGINFO
-			echo "builddate = $builddate" >>log/.PKGINFO
-			echo "packager = $packager" >>log/.PKGINFO
-			echo "size = $size" >>log/.PKGINFO
-			echo "arch = $PKGARCH" >>log/.PKGINFO
-			echo "group = chakra-log" >>log/.PKGINFO
-			echo "group = chakra-log-uninstall" >>log/.PKGINFO
-			echo "group = kde-uninstall" >>log/.PKGINFO
+			echo "# Generated by build.sh $_build_sh_ver" >.PKGINFO
+			echo "# $(LC_ALL=C date -u)" >>.PKGINFO
+			echo "pkgname = $module-log" >>.PKGINFO
+			echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO
+			echo "builddate = $builddate" >>.PKGINFO
+			echo "packager = $packager" >>.PKGINFO
+			echo "size = $size" >>.PKGINFO
+			echo "arch = $CARCH" >>.PKGINFO
+			echo "group = chakra-log" >>.PKGINFO
 			# Create tarball
-			tar -cJf $module-log-$builddate-$PKGARCH.pkg.tar.xz log/var log/.PKGINFO
+			tar -cJf $module-log-$pkgver-$pkgrel-$CARCH.pkg.tar.xz var .PKGINFO
 			# Move pkg
-			mv -v $module-log-$builddate-$PKGARCH.pkg.tar.xz ../../_repo/local
+			mv -v $module-log-$pkgver-$pkgrel-$CARCH.pkg.tar.xz ../../_repo/local
+			cd ..
 
 			# Install packages	
 			if [ "$_build_autoinstall" = "1" ] ; then
diff --git a/clean-workdir.sh b/clean-workdir.sh
index 6c339e260..2e4ebf73d 100755
--- a/clean-workdir.sh
+++ b/clean-workdir.sh
@@ -40,7 +40,7 @@ cleanup_src()
 	do
 		status_start "${module}"
 		pushd $module &>/dev/null
-		rm -rf pkg src dbg hdr *.pkg.* &>/dev/null
+		rm -rf pkg src dbg hdr *.pkg.* *log* &>/dev/null
 		popd &>/dev/null
 		status_done
 	done
diff --git a/kdeadmin/fix-syslog-path.patch b/kdeadmin/fix-syslog-path.patch
deleted file mode 100644
index d2b8a755a..000000000
--- a/kdeadmin/fix-syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.2.2/ksystemlog/src/modes/system/systemConfiguration.h~	2009-04-22 16:11:44.000000000 +0200
-+++ kdeadmin-4.2.2/ksystemlog/src/modes/system/systemConfiguration.h	2009-04-22 16:11:56.000000000 +0200
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					SYSTEM_LOG_MODE_ID, 
--					QStringList() << "/var/log/syslog",
-+					QStringList() << "/var/log/messages.log",
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 			
diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD
index 36cc8edcf..369ef0297 100644
--- a/kdebindings/PKGBUILD
+++ b/kdebindings/PKGBUILD
@@ -42,8 +42,10 @@ options=('docs' '!splithdr' 'splitdbg')
 makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt>=4.8.1'
              'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}" "kdepim-runtime>=${_kdever}")
 
-source=($_mirror/${_origname}-$_kdever.tar.bz2)
-md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
+source=($_mirror/${_origname}-$_kdever.tar.bz2
+        perl-qtdbus.patch)
+md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
+         42a6ecd926b051b6c7a23d3988c7ebcf)
 
 
 #
@@ -53,6 +55,9 @@ build()
 {
 	cd ${srcdir}/${_origname}-${pkgver}
 
+	msg "applying upstream patches ..."
+	patch -Np3 -i ${startdir}/perl-qtdbus.patch || return 1
+
 	#fix ruby
 	for f in `find ruby -name CMakeLists.txt`; do
 		sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH} /usr/include/ruby-1.9.1/${_ARCHITECTURE}-linux|" "${f}"
diff --git a/kdebindings/perl-qtdbus.patch b/kdebindings/perl-qtdbus.patch
new file mode 100644
index 000000000..6f23c2b2c
--- /dev/null
+++ b/kdebindings/perl-qtdbus.patch
@@ -0,0 +1,22 @@
+--- trunk/KDE/kdebindings/perl/qtdbus/tools/qdbusxml2perl/qdbusintrospection_p.h	2010/11/23 18:59:15	1200042
++++ trunk/KDE/kdebindings/perl/qtdbus/tools/qdbusxml2perl/qdbusintrospection_p.h	2010/11/23 19:00:56	1200043
+@@ -63,7 +63,7 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
+-class Q_DBUS_EXPORT QDBusIntrospection
++class Q_DECL_EXPORT QDBusIntrospection
+ {
+ public:
+     // forward declarations
+-- trunk/KDE/kdebindings/perl/qtdbus/tools/qdbusxml2perl/qdbusmetaobject_p.h	2010/11/18 00:55:20	1198257
++++ trunk/KDE/kdebindings/perl/qtdbus/tools/qdbusxml2perl/qdbusmetaobject_p.h	2010/11/23 19:00:56	1200043
+@@ -62,7 +62,7 @@
+ class QDBusError;
+ 
+ struct QDBusMetaObjectPrivate;
+-struct Q_DBUS_EXPORT QDBusMetaObject: public QMetaObject
++struct Q_DECL_EXPORT QDBusMetaObject: public QMetaObject
+ {
+     bool cached;
+