From 1e59e248db3adab7bf138f47c7f51269289cb943 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 19 Sep 2016 03:57:00 +0200 Subject: [PATCH] Cherry-picked upstream snapshot 1.96~38-g975f8ce Removed not needed reproducible.patch, merged upstream Added patch build-date-time.patch Added patch disable-uploads.patch, core-cli-upload-option.patch, disable-cli-upload-option.patch (Closes: #834517) Bumped compat to 10 Bumped dependency debhelper (>= 10) Bumped Standards to 3.9.8, no changes needed --- debian/changelog | 13 +++++++++ debian/control | 2 +- debian/patches/build-date-time.patch | 5 ++-- debian/patches/core-cli-upload-option.patch | 28 +++++++++++++++++++ .../patches/disable-cli-upload-option.patch | 21 ++++++++++++++ debian/patches/disable-uploads.patch | 8 ++++-- debian/patches/series | 2 ++ 7 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 debian/patches/core-cli-upload-option.patch create mode 100644 debian/patches/disable-cli-upload-option.patch diff --git a/debian/changelog b/debian/changelog index 3cc828d..dffd1eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +screengrab (1.96~38-g975f8ce-1) unstable; urgency=medium + + * Cherry-picked upstream snapshot 1.96~38-g975f8ce + * Removed not needed reproducible.patch, merged upstream + * Added patch build-date-time.patch + * Added patch disable-uploads.patch, core-cli-upload-option.patch, + disable-cli-upload-option.patch (Closes: #834517) + * Bumped compat to 10 + * Bumped dependency debhelper (>= 10) + * Bumped Standards to 3.9.8, no changes needed + + -- Alf Gaida Mon, 19 Sep 2016 03:56:48 +0200 + screengrab (1.95+20160128-3) unstable; urgency=medium * Set LC_ALL for reproducible builds. diff --git a/debian/control b/debian/control index 00efc4d..828b256 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9), pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git -b debian/sid Homepage: https://github.com/QtDesktop/screengrab diff --git a/debian/patches/build-date-time.patch b/debian/patches/build-date-time.patch index 6eaa89b..ef92b2c 100644 --- a/debian/patches/build-date-time.patch +++ b/debian/patches/build-date-time.patch @@ -1,5 +1,6 @@ -diff --git a/src/core/ui/about.cpp b/src/core/ui/about.cpp -index 33f2b15..6c47467 100644 +Description: Build date time +Author: Alf Gaida + --- a/src/core/ui/about.cpp +++ b/src/core/ui/about.cpp @@ -31,16 +31,8 @@ AboutDialog::AboutDialog(QWidget *parent): diff --git a/debian/patches/core-cli-upload-option.patch b/debian/patches/core-cli-upload-option.patch new file mode 100644 index 0000000..9f4d5d4 --- /dev/null +++ b/debian/patches/core-cli-upload-option.patch @@ -0,0 +1,28 @@ +Description: Disable cli upload option +Author: Alf Gaida +Bug-Debian: https://bugs.debian.org/834517 +Last-Update: 2016-09-19 + +--- a/src/core/core.cpp ++++ b/src/core/core.cpp +@@ -511,8 +511,9 @@ + if (_cmdLine.isSet(_screenTypeOpts.at(i))) + _conf->setScreenshotType(i); + ++/* + #ifdef SG_EXT_UPLOADS +- /// FIXMA - In module interface need add the mthod for geting module cmdLine options ++ /// FIXMA - In module interface need add the mthod for geting module cmdLine option + const QString UPLOAD_CMD_PARAM = "upload"; + const QString UPLOAD_CMD_PARAM_SHORT = "u"; + QCommandLineOption u(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM); +@@ -524,6 +525,9 @@ + } else + initWindow(); + #endif ++*/ ++ ++initWindow(); + + } + diff --git a/debian/patches/disable-cli-upload-option.patch b/debian/patches/disable-cli-upload-option.patch new file mode 100644 index 0000000..3e7a66a --- /dev/null +++ b/debian/patches/disable-cli-upload-option.patch @@ -0,0 +1,21 @@ +Description: Disable cli upload option +Author: Alf Gaida +Bug-Debian: https://bugs.debian.org/834517 +Last-Update: 2016-09-19 + +--- screengrab-1.96~38-g975f8ce.orig/src/modules/uploader/moduleuploader.cpp ++++ screengrab-1.96~38-g975f8ce/src/modules/uploader/moduleuploader.cpp +@@ -36,11 +36,11 @@ const QString UPLOAD_CMD_PARAM_SHORT = " + + ModuleUploader::ModuleUploader(QObject *parent) : + QObject(parent), _ignoreCmdParam(false), +- _optUpload(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM) ++ _optUpload(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM) + { + QString optUploadDescr = tr("Upload the screenshot to the default image host"); + _optUpload.setDescription(optUploadDescr); +- Core::instance()->addCmdLineOption(_optUpload); ++ /* Core::instance()->addCmdLineOption(_optUpload); */ + } + + QString ModuleUploader::moduleName() diff --git a/debian/patches/disable-uploads.patch b/debian/patches/disable-uploads.patch index b0820e1..82a8b2c 100644 --- a/debian/patches/disable-uploads.patch +++ b/debian/patches/disable-uploads.patch @@ -1,5 +1,6 @@ -diff --git a/src/core/modulemanager.cpp b/src/core/modulemanager.cpp -index 8778e93..b35202c 100644 +Description: Disable uploads +Author: Alf Gaida + --- a/src/core/modulemanager.cpp +++ b/src/core/modulemanager.cpp @@ -18,9 +18,9 @@ @@ -27,3 +28,6 @@ index 8778e93..b35202c 100644 +// ModuleUploader *uploader = new ModuleUploader(); +// _modules->insert(MOD_UPLOADER , uploader); +//#endif + #ifdef SG_EXT_EDIT + ModuleExtEdit *extedit = new ModuleExtEdit(); + _modules->insert(MOD_EXT_EDIT.data(), extedit); diff --git a/debian/patches/series b/debian/patches/series index 7819566..5c620e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ disable-uploads.patch build-date-time.patch +disable-cli-upload-option.patch +core-cli-upload-option.patch