Tue Apr 5 14:26:38 UTC 2011

3 files changed, 153 insertions, 0 deletions

diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD
new file mode 100644
index 000000000..43767818f
--- /dev/null
+++ b/community/tipp10/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 43635 2011-03-28 15:07:14Z bluewind $
+# Maintainer: Florian Pritz <flo@xinu.at>
+# Contributor: toliman <altergan@hs-albsig.de>
+
+pkgname=tipp10
+pkgver=2.1.0
+pkgrel=3
+pkgdesc="intelligent typing tutor"
+arch=('i686' 'x86_64')
+url="http://www.tipp10.com/"
+license=('GPL2')
+depends=('qt>=4.2.2')
+source=(defines.h.patch gcc-4.5.patch \
+  "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip")
+md5sums=('73a987123ca842026b7bde5e89370b86'
+         'a9d388ddb17ae93f13acb915bc8eba57'
+         '38c1e1fc9c5ba183279efdd22b318b7a')
+
+_srcdir="$srcdir/tipp10_source_v${pkgver//./-}"
+
+build() {
+  cd "$_srcdir"
+
+  sed -i 's#tipp10v2.template#../share/tipp10/tipp10v2.template#' def/defines.h
+  patch -p0 < "$srcdir/defines.h.patch"
+  patch -p0 < "$srcdir/gcc-4.5.patch"
+  qmake
+  make
+}
+
+package() {
+  cd "$_srcdir"
+
+	make DESTDIR="$pkgdir" install
+
+  install -Dm755 tipp10 "$pkgdir/usr/bin/tipp10"
+  install -Dm644 release/tipp10v2.template "$pkgdir/usr/share/tipp10/tipp10v2.template"
+  install -Dm644 tipp10.png "$pkgdir/usr/share/pixmaps/tipp10.png"
+  install -Dm644 tipp10.desktop "$pkgdir/usr/share/applications/tipp10.desktop"
+}
diff --git a/community/tipp10/defines.h.patch b/community/tipp10/defines.h.patch
new file mode 100644
index 000000000..e7d057e53
--- /dev/null
+++ b/community/tipp10/defines.h.patch
@@ -0,0 +1,14 @@
+--- def/defines.h.orig	2011-03-12 22:44:51.000000000 +0100
++++ def/defines.h	2011-03-12 22:45:02.000000000 +0100
+@@ -27,9 +27,9 @@
+ #define DEFINES_H

+ 

+ // OS constants

+-#define APP_WIN						true

++#define APP_WIN						false

+ #define APP_MAC						false

+-#define APP_X11						false

++#define APP_X11						true

+ #define APP_PORTABLE				false //at least one of the 3 OS must be true too!

+ 

+ // Languages

diff --git a/community/tipp10/gcc-4.5.patch b/community/tipp10/gcc-4.5.patch
new file mode 100644
index 000000000..dfff82057
--- /dev/null
+++ b/community/tipp10/gcc-4.5.patch
@@ -0,0 +1,99 @@
+--- sql/chartablesql.cpp	2010-05-08 14:53:48.000000000 +0200
++++ sql/chartablesql.cpp	2010-05-08 14:53:59.000000000 +0200
+@@ -50,7 +50,7 @@
+ 			// 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)

+--- sql/startsql.cpp	2010-05-08 14:54:24.000000000 +0200
++++ sql/startsql.cpp	2010-05-08 14:54:49.000000000 +0200
+@@ -338,7 +338,7 @@
+ 		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,'" +

+--- widget/lessondialog.cpp	2010-05-08 14:52:48.000000000 +0200
++++ widget/lessondialog.cpp	2010-05-08 14:53:11.000000000 +0200
+@@ -89,7 +89,7 @@
+ 			*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);

+ 				}

+ 			}

+@@ -268,7 +268,7 @@
+ 	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);

+ 		}

+ 	}

+--- widget/settingspages.cpp	2010-05-08 14:45:41.000000000 +0200
++++ widget/settingspages.cpp	2010-05-08 14:45:57.000000000 +0200
+@@ -617,7 +617,7 @@
+ 	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();

+ }

+ 

+--- widget/tickerboard.cpp	2010-05-08 14:28:38.000000000 +0200
++++ widget/tickerboard.cpp	2010-05-08 14:44:11.000000000 +0200
+@@ -96,7 +96,7 @@
+ 

+ 		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;

+@@ -150,7 +150,7 @@
+ 			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();

+ 	}

+@@ -239,7 +239,7 @@
+ 

+ 				// 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);

+@@ -262,14 +262,14 @@
+ 			// 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());

+ 			}

+ 

+ 		}