[arch-commits] Commit in kcheckers/trunk (PKGBUILD qt5-migration.diff)

[Eli Schwartz]

    Date: Thursday, January 18, 2018 @ 04:37:18
  Author: eschwartz
Revision: 283783

upgpkg: kcheckers 0.8.1-11

port to qt5

Added:
  kcheckers/trunk/qt5-migration.diff
Modified:
  kcheckers/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   20 +++++++++++++++-----
 qt5-migration.diff |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-18 03:46:05 UTC (rev 283782)
+++ PKGBUILD	2018-01-18 04:37:18 UTC (rev 283783)
@@ -3,20 +3,29 @@
 
 pkgname=kcheckers
 pkgver=0.8.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Qt4-based checkers boardgame"
 arch=('x86_64')
 url="http://qcheckers.sourceforge.net/"
 license=('GPL')
-depends=('qt4')
-source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz kcheckers.desktop)
+depends=('qt5-base')
+source=(https://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz
+        qt5-migration.diff
+        kcheckers.desktop)
 md5sums=('793736a007cd92122dfd91bcfd14ab69'
+         '310f61c6e4366f2fe9ad40e16f779cf0'
          '25b2605f4d605615e265150b722f1897')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # patch from Debian
+  patch -p1 < ../qt5-migration.diff
+  sed -i 's|/usr/local|/usr|' common.h
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/usr/local|/usr|' common.h
-  qmake-qt4 kcheckers.pro
+  qmake kcheckers.pro
   make
 }
 
@@ -23,5 +32,6 @@
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make INSTALL_ROOT="${pkgdir}/usr" install
+  rm "${pkgdir}"/usr/share/kcheckers/*.ts
   install -Dm644 "${srcdir}/kcheckers.desktop" "${pkgdir}/usr/share/applications/kcheckers.desktop"
 }

Added: qt5-migration.diff
===================================================================
--- qt5-migration.diff	                        (rev 0)
+++ qt5-migration.diff	2018-01-18 04:37:18 UTC (rev 283783)
@@ -0,0 +1,49 @@
+Description: Ported to Qt5.
+Author: Innocent De Marchi <tangram.peces at gmail.com>
+Last-Update: 2017-12-31
+Forwarded: yes
+
+--- a/history.cc
++++ b/history.cc
+@@ -60,7 +60,7 @@
+ 	m_movelist = new QTreeWidget(this);
+ 	m_movelist->setColumnCount(3);
+ 	m_movelist->header()->setStretchLastSection(true);
+-	m_movelist->header()->setMovable(false);
++    //m_movelist->header()->setMovable(false);
+ 	m_movelist->setRootIsDecorated(false);
+ 	QStringList header;
+ 	header << "#" << tr("Move") << tr("Comment");
+--- a/kcheckers.pro
++++ b/kcheckers.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
+-
++QT += widgets
+ CONFIG  += qt warn_on
+ 
+ HEADERS	= pdn.h \
+--- a/main.cc
++++ b/main.cc
+@@ -37,8 +37,8 @@
+     top->show();
+ 
+     // command line
+-    if(app.argc()==2)
+-	top->open(app.argv()[1]);
++    //if(app.argc() ==2)
++    //top->open(app.argv()[1]);
+ 
+     int exit = app.exec();
+ 
+--- a/pdn.cc
++++ b/pdn.cc
+@@ -21,7 +21,7 @@
+  ***************************************************************************/
+ #include <QFile>
+ #include <QTextStream>
+-#include <QProgressDialog>
++#include <QtWidgets/QProgressDialog>
+ #include <QDebug>
+ 
+ #include "checkers.h"