Attachment 675 Details for Bug 1045 – Patch to fix kate and kwrite version numbers with the new Rx.y.x version scheme

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to fix kate and kwrite version numbers with the new Rx.y.x version scheme

tdebase-kate-kwrite-version-2.diff (text/plain), 1.79 KB, created by Darrell on 2012-06-17 16:05:04 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-06-17 16:05:04 CDT

Size: 1.79 KB

patch

obsolete

>diff -urN tdebase/kate/app/kateapp.cpp tdebase.new/kate/app/kateapp.cpp
>--- tdebase/kate/app/kateapp.cpp	2012-05-27 18:05:02.000000000 -0500
>+++ tdebase.new/kate/app/kateapp.cpp	2012-06-07 11:53:35.000000000 -0500
>@@ -131,8 +131,11 @@
>  */
> TQString KateApp::kateVersion (bool fullVersion)
> {
>-  return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease())
>-           : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor());
>+  /** The old version scheme worked fine in the 3.5.x days but with the new Trinity Rx.y.z
>+      scheme the version number gets weird. Hard-code the first two numbers to match the old days
>+      and only update the last number. */
>+  return fullVersion ? TQString ("2.5.%1").arg(KDE::versionMajor())
>+           : TQString ("%1.%2").arg(2.5);
> }
> 
> void KateApp::restoreKate ()
>diff -urN tdebase/kate/app/kwritemain.cpp tdebase.new/kate/app/kwritemain.cpp
>--- tdebase/kate/app/kwritemain.cpp	2012-05-27 18:05:02.000000000 -0500
>+++ tdebase.new/kate/app/kwritemain.cpp	2012-06-07 11:55:43.000000000 -0500
>@@ -543,7 +543,10 @@
>   KLocale::setMainCatalogue("kate");         //lukas: set this to have the kwritepart translated using kate message catalog
> 
>   // here we go, construct the KWrite version
>-  TQString kWriteVersion  = TQString ("%1.%2.%3").arg(KDE::versionMajor() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease());
>+  /** The old version scheme worked fine in the 3.5.x days but with the new Trinity Rx.y.z
>+      scheme the version number gets weird. Hard-code the first two numbers to match the old days
>+      and only update the last number. */
>+  TQString kWriteVersion  = TQString ("4.5.%1").arg(KDE::versionMajor());
> 
>   KAboutData aboutData ( "kwrite",
>                          I18N_NOOP("KWrite"),

Actions: View | Diff

Attachments on bug 1045: 675