diff options
| author | pawel <pawel@FreeBSD.org> | 2014-11-08 07:16:16 +0800 |
|---|---|---|
| committer | pawel <pawel@FreeBSD.org> | 2014-11-08 07:16:16 +0800 |
| commit | d84b9d2f46f742d863d30d5ed7210e468d2278cc (patch) | |
| tree | 719be184054946f36de99ede60240cc6887cd951 | |
| parent | 542961444b020f9201ac93de14a88d8cf0034d3b (diff) | |
| download | freebsd-ports-gnome-d84b9d2f46f742d863d30d5ed7210e468d2278cc.tar.gz freebsd-ports-gnome-d84b9d2f46f742d863d30d5ed7210e468d2278cc.tar.zst freebsd-ports-gnome-d84b9d2f46f742d863d30d5ed7210e468d2278cc.zip | |
Update to version 1.1.4.0
PR: 194844
Submitted by: maintainer
| -rw-r--r-- | lang/basic256/Makefile | 5 | ||||
| -rw-r--r-- | lang/basic256/distinfo | 4 | ||||
| -rw-r--r-- | lang/basic256/files/patch-BASIC256.pro | 31 | ||||
| -rw-r--r-- | lang/basic256/files/patch-BasicMediaPlayer.cpp | 16 | ||||
| -rw-r--r-- | lang/basic256/pkg-plist | 1 |
5 files changed, 18 insertions, 39 deletions
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile index 124ff2d9d80e..e53921a76808 100644 --- a/lang/basic256/Makefile +++ b/lang/basic256/Makefile @@ -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 diff --git a/lang/basic256/distinfo b/lang/basic256/distinfo index 7ac8ca74266e..8b496e4e5764 100644 --- a/lang/basic256/distinfo +++ b/lang/basic256/distinfo @@ -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 diff --git a/lang/basic256/files/patch-BASIC256.pro b/lang/basic256/files/patch-BASIC256.pro index d321e0c1f84e..c12e580bde8f 100644 --- a/lang/basic256/files/patch-BASIC256.pro +++ b/lang/basic256/files/patch-BASIC256.pro @@ -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 diff --git a/lang/basic256/files/patch-BasicMediaPlayer.cpp b/lang/basic256/files/patch-BasicMediaPlayer.cpp deleted file mode 100644 index c7b5f9a0aec9..000000000000 --- a/lang/basic256/files/patch-BasicMediaPlayer.cpp +++ /dev/null @@ -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() { diff --git a/lang/basic256/pkg-plist b/lang/basic256/pkg-plist index 0a6a981245b8..0d7adf846596 100644 --- a/lang/basic256/pkg-plist +++ b/lang/basic256/pkg-plist @@ -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 |