From eae01a58507948b2babe869c0410ca40b2635dd4 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 19 Oct 2016 00:00:24 +0200 Subject: [PATCH] Cherry-picked upstream version 1.96. * Removed disable-upload.patch, applied upstream * Bumped minimum version libqt5xdg-dev (>= 2.0.0) * Added buid dependency libqt5svg5-dev * Added build dependency libqt5xdgiconloader-dev * Removed --parallel from rules, compat 10 standard --- .gitignore | 3 +++ CMakeLists.txt | 2 +- debian/changelog | 11 ++++++++++ debian/compat | 2 +- debian/control | 8 ++++--- debian/patches/disable-uploads.patch | 33 ---------------------------- debian/patches/series | 1 - debian/rules | 3 +-- src/core/modulemanager.cpp | 14 ++++++------ 9 files changed, 29 insertions(+), 48 deletions(-) create mode 100644 .gitignore delete mode 100644 debian/patches/disable-uploads.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41b1005 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build/ +*.qm +*.kdev4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 01ac9d9..51c0250 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ find_package( ) # add version define -set(SCREENGRAB_VERSION "1.95") +set(SCREENGRAB_VERSION "1.96") set(SCREENGRAB_VERSION_DEV "2.0-beta1") # set(DEV_BUILD True) diff --git a/debian/changelog b/debian/changelog index dffd1eb..045a8b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +screengrab (1.96-1) unstable; urgency=medium + + * Cherry-picked upstream version 1.96. + * Removed disable-upload.patch, applied upstream + * Bumped minimum version libqt5xdg-dev (>= 2.0.0) + * Added buid dependency libqt5svg5-dev + * Added build dependency libqt5xdgiconloader-dev + * Removed --parallel from rules, compat 10 standard + + -- Alf Gaida Tue, 18 Oct 2016 23:59:57 +0200 + screengrab (1.96~38-g975f8ce-1) unstable; urgency=medium * Cherry-picked upstream snapshot 1.96~38-g975f8ce diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 828b256..c4837b9 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,13 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: graphics Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), libkf5windowsystem-dev, + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev, libx11-dev, libx11-xcb-dev, libxcb1-dev, @@ -18,7 +20,7 @@ Build-Depends: debhelper (>= 9), qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git/?h=debian/sid +Vcs-Browser: https://anonscm.debian.org/cgit/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/disable-uploads.patch b/debian/patches/disable-uploads.patch deleted file mode 100644 index 82a8b2c..0000000 --- a/debian/patches/disable-uploads.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Disable uploads -Author: Alf Gaida - ---- a/src/core/modulemanager.cpp -+++ b/src/core/modulemanager.cpp -@@ -18,9 +18,9 @@ - - #include "modulemanager.h" - --#ifdef SG_EXT_UPLOADS --#include "src/modules/uploader/moduleuploader.h" --#endif -+// #ifdef SG_EXT_UPLOADS -+// #include "src/modules/uploader/moduleuploader.h" -+// #endif - - #ifdef SG_EXT_EDIT - #include "src/modules/extedit/moduleextedit.h" -@@ -35,10 +35,10 @@ ModuleManager::ModuleManager() - - void ModuleManager::initModules() - { --#ifdef SG_EXT_UPLOADS -- ModuleUploader *uploader = new ModuleUploader(); -- _modules->insert(MOD_UPLOADER , uploader); --#endif -+//#ifdef SG_EXT_UPLOADS -+// 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 5c620e7..a293dd1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -disable-uploads.patch build-date-time.patch disable-cli-upload-option.patch diff --git a/debian/rules b/debian/rules index c14ddd7..379a0ae 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export LC_ALL=C.UTF-8 %: - dh ${@} --buildsystem=cmake \ - --parallel + dh ${@} --buildsystem=cmake override_dh_install: rm -f $(currdir)/debian/screengrab/usr/share/doc/screengrab/LICENSE.txt diff --git a/src/core/modulemanager.cpp b/src/core/modulemanager.cpp index 8778e93..b35202c 100644 --- a/src/core/modulemanager.cpp +++ b/src/core/modulemanager.cpp @@ -18,9 +18,9 @@ #include "modulemanager.h" -#ifdef SG_EXT_UPLOADS -#include "src/modules/uploader/moduleuploader.h" -#endif +// #ifdef SG_EXT_UPLOADS +// #include "src/modules/uploader/moduleuploader.h" +// #endif #ifdef SG_EXT_EDIT #include "src/modules/extedit/moduleextedit.h" @@ -35,10 +35,10 @@ ModuleManager::ModuleManager() void ModuleManager::initModules() { -#ifdef SG_EXT_UPLOADS - ModuleUploader *uploader = new ModuleUploader(); - _modules->insert(MOD_UPLOADER , uploader); -#endif +//#ifdef SG_EXT_UPLOADS +// 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);