From 68505468fb74e8424fdfdd530a641dd015defb0a Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 30 Jan 2016 03:19:42 +0100 Subject: [PATCH] Cherry-picking upstream version 1.95+20160128. Fixed upload to Imgur Drop debug package use secure VCS uris add hardening=+all make builds reproducible (Closes: #813167) --- CMakeLists.txt | 6 +- debian/changelog | 11 ++ debian/control | 16 +- debian/rules | 8 +- docs/html/en/index.html | 26 ++-- docs/html/pt_BR/index.html | 5 +- screengrab_de.qm | Bin 0 -> 16319 bytes screengrab_es_ES.qm | Bin 0 -> 9006 bytes screengrab_it.qm | Bin 0 -> 15367 bytes screengrab_pt_BR.qm | Bin 0 -> 9261 bytes screengrab_ru.qm | Bin 0 -> 15873 bytes screengrab_uk_UA.qm | Bin 0 -> 11321 bytes src/core/config.cpp | 1 - src/core/core.cpp | 8 - src/core/ui/about.cpp | 8 - src/core/ui/configwidget.cpp | 1 - src/core/ui/mainwindow.cpp | 1 - src/modules/uploader/CMakeLists.txt | 5 - src/modules/uploader/dialoguploader.cpp | 10 +- .../uploader/imgur/uploader_imgur_widget.ui | 2 +- .../imgur/uploaderconfigwidget_imgur.ui | 2 +- .../mediacrush/uploader_mediacrush.cpp | 137 ------------------ .../uploader/mediacrush/uploader_mediacrush.h | 51 ------- .../mediacrush/uploader_mediacrush_widget.cpp | 32 ---- .../mediacrush/uploader_mediacrush_widget.h | 40 ----- .../mediacrush/uploader_mediacrush_widget.ui | 44 ------ .../uploaderconfigwidget_mediacrush.cpp | 56 ------- .../uploaderconfigwidget_mediacrush.h | 43 ------ .../uploaderconfigwidget_mediacrush.ui | 87 ----------- src/modules/uploader/moduleuploader.cpp | 4 - src/modules/uploader/uploaderconfig.cpp | 9 +- src/modules/uploader/uploaderconfig.h | 3 - src/modules/uploader/uploaderconfigwidget.cpp | 3 - src/modules/uploader/uploaderconfigwidget.h | 2 - .../{screengrab_de_DE.ts => screengrab_de.ts} | 26 ---- .../{screengrab_it_IT.ts => screengrab_it.ts} | 0 translations/screengrab_ru.ts | 18 --- translations/screengrab_uk_UA.ts | 7 - translations/uploader.ts | 31 ---- 39 files changed, 36 insertions(+), 667 deletions(-) create mode 100644 screengrab_de.qm create mode 100644 screengrab_es_ES.qm create mode 100644 screengrab_it.qm create mode 100644 screengrab_pt_BR.qm create mode 100644 screengrab_ru.qm create mode 100644 screengrab_uk_UA.qm delete mode 100644 src/modules/uploader/mediacrush/uploader_mediacrush.cpp delete mode 100644 src/modules/uploader/mediacrush/uploader_mediacrush.h delete mode 100644 src/modules/uploader/mediacrush/uploader_mediacrush_widget.cpp delete mode 100644 src/modules/uploader/mediacrush/uploader_mediacrush_widget.h delete mode 100644 src/modules/uploader/mediacrush/uploader_mediacrush_widget.ui delete mode 100644 src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.cpp delete mode 100644 src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.h delete mode 100644 src/modules/uploader/mediacrush/uploaderconfigwidget_mediacrush.ui rename translations/{screengrab_de_DE.ts => screengrab_de.ts} (97%) rename translations/{screengrab_it_IT.ts => screengrab_it.ts} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7291b54..01ac9d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ message(STATUS "Library path: ${CMAKE_INSTALL_RPATH}") # options option(SG_GLOBALSHORTCUTS "Enable global shortcuts" OFF) -option(SG_EXT_UPLOADS "Enable upload screenshots to MediaCrush and imgur" ON) +option(SG_EXT_UPLOADS "Enable upload screenshots to Imgur" ON) option(SG_EXT_EDIT "Enable ability to edit screenshots in external editor" ON) option(SG_DBUS_NOTIFY "Enable D-Bus notifications" ON) option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) @@ -117,7 +117,7 @@ if(SG_DBUS_NOTIFY) endif() message(STATUS "Global shortcuts support: " ${SG_GLOBALSHORTCUTS}) -message(STATUS "Upload to MediaCrush and imgur support: " ${SG_EXT_UPLOADS}) +message(STATUS "Imgur upload support: " ${SG_EXT_UPLOADS}) message(STATUS "Editing screenshots in external editor support: " ${SG_EXT_EDIT}) message(STATUS "Enable D-Bus notifications: " ${SG_DBUS_NOTIFY}) message(STATUS "Use system Qxt Library: " ${SG_USE_SYSTEM_QXT}) @@ -155,7 +155,7 @@ set(SCREENGRAB_SRC src/core/modulemanager.cpp src/core/ui/configwidget.cpp src/core/ui/about.cpp - src/core/ui/mainwindow.cpp + src/core/ui/mainwindow.cpp ) if(SG_DBUS_NOTIFY) diff --git a/debian/changelog b/debian/changelog index 62f1ca8..cb92af2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +screengrab (1.95+20160128-1) unstable; urgency=medium + + * Cherry-picking upstream version 1.95+20160128. + * Fixed upload to Imgur + * Drop debug package + * use secure VCS uris + * add hardening=+all + * make builds reproducible (Closes: #813167) + + -- Alf Gaida Sat, 30 Jan 2016 03:19:31 +0100 + screengrab (1.95+20151117-4) unstable; urgency=medium * modify some build dependencies - and remove the limit of diff --git a/debian/control b/debian/control index c3972b9..041cf3a 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 9), qttools5-dev, qttools5-dev-tools, Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/screengrab.git -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/screengrab.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/screengrab.git +Vcs-Git: https://anonscm.debian.org/pkg-lxqt/screengrab.git Homepage: https://github.com/QtDesktop/screengrab Package: screengrab @@ -36,15 +36,3 @@ Description: Crossplatform tool for getting screenshots * Copy screenshot to clipboard * Saving your image files in formats PNG or JPEG or BMP * Ability to set delay in getting screenshots (from 1 to 90 seconds) - -Package: screengrab-dbg -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, - screengrab, -Description: Crossplatform tool for getting screenshots (debug) - Screengrab working in Linux and Windows. The program uses Qt and is - independent of any desktop environment. - . - This package contain the debugging symbols for screengrab. diff --git a/debian/rules b/debian/rules index 403ef22..c2e446f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,15 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --buildsystem=cmake --parallel -override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/screengrab - override_dh_install: rm -f $(currdir)/debian/screengrab/usr/share/doc/screengrab/LICENSE.txt dh_install -override_dh_strip: - dh_strip --dbg-package screengrab-dbg - - override_dh_makeshlibs: # do nothing diff --git a/docs/html/en/index.html b/docs/html/en/index.html index 0dbb479..0399b7d 100644 --- a/docs/html/en/index.html +++ b/docs/html/en/index.html @@ -27,18 +27,18 @@

ScreenGrab is a crossplatform application designed to quickly get screenshots. ScreenGrab is based on the Qt Framework, which allows the program to be used in -Microsoft Windows and GNU/Linux environments. +GNU/Linux and Microsoft Windows environments.

Main features:

- These buttons can be accessed via right-click on the ScreenGrab icon in the systemtray menu as well. + These buttons can be accessed via right-click on the ScreenGrab icon in the system tray menu as well.

Additional controls, located in main window. @@ -101,7 +101,7 @@ or active window].

  • Default directory -- Default directory to save screenshots
  • Default filename -- Default name of the saved file
  • Format -- Default saving image format (you can select other formats)
    • -
  • No window decoration -- Grab a screenshot of the active window without window decorations (only for linux version).
    • +
  • No window decoration -- Grab a screenshot of the active window without window decorations (only for Linux version).

    • Advanced settings: @@ -178,12 +178,12 @@ when exiting ScreenGrab (and restore it at next run)

  • Tray messages -- Mode of displaying tray messages on grab|save events. Can be "none" or "if hidden" or "always"
  • Time to display tray messages -- Time within a specific notification is displayed
    • -
  • Close in tray -- Minimize the main window into the systemtray +
  • Close in tray -- Minimize the main window into the system tray by click on the close window button.

    • - Shortcut Settings: + Shortcut Settings:

    On the tab "Shortcuts" in the options window you can set the keyboard shortcuts, which allows you to access the application functions easily. There are two kinds of key combinations used in ScreenGrab - local and global. @@ -195,7 +195,7 @@ by click on the close window button. Global shortcuts can be used the get a new screenshot when you have opened other application windows.

    - Command line parameters: + Command line parameters: