jreznik pushed to kdelibs3 (epel7). "build without patching (..more)"

[notifications at fedoraproject.org]

>From cf44ec3785a2fc866c78138360c090182dc5dfce Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 4 Dec 2012 16:12:10 -0600
Subject: build without patching

turns out the patch was wrong anyway

diff --git a/kdelibs-3.5.10-kate_defaults.patch b/kdelibs-3.5.10-kate_defaults.patch
deleted file mode 100644
index 929af8c..0000000
--- a/kdelibs-3.5.10-kate_defaults.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up kdelibs-3.5.10/kate/part/katejscript.cpp.kate_defaults kdelibs-3.5.10/kate/part/katejscript.cpp
---- kdelibs-3.5.10/kate/part/katejscript.cpp.kate_defaults	2007-01-15 05:33:48.000000000 -0600
-+++ kdelibs-3.5.10/kate/part/katejscript.cpp	2012-12-04 15:52:52.162501234 -0600
-@@ -646,7 +646,7 @@ void KateJScriptManager::collectScripts
- 
-   // figure out if the kate install is too new
-   config.setGroup ("General");
--  if (config.readNumEntry ("Version") > config.readNumEntry ("CachedVersion"))
-+  if (config.readNumEntry ("Version", 14) > config.readNumEntry ("CachedVersion", 0))
-   {
-     config.writeEntry ("CachedVersion", config.readNumEntry ("Version"));
-     force = true;
-diff -up kdelibs-3.5.10/kate/part/kateluaindentscript.cpp.kate_defaults kdelibs-3.5.10/kate/part/kateluaindentscript.cpp
-diff -up kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp.kate_defaults kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp
---- kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp.kate_defaults	2005-10-10 10:05:26.000000000 -0500
-+++ kdelibs-3.5.10/kate/part/katesyntaxdocument.cpp	2012-12-04 15:53:38.394931447 -0600
-@@ -339,7 +339,7 @@ void KateSyntaxDocument::setupModeList (
- 
-   // figure our if the kate install is too new
-   config.setGroup ("General");
--  if (config.readNumEntry ("Version") > config.readNumEntry ("CachedVersion"))
-+  if (config.readNumEntry ("Version", 14) > config.readNumEntry ("CachedVersion", 0))
-   {
-     config.writeEntry ("CachedVersion", config.readNumEntry ("Version"));
-     force = true;
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 586f6c7..0ca28cb 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -75,8 +75,6 @@ Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
 Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
 # remove flawed and obsolete automake version check in admin/cvs.sh
 Patch58: kdelibs-3.5.10-automake-version.patch
-# put katesyntaxhighlightingrc defaults in code (#883529)
-patch59: kdelibs-3.5.10-kate_defaults.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -249,7 +247,6 @@ format for easy browsing
 %patch56 -p1 -b .qcolor_gcc_ftbfs
 %patch57 -p1 -b .cups-util
 %patch58 -p1 -b .automake-version
-%patch59 -p1 -b .kate_defaults
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=cf44ec3785a2fc866c78138360c090182dc5dfce