[arch-commits] CVS update of extra/kde/kdesdk (PKGBUILD kompare-utf8.patch)

[Tobias Powalowski]

    Date: Monday, August 13, 2007 @ 15:55:31
  Author: tpowa
    Path: /home/cvs-extra/extra/kde/kdesdk

   Added: kompare-utf8.patch (1.1)
Modified: PKGBUILD (1.41 -> 1.42)

'upgpkg: update to fixed kompare utf8'


--------------------+
 PKGBUILD           |   12 ++++++++----
 kompare-utf8.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)


Index: extra/kde/kdesdk/PKGBUILD
diff -u extra/kde/kdesdk/PKGBUILD:1.41 extra/kde/kdesdk/PKGBUILD:1.42
--- extra/kde/kdesdk/PKGBUILD:1.41	Tue Jul 31 20:56:01 2007
+++ extra/kde/kdesdk/PKGBUILD	Mon Aug 13 15:55:31 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.41 2007/08/01 00:56:01 travis Exp $
+# $Id: PKGBUILD,v 1.42 2007/08/13 19:55:31 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kdesdk
 pkgver=3.5.7
 kdever=3.5.7 # if minor 0, then without .0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Software Development Kit."
 arch=(i686 x86_64)
 url="http://www.kde.org"
@@ -18,7 +18,8 @@
 # mirror="ftp.kde.org/pub/kde/"             # main server
 # mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
 
-source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2) 
+source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
+	kompare-utf8.patch) 
 
 build() {
   # Source the QT and KDE profile
@@ -26,6 +27,8 @@
   [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
   # start building
   cd $startdir/src/$pkgname-$pkgver
+  # add kompare utf8 patch
+  patch -Np1 -i ../kompare-utf8.patch || return 1
   ./configure --prefix=/opt/kde --disable-debug --disable-dependency-tracking \
   --with-svn-include=/usr/include/  --with-svn-lib=/usr/lib --enable-gcc-hidden-visibility \
   --enable-final
@@ -33,4 +36,5 @@
   make || return 1
   make DESTDIR=$startdir/pkg install || return 1
 }
-md5sums=('6a8f7b7fea753e2a4517301dee76d84a')
+md5sums=('6a8f7b7fea753e2a4517301dee76d84a'
+         'd9d099de98eef90ba6a2d72ecb6db850')
Index: extra/kde/kdesdk/kompare-utf8.patch
diff -u /dev/null extra/kde/kdesdk/kompare-utf8.patch:1.1
--- /dev/null	Mon Aug 13 15:55:31 2007
+++ extra/kde/kdesdk/kompare-utf8.patch	Mon Aug 13 15:55:31 2007
@@ -0,0 +1,34 @@
+diff -ur kdesdk-3.5.5/kompare/kompare_shell.cpp kdesdk-3.5.5-patch/kompare/kompare_shell.cpp
+--- kdesdk-3.5.5/kompare/kompare_shell.cpp	2005-09-10 10:21:05.000000000 +0200
++++ kdesdk-3.5.5-patch/kompare/kompare_shell.cpp	2006-10-18 15:36:24.000000000 +0200
+@@ -192,7 +192,6 @@
+ {
+ 	kdDebug(8102) << "Url = " << url.prettyURL() << endl;
+ 	m_diffURL = url;
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDiff( url );
+ }
+ 
+@@ -207,7 +206,6 @@
+ 
+ 	file.close();
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDiff( diff );
+ 
+ }
+@@ -217,7 +215,6 @@
+ 	m_sourceURL = source;
+ 	m_destinationURL = destination;
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->compare( source, destination );
+ }
+ 
+@@ -226,7 +223,6 @@
+ 	m_sourceURL = url1;
+ 	m_destinationURL = diff;
+ 
+-	m_viewPart->setEncoding( "Default" );
+ 	m_viewPart->openDirAndDiff( url1, diff );
+ }