[RHEL/Fedora] some fixes to kdelibs, kdebase, kdemultimedia

3 files changed, 77 insertions, 1 deletions

diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
new file mode 100644
index 000000000..6fa9a085a
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
@@ -0,0 +1,45 @@
+From 1f37c9cdb9bb47f8453cf26af8006c7c8d4ca3b3 Mon Sep 17 00:00:00 2001

+From: Thorsten Glaser <t.glaser@tarent.de>

+Date: Tue, 27 Dec 2011 14:28:27 +0100

+Subject: [PATCH] fix UTF-8 encoding for WebDAV directories

+

+idea derived from KIO slave http.cpp from KDE 4; reimplemented

+on top of Qt3/KDE3 APIs

+

+Bug: http://bugs.kde.org/show_bug.cgi?id=127251

+

+Signed-off-by: Thorsten Glaser <t.glaser@tarent.de>

+---

+ kioslave/http/http.cc |    6 ++++++

+ 1 files changed, 6 insertions(+), 0 deletions(-)

+

+diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc

+index a1495d7..16b785d 100644

+--- a/kioslave/http/http.cc

++++ b/kioslave/http/http.cc

+@@ -45,6 +45,7 @@

+ #include <tqregexp.h>

+ #include <tqdatetime.h>

+ #include <tqstringlist.h>

++#include <tqurl.h>

+ 

+ #include <kurl.h>

+ #include <kidna.h>

+@@ -750,9 +751,14 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )

+       entry.clear();

+ 

+       TQString urlStr = href.text();

++#if 0

+       int encoding = remoteEncoding()->encodingMib();

+       if ((encoding == 106) && (!KStringHandler::isUtf8(KURL::decode_string(urlStr, 4).latin1())))

+         encoding = 4; // Use latin1 if the file is not actually utf-8

++#else

++      TQUrl::decode(urlStr);

++      int encoding = 106;

++#endif

+ 

+       KURL thisURL ( urlStr, encoding );

+ 

+-- 

+1.7.2.3

+

diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch
new file mode 100644
index 000000000..5fb5aa576
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch
@@ -0,0 +1,20 @@
+commit 87201a3741bd9d4b4638be7b3d8c44a737115b0f
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1325899796 -0600
+
+    Fix make_driver_db_cups path
+    This closes Bug 383
+
+diff --git a/kdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
+index 635cfd5..4a64248 100644
+--- a/kdeprint/cups/kmcupsmanager.cpp
++++ b/kdeprint/cups/kmcupsmanager.cpp
+@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager()
+ 
+ TQString KMCupsManager::driverDbCreationProgram()
+ {
+-	return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups");
++	return TQString(__KDE_BINDIR).append(TQString::fromLatin1("/make_driver_db_cups"));
+ }
+ 
+ TQString KMCupsManager::driverDirectory()
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 21e80ffd8..c6a44125f 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 6
+%define release 7
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -48,6 +48,10 @@ Patch12:	kdelibs-3.5.13-kate_syntax.patch.gz
 Patch13:	kdelibs-3.5.13-add_inotify_support.patch
 ## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349c31fe64c31d2c050892b117a3a807179)
 Patch14:	kdelibs-3.5.13-enable_fam_gamin.patch
+## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories
+Patch15:	kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
+## [kdelibs/kdeprint] Fix add printer [Bug #383]
+Patch16:	kdelibs-3.5.13-fix_add_printer.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
@@ -69,6 +73,7 @@ BuildRequires:	OpenEXR-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gamin-devel
+BuildRequires:	xorg-x11-proto-devel
 
 Requires:		tqtinterface
 Requires:		trinity-arts
@@ -124,6 +129,8 @@ format for easy browsing
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 
 %build
@@ -324,6 +331,10 @@ EOF
 
 
 %changelog
+* Sat Jan 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Fix UTF8 Encoding for WebDAV directories
+- Fix hardcoded path in 'add printer' [Bug #383]
+
 * Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
 - Adds 'fam' and 'gamin' support