[arch-commits] Commit in qalculate-kde/trunk (2 files)

[Eric Bélanger]

    Date: Thursday, March 20, 2014 @ 05:26:41
  Author: eric
Revision: 208231

upgpkg: qalculate-kde 0.9.7-4

Add build fix (close FS#39150)

Added:
  qalculate-kde/trunk/qalculate-kde-0.9.7-gcc47.patch
Modified:
  qalculate-kde/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   17 ++++++++++++-----
 qalculate-kde-0.9.7-gcc47.patch |   18 ++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-03-19 21:26:01 UTC (rev 208230)
+++ PKGBUILD    2014-03-20 04:26:41 UTC (rev 208231)
@@ -3,7 +3,7 @@
 
 pkgname=qalculate-kde
 pkgver=0.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE frontend for libqalculate"
 arch=('i686' 'x86_64')
 url="http://qalculate.sourceforge.net/";
@@ -10,16 +10,23 @@
 license=('GPL')
 depends=('libqalculate' 'kdelibs3' 'cln')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('fa0db8a3fb80264328770c4bbcbc0892a4d4ce91')
+source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz
+        qalculate-kde-0.9.7-gcc47.patch)
+sha1sums=('fa0db8a3fb80264328770c4bbcbc0892a4d4ce91'
+          '8f23a12dd37e2fd3d316b78ee0831700310c0d36')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/qalculate-kde-0.9.7-gcc47.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/opt/kde --without-arts
   make
 }
 
 package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }

Added: qalculate-kde-0.9.7-gcc47.patch
===================================================================
--- qalculate-kde-0.9.7-gcc47.patch                             (rev 0)
+++ qalculate-kde-0.9.7-gcc47.patch     2014-03-20 04:26:41 UTC (rev 208231)
@@ -0,0 +1,18 @@
+diff -ur qalculate-kde-0.9.7/src/qalculateeditfunctiondialog.cpp 
qalculate-kde-0.9.7-gcc47/src/qalculateeditfunctiondialog.cpp
+--- qalculate-kde-0.9.7/src/qalculateeditfunctiondialog.cpp    2009-12-03 
17:06:06.000000000 +0100
++++ qalculate-kde-0.9.7-gcc47/src/qalculateeditfunctiondialog.cpp      
2012-07-31 23:50:07.000000000 +0200
+@@ -377,10 +377,10 @@
+                               str = defarg.printlong().c_str();
+                               str2 = "";
+                       }
+-                      QListViewItem *i = new KListViewItem(argumentsView, 
i_prev, str2, str);
+-                      i_prev = i;
+-                      argumentsItems[i] = arg;
+-                      argumentsItemsEdited[i] = false;
++                      QListViewItem *item = new KListViewItem(argumentsView, 
i_prev, str2, str);
++                      i_prev = item;
++                      argumentsItems[item] = arg;
++                      argumentsItemsEdited[item] = false;
+               }
+       }
+       argumentsView->setResizeMode(KListView::AllColumns);