Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2014-03-10 12:17:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2014-02-24 06:53:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2014-03-10 12:17:36.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:40:25 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: ---- kwindowsystem-4.96.0.tar.xz New: ---- kwindowsystem-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.mf3eA4/_old 2014-03-10 12:17:37.000000000 +0100 +++ /var/tmp/diff_new_pack.mf3eA4/_new 2014-03-10 12:17:37.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5WindowSystem4 +%define lname libKF5WindowSystem5 Name: kwindowsystem -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: kf5-filesystem BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 ++++++ kwindowsystem-4.96.0.tar.xz -> kwindowsystem-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/CMakeLists.txt new/kwindowsystem-4.97.0/CMakeLists.txt --- old/kwindowsystem-4.96.0/CMakeLists.txt 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/CMakeLists.txt 2014-03-01 12:51:48.000000000 +0100 @@ -3,20 +3,22 @@ project(KWindowSystem) # 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(FeatureSummary) include(GenerateExportHeader) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(CMakeFindFrameworks) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWINDOWSYSTEM VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5WindowSystemConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5WindowSystemConfigVersion.cmake" + SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.2.0) @@ -26,22 +28,23 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -if(NOT WIN32) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -endif() - if (APPLE) - find_package(Carbon REQUIRED) -endif () + cmake_find_frameworks(Carbon) + cmake_find_frameworks(CoreFoundation) +endif() if(WIN32) find_package(Qt5WinExtras REQUIRED) endif() -find_package(X11) +if (NOT APPLE) + find_package(X11) +endif() + set(KWINDOWSYSTEM_HAVE_X11 ${X11_FOUND}) find_package(XCB COMPONENTS XCB KEYSYMS) if(X11_FOUND) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) set_package_properties(X11_Xrender PROPERTIES DESCRIPTION "X Rendering Extension (libXrender)" URL "http://www.x.org"; TYPE RECOMMENDED PURPOSE "Support for compositing, rendering operations, and alpha-blending") @@ -57,7 +60,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5WindowSystem") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5WindowSystemConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5WindowSystemConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5WindowSystemConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/autotests/CMakeLists.txt new/kwindowsystem-4.97.0/autotests/CMakeLists.txt --- old/kwindowsystem-4.96.0/autotests/CMakeLists.txt 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:51:48.000000000 +0100 @@ -5,8 +5,11 @@ include(ECMMarkAsTest) find_package(Qt5 5.2.0 CONFIG REQUIRED Test) -find_package(X11) -find_package(XCB COMPONENTS XCB) + +if (NOT APPLE) + find_package(X11) + find_package(XCB COMPONENTS XCB) +endif() macro(KWINDOWSYSTEM_UNIT_TESTS) foreach(_testname ${ARGN}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/CMakeLists.txt new/kwindowsystem-4.97.0/src/CMakeLists.txt --- old/kwindowsystem-4.96.0/src/CMakeLists.txt 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/CMakeLists.txt 2014-03-01 12:51:48.000000000 +0100 @@ -6,8 +6,6 @@ kkeyserver.cpp kstartupinfo.cpp kusertimestamp.cpp - kxerrorhandler.cpp - kxutils.cpp kwindoweffects.cpp kwindoweffects_dummy.cpp kwindowinfo.cpp @@ -18,6 +16,8 @@ set(kwindowsystem_SRCS ${kwindowsystem_SRCS} kselectionowner.cpp kselectionwatcher.cpp + kxerrorhandler.cpp + kxutils.cpp ) endif() @@ -39,6 +39,7 @@ # FIXME: adjust kwindowinfo_mac to inherit from KWindowInfoPrivate # kwindowinfo_mac.cpp ) + set(platformLinkLibraries "-framework CoreFoundation -framework Carbon") endif () if (WIN32) @@ -75,7 +76,8 @@ EXPORT_NAME WindowSystem ) -ecm_generate_headers( +ecm_generate_headers(KWindowSystem_HEADERS + HEADER_NAMES KKeyServer KStartupInfo KUserTimestamp @@ -88,10 +90,8 @@ NETWM # does not match the classnames in that file... KWindowSystem - MODULE_NAME KWindowSystem REQUIRED_HEADERS KWindowSystem_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KWindowSystem DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5WindowSystem EXPORT KF5WindowSystemTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kkeyserver_mac.cpp new/kwindowsystem-4.97.0/src/kkeyserver_mac.cpp --- old/kwindowsystem-4.96.0/src/kkeyserver_mac.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kkeyserver_mac.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -19,8 +19,6 @@ #include "kkeyserver_mac.h" -#include <QtCore/QCOORD> - #ifdef Q_OS_MAC // Only compile this module if we're compiling for Mac OS X #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kkeyserver_mac.h new/kwindowsystem-4.97.0/src/kkeyserver_mac.h --- old/kwindowsystem-4.96.0/src/kkeyserver_mac.h 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kkeyserver_mac.h 2014-03-01 12:51:48.000000000 +0100 @@ -22,6 +22,8 @@ #include <kwindowsystem_export.h> +#include <QList> + namespace KKeyServer { /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kstartupinfo.cpp new/kwindowsystem-4.97.0/src/kstartupinfo.cpp --- old/kwindowsystem-4.96.0/src/kstartupinfo.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kstartupinfo.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -243,6 +243,8 @@ } else if (msg.startsWith(QLatin1String("remove:"))) { // must match length below got_remove_startup_info(msg.mid(7)); } +#else + Q_UNUSED(msg_P) #endif } @@ -463,6 +465,8 @@ msg = Private::check_required_startup_fields(msg, data_P, QX11Info::appScreen()); //qDebug() << "sending " << msg; msgs.broadcastMessage(NET_STARTUP_MSG, msg); +#else + Q_UNUSED(data_P) #endif return true; } @@ -482,6 +486,8 @@ #endif return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else + Q_UNUSED(disp_P) + Q_UNUSED(data_P) return true; #endif } @@ -515,6 +521,8 @@ .arg(id_P.d->to_text()).arg(data_P.d->to_text()); //qDebug() << "sending " << msg; msgs.broadcastMessage(NET_STARTUP_MSG, msg); +#else + Q_UNUSED(data_P) #endif return true; } @@ -533,6 +541,8 @@ #endif return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else + Q_UNUSED(disp_P) + Q_UNUSED(data_P) return true; #endif } @@ -563,6 +573,7 @@ #endif return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else + Q_UNUSED(disp_P) return true; #endif } @@ -577,6 +588,9 @@ .arg(id_P.d->to_text()).arg(data_P.d->to_text()); //qDebug() << "sending " << msg; msgs.broadcastMessage(NET_STARTUP_MSG, msg); +#else + Q_UNUSED(id_P) + Q_UNUSED(data_P) #endif return true; } @@ -594,6 +608,9 @@ #endif return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else + Q_UNUSED(disp_P) + Q_UNUSED(id_P) + Q_UNUSED(data_P) return true; #endif } @@ -711,6 +728,9 @@ KWindowSystem::forceActiveWindow(window->winId()); } } +#else + Q_UNUSED(activate) + Q_UNUSED(window) #endif KStartupInfo::handleAutoAppStartedSending(); } @@ -930,6 +950,7 @@ } return ret; #else + Q_UNUSED(w_P) return QByteArray(); #endif } @@ -951,6 +972,9 @@ } XChangeProperty(QX11Info::display(), w_P, net_startup_atom, utf8_string_atom, 8, PropModeReplace, reinterpret_cast< const unsigned char * >(id_P.data()), id_P.length()); +#else + Q_UNUSED(w_P) + Q_UNUSED(id_P) #endif } @@ -972,6 +996,8 @@ } XFreeStringList(hh); } +#else + Q_UNUSED(w_P) #endif // no hostname return QByteArray(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kusertimestamp.cpp new/kwindowsystem-4.97.0/src/kusertimestamp.cpp --- old/kwindowsystem-4.96.0/src/kusertimestamp.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kusertimestamp.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -55,6 +55,8 @@ || NET::timestampCompare(time, QX11Info::appTime()) > 0) { // time > appTime QX11Info::setAppTime(time); } +#else + Q_UNUSED(time) #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kwindowsystem.cpp new/kwindowsystem-4.97.0/src/kwindowsystem.cpp --- old/kwindowsystem-4.96.0/src/kwindowsystem.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kwindowsystem.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -342,9 +342,9 @@ } #ifndef KWINDOWSYSTEM_NO_DEPRECATED -KWindowInfo KWindowSystem::windowInfo(WId win, unsigned long properties, unsigned long properties2) +KWindowInfo KWindowSystem::windowInfo(WId win, NET::Properties properties, NET::Properties2 properties2) { - return KWindowInfo(win, NET::Properties(uint(properties)), NET::Properties2(uint(properties2))); + return KWindowInfo(win, properties, properties2); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kwindowsystem.h new/kwindowsystem-4.97.0/src/kwindowsystem.h --- old/kwindowsystem-4.96.0/src/kwindowsystem.h 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kwindowsystem.h 2014-03-01 12:51:48.000000000 +0100 @@ -101,7 +101,7 @@ * @return the window information * @deprecated use KWindowInfo directly */ - KWINDOWSYSTEM_DEPRECATED static KWindowInfo windowInfo(WId win, unsigned long properties, unsigned long properties2 = 0); + KWINDOWSYSTEM_DEPRECATED static KWindowInfo windowInfo(WId win, NET::Properties properties, NET::Properties2 properties2 = 0); #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kxerrorhandler.cpp new/kwindowsystem-4.97.0/src/kxerrorhandler.cpp --- old/kwindowsystem-4.96.0/src/kxerrorhandler.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kxerrorhandler.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -25,8 +25,6 @@ #include "kxerrorhandler_p.h" #include <config-kwindowsystem.h> -#if KWINDOWSYSTEM_HAVE_X11 //FIXME - #include "netwm_def.h" #include <stdio.h> @@ -246,4 +244,3 @@ return ret; } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/kxutils.cpp new/kwindowsystem-4.97.0/src/kxutils.cpp --- old/kwindowsystem-4.96.0/src/kxutils.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/kxutils.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -21,7 +21,6 @@ #include "kxutils_p.h" -#if KWINDOWSYSTEM_HAVE_X11 #include <qbitmap.h> #include <QX11Info> #include <QDebug> @@ -214,5 +213,3 @@ #endif } // namespace - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.96.0/src/netwm.cpp new/kwindowsystem-4.97.0/src/netwm.cpp --- old/kwindowsystem-4.96.0/src/netwm.cpp 2014-02-06 14:51:17.000000000 +0100 +++ new/kwindowsystem-4.97.0/src/netwm.cpp 2014-03-01 12:51:48.000000000 +0100 @@ -4744,7 +4744,7 @@ int NETWinInfo::desktop(bool ignore_viewport) const { if (!ignore_viewport && KWindowSystem::mapViewport()) { - return KWindowSystem::windowInfo(p->window, NET::Desktop).desktop(); + return KWindowSystem::windowInfo(p->window, NET::WMDesktop).desktop(); } return p->desktop; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
