Attachment #149097 for bug #194844

View | Details | Raw Unified | Return to bug 194844
Collapse All | Expand All

Lines 2-8 Link Here

(-)lang/basic256/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/lang/basic256/Makefile 367888 2014-09-10 20:50:31Z gerald $	2	# $FreeBSD: head/lang/basic256/Makefile 367888 2014-09-10 20:50:31Z gerald $
3		3
4	PORTNAME= basic256	4	PORTNAME= basic256
5	PORTVERSION= 1.1.3.0	5	PORTVERSION= 1.1.4.0
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= SF	8	MASTER_SITES= SF
Lines 22-28 Link Here
22		22
23	USES= bison dos2unix qmake	23	USES= bison dos2unix qmake
24	USE_SDL= sdl mixer	24	USE_SDL= sdl mixer
25	USE_QT5= buildtools core gui multimedia network printsupport sql widgets	25	USE_QT5= buildtools core gui multimedia network printsupport sql widgets serialport
26	QMAKE_ARGS+= LOCALBASE="${LOCALBASE}"	26	QMAKE_ARGS+= LOCALBASE="${LOCALBASE}"
27	QMAKE_SOURCE_PATH= BASIC256.pro	27	QMAKE_SOURCE_PATH= BASIC256.pro
28		28

Lines 1-2 Link Here

(-)lang/basic256/distinfo (-2 / +2 lines)
1	SHA256 (basic256_1.1.3.0.orig.tar.gz) = 77e87fb443163c3bf5408938472960c69df9ca24a2bbd0499d324617306b3f47	1	SHA256 (basic256_1.1.4.0.orig.tar.gz) = 9df3ac4535448c1bd721364829e1bf4df7087c9b2c8d789e1fb5903e58c043ba
2	SIZE (basic256_1.1.3.0.orig.tar.gz) = 2582426	2	SIZE (basic256_1.1.4.0.orig.tar.gz) = 2611721




--- BASIC256.pro.orig	2014-11-05 17:03:39 UTC
+++ BASIC256.pro
@@ -13,13 +13,6 @@ CONFIG						+=	 qt debug_and_release
 
-lessThan(QT_MAJOR_VERSION, 5) {
-  message( FATAL_ERROR "BASIC-256 requires QT 5 or better." )
-}
-
 
 TEMPLATE					=	app
 TARGET						=	basic256
@@ -13,11 +9,6 @@
 OBJECTS_DIR					=	tmp/obj
 MOC_DIR						=	tmp/moc
 

-QT						+=	sql
-QT						+=	widgets
-QT						+=	printsupport
-QT						+=	serialport
-
 RESOURCES					+=	resources/resource.qrc
 RC_FILE						=	resources/basic256.rc
 TRANSLATIONS				=	Translations/basic256_en.ts \
