Attachment 144097 Details for Bug 191340 – Patch to the port tree

[patch] Patch to the port tree

patch-upgrade-1.1.2.6.txt (text/plain), 3.87 KB, created by Fernando Apesteguía on 2014-06-24 12:59:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2014-06-24 12:59:36 UTC

Size: 3.87 KB

patch

obsolete

>diff -ruN /usr/ports/lang/basic256/Makefile lang/basic256/Makefile
>--- /usr/ports/lang/basic256/Makefile	2014-02-22 13:11:25.000000000 +0100
>+++ lang/basic256/Makefile	2014-06-23 23:18:38.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/lang/basic256/Makefile 345627 2014-02-22 12:11:25Z pawel $
> 
> PORTNAME=	basic256
>-PORTVERSION=	1.1.0.0
>+PORTVERSION=	1.1.2.6
> CATEGORIES=	lang
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=	kidbasic/${PORTNAME}
>@@ -13,13 +13,13 @@
> 
> BUILD_DEPENDS=	espeak:${PORTSDIR}/audio/espeak \
> 		sqlite3:${PORTSDIR}/databases/sqlite3 \
>-		flex:${PORTSDIR}/textproc/flex
>+		flex:${PORTSDIR}/textproc/flex \
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> USES=		bison dos2unix qmake
> USE_SDL=	sdl mixer
>-USE_QT4=	corelib gui network xml webkit moc_build rcc_build uic_build
>+USE_QT5=	buildtools core gui multimedia network printsupport sql widgets
> QMAKE_SOURCE_PATH=	BASIC256.pro
> 
> MAKE_JOBS_UNSAFE=	yes
>diff -ruN /usr/ports/lang/basic256/distinfo lang/basic256/distinfo
>--- /usr/ports/lang/basic256/distinfo	2014-02-22 13:11:25.000000000 +0100
>+++ lang/basic256/distinfo	2014-06-11 19:06:06.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (basic256_1.1.0.0.orig.tar.gz) = e89d039a055c74b13a23890d0200af37f171b5a48a7174fb08acfb35c1506c63
>-SIZE (basic256_1.1.0.0.orig.tar.gz) = 2043561
>+SHA256 (basic256_1.1.2.6.orig.tar.gz) = f9b7920a4e7d042bcefb05a73c03ec5bb9e70b1118a8612a58a7a1a41d09add4
>+SIZE (basic256_1.1.2.6.orig.tar.gz) = 19090301
>diff -ruN /usr/ports/lang/basic256/files/patch-BASIC256.pro lang/basic256/files/patch-BASIC256.pro
>--- /usr/ports/lang/basic256/files/patch-BASIC256.pro	2014-02-22 13:11:25.000000000 +0100
>+++ lang/basic256/files/patch-BASIC256.pro	2014-06-20 21:03:26.000000000 +0200
>@@ -1,15 +1,47 @@
>---- BASIC256.pro.orig	2014-02-15 18:45:35.000000000 +0100
>-+++ BASIC256.pro	2014-02-15 18:46:10.000000000 +0100
>-@@ -82,7 +82,7 @@
>+--- 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 @@
>+ OBJECTS_DIR					=	tmp/obj
>+ MOC_DIR						=	tmp/moc
>+ 
>+-QT						+=	webkit
>+-QT						+=	gui
>+-QT						+=	sql
>+-QT						+=	widgets
>+-QT						+=	printsupport
>+ 
>+ RESOURCES					+=	resources/resource.qrc
>+ RC_FILE						=	resources/basic256.rc
>+@@ -84,7 +75,7 @@
>  
>  	## TTS Option 2 - use the espeak library
>  	DEFINES					+=	ESPEAK
> -	INCLUDEPATH				+=	/usr/include/espeak
>-+	INCLUDEPATH				+=	%%LOCALBASE%%/include/espeak
>++	INCLUDEPATH				+=	/usr/local/include/espeak
>  	LIBS					+=	-lespeak
>  
>  	LIBS					+=	-lm
>-@@ -117,19 +117,19 @@
>+@@ -99,28 +90,28 @@
>+ 
>+ 	# Sound - QT Mobility Multimedia AudioOut
>+ 	DEFINES					+=	SOUND_QMOBILITY
>+-	QT						+=	multimedia
>+-	INCLUDEPATH				+=	QtMultimediaKit
>++	INCLUDEPATH				+=	/usr/local/include/qt5/QtMultimedia
>+ 	INCLUDEPATH				+=	QtMobility
>++	LIBS					+=	-L/usr/local/lib -lQt5Gui -lQt5Core -lQt5Widgets -lQt5Sql -lQt5Multimedia -lQt5PrintSupport
>+ 
>+ 
>+ 	########
>  	# rules for make install
>  	########
>  	exampleFiles.files		=	./Examples
>diff -ruN /usr/ports/lang/basic256/files/patch-BasicMediaPlayer.cpp lang/basic256/files/patch-BasicMediaPlayer.cpp
>--- /usr/ports/lang/basic256/files/patch-BasicMediaPlayer.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ lang/basic256/files/patch-BasicMediaPlayer.cpp	2014-06-20 20:35:06.000000000 +0200
>@@ -0,0 +1,16 @@
>+--- 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() {

Actions: View | Diff

Attachments on bug 191340: 144097