Hello community, here is the log from the commit of package ktextwidgets for openSUSE:Factory checked in at 2014-03-10 12:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktextwidgets (Old) and /work/SRC/openSUSE:Factory/.ktextwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktextwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/ktextwidgets/ktextwidgets.changes 2014-02-28 16:24:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktextwidgets.new/ktextwidgets.changes 2014-03-10 12:18:17.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:38:38 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- ktextwidgets-4.96.0.tar.xz New: ---- ktextwidgets-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktextwidgets.spec ++++++ --- /var/tmp/diff_new_pack.GtipHl/_old 2014-03-10 12:18:17.000000000 +0100 +++ /var/tmp/diff_new_pack.GtipHl/_new 2014-03-10 12:18:17.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5TextWidgets4 +%define lname libKF5TextWidgets5 Name: ktextwidgets -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kcompletion-devel >= %{_kf5_version} BuildRequires: kconfig-devel >= %{_kf5_version} @@ -51,6 +51,7 @@ %package -n %lname Summary: KDE Text editing widgets Group: System/GUI/KDE +Obsoletes: libKF5TextWidgets4 %description -n %lname KTextWidgets provides widgets for displaying and editing text. It supports ++++++ ktextwidgets-4.96.0.tar.xz -> ktextwidgets-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.96.0/CMakeLists.txt new/ktextwidgets-4.97.0/CMakeLists.txt --- old/ktextwidgets-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/ktextwidgets-4.97.0/CMakeLists.txt 2014-03-01 12:51:40.000000000 +0100 @@ -3,7 +3,7 @@ project(KTextWidgets) # ECM setup -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) @@ -13,14 +13,15 @@ include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KTEXTWIDGETS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ktextwidgets_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5TextWidgetsConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5TextWidgetsConfigVersion.cmake" + SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.2.0) @@ -46,7 +47,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5TextWidgets") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5TextWidgetsConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5TextWidgetsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5TextWidgetsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.96.0/autotests/CMakeLists.txt new/ktextwidgets-4.97.0/autotests/CMakeLists.txt --- old/ktextwidgets-4.96.0/autotests/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/ktextwidgets-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:51:40.000000000 +0100 @@ -1,4 +1,5 @@ include(ECMMarkAsTest) +include(ECMMarkNonGuiExecutable) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) @@ -8,6 +9,7 @@ add_test(ktextwidgets-${_testname} ${_testname}) target_link_libraries(${_testname} Qt5::Test KF5::TextWidgets KF5::ConfigWidgets) ecm_mark_as_test(${_testname}) + ecm_mark_nongui_executable(${_testname}) endforeach() endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.96.0/src/CMakeLists.txt new/ktextwidgets-4.97.0/src/CMakeLists.txt --- old/ktextwidgets-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/ktextwidgets-4.97.0/src/CMakeLists.txt 2014-03-01 12:51:40.000000000 +0100 @@ -45,34 +45,33 @@ EXPORT_NAME TextWidgets ) -ecm_generate_headers( +ecm_generate_headers(KTextWidgets_HEADERS + HEADER_NAMES KRichTextEdit KRichTextWidget KTextEdit RELATIVE widgets - MODULE_NAME KTextWidgets REQUIRED_HEADERS KTextWidgets_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KTextWidgets_HEADERS + HEADER_NAMES KFind KFindDialog KReplace KReplaceDialog RELATIVE findreplace - MODULE_NAME KTextWidgets REQUIRED_HEADERS KTextWidgets_HEADERS ) -ecm_generate_headers( +ecm_generate_headers(KTextWidgets_HEADERS + HEADER_NAMES KRegExpEditorInterface RELATIVE kregexpeditor - MODULE_NAME KTextWidgets REQUIRED_HEADERS KTextWidgets_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KTextWidgets DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5TextWidgets EXPORT KF5TextWidgetsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.96.0/src/widgets/ktextedit.cpp new/ktextwidgets-4.97.0/src/widgets/ktextedit.cpp --- old/ktextwidgets-4.96.0/src/widgets/ktextedit.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/ktextwidgets-4.97.0/src/widgets/ktextedit.cpp 2014-03-01 12:51:40.000000000 +0100 @@ -413,10 +413,14 @@ } return true; } else if (KStandardShortcut::deleteWordBack().contains(key)) { - parent->deleteWordBack(); + if (!parent->isReadOnly()) { + parent->deleteWordBack(); + } return true; } else if (KStandardShortcut::deleteWordForward().contains(key)) { - parent->deleteWordForward(); + if (!parent->isReadOnly()) { + parent->deleteWordForward(); + } return true; } else if (KStandardShortcut::backwardWord().contains(key)) { QTextCursor cursor = parent->textCursor(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.96.0/tests/CMakeLists.txt new/ktextwidgets-4.97.0/tests/CMakeLists.txt --- old/ktextwidgets-4.96.0/tests/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/ktextwidgets-4.97.0/tests/CMakeLists.txt 2014-03-01 12:51:40.000000000 +0100 @@ -1,4 +1,5 @@ include(ECMMarkAsTest) +include(ECMMarkNonGuiExecutable) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) @@ -6,6 +7,7 @@ foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) target_link_libraries(${_testname} Qt5::Test KF5::TextWidgets) + ecm_mark_nongui_executable(${_testname}) ecm_mark_as_test(${_testname}) endforeach() endmacro() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
