[arch-commits] Commit in spectacle/trunk (PKGBUILD kdebug-362241.patch)

[Antonio Rojas]

    Date: Tuesday, April 26, 2016 @ 21:18:14
  Author: arojas
Revision: 266185

Backport critical bugfixes

Added:
  spectacle/trunk/kdebug-362241.patch
Modified:
  spectacle/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   16 ++++++++++++---
 kdebug-362241.patch |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-26 18:56:30 UTC (rev 266184)
+++ PKGBUILD	2016-04-26 19:18:14 UTC (rev 266185)
@@ -3,7 +3,7 @@
 
 pkgname=spectacle
 pkgver=16.04.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE screenshot capture utility"
 arch=(i686 x86_64)
 url='https://www.kde.org/applications/graphics/'
@@ -13,12 +13,22 @@
 conflicts=(kdegraphics-ksnapshot kscreengenie)
 replaces=(kdegraphics-ksnapshot kscreengenie)
 groups=(kde-applications kdegraphics)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+        spectacle-hidpi.patch::"https://quickgit.kde.org/?p=spectacle.git&a=commitdiff&h=3d4dcacc&o=plain"
+        kdebug-362241.patch)
 install=$pkgname.install
-md5sums=('231a565255ff420b2a8b0974530b1c28')
+md5sums=('231a565255ff420b2a8b0974530b1c28'
+         '53e7af8dd42eb968d642d110f0a69be1'
+         '4cc380edb046432832fc6a3aeb926d82')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+# Fix high DPI
+  patch -p1 -i ../spectacle-hidpi.patch
+# Unbreak rectangular image grabs for nvidia users http://bugs.kde.org/show_bug.cgi?id=362241
+  patch -p1 -i ../kdebug-362241.patch
 }
 
 build() {

Added: kdebug-362241.patch
===================================================================
--- kdebug-362241.patch	                        (rev 0)
+++ kdebug-362241.patch	2016-04-26 19:18:14 UTC (rev 266185)
@@ -0,0 +1,52 @@
+From: Boudhayan Gupta <me at BaloneyGeek.com>
+Date: Mon, 25 Apr 2016 18:27:49 +0000
+Subject: Unbreak rectangular image grabs for nvidia users.
+X-Git-Url: http://quickgit.kde.org/?p=spectacle.git&a=commitdiff&h=abbbe6d13de870f9e9349acc2542cffc5d41b76d
+---
+Unbreak rectangular image grabs for nvidia users.
+
+BUG: 362241
+FIXED-IN: 16.04.1
+---
+
+
+--- a/src/QuickEditor/QuickEditor.cpp
++++ b/src/QuickEditor/QuickEditor.cpp
+@@ -138,23 +138,7 @@
+     d->mGrabRect = QRect(x, y, width, height);
+     SpectacleConfig::instance()->setCropRegion(d->mGrabRect);
+ 
+-    QQuickItem *target = d->mQuickView->rootObject()->findChild<QQuickItem *>(QStringLiteral("imageBackground"));
+-    d->mCurrentGrabResult = target->grabToImage();
+-    if (d->mCurrentGrabResult.isNull()) {
+-        emit grabCancelled();
+-        return;
+-    }
+-
+-    connect(d->mCurrentGrabResult.data(), &QQuickItemGrabResult::ready, this, &QuickEditor::grabReadyHandler);
++    d->mQuickView->hide();
++    emit grabDone(mImageStore->mPixmap.copy(d->mGrabRect), d->mGrabRect);
+ }
+ 
+-void QuickEditor::grabReadyHandler()
+-{
+-    Q_D(QuickEditor);
+-
+-    QImage croppedImage = d->mCurrentGrabResult->image().copy(d->mGrabRect);
+-    QPixmap croppedPixmap = QPixmap::fromImage(croppedImage);
+-
+-    d->mQuickView->hide();
+-    emit grabDone(croppedPixmap, d->mGrabRect);
+-}
+
+--- a/src/QuickEditor/QuickEditor.h
++++ b/src/QuickEditor/QuickEditor.h
+@@ -39,7 +39,6 @@
+     private slots:
+ 
+     void acceptImageHandler(int x, int y, int width, int height);
+-    void grabReadyHandler();
+ 
+     private:
+ 
+