From 3e6b9539aae9f7d6c3da49d4f4042fa133be9c44 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 1 May 2016 00:13:54 +0200
Subject: Patches for post Applications 16.04.0 bugs in kcalc and spectacle.

spectacle:
- fix broken HiDPI support.
- fix broken rectangular image capture on Nvidia GPU.

kcalc:
- Fix issue where kcalc has a zero-sized window and appears not to start.
---
 kde/patch/kcalc.patch                            |  5 +++
 kde/patch/kcalc/kcalc-kdebug_360105.patch        | 15 +++++++
 kde/patch/spectacle.patch                        |  7 ++++
 kde/patch/spectacle/spectacle_hidpi.patch        | 28 +++++++++++++
 kde/patch/spectacle/spectacle_rect_capture.patch | 53 ++++++++++++++++++++++++
 5 files changed, 108 insertions(+)
 create mode 100644 kde/patch/kcalc.patch
 create mode 100644 kde/patch/kcalc/kcalc-kdebug_360105.patch
 create mode 100644 kde/patch/spectacle.patch
 create mode 100644 kde/patch/spectacle/spectacle_hidpi.patch
 create mode 100644 kde/patch/spectacle/spectacle_rect_capture.patch

(limited to 'kde/patch')

diff --git a/kde/patch/kcalc.patch b/kde/patch/kcalc.patch
new file mode 100644
index 0000000..05bcb89
--- /dev/null
+++ b/kde/patch/kcalc.patch
@@ -0,0 +1,5 @@
+# Fix issue where kcalc has a zero-sized window and appears not to start,
+# in combination with Qt 5.6.
+# Should be fixed after 16.04.0.
+cat $CWD/patch/kcalc/kcalc-kdebug_360105.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kcalc/kcalc-kdebug_360105.patch b/kde/patch/kcalc/kcalc-kdebug_360105.patch
new file mode 100644
index 0000000..a2ff272
--- /dev/null
+++ b/kde/patch/kcalc/kcalc-kdebug_360105.patch
@@ -0,0 +1,15 @@
+Fix issue where kcalc has a zero-sized window and appears not to start.
+
+Patch-by: Rex Dieter <rdieter@math.unl.edu>
+Gentoo-bug: 577782
+KDE-bug: 360105
+
+--- a/kcalc.cpp
++++ b/kcalc.cpp
+@@ -124,5 +124,5 @@ KCalculator::KCalculator(QWidget *parent
+	updateGeometry();
+
+-	setFixedSize(minimumSize());
++	if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize());
+
+	updateDisplay(UPDATE_FROM_CORE);
diff --git a/kde/patch/spectacle.patch b/kde/patch/spectacle.patch
new file mode 100644
index 0000000..5971d13
--- /dev/null
+++ b/kde/patch/spectacle.patch
@@ -0,0 +1,7 @@
+# Fix for broken HiDPI support.
+# Fixed post Applications 16.04.0:
+cat $CWD/patch/spectacle/spectacle_hidpi.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Fix for broken rectangular image capture on Nvidia GPU (KDEBUG 362241):
+# Fixed post Applications 16.04.0:
+cat $CWD/patch/spectacle/spectacle_rect_capture.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/spectacle/spectacle_hidpi.patch b/kde/patch/spectacle/spectacle_hidpi.patch
new file mode 100644
index 0000000..19cf923
--- /dev/null
+++ b/kde/patch/spectacle/spectacle_hidpi.patch
@@ -0,0 +1,28 @@
+--- a/src/QuickEditor/EditorRoot.qml
++++ b/src/QuickEditor/EditorRoot.qml
+@@ -36,10 +36,10 @@
+         }
+ 
+         selection = cropRectangle.createObject(parent, {
+-             "x": xx,
+-             "y": yy,
++             "x":      xx,
++             "y":      yy,
+              "height": hh,
+-             "width": ww
++             "width":  ww
+         });
+ 
+         cropDisplayCanvas.requestPaint();
+@@ -73,8 +73,8 @@
+         source: "image://snapshot/rawimage";
+         cache: false;
+ 
+-        height: Window.height;
+-        width: Window.width;
++        height: Window.height / Screen.devicePixelRatio;
++        width: Window.width / Screen.devicePixelRatio;
+         fillMode: Image.PreserveAspectFit;
+     }
+ 
+
diff --git a/kde/patch/spectacle/spectacle_rect_capture.patch b/kde/patch/spectacle/spectacle_rect_capture.patch
new file mode 100644
index 0000000..ee77216
--- /dev/null
+++ b/kde/patch/spectacle/spectacle_rect_capture.patch
@@ -0,0 +1,53 @@
+From: Boudhayan Gupta <me@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,24 +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:
+ 
+
-- 
cgit v1.2.3