[arch-commits] Commit in tipp10/repos/community-x86_64 (6 files)

Antonio Rojas arojas at archlinux.org
Tue Apr 30 20:35:13 UTC 2019


    Date: Tuesday, April 30, 2019 @ 20:34:56
  Author: arojas
Revision: 457219

archrelease: copy trunk to community-x86_64

Added:
  tipp10/repos/community-x86_64/PKGBUILD
    (from rev 457218, tipp10/trunk/PKGBUILD)
  tipp10/repos/community-x86_64/defines.h.patch
    (from rev 457218, tipp10/trunk/defines.h.patch)
  tipp10/repos/community-x86_64/gcc-4.5.patch
    (from rev 457218, tipp10/trunk/gcc-4.5.patch)
Deleted:
  tipp10/repos/community-x86_64/PKGBUILD
  tipp10/repos/community-x86_64/defines.h.patch
  tipp10/repos/community-x86_64/gcc-4.5.patch

-----------------+
 PKGBUILD        |   70 ++++++++-----------
 defines.h.patch |   28 +++----
 gcc-4.5.patch   |  198 +++++++++++++++++++++++++++---------------------------
 3 files changed, 144 insertions(+), 152 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-30 20:34:29 UTC (rev 457218)
+++ PKGBUILD	2019-04-30 20:34:56 UTC (rev 457219)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <flo at xinu.at>
-# Contributor: toliman <altergan at hs-albsig.de>
-
-pkgname=tipp10
-pkgver=2.1.0
-pkgrel=8
-pkgdesc="intelligent typing tutor"
-arch=('x86_64')
-url="https://www.tipp10.com/"
-license=('GPL2')
-depends=('qt4')
-source=(defines.h.patch
-        gcc-4.5.patch \
-        "https://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip")
-md5sums=('73a987123ca842026b7bde5e89370b86'
-         'a9d388ddb17ae93f13acb915bc8eba57'
-         '38c1e1fc9c5ba183279efdd22b318b7a')
-
-build() {
-  cd "$srcdir/tipp10_source_v${pkgver//./-}"
-
-  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-qt4
-  make
-}
-
-package() {
-  cd "$srcdir/tipp10_source_v${pkgver//./-}"
-
-  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"
-}

Copied: tipp10/repos/community-x86_64/PKGBUILD (from rev 457218, tipp10/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-30 20:34:56 UTC (rev 457219)
@@ -0,0 +1,31 @@
+# Maintainer: Florian Pritz <flo at xinu.at>
+# Contributor: toliman <altergan at hs-albsig.de>
+
+pkgname=tipp10
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="intelligent typing tutor"
+arch=('x86_64')
+url="https://www.tipp10.com/"
+license=('GPL2')
+depends=('qt5-multimedia')
+source=(https://gitlab.com/a_a/tipp10/-/archive/v$pkgver/tipp10-v$pkgver.tar.gz)
+md5sums=('2ead321736d58a5be70442eeac90b0f1')
+
+build() {
+  cd tipp10-v$pkgver
+
+  qmake-qt5
+  make
+}
+
+package() {
+  cd tipp10-v$pkgver
+
+  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"
+}

Deleted: defines.h.patch
===================================================================
--- defines.h.patch	2019-04-30 20:34:29 UTC (rev 457218)
+++ defines.h.patch	2019-04-30 20:34:56 UTC (rev 457219)
@@ -1,14 +0,0 @@
---- 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

Copied: tipp10/repos/community-x86_64/defines.h.patch (from rev 457218, tipp10/trunk/defines.h.patch)
===================================================================
--- defines.h.patch	                        (rev 0)
+++ defines.h.patch	2019-04-30 20:34:56 UTC (rev 457219)
@@ -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

Deleted: gcc-4.5.patch
===================================================================
--- gcc-4.5.patch	2019-04-30 20:34:29 UTC (rev 457218)
+++ gcc-4.5.patch	2019-04-30 20:34:56 UTC (rev 457219)
@@ -1,99 +0,0 @@
---- 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());
- 			}
- 
- 		}

Copied: tipp10/repos/community-x86_64/gcc-4.5.patch (from rev 457218, tipp10/trunk/gcc-4.5.patch)
===================================================================
--- gcc-4.5.patch	                        (rev 0)
+++ gcc-4.5.patch	2019-04-30 20:34:56 UTC (rev 457219)
@@ -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());
+ 			}
+ 
+ 		}


More information about the arch-commits mailing list