From 9862fe6e3d31a8d98c62f6248611584e184e4c2d Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 24 Oct 2017 18:39:56 +0200 Subject: [PATCH] Cherry-picking upstream release 0.12.0. * Switched to experimental * Bumped Standards to 4.1.1 - no changes needed * Bumped liblxqt dependency to >= 0.12.0 --- AUTHORS | 2 +- CHANGELOG | 14 +++++++++++++- CMakeLists.txt | 14 ++++++++++++-- debian/changelog | 9 +++++++++ debian/control | 8 ++++---- src/main.cpp | 13 +++++++++++++ 6 files changed, 52 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index a66be6d..abb6e1f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2016 LXQt team + Copyright (c) 2012-2017 LXQt team License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG index 827fdbf..1bca4d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,19 @@ -lxqt-openssh-askpass-0.11.1 / 2017-01-01 +lxqt-openssh-askpass-0.12.0 / 2017-10-21 ======================================== + * Set patch version + * Don't export github templates + * Drops Qt5Core_VERSION_STRING + * set Qt::AA_UseHighDpiPixmaps to true + * Added QCommandLineParser and basic cli interface to lxqt-openssh-askpass + * Added default CMAKE_BUILD_TYPE and LXQT_ASKPASS_PATCH_VERSION + * Bump year + +0.11.1 / 2017-01-01 +=================== + + * Release 0.11.1: Update changelog * Make CMakeLists.txt more uniform. * Remove cpack (#21) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25aeea7..69a226e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,12 +13,22 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) -find_package(Qt5LinguistTools REQUIRED QUIET) +find_package(Qt5LinguistTools REQUIRED) find_package(Qt5Widgets REQUIRED) -message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") +message(STATUS "Building with Qt${Qt5Core_VERSION}") find_package(lxqt REQUIRED) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +# Patch Version +set(LXQT_ASKPASS_PATCH_VERSION 0) + +set(LXQT_ASKPASS_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_ADMIN_ASKPASS_VERSION}) +add_definitions("-DLXQT_ASKPASS_VERSION=\"${LXQT_ASKPASS_VERSION}\"") + include(LXQtCompilerSettings NO_POLICY_SCOPE) set(lxqt-openssh-askpass_HDRS diff --git a/debian/changelog b/debian/changelog index fc5c746..0c4f885 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lxqt-openssh-askpass (0.12.0-1) experimental; urgency=medium + + * Cherry-picking upstream release 0.12.0. + * Switched to experimental + * Bumped Standards to 4.1.1 - no changes needed + * Bumped liblxqt dependency to >= 0.12.0 + + -- Alf Gaida Tue, 24 Oct 2017 18:39:44 +0200 + lxqt-openssh-askpass (0.11.1-2) unstable; urgency=medium * Bumped Standards to 4.0.0 - no changes needed diff --git a/debian/control b/debian/control index 5fcd5b3..395e755 100644 --- a/debian/control +++ b/debian/control @@ -9,13 +9,13 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.1), + liblxqt0-dev (>= 0.12.0), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-openssh-askpass.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-openssh-askpass.git -b debian/sid +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-openssh-askpass.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-openssh-askpass.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-openssh-askpass Package: lxqt-openssh-askpass diff --git a/src/main.cpp b/src/main.cpp index b324293..ffa7456 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,12 +26,25 @@ * END_COMMON_COPYRIGHT_HEADER */ #include +#include + #include "mainwindow.h" int main(int argc, char *argv[]) { LXQt::Application a(argc, argv); + a.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt OpenSSH Askpass")); + const QString VERINFO = QStringLiteral(LXQT_ASKPASS_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + a.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(a); // TODO/FIXME: maybe a better algorithm? QString prompt;