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 neededubuntu/disco debian/1.96_38-g975f8ce-1
parent
828954d296
commit
1e59e248db
@ -0,0 +1,28 @@
|
|||||||
|
Description: Disable cli upload option
|
||||||
|
Author: Alf Gaida <agaida@siduction.org>
|
||||||
|
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();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
|||||||
|
Description: Disable cli upload option
|
||||||
|
Author: Alf Gaida <agaida@siduction.org>
|
||||||
|
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()
|
@ -1,3 +1,5 @@
|
|||||||
disable-uploads.patch
|
disable-uploads.patch
|
||||||
build-date-time.patch
|
build-date-time.patch
|
||||||
|
|
||||||
|
disable-cli-upload-option.patch
|
||||||
|
core-cli-upload-option.patch
|
||||||
|
Loading…
Reference in new issue