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
This commit is contained in:
parent
828954d296
commit
1e59e248db
13
debian/changelog
vendored
13
debian/changelog
vendored
@ -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 <agaida@siduction.org> Mon, 19 Sep 2016 03:56:48 +0200
|
||||
|
||||
screengrab (1.95+20160128-3) unstable; urgency=medium
|
||||
|
||||
* Set LC_ALL for reproducible builds.
|
||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -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
|
||||
|
5
debian/patches/build-date-time.patch
vendored
5
debian/patches/build-date-time.patch
vendored
@ -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 <agaida@siduction.org>
|
||||
|
||||
--- a/src/core/ui/about.cpp
|
||||
+++ b/src/core/ui/about.cpp
|
||||
@@ -31,16 +31,8 @@ AboutDialog::AboutDialog(QWidget *parent):
|
||||
|
28
debian/patches/core-cli-upload-option.patch
vendored
Normal file
28
debian/patches/core-cli-upload-option.patch
vendored
Normal file
@ -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();
|
||||
|
||||
}
|
||||
|
21
debian/patches/disable-cli-upload-option.patch
vendored
Normal file
21
debian/patches/disable-cli-upload-option.patch
vendored
Normal file
@ -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()
|
8
debian/patches/disable-uploads.patch
vendored
8
debian/patches/disable-uploads.patch
vendored
@ -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 <agaida@siduction.org>
|
||||
|
||||
--- 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);
|
||||
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -1,3 +1,5 @@
|
||||
disable-uploads.patch
|
||||
build-date-time.patch
|
||||
|
||||
disable-cli-upload-option.patch
|
||||
core-cli-upload-option.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user