summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-05-01 00:13:54 +0200
committer Eric Hameleers <alien@slackware.com>2016-05-01 00:13:54 +0200
commit3e6b9539aae9f7d6c3da49d4f4042fa133be9c44 (patch)
tree01202f1df296aa665056b4c8497b530819f9bb6e /kde
parent282b1f2689d71a15cc1ab4cd89e4ca3df1369171 (diff)
downloadktown-3e6b9539aae9f7d6c3da49d4f4042fa133be9c44.tar.gz
ktown-3e6b9539aae9f7d6c3da49d4f4042fa133be9c44.tar.xz
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.
Diffstat (limited to 'kde')
-rw-r--r--kde/build/kcalc1
-rw-r--r--kde/build/spectacle1
-rw-r--r--kde/patch/kcalc.patch5
-rw-r--r--kde/patch/kcalc/kcalc-kdebug_360105.patch15
-rw-r--r--kde/patch/spectacle.patch7
-rw-r--r--kde/patch/spectacle/spectacle_hidpi.patch28
-rw-r--r--kde/patch/spectacle/spectacle_rect_capture.patch53
7 files changed, 110 insertions, 0 deletions
diff --git a/kde/build/kcalc b/kde/build/kcalc
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kcalc
@@ -0,0 +1 @@
+2
diff --git a/kde/build/spectacle b/kde/build/spectacle
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/spectacle
@@ -0,0 +1 @@
+2
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:
+
+