upstreamed qt47 patch too

2010-04-30 17:46:47 +00:00 · 2010-04-30 17:46:47 +00:00 · 1ef7e09fe4
commit 1ef7e09fe4
parent 0263dd8e3f
2 changed files with 0 additions and 13 deletions
--- a/kdelibs-4.4.1-k3passworddialog_qt47.patch
+++ b/kdelibs-4.4.1-k3passworddialog_qt47.patch
@ -1,11 +0,0 @@
--- kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp.qt47	2008-05-21 06:06:15.000000000 -0500
-+++ kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp	2010-03-20 08:13:23.892254206 -0500
-@@ -83,7 +83,7 @@ class K3PasswordDialog::K3PasswordDialog
- {
-     public:
- 	K3PasswordDialogPrivate()
-	 : m_MatchLabel( 0 ), iconName( 0 ), allowEmptyPasswords( false ),
-+        : m_MatchLabel( 0 ), allowEmptyPasswords( false ),
- 	   minimumPasswordLength(0), maximumPasswordLength(K3PasswordEdit::PassLen - 1),
- 	   passwordStrengthWarningLevel(1), m_strengthBar(0),
- 	   reasonablePasswordLength(8)
--- a/kdelibs.spec
+++ b/kdelibs.spec
@ -89,7 +89,6 @@ Patch27: kdelibs-4.3.98-no_rpath.patch
 ## 4.4 upstream

 ## trunk upstream
-Patch110: kdelibs-4.4.1-k3passworddialog_qt47.patch 

 ## security fix
 # Not Upstreamed? why not ? -- Rex
@ -239,7 +238,6 @@ format for easy browsing.
 # upstreamable patches

 # upstream patches
-%{?_qt47:%patch110 -p1 -b .k3passworddialog_qt47}

 # security fix
 %patch200 -p1 -b .CVE-2009-2702