From 2be1ccb2951321cb351bd8580b2db5ce00fcc9d1 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 2 Jan 2017 13:28:19 +0100 Subject: [PATCH] Cherry-picking upstream release 0.11.1. * Removed some build dependencies: -cmake -libqt5xdg-dev -libqt5xdgiconloader-dev -pkg-config -qttools5-dev -qttools5-dev-tools * Bumped build dependency liblxqt0-dev (>= 0.11.1) * Bumped years in d/copyright --- .gitignore | 3 -- CHANGELOG | 12 +++++++- CMakeLists.txt | 13 ++------ client/CMakeLists.txt | 8 ++--- cmake/create_portable_headers.cmake | 30 ------------------- .../lxqt-config-globalkeyshortcuts_da.desktop | 7 ++--- ...qt-config-globalkeyshortcuts_da_DK.desktop | 4 --- .../lxqt-config-globalkeyshortcuts_fr.desktop | 3 ++ debian/changelog | 15 ++++++++++ debian/control | 10 ++----- debian/copyright | 4 +-- ui/CMakeLists.txt | 7 ++--- 12 files changed, 46 insertions(+), 70 deletions(-) delete mode 100644 .gitignore delete mode 100644 cmake/create_portable_headers.cmake delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_da_DK.desktop create mode 100644 config/translations/lxqt-config-globalkeyshortcuts_fr.desktop diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d34465a..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -build -*.kdev4 -config/translations/lxqt-globalkeys diff --git a/CHANGELOG b/CHANGELOG index eb9cd07..e69b534 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,17 @@ -lxqt-globalkeys-0.11.0 / 2016-09-24 +lxqt-globalkeys-0.11.1 / 2017-01-01 =================================== + * Added *da.desktop + * Use the lxqt-build-tools/lxqt_create_portable_headers + * Use the new lxqt-build-tools package + * Create lxqt-config-globalkeyshortcuts_fr.desktop + * Remove cpack (#41) + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * Add README.md * Add Catalan translation * daemon: Use QDBusServiceWatcher diff --git a/CMakeLists.txt b/CMakeLists.txt index b52d011..5acc35c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +set(LXQTBT_MINIMUM_VERSION "0.1.0") set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -20,11 +21,13 @@ set(CMAKE_AUTOUIC ON) find_package(Qt5Widgets REQUIRED) find_package(Qt5DBus REQUIRED) find_package(Qt5LinguistTools REQUIRED QUIET) +find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) find_package(lxqt REQUIRED QUIET) include(LXQtTranslate) include(LXQtCreatePkgConfigFile) +include(LXQtCreatePortableHeaders) include(LXQtCompilerSettings NO_POLICY_SCOPE) include(GNUInstallDirs) # Standard directories for installation @@ -90,13 +93,3 @@ install(FILES "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config-version.cmake" DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}" ) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 66932e8..530e979 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -172,11 +172,11 @@ target_compile_definitions(${PROJECT_NAME} export(TARGETS ${PROJECT_NAME} FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake") -include(create_portable_headers) -create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS - NAMESPACE "${${PROJECT_NAME}_NAMESPACE}/" - FILENAMES ${${PROJECT_NAME}_PUBLIC_CLASSES} +lxqt_create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS + PATH_PREFIX ".." + NAME_PREFIX "${${PROJECT_NAME}_NAMESPACE}" + HEADER_NAMES ${${PROJECT_NAME}_PUBLIC_CLASSES} ) # Copy public headers for intree building diff --git a/cmake/create_portable_headers.cmake b/cmake/create_portable_headers.cmake deleted file mode 100644 index 13a67a2..0000000 --- a/cmake/create_portable_headers.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# Creates portable headers; e.g.: -# Creates XdgAction from xdgaction.h -# XdgAction contents: -# #include "xdgaction.h" -# -# Use: -# set(PUBLIC_CLASSES MyClass YourClass) -# create_portable_headers(PORTABLE_HEADERS ${PUBLIC_CLASSES}) -# PORTABLE_HEADER is an return value that contains the full name of the -# generated headers. - -function(create_portable_headers outfiles) - set(options) - set(oneValueArgs NAMESPACE) - set(multiValueArgs FILENAMES) - - cmake_parse_arguments(_CREATE_PORTABLE_HEADERS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - set(prefix ${_CREATE_PORTABLE_HEADERS_NAMESPACE}) - set(class_list ${_CREATE_PORTABLE_HEADERS_FILENAMES}) - foreach(f ${class_list}) - string(TOLOWER "${f}.h" _filename) - - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${f} - "#include \"../${_filename}\"") - - list(APPEND ${outfiles} ${CMAKE_CURRENT_BINARY_DIR}/${f}) - endforeach() - - set(${outfiles} ${${outfiles}} PARENT_SCOPE) -endfunction() diff --git a/config/translations/lxqt-config-globalkeyshortcuts_da.desktop b/config/translations/lxqt-config-globalkeyshortcuts_da.desktop index ff6f536..cd3679b 100644 --- a/config/translations/lxqt-config-globalkeyshortcuts_da.desktop +++ b/config/translations/lxqt-config-globalkeyshortcuts_da.desktop @@ -1,4 +1,3 @@ -# Translations -Name[da]=Konfiguration af LXQt Tastaturgenveje -Comment[da]=Konfigurer globale tastaturgenveje for LXQt-skrivebordet -GenericName[da]=Konfiguration af LXQt Globale Tastaturgenveje +Name[da]=Genvejstaster +GenericName[da]=Indstillinger for tastaturgenveje +Comment[da]=Konfigurér genvejstaster i LXQt diff --git a/config/translations/lxqt-config-globalkeyshortcuts_da_DK.desktop b/config/translations/lxqt-config-globalkeyshortcuts_da_DK.desktop deleted file mode 100644 index 8715242..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_da_DK.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[da_DK]=Konfiguration af LXQt Tastaturgenveje -Comment[da_DK]=Konfigurer globale tastaturgenveje for LXQt-skrivebordet -GenericName[da_DK]=Konfiguration af LXQt Globale Tastaturgenveje diff --git a/config/translations/lxqt-config-globalkeyshortcuts_fr.desktop b/config/translations/lxqt-config-globalkeyshortcuts_fr.desktop new file mode 100644 index 0000000..f972569 --- /dev/null +++ b/config/translations/lxqt-config-globalkeyshortcuts_fr.desktop @@ -0,0 +1,3 @@ +Name[fr]=Touches de raccourcis +GenericName[fr]=Configuration des touches de raccourcis +Comment[fr]=Configuration des touches de raccourcis de LXQt diff --git a/debian/changelog b/debian/changelog index 8f07dee..cc746f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +lxqt-globalkeys (0.11.1-1) unstable; urgency=medium + + * Cherry-picking upstream release 0.11.1. + * Removed some build dependencies: + -cmake + -libqt5xdg-dev + -libqt5xdgiconloader-dev + -pkg-config + -qttools5-dev + -qttools5-dev-tools + * Bumped build dependency liblxqt0-dev (>= 0.11.1) + * Bumped years in d/copyright + + -- Alf Gaida Mon, 02 Jan 2017 13:28:07 +0100 + lxqt-globalkeys (0.11.0-3) unstable; urgency=medium * Cherry-picking upstream release 0.11.0. diff --git a/debian/control b/debian/control index 24321aa..8e109e9 100644 --- a/debian/control +++ b/debian/control @@ -6,17 +6,11 @@ Uploaders: Alf Gaida , Section: x11 Priority: optional Build-Depends: debhelper (>= 10), - cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.0), + liblxqt0-dev (>= 0.11.1), libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 2.0.0), - libqt5xdgiconloader-dev (>= 2.0.0), - libx11-dev, - pkg-config, - qttools5-dev, - qttools5-dev-tools + libx11-dev Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-globalkeys.git -b debian/sid diff --git a/debian/copyright b/debian/copyright index 93e1792..c7231f1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name:lxqt-globalkeys Source: https://github.com/lxde/lxqt-globalkeys Files: * -Copyright: 2012-2016 LXQt team +Copyright: 2012-2017 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2016 Alf Gaida +Copyright: 2014-2017 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 3359ddb..82942c3 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -153,10 +153,9 @@ target_compile_definitions(${PROJECT_NAME} export(TARGETS ${PROJECT_NAME} APPEND FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake") -include(create_portable_headers) -create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS - NAMESPACE "${${PROJECT_NAME}_HEADER_NAMESPACE}/" - FILENAMES ${${PROJECT_NAME}_PUBLIC_CLASSES} +lxqt_create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS + PATH_PREFIX ".." + HEADER_NAMES ${${PROJECT_NAME}_PUBLIC_CLASSES} ) # Copy public headers for intree building