pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/tipp10: Make it build again.
Module Name: pkgsrc-wip
Committed By: ng0 <ng0%n0.is@localhost>
Pushed By: ng0
Date: Fri Mar 29 12:47:40 2019 +0000
Changeset: e44797fab546042e2236e4c0d6f908d002d68f72
Modified Files:
tipp10/Makefile
tipp10/distinfo
tipp10/patches/patch-def_defines.h
tipp10/patches/patch-sql_chartablesql.cpp
tipp10/patches/patch-sql_startsql.cpp
tipp10/patches/patch-widget_lessondialog.cpp
tipp10/patches/patch-widget_settingspages.cpp
tipp10/patches/patch-widget_tickerboard.cpp
Added Files:
tipp10/README
tipp10/TODO
Log Message:
wip/tipp10: Make it build again.
Makefile: Use debian mirror of source.
Update patches.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e44797fab546042e2236e4c0d6f908d002d68f72
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
tipp10/Makefile | 9 +--
tipp10/README | 2 +
tipp10/TODO | 4 ++
tipp10/distinfo | 19 +++---
tipp10/patches/patch-def_defines.h | 45 +++++++-------
tipp10/patches/patch-sql_chartablesql.cpp | 24 ++++----
tipp10/patches/patch-sql_startsql.cpp | 24 ++++----
tipp10/patches/patch-widget_lessondialog.cpp | 39 ++++++------
tipp10/patches/patch-widget_settingspages.cpp | 21 +++----
tipp10/patches/patch-widget_tickerboard.cpp | 87 +++++++++++++--------------
10 files changed, 139 insertions(+), 135 deletions(-)
diffs:
diff --git a/tipp10/Makefile b/tipp10/Makefile
index 73cd54d7c3..67d6c34432 100644
--- a/tipp10/Makefile
+++ b/tipp10/Makefile
@@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.3 2012/12/29 14:54:37 othyro Exp $
-DISTNAME= tipp10_source_v2-1-0
-EXTRACT_SUFFIX= .zip
+DISTNAME= tipp10_2.1.0.orig.tar.gz
DISTFILES= ${DISTNAME}${EXTRACT_SUFFIX}
PKGVERSION= 2.1.0
PKGNAME= tipp10-${PKGVERSION}
CATEGORIES= games
-MASTER_SITES= http://2pktfkt.de/pkgsrc/
+MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/t/tipp10/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.tipp10.com/
@@ -15,11 +14,13 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c++
+WRKSRC= ${WRKDIR}/${PKGNAME}
+
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_MESSAGE.paths= Fixing data directory paths
SUBST_FILES.paths= main.cpp sql/connection.h sql/lessontablesql.cpp \
- widget/downloaddialog.cpp widget/fingerwidget.cpp widget/helpbrowser.cpp \
+ widget/downloaddialog.cpp widget/fingerwidget.cpp widget/helpbrowser.cpp \
widget/illustrationdialog.cpp widget/keyboard.cpp widget/lessonresult.cpp \
widget/licensedialog.cpp widget/mainwindow.cpp widget/numpad.cpp \
widget/progressionwidget.cpp widget/regexpdialog.cpp widget/settingsdialog.cpp \
diff --git a/tipp10/README b/tipp10/README
new file mode 100644
index 0000000000..ad78335476
--- /dev/null
+++ b/tipp10/README
@@ -0,0 +1,2 @@
+* Patches are checked into / created from a git branch
+ at https://c.n0.is/pkgsrc/packages/tipp10.git
diff --git a/tipp10/TODO b/tipp10/TODO
new file mode 100644
index 0000000000..10f769201f
--- /dev/null
+++ b/tipp10/TODO
@@ -0,0 +1,4 @@
+* FIXME: https://www.tipp10.com/de/download/getfile/3/ is the
+ real source. We need a webbrowser user-agent string to get
+ this, otherwise we get a 0 length gzip file. This is why we
+ are using Debian as a source.
diff --git a/tipp10/distinfo b/tipp10/distinfo
index b887968c4a..ce8713cdaa 100644
--- a/tipp10/distinfo
+++ b/tipp10/distinfo
@@ -1,11 +1,12 @@
$NetBSD: distinfo,v 1.3 2013/01/19 12:57:35 othyro Exp $
-SHA1 (tipp10_source_v2-1-0.zip) = a50aeab9b579149b3d34789fdeeab4c175db6a0f
-RMD160 (tipp10_source_v2-1-0.zip) = 2d460d3447a8de5344fded0638e2b993f3320167
-Size (tipp10_source_v2-1-0.zip) = 2106535 bytes
-SHA1 (patch-def_defines.h) = 4d0ac4c2e5ea9e25b89ae0e3df645fbfd8d9b2b4
-SHA1 (patch-sql_chartablesql.cpp) = 9bb09d8248528dec62ed8b233519dd7297a7509d
-SHA1 (patch-sql_startsql.cpp) = d14d8f71fbf2539cbd98c07d91a65eea4f4c969e
-SHA1 (patch-widget_lessondialog.cpp) = 6b82ef02ffc8765f4936947338e2b3214cf59f70
-SHA1 (patch-widget_settingspages.cpp) = ed33422950e012ea3cf381238aaa8b35585db559
-SHA1 (patch-widget_tickerboard.cpp) = 287ce80c0164d6c903292cc3c24f1e10f82bffd5
+SHA1 (tipp10_2.1.0.orig.tar.gz) = 1e12750c2dcb5381132fc6d0d9c6cbb59d82fbd7
+RMD160 (tipp10_2.1.0.orig.tar.gz) = a1ddf1fa7d3b8aec9b3fa5f1574cec70857713ab
+SHA512 (tipp10_2.1.0.orig.tar.gz) = e28f7a9dcd2b3210e0945b63c31f98fac3c335c920c2345371f717621af39133f5482acf82fb1e8495e1538e1c72608f65a3519fed3d43de350914d7455526ce
+Size (tipp10_2.1.0.orig.tar.gz) = 1871451 bytes
+SHA1 (patch-def_defines.h) = ceafd8ff59481d25c909157e0b17605fc311816b
+SHA1 (patch-sql_chartablesql.cpp) = a07e8f5417e4e90c53d68360d9ff8628b0231e5f
+SHA1 (patch-sql_startsql.cpp) = eacfa29b58a715d1a265ce9473d794a2338772d9
+SHA1 (patch-widget_lessondialog.cpp) = ade65ade3e24027b0713743b1e602bfe990b5eaa
+SHA1 (patch-widget_settingspages.cpp) = 60b45922fda2ddbb4afad22c1f5bdc6207983f83
+SHA1 (patch-widget_tickerboard.cpp) = aa0ad56d4cf0a28f5e3aa7dd25fca0c6468e4f04
diff --git a/tipp10/patches/patch-def_defines.h b/tipp10/patches/patch-def_defines.h
index cda299e6af..7af4822e53 100644
--- a/tipp10/patches/patch-def_defines.h
+++ b/tipp10/patches/patch-def_defines.h
@@ -1,26 +1,25 @@
-$NetBSD: patch-def_defines.h,v 1.1.1.1 2011/05/31 00:50:56 mrampke Exp $
-
+$NetBSD$
automatically determine for what system to compile
---- def/defines.h.orig 2011-03-12 19:26:12.000000000 +0000
+--- def/defines.h
+++ def/defines.h
-@@ -27,9 +27,19 @@ Foundation, Inc., 51 Franklin Street, Fi
- #define DEFINES_H
-
- // OS constants
-+#if defined(_WIN32)
- #define APP_WIN true
- #define APP_MAC false
- #define APP_X11 false
-+#elif defined(__APPLE__)
-+#define APP_WIN false
-+#define APP_MAC true
-+#define APP_X11 false
-+#else
-+#define APP_WIN false
-+#define APP_MAC false
-+#define APP_X11 true
-+#endif
- #define APP_PORTABLE false //at least one of the 3 OS must be true too!
-
- // Languages
+@@ -27,9 +27,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #define DEFINES_H
+
+ // OS constants
++#if defined(_WIN32)
+ #define APP_WIN true
+ #define APP_MAC false
+ #define APP_X11 false
++#elif defined(__APPLE__)
++#define APP_WIN false
++#define APP_MAC true
++#define APP_X11 false
++#else
++#define APP_WIN false
++#define APP_MAC false
++#define APP_X11 true
++#endif
+ #define APP_PORTABLE false //at least one of the 3 OS must be true too!
+
+ // Languages
diff --git a/tipp10/patches/patch-sql_chartablesql.cpp b/tipp10/patches/patch-sql_chartablesql.cpp
index 62d44e5101..3f665ecf4b 100644
--- a/tipp10/patches/patch-sql_chartablesql.cpp
+++ b/tipp10/patches/patch-sql_chartablesql.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-sql_chartablesql.cpp,v 1.1 2012/12/29 14:51:33 othyro Exp $
+$NetBSD$
-Removing unnecessary function qualifier.
+Remove unnecessary function qualifier
---- sql/chartablesql.cpp.orig 2010-12-28 12:30:54.000000000 +0000
+--- sql/chartablesql.cpp
+++ sql/chartablesql.cpp
-@@ -57,7 +57,7 @@ QVariant CharSqlModel::data(const QModel
- // Read the unicode value
- unicode = value.toInt();
- // Convert unicode to a char
-- unicodeToChar = QString::QString(QChar(unicode)); //"\'" + QString::QString(QChar(unicode)) + "\'";
-+ unicodeToChar = QString(QChar(unicode)); //"\'" + QString::QString(QChar(unicode)) + "\'";
- return unicodeToChar;
- } else {
- // Last column (error weight)
+@@ -57,7 +57,7 @@ QVariant CharSqlModel::data(const QModelIndex &index, int role) const {
+ // Read the unicode value
+ unicode = value.toInt();
+ // Convert unicode to a char
+- unicodeToChar = QString::QString(QChar(unicode)); //"\'" + QString::QString(QChar(unicode)) + "\'";
++ unicodeToChar = QString(QChar(unicode)); //"\'" + QString::QString(QChar(unicode)) + "\'";
+ return unicodeToChar;
+ } else {
+ // Last column (error weight)
diff --git a/tipp10/patches/patch-sql_startsql.cpp b/tipp10/patches/patch-sql_startsql.cpp
index 5d3148d30d..47a3212248 100644
--- a/tipp10/patches/patch-sql_startsql.cpp
+++ b/tipp10/patches/patch-sql_startsql.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-sql_startsql.cpp,v 1.1 2012/12/29 14:51:33 othyro Exp $
+$NetBSD$
-Remove unnecessary function qualifier.
+Remove unnecessary function qualifier
---- sql/startsql.cpp.orig 2011-03-12 20:14:24.000000000 +0000
+--- sql/startsql.cpp
+++ sql/startsql.cpp
-@@ -344,7 +344,7 @@ bool StartSql::updateOwnLesson(QString l
- for (i = 0; i < content.size(); i++) {
- //simplifiedContent = QString::QString(
- // content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive).simplified();
-- simplifiedContent = trim(QString::QString(
-+ simplifiedContent = trim(QString(
- content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive));
-
- if (!query.exec("INSERT INTO own_content VALUES(NULL,'" +
+@@ -344,7 +344,7 @@ bool StartSql::updateOwnLesson(QString lessonnumber, QString lessonname,
+ for (i = 0; i < content.size(); i++) {
+ //simplifiedContent = QString::QString(
+ // content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive).simplified();
+- simplifiedContent = trim(QString::QString(
++ simplifiedContent = trim(QString(
+ content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive));
+
+ if (!query.exec("INSERT INTO own_content VALUES(NULL,'" +
diff --git a/tipp10/patches/patch-widget_lessondialog.cpp b/tipp10/patches/patch-widget_lessondialog.cpp
index fbe990455f..0539131a19 100644
--- a/tipp10/patches/patch-widget_lessondialog.cpp
+++ b/tipp10/patches/patch-widget_lessondialog.cpp
@@ -1,24 +1,23 @@
-$NetBSD: patch-widget_lessondialog.cpp,v 1.1 2012/12/29 14:51:33 othyro Exp $
+$NetBSD$
+Remove unncessary function qualifier.
-Removing unnecessary function qualifier.
-
---- widget/lessondialog.cpp.orig 2011-03-12 20:10:08.000000000 +0000
+--- widget/lessondialog.cpp
+++ widget/lessondialog.cpp
@@ -89,7 +89,7 @@ void LessonDialog::updateContent() {
- *lessonData = lineLessonContent->toPlainText().split("\n", QString::SkipEmptyParts);
- // Delete empty lines
- for (int i = 0; i < lessonData->size(); i++) {
-- if (QString::QString(lessonData->at(i).toLocal8Bit().constData()).simplified() == "") {
-+ if (QString(lessonData->at(i).toLocal8Bit().constData()).simplified() == "") {
- lessonData->removeAt(i);
- }
- }
+ *lessonData = lineLessonContent->toPlainText().split("\n", QString::SkipEmptyParts);
+ // Delete empty lines
+ for (int i = 0; i < lessonData->size(); i++) {
+- if (QString::QString(lessonData->at(i).toLocal8Bit().constData()).simplified() == "") {
++ if (QString(lessonData->at(i).toLocal8Bit().constData()).simplified() == "") {
+ lessonData->removeAt(i);
+ }
+ }
@@ -259,7 +259,7 @@ void LessonDialog::clickSave() {
- contentList = lineLessonContent->toPlainText().split("\n", QString::SkipEmptyParts);
- // Delete empty lines
- for (i = 0; i < contentList.size(); i++) {
-- if (QString::QString(contentList.at(i).toLocal8Bit().constData()).simplified() == "") {
-+ if (QString(contentList.at(i).toLocal8Bit().constData()).simplified() == "") {
- contentList.removeAt(i);
- }
- }
+ contentList = lineLessonContent->toPlainText().split("\n", QString::SkipEmptyParts);
+ // Delete empty lines
+ for (i = 0; i < contentList.size(); i++) {
+- if (QString::QString(contentList.at(i).toLocal8Bit().constData()).simplified() == "") {
++ if (QString(contentList.at(i).toLocal8Bit().constData()).simplified() == "") {
+ contentList.removeAt(i);
+ }
+ }
diff --git a/tipp10/patches/patch-widget_settingspages.cpp b/tipp10/patches/patch-widget_settingspages.cpp
index 1bdd9dd38a..b7520317fd 100644
--- a/tipp10/patches/patch-widget_settingspages.cpp
+++ b/tipp10/patches/patch-widget_settingspages.cpp
@@ -1,15 +1,14 @@
-$NetBSD: patch-widget_settingspages.cpp,v 1.1 2012/12/29 14:51:33 othyro Exp $
-
+$NetBSD$
Remove unnecessary qualifier.
---- widget/settingspages.cpp.orig 2011-03-12 20:10:08.000000000 +0000
+--- widget/settingspages.cpp
+++ widget/settingspages.cpp
@@ -501,7 +501,7 @@ void DatabasePage::writeSettings() {
- QSettings settings;
- #endif
- settings.beginGroup("database");
-- settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString::QString(APP_USER_DB));
-+ settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString(APP_USER_DB));
- settings.endGroup();
- }
-
+ QSettings settings;
+ #endif
+ settings.beginGroup("database");
+- settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString::QString(APP_USER_DB));
++ settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString(APP_USER_DB));
+ settings.endGroup();
+ }
+
diff --git a/tipp10/patches/patch-widget_tickerboard.cpp b/tipp10/patches/patch-widget_tickerboard.cpp
index 1c7df2071e..d048e400bf 100644
--- a/tipp10/patches/patch-widget_tickerboard.cpp
+++ b/tipp10/patches/patch-widget_tickerboard.cpp
@@ -1,50 +1,49 @@
-$NetBSD: patch-widget_tickerboard.cpp,v 1.1 2012/12/29 14:51:33 othyro Exp $
-
+$NetBSD$
Remove redundant qualifier.
---- widget/tickerboard.cpp.orig 2011-03-12 20:10:08.000000000 +0000
+--- widget/tickerboard.cpp
+++ widget/tickerboard.cpp
-@@ -97,7 +97,7 @@ void TickerBoard::startTicker(bool wasPa
-
- if (tickerSpeed == 50) {
- scrollOffset = 290;
-- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
-+ scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
- }
-
- startFlag = true;
+@@ -97,7 +97,7 @@ void TickerBoard::startTicker(bool wasPaused) {
+
+ if (tickerSpeed == 50) {
+ scrollOffset = 290;
+- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++ scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ }
+
+ startFlag = true;
@@ -153,7 +153,7 @@ void TickerBoard::changeChar() {
- scrollOffset = 0;
- } else {
- scrollOffset = 290;
-- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
-+ scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
- }
- splitLesson();
- }
+ scrollOffset = 0;
+ } else {
+ scrollOffset = 290;
+- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++ scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ }
+ splitLesson();
+ }
@@ -242,7 +242,7 @@ void TickerBoard::progress() {
-
- // Move ticker 1 pixel to left
- scrollOffset++;
-- scroll(-1, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
-+ scroll(-1, 0, QRect(10, 15, 590, 35)); //contentsRect());
-
- if ((lessonOffset - scrollOffset) <= 30) {
- setSpeed(tickerSpeed);
+
+ // Move ticker 1 pixel to left
+ scrollOffset++;
+- scroll(-1, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++ scroll(-1, 0, QRect(10, 15, 590, 35)); //contentsRect());
+
+ if ((lessonOffset - scrollOffset) <= 30) {
+ setSpeed(tickerSpeed);
@@ -265,14 +265,14 @@ void TickerBoard::progress() {
- // 160 pixels overage (because the user must see at least the next word)
- if ((lessonOffset - scrollOffset) > 200) {
- scrollOffset += (lessonOffset - scrollOffset) - 200;
-- scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
-+ scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect(10, 15, 590, 35)); //contentsRect());
- }
- } else {
- // If the user types faster than the ticker, move ticker faster after
- // 160 pixels overage (because the user must see at least the next word)
- if ((lessonOffset - scrollOffset) > 280) {
- scrollOffset += 570;
-- scroll(-570, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
-+ scroll(-570, 0, QRect(10, 15, 590, 35)); //contentsRect());
- }
-
- }
+ // 160 pixels overage (because the user must see at least the next word)
+ if ((lessonOffset - scrollOffset) > 200) {
+ scrollOffset += (lessonOffset - scrollOffset) - 200;
+- scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++ scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect(10, 15, 590, 35)); //contentsRect());
+ }
+ } else {
+ // If the user types faster than the ticker, move ticker faster after
+ // 160 pixels overage (because the user must see at least the next word)
+ if ((lessonOffset - scrollOffset) > 280) {
+ scrollOffset += 570;
+- scroll(-570, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++ scroll(-570, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ }
+
+ }
Home |
Main Index |
Thread Index |
Old Index