Update to version 1.1.4.0
PR: 194844 Submitted by: maintainer
This commit is contained in:
parent
006d036ae6
commit
7c6916706a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372303
5 changed files with 18 additions and 39 deletions
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= basic256
|
||||
PORTVERSION= 1.1.3.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.1.4.0
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= SF
|
||||
MASTER_SITE_SUBDIR= kidbasic/${PORTNAME}
|
||||
|
@ -22,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
|||
|
||||
USES= bison dos2unix qmake
|
||||
USE_SDL= sdl mixer
|
||||
USE_QT5= buildtools core gui multimedia network printsupport sql widgets
|
||||
USE_QT5= buildtools core gui multimedia network printsupport sql widgets serialport
|
||||
QMAKE_ARGS+= LOCALBASE="${LOCALBASE}"
|
||||
QMAKE_SOURCE_PATH= BASIC256.pro
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (basic256_1.1.3.0.orig.tar.gz) = 77e87fb443163c3bf5408938472960c69df9ca24a2bbd0499d324617306b3f47
|
||||
SIZE (basic256_1.1.3.0.orig.tar.gz) = 2582426
|
||||
SHA256 (basic256_1.1.4.0.orig.tar.gz) = 9df3ac4535448c1bd721364829e1bf4df7087c9b2c8d789e1fb5903e58c043ba
|
||||
SIZE (basic256_1.1.4.0.orig.tar.gz) = 2611721
|
||||
|
|
|
@ -1,15 +1,6 @@
|
|||
--- BASIC256.pro.orig 2014-06-20 21:01:15.000000000 +0200
|
||||
+++ BASIC256.pro 2014-06-20 21:03:24.000000000 +0200
|
||||
@@ -1,8 +1,4 @@
|
||||
|
||||
-lessThan(QT_MAJOR_VERSION, 5) {
|
||||
- message( FATAL_ERROR "BASIC-256 requires QT 5 or better." )
|
||||
-}
|
||||
-
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = basic256
|
||||
@@ -13,11 +9,6 @@
|
||||
--- BASIC256.pro.orig 2014-11-05 17:03:39 UTC
|
||||
+++ BASIC256.pro
|
||||
@@ -13,13 +13,6 @@ CONFIG += qt debug_and_release
|
||||
OBJECTS_DIR = tmp/obj
|
||||
MOC_DIR = tmp/moc
|
||||
|
||||
|
@ -18,10 +9,12 @@
|
|||
-QT += sql
|
||||
-QT += widgets
|
||||
-QT += printsupport
|
||||
|
||||
-QT += serialport
|
||||
-
|
||||
RESOURCES += resources/resource.qrc
|
||||
RC_FILE = resources/basic256.rc
|
||||
@@ -84,7 +75,7 @@
|
||||
TRANSLATIONS = Translations/basic256_en.ts \
|
||||
@@ -86,7 +79,7 @@ unix:!macx {
|
||||
|
||||
## TTS Option 2 - use the espeak library
|
||||
DEFINES += ESPEAK
|
||||
|
@ -30,18 +23,20 @@
|
|||
LIBS += -lespeak
|
||||
|
||||
LIBS += -lm
|
||||
@@ -99,28 +90,28 @@
|
||||
@@ -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/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
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
--- 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() {
|
|
@ -128,6 +128,7 @@ bin/basic256
|
|||
%%DATADIR%%/basic256_en.qm
|
||||
%%DATADIR%%/basic256_es.qm
|
||||
%%DATADIR%%/basic256_fr.qm
|
||||
%%DATADIR%%/basic256_it.qm
|
||||
%%DATADIR%%/basic256_nl.qm
|
||||
%%DATADIR%%/basic256_pt.qm
|
||||
%%DATADIR%%/basic256_ru.qm
|
||||
|
|
Loading…
Reference in a new issue