Lubuntu/lxqt-openssh-askpass-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picking upstream version 0.12.0.

Browse Source
This commit is contained in:
Alf Gaida 2017-12-04 23:50:55 +01:00
parent c871018d9e
commit 68e2527ba1
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -4,7 +4,7 @@ Upstream Authors:
Copyright: Copyright:
Copyright (c) 2010-2012 Razor team Copyright (c) 2010-2012 Razor team
Copyright (c) 2012-2016 LXQt team Copyright (c) 2012-2017 LXQt team
License: LGPL-2.1+ License: LGPL-2.1+
The full text of the licenses can be found in the 'COPYING' file. The full text of the licenses can be found in the 'COPYING' file.

14
CHANGELOG
View File

@ -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. * Make CMakeLists.txt more uniform.
* Remove cpack (#21) * Remove cpack (#21)

14
CMakeLists.txt
View File

@ -13,12 +13,22 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
find_package(Qt5LinguistTools REQUIRED QUIET) find_package(Qt5LinguistTools REQUIRED)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") message(STATUS "Building with Qt${Qt5Core_VERSION}")
find_package(lxqt REQUIRED) 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) include(LXQtCompilerSettings NO_POLICY_SCOPE)
set(lxqt-openssh-askpass_HDRS set(lxqt-openssh-askpass_HDRS

13
src/main.cpp
View File

@ -26,12 +26,25 @@
* END_COMMON_COPYRIGHT_HEADER */ * END_COMMON_COPYRIGHT_HEADER */
#include <LXQt/Application> #include <LXQt/Application>
#include <QCommandLineParser>
#include "mainwindow.h" #include "mainwindow.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
LXQt::Application a(argc, 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? // TODO/FIXME: maybe a better algorithm?
QString prompt; QString prompt;