@@ -86,7 +79,7 @@ unix:!macx {
 
 	## TTS Option 2 - use the espeak library
 	DEFINES					+=	ESPEAK

 	LIBS					+=	-lespeak
 
 	LIBS					+=	-lm
@@ -101,8 +94,10 @@ unix:!macx {
 
 	# Sound - QT Mobility Multimedia AudioOut
 	DEFINES					+=	SOUND_QMOBILITY
-	QT						+=	multimedia
-	INCLUDEPATH				+=	QtMultimediaKit
+	INCLUDEPATH                             +=      $$LOCALBASE/include/qt5/QtMultimedia
+	INCLUDEPATH                             +=      $$LOCALBASE/include/qt5/QtSerialPort
+ 	INCLUDEPATH				+=	QtMobility
+	LIBS                                    +=      -L$$LOCALBASE/lib -lQt5Gui -lQt5Core -lQt5Widgets -lQt5Sql -lQt5Multimedia -lQt5PrintSupport -lQt5SerialPort
 	INCLUDEPATH				+=	QtMobility
+	LIBS					+=	-L$$LOCALBASE/lib -lQt5Gui -lQt5Core -lQt5Widgets -lQt5Sql -lQt5Multimedia -lQt5PrintSupport
 
 
@@ -110,19 +105,19 @@ unix:!macx {
 	# rules for make install
 	########
 	exampleFiles.files		=	./Examples




--- BasicMediaPlayer.cpp.orig	2014-06-20 20:34:01.000000000 +0200
+++ BasicMediaPlayer.cpp	2014-06-20 20:34:34.000000000 +0200
@@ -104,11 +104,11 @@
 }
 
 double BasicMediaPlayer::length() {
-	return QMediaPlayer::duration() / 1000.0d;
+	return QMediaPlayer::duration() / 1000.0;
 }
 
 double BasicMediaPlayer::position() {
-	return QMediaPlayer::position() / 1000.0d;
+	return QMediaPlayer::position() / 1000.0;
 }
 
 void BasicMediaPlayer::play() {

Lines 128-133 Link Here

(-)lang/basic256/pkg-plist (+1 lines)
128	%%DATADIR%%/basic256_en.qm	128	%%DATADIR%%/basic256_en.qm
129	%%DATADIR%%/basic256_es.qm	129	%%DATADIR%%/basic256_es.qm
130	%%DATADIR%%/basic256_fr.qm	130	%%DATADIR%%/basic256_fr.qm
		131	%%DATADIR%%/basic256_it.qm
131	%%DATADIR%%/basic256_nl.qm	132	%%DATADIR%%/basic256_nl.qm
132	%%DATADIR%%/basic256_pt.qm	133	%%DATADIR%%/basic256_pt.qm
133	%%DATADIR%%/basic256_ru.qm	134	%%DATADIR%%/basic256_ru.qm

Return to bug 194844

Lines 1-15 Link Here

(-)lang/basic256/files/patch-BASIC256.pro (-18 / +13 lines)
1	--- BASIC256.pro.orig 2014-06-20 21:01:15.000000000 +0200	1	--- BASIC256.pro.orig 2014-11-05 17:03:39 UTC
2	+++ BASIC256.pro 2014-06-20 21:03:24.000000000 +0200	2	+++ BASIC256.pro
3	@@ -1,8 +1,4 @@	3	@@ -13,13 +13,6 @@ CONFIG += qt debug_and_release
4
5	-lessThan(QT_MAJOR_VERSION, 5) {
6	- message( FATAL_ERROR "BASIC-256 requires QT 5 or better." )
7	-}
8	-
9
10	TEMPLATE = app
11	TARGET = basic256
12	@@ -13,11 +9,6 @@
13	OBJECTS_DIR = tmp/obj	4	OBJECTS_DIR = tmp/obj
14	MOC_DIR = tmp/moc	5	MOC_DIR = tmp/moc
15		6
Lines 18-27 Link Here
18	-QT += sql	9	-QT += sql
19	-QT += widgets	10	-QT += widgets
20	-QT += printsupport	11	-QT += printsupport
21		12	-QT += serialport
		13	-
22	RESOURCES += resources/resource.qrc	14	RESOURCES += resources/resource.qrc
23	RC_FILE = resources/basic256.rc	15	RC_FILE = resources/basic256.rc
24	@@ -84,7 +75,7 @@	16	TRANSLATIONS = Translations/basic256_en.ts \
		17	@@ -86,7 +79,7 @@ unix:!macx {
25		18
26	## TTS Option 2 - use the espeak library	19	## TTS Option 2 - use the espeak library
27	DEFINES += ESPEAK	20	DEFINES += ESPEAK
Lines 30-47 Link Here
30	LIBS += -lespeak	23	LIBS += -lespeak
31		24
32	LIBS += -lm	25	LIBS += -lm
33	@@ -99,28 +90,28 @@	26	@@ -101,8 +94,10 @@ unix:!macx {
34		27
35	# Sound - QT Mobility Multimedia AudioOut	28	# Sound - QT Mobility Multimedia AudioOut
36	DEFINES += SOUND_QMOBILITY	29	DEFINES += SOUND_QMOBILITY
37	- QT += multimedia	30	- QT += multimedia
38	- INCLUDEPATH += QtMultimediaKit	31	- INCLUDEPATH += QtMultimediaKit
39	+ INCLUDEPATH += $$LOCALBASE/include/qt5/QtMultimedia	32	+ INCLUDEPATH += $$LOCALBASE/include/qt5/QtMultimedia
		33	+ INCLUDEPATH += $$LOCALBASE/include/qt5/QtSerialPort
		34	+ INCLUDEPATH += QtMobility
		35	+ LIBS += -L$$LOCALBASE/lib -lQt5Gui -lQt5Core -lQt5Widgets -lQt5Sql -lQt5Multimedia -lQt5PrintSupport -lQt5SerialPort
40	INCLUDEPATH += QtMobility	36	INCLUDEPATH += QtMobility
41	+ LIBS += -L$$LOCALBASE/lib -lQt5Gui -lQt5Core -lQt5Widgets -lQt5Sql -lQt5Multimedia -lQt5PrintSupport
42		37
43		38
44	########	39	@@ -110,19 +105,19 @@ unix:!macx {
45	# rules for make install	40	# rules for make install
46	########	41	########
47	exampleFiles.files = ./Examples	42	exampleFiles.files = ./Examples

Lines 1-16 Link Here

(-)lang/basic256/files/patch-BasicMediaPlayer.cpp (-16 lines)
1	--- BasicMediaPlayer.cpp.orig 2014-06-20 20:34:01.000000000 +0200
2	+++ BasicMediaPlayer.cpp 2014-06-20 20:34:34.000000000 +0200
3	@@ -104,11 +104,11 @@
4	}
5
6	double BasicMediaPlayer::length() {
7	- return QMediaPlayer::duration() / 1000.0d;
8	+ return QMediaPlayer::duration() / 1000.0;
9	}
10
11	double BasicMediaPlayer::position() {
12	- return QMediaPlayer::position() / 1000.0d;
13	+ return QMediaPlayer::position() / 1000.0;
14	}
15
16	void BasicMediaPlayer::play() {