[arch-commits] Commit in kcalc/trunk (PKGBUILD kcalc-qt5.6.patch)

[Antonio Rojas]

    Date: Wednesday, March 16, 2016 @ 17:31:43
  Author: arojas
Revision: 261920

Workaround null window size with Qt 5.6

Added:
  kcalc/trunk/kcalc-qt5.6.patch
Modified:
  kcalc/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 +++++++++----
 kcalc-qt5.6.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-16 16:31:30 UTC (rev 261919)
+++ PKGBUILD	2016-03-16 16:31:43 UTC (rev 261920)
@@ -4,7 +4,7 @@
 
 pkgname=kcalc
 pkgver=15.12.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
 arch=('i686' 'x86_64')
@@ -15,16 +15,21 @@
 replaces=('kdeutils-kcalc')
 groups=('kde-applications' 'kdeutils')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('3a702934281d8cece1efd877b344f14f51e9ce36')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kcalc-${pkgver}.tar.xz" kcalc-qt5.6.patch)
+sha1sums=('3a702934281d8cece1efd877b344f14f51e9ce36'
+          'd22bc7c30802cf7d7bec8d9da9049679ad5b754c')
 
 prepare() {
   mkdir -p build
+
+# Workaround for null size window with Qt 5.6 (Fedora) https://bugs.kde.org/show_bug.cgi?id=360105
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kcalc-qt5.6.patch
 }
 
 build() {
   cd build
-  cmake ../kcalc-${pkgver} \
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \

Added: kcalc-qt5.6.patch
===================================================================
--- kcalc-qt5.6.patch	                        (rev 0)
+++ kcalc-qt5.6.patch	2016-03-16 16:31:43 UTC (rev 261920)
@@ -0,0 +1,11 @@
+--- kcalc-15.12.3/kcalc.cpp.orig	2016-03-16 16:26:37.327157522 +0000
++++ kcalc-15.12.3/kcalc.cpp	2016-03-16 16:28:08.533357025 +0000
+@@ -123,7 +123,7 @@
+ 
+ 	updateGeometry();
+ 
+-	setFixedSize(minimumSize());
++	if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize());
+ 
+ 	updateDisplay(UPDATE_FROM_CORE);
+