diff options
Diffstat (limited to 'deskutils/kdeplasma-addons-kde4/files')
| -rw-r--r-- | deskutils/kdeplasma-addons-kde4/files/patch-CMakeLists.txt | 29 | ||||
| -rw-r--r-- | deskutils/kdeplasma-addons-kde4/files/patch-applets_timer_timer.cpp | 13 |
2 files changed, 42 insertions, 0 deletions
diff --git a/deskutils/kdeplasma-addons-kde4/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons-kde4/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..8d8f6daf183c --- /dev/null +++ b/deskutils/kdeplasma-addons-kde4/files/patch-CMakeLists.txt @@ -0,0 +1,29 @@ +--- CMakeLists.txt.orig 2013-08-14 12:32:08.088461763 +0000 ++++ CMakeLists.txt 2013-08-14 12:33:12.856460461 +0000 +@@ -36,17 +36,21 @@ + endif (DEPEND_PACKAGE_Marble) + macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.") + +-if (NEPOMUK_FOUND) +- include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} ) +-endif (NEPOMUK_FOUND) +- + add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +-include_directories (${KDE4_INCLUDES} ++include_directories (${QT_QTGUI_INCLUDE_DIR} ++ ${QT_QTCORE_INCLUDE_DIR} ++ ${QT_QTXML_INCLUDE_DIR} ++ ${PHONON_INCLUDE_DIR} ++ ${KDE4_INCLUDES} + ${KDE4WORKSPACE_INCLUDE_DIR} + ${KDEPIMLIBS_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/libs) + ++if (NEPOMUK_FOUND) ++ include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} ) ++endif (NEPOMUK_FOUND) ++ + add_subdirectory(libs) + add_subdirectory(applets) + add_subdirectory(dataengines) diff --git a/deskutils/kdeplasma-addons-kde4/files/patch-applets_timer_timer.cpp b/deskutils/kdeplasma-addons-kde4/files/patch-applets_timer_timer.cpp new file mode 100644 index 000000000000..2218e86f96c9 --- /dev/null +++ b/deskutils/kdeplasma-addons-kde4/files/patch-applets_timer_timer.cpp @@ -0,0 +1,13 @@ +Fix ambiguous call on armv6/armv7. + +--- applets/timer/timer.cpp.orig 2017-01-12 05:36:14 UTC ++++ applets/timer/timer.cpp +@@ -498,7 +498,7 @@ void Timer::toggleTimerVisible() + m_blinkAnim = animGroup; + } + +- m_blinkAnim->setDirection(qFuzzyCompare(m_hoursDigit[0]->opacity(), 1.0) ? ++ m_blinkAnim->setDirection(qFuzzyCompare(m_hoursDigit[0]->opacity(), qreal(1.0)) ? + QAbstractAnimation::Forward : QAbstractAnimation::Backward); + m_blinkAnim->start(); + } |