Changes - SailfishOS Open Build Service

Changes of Revision 8

[-] [+]	Changed	kemoticons-5.9.0.tar.xz/CMakeLists.txt
@@ -2,7 +2,7 @@ project(KEmoticons) -find_package(ECM 1.6.0 REQUIRED NO_MODULE) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -19,8 +19,8 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "5.6.0") # handled by release scripts -set(KF5_DEP_VERSION "5.6.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_DEP_VERSION "5.9.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KEMOTICONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h" @@ -33,7 +33,7 @@ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h - DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) # the strings throughout this library are used to search ressources @@ -46,7 +46,7 @@ add_subdirectory(tests) # create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Emoticons") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Emoticons") install(EXPORT KF5EmoticonsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5EmoticonsTargets.cmake NAMESPACE KF5:: )
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/KF5EmoticonsConfig.cmake.in ^
@@ -1,8 +1,7 @@ @PACKAGE_INIT@ -find_dependency(KF5Archive "@KF5_DEP_VERSION@") -find_dependency(KF5Service "@KF5_DEP_VERSION@") - find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) +find_dependency(KF5Service "@KF5_DEP_VERSION@") + include("${CMAKE_CURRENT_LIST_DIR}/KF5EmoticonsTargets.cmake")
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/core/CMakeLists.txt ^
@@ -10,7 +10,7 @@ generate_export_header(KF5Emoticons BASE_NAME KEmoticons) add_library(KF5::Emoticons ALIAS KF5Emoticons) -target_include_directories(KF5Emoticons INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KEmoticons>") +target_include_directories(KF5Emoticons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KEmoticons>") target_link_libraries(KF5Emoticons PUBLIC @@ -26,7 +26,7 @@ EXPORT_NAME Emoticons ) -install(FILES kemoticonsTheme.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES kemoticonsTheme.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) ecm_generate_headers(KEmoticons_HEADERS HEADER_NAMES @@ -43,10 +43,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kemoticons_export.h ${KEmoticons_HEADERS} - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KEmoticons + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KEmoticons COMPONENT Devel ) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KEmoticons LIB_NAME KF5Emoticons DEPS "widgets KService" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KEmoticons) +ecm_generate_pri_file(BASE_NAME KEmoticons LIB_NAME KF5Emoticons DEPS "widgets KService" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KEmoticons) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/integrationplugin/CMakeLists.txt ^
@@ -12,4 +12,4 @@ ) install(TARGETS KEmoticonsIntegrationPlugin - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5) + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5)
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/adium/CMakeLists.txt ^
@@ -18,9 +18,9 @@ ) install( TARGETS emoticonstheme_adium - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/emoticonsthemes + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes ) install( FILES emoticonstheme_adium.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/adium/adium_emoticons.h ^
@@ -29,13 +29,13 @@ public: AdiumEmoticons(QObject *parent, const QVariantList &args); - bool loadTheme(const QString &path); + bool loadTheme(const QString &path) Q_DECL_OVERRIDE; - bool removeEmoticon(const QString &emo); - bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy); - void saveTheme(); + bool removeEmoticon(const QString &emo) Q_DECL_OVERRIDE; + bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy) Q_DECL_OVERRIDE; + void saveTheme() Q_DECL_OVERRIDE; - void newTheme(); + void newTheme() Q_DECL_OVERRIDE; private: QDomDocument m_themeXml;
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/kde/CMakeLists.txt ^
@@ -17,9 +17,9 @@ ) install( TARGETS emoticonstheme_kde - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/emoticonsthemes + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes ) install( FILES emoticonstheme_kde.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/kde/kde_emoticons.h ^
@@ -29,12 +29,12 @@ public: KdeEmoticons(QObject *parent, const QVariantList &args); - bool loadTheme(const QString &path); + bool loadTheme(const QString &path) Q_DECL_OVERRIDE; - bool removeEmoticon(const QString &emo); - bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy); - void saveTheme(); - void newTheme(); + bool removeEmoticon(const QString &emo) Q_DECL_OVERRIDE; + bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy) Q_DECL_OVERRIDE; + void saveTheme() Q_DECL_OVERRIDE; + void newTheme() Q_DECL_OVERRIDE; private: QDomDocument m_themeXml;
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/pidgin/CMakeLists.txt ^
@@ -13,9 +13,9 @@ ) install( TARGETS emoticonstheme_pidgin - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/emoticonsthemes + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes ) install( FILES emoticonstheme_pidgin.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/pidgin/pidgin_emoticons.h ^
@@ -27,13 +27,13 @@ public: PidginEmoticons(QObject *parent, const QVariantList &args); - bool loadTheme(const QString &path); + bool loadTheme(const QString &path) Q_DECL_OVERRIDE; - bool removeEmoticon(const QString &emo); - bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy); - void saveTheme(); + bool removeEmoticon(const QString &emo) Q_DECL_OVERRIDE; + bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy) Q_DECL_OVERRIDE; + void saveTheme() Q_DECL_OVERRIDE; - void newTheme(); + void newTheme() Q_DECL_OVERRIDE; private: QStringList m_text;
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/xmpp/CMakeLists.txt ^
@@ -18,9 +18,9 @@ ) install( TARGETS emoticonstheme_xmpp - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/emoticonsthemes + DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes ) install( FILES emoticonstheme_xmpp.desktop - DESTINATION ${SERVICES_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/src/providers/xmpp/xmpp_emoticons.h ^
@@ -29,13 +29,13 @@ public: XmppEmoticons(QObject *parent, const QVariantList &args); - bool loadTheme(const QString &path); + bool loadTheme(const QString &path) Q_DECL_OVERRIDE; - bool removeEmoticon(const QString &emo); - bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy); - void saveTheme(); + bool removeEmoticon(const QString &emo) Q_DECL_OVERRIDE; + bool addEmoticon(const QString &emo, const QString &text, AddEmoticonOption option = DoNotCopy) Q_DECL_OVERRIDE; + void saveTheme() Q_DECL_OVERRIDE; - void newTheme(); + void newTheme() Q_DECL_OVERRIDE; private: QDomDocument m_themeXml;
[-] [+]	Changed	kemoticons-5.9.0.tar.xz/themes/CMakeLists.txt ^
@@ -2,7 +2,7 @@ DIRECTORY Glass DESTINATION - ${SHARE_INSTALL_PREFIX}/emoticons/ + ${KDE_INSTALL_DATAROOTDIR}/emoticons/ FILES_MATCHING PATTERN "*.png" PATTERN "emoticons.xml"