Control: tags -1 + patch
Hi Christoph,
I attached a patch that builds tipp10 with Qt5.
I tested building with pbuilder and did a few tests of the program,
and it looks to me like everything is working.
As porting the download modules would have been a bit more effort,
as QHttp is no longer available in Qt5 (replaced by QNetworkAccessManager),
I had a look what they are actually used for.
It turned out that two of them were currently not used at all
(updatedialog, downloaddialog), as their actions have not been
associated with any menu. And the third one (checkversion, which checks on a
remote server if the version is up-to-date) has no real use in a Debian
package and there seems to be no upstream development anyway. It's also
not nice to let it "phone home" regularly.
So I decided to drop them, which simplified the porting effort.
I hope you are fine with this change.
Kind regards,
Reiner
From 03bfa696455efad18984fab80bee00e2d4d57cdd Mon Sep 17 00:00:00 2001
From: Reiner Herrmann
Date: Sat, 21 Sep 2019 00:04:31 +0200
Subject: [PATCH] Port to Qt5
Closes: #875207
---
debian/control | 4 +-
debian/patches/disable_downloaders.patch | 163 +++
debian/patches/qt5.patch | 67 ++
debian/patches/series| 2 +
debian/rules | 2 +-
5 files changed, 235 insertions(+), 3 deletions(-)
create mode 100644 debian/patches/disable_downloaders.patch
create mode 100644 debian/patches/qt5.patch
diff --git a/debian/control b/debian/control
index e20a052..3ab3edb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tipp10
Section: education
Priority: optional
Maintainer: Christoph Martin
-Build-Depends: debhelper (>= 9), qt4-qmake, libqt4-dev
+Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, qtmultimedia5-dev
Standards-Version: 3.9.5
Homepage: https://www.tipp10.com/
#Vcs-Git: git://anonscm.debian.org/collab-maint/tipp10.git
@@ -10,7 +10,7 @@ Homepage: https://www.tipp10.com/
Package: tipp10
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5sql5-sqlite
Description: free open source touch typing software
TIPP10 is a free touch typing tutor for Windows, Mac OS and Linux. The
ingenious thing about the software is its intelligence feature.
diff --git a/debian/patches/disable_downloaders.patch b/debian/patches/disable_downloaders.patch
new file mode 100644
index 000..ac172a1
--- /dev/null
+++ b/debian/patches/disable_downloaders.patch
@@ -0,0 +1,163 @@
+Author: Reiner Herrmann
+Description: Disable downloaders
+ This makes porting to Qt5 much easier, as QHttp is no longer available.
+ But the functionality was not enabled anyway or is no longer useful.
+ .
+ - checkversion.h/.cpp:
+ At startup (while loading settings), Tipp10 "phones home" to do an
+ update check (www.tipp10.com/update/version.tipp10v210).
+ For a packaged software and one that is no longer being developed,
+ this does not make much sense.
+ - updatedialog.h/.cpp:
+ Can download newer sqlite database (www.tipp10.com/update/sql.tipp10v210.utf),
+ but this file is no longer available on the server (404).
+ The update action has also not been enabled in the menu, so the update
+ functionality was currently not active:
+ widget/mainwindow.cpp:143: //fileMenu->addAction(updateAction);
+ - downloaddialog.h/.cpp:
+ Allows downloading lessons from user-specified location.
+ But the action (widget/startwidget.cpp -> lessonDownload) has not been part
+ of any menu, so it was also not in use.
+
+--- a/tipp10.pro
b/tipp10.pro
+@@ -15,7 +15,6 @@
+ INCLUDEPATH += .
+ CONFIG += qt
+ QT += sql
+-QT += network
+ RC_FILE += tipp10.rc
+ RESOURCES += tipp10.qrc
+ HEADERS += def/defines.h \
+@@ -36,15 +35,12 @@
+ widget/settingspages.h \
+ widget/lessondialog.h \
+ widget/regexpdialog.h \
+-widget/downloaddialog.h \
+ widget/lessonprintdialog.h \
+ widget/lessonresult.h \
+-widget/updatedialog.h \
+ widget/helpbrowser.h \
+ widget/companylogo.h \
+ widget/errormessage.h \
+ widget/txtmessagedialog.h \
+-widget/checkversion.h \
+ sql/connection.h \
+ sql/lessontablesql.h \
+ sql/chartablesql.h \
+@@ -70,15 +66,12 @@
+ widget/settingspages.cpp \
+ widget/lessondialog.cpp \
+ widget/regexpdialog.cpp \
+-widget/downloaddialog.cpp \
+ widget/lessonprintdialog.cpp \
+ widget/lessonresult.cpp \
+-
