Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2014-03-26 16:40:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2014-03-10 12:17:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2014-03-26 16:40:51.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 25 17:37:50 UTC 2014 - [email protected] + +- Added 0001-Normalize-vars-to-avoid-odd-bugs-QT_REQUIRED_VERSION.patch, + fixes build with CMake 3.0 rc2 (find_dependency macro needs passing + of version) + +------------------------------------------------------------------- New: ---- 0001-Normalize-vars-to-avoid-odd-bugs-QT_REQUIRED_VERSION.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.kuJ9Zh/_old 2014-03-26 16:40:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kuJ9Zh/_new 2014-03-26 16:40:52.000000000 +0100 @@ -32,6 +32,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source0: kconfig-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 0001-Normalize-vars-to-avoid-odd-bugs-QT_REQUIRED_VERSION.patch +Patch0: 0001-Normalize-vars-to-avoid-odd-bugs-QT_REQUIRED_VERSION.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -106,6 +108,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-Normalize-vars-to-avoid-odd-bugs-QT_REQUIRED_VERSION.patch ++++++ >From 245e758cb94c0abd7e8a87c5349c49a5de1c146f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <[email protected]> Date: Thu, 13 Mar 2014 11:01:07 +0100 Subject: [PATCH 1/1] Normalize vars to avoid odd bugs: QT_REQUIRED_VERSION => REQUIRED_QT_VERSION --- CMakeLists.txt | 4 ++-- autotests/CMakeLists.txt | 4 ++-- src/gui/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2972f3f..417cd9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,9 @@ project(KConfig) find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(QT_REQUIRED_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.2.0) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui Xml) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 93745a9..b45b210 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -3,8 +3,8 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) include(ECMMarkAsTest) -find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG QUIET) -find_package(Qt5Concurrent ${QT_REQUIRED_VERSION} CONFIG QUIET) +find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) +find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} CONFIG QUIET) if(NOT Qt5Test_FOUND) message(STATUS "Qt5Test not found, autotests will not be built.") diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 05fe3a2..ad0ff16 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,6 +1,6 @@ -find_package(Qt5Gui ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) -find_package(Qt5Xml ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) +find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) set(libkconfiggui_SRCS kconfiggui.cpp -- 1.9.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
