[arch-commits] Commit in kdelibs/trunk (PKGBUILD kde-r938348.patch kde-r938657.patch)

[Pierre Schmitz]

    Date: Thursday, March 12, 2009 @ 13:20:18
  Author: pierre
Revision: 29784

and even more utf8 fixes

Added:
  kdelibs/trunk/kde-r938348.patch
  kdelibs/trunk/kde-r938657.patch
Modified:
  kdelibs/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    8 ++++++--
 kde-r938348.patch |   27 +++++++++++++++++++++++++++
 kde-r938657.patch |   13 +++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-12 15:39:55 UTC (rev 29783)
+++ PKGBUILD	2009-03-12 17:20:18 UTC (rev 29784)
@@ -18,18 +18,22 @@
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch' 'archlinux-menu.patch'
-	'kde-r934640.patch' 'kde-r938370.patch')
+	'kde-r934640.patch' 'kde-r938348.patch' 'kde-r938370.patch' 'kde-r938657.patch')
 md5sums=('fa4206dd747890c4e4283c8adb831e6c'
          'e94450ba5430ea9c1e33bad9ae38ca2d'
          '0ad42200df2d2b8aab01d2ef4b21e02f'
          '9b5290f23dbea83b7fabd638cb26687b'
-         '688151661aa1f7022847cae1e4b3c8da')
+         'c13c5e7570fdfb08a4b3c3e344eb026b'
+         '688151661aa1f7022847cae1e4b3c8da'
+         '4ce23b4a2a2b1ddd9ed6e0e15a0711b0')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
 	# fix utf8 handling; see https://bugs.kde.org/show_bug.cgi?id=186038
 	patch -p1 -i $srcdir/kde-r934640.patch || return 1
+	patch -p1 -i $srcdir/kde-r938348.patch || return 1
 	patch -p1 -i $srcdir/kde-r938370.patch || return 1
+	patch -p1 -i $srcdir/kde-r938657.patch || return 1
 	# avoid file conflict with gnome-menu
 	patch -p1 -i $srcdir/kde-applications-menu.patch || return 1
 	# add Archlinux menu entry

Added: kde-r938348.patch
===================================================================
--- kde-r938348.patch	                        (rev 0)
+++ kde-r938348.patch	2009-03-12 17:20:18 UTC (rev 29784)
@@ -0,0 +1,27 @@
+--- kdelibs/kdecore/localization/kencodingdetector.cpp	2009/03/11 16:32:16	938347
++++ kdelibs/kdecore/localization/kencodingdetector.cpp	2009/03/11 16:37:50	938348
+@@ -1052,10 +1052,8 @@
+     }
+ 
+     if (len<20)
+-    {
+-        setEncoding("",DefaultEncoding);
+         return false;
+-    }
++
+ #ifdef DECODE_DEBUG
+     kDebug( 6005 ) << "KEncodingDetector: using heuristics (" << strlen(data) << ")";
+ #endif
+@@ -1110,10 +1108,9 @@
+             // huh. somethings broken in this code ### FIXME
+             //enc = 0; //Reset invalid codec we tried, so we get back to latin1 fallback.
+             break;
+-        }
++    }
+ 
+-        setEncoding("",DefaultEncoding);
+-        return true;
++    return true;
+ }
+ 
+ 

Added: kde-r938657.patch
===================================================================
--- kde-r938657.patch	                        (rev 0)
+++ kde-r938657.patch	2009-03-12 17:20:18 UTC (rev 29784)
@@ -0,0 +1,13 @@
+Index: kdelibs/kdecore/kernel/kcmdlineargs.cpp
+===================================================================
+--- kdelibs/kdecore/kernel/kcmdlineargs.cpp	(Revision 938656)
++++ kdelibs/kdecore/kernel/kcmdlineargs.cpp	(Revision 938657)
+@@ -1407,7 +1407,7 @@
+       value = d->parsedOptionList->value(opt);
+    }
+    if (!value.isEmpty())
+-      return value;
++       return QString::fromLocal8Bit(value);
+ 
+    // Look up the default.
+    QByteArray opt_name;