Attachment 5018 Details for Bug 25936 – Правка

[patch] Правка

kdelibs-4.6.5.patch (text/plain), 1.37 KB, created by serpiph on 2011-07-21 00:53:36 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: serpiph

Created: 2011-07-21 00:53:36 MSK

Size: 1.37 KB

patch

obsolete

>diff -Naur kdelibs-4.6.5.orig/cmake/modules/FindQt4.cmake kdelibs-4.6.5/cmake/modules/FindQt4.cmake
>--- kdelibs-4.6.5.orig/cmake/modules/FindQt4.cmake	2011-07-04 17:25:55.000000000 +0400
>+++ kdelibs-4.6.5/cmake/modules/FindQt4.cmake	2011-07-21 00:49:27.307074307 +0400
>@@ -497,7 +497,7 @@
> 
>     # now parse the parts of the user given version string into variables
>     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
>-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
>+    STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
>     STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
> 
>     # Suppport finding at least a particular version, for instance FIND_PACKAGE( Qt4 4.4.3 )
>@@ -516,7 +516,7 @@
> 
>     # and now the version string given by qmake
>     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
>-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
>+    STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
>     STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
> 
>     # compute an overall version number which can be compared at once

Actions: View | Diff

Attachments on bug 25936: 5018