Attachment 103191 Details for Bug 143081 – qt4pas.diff

[patch] qt4pas.diff

qt4pas.diff (text/plain), 4.40 KB, created by Dima Panov on 2010-01-22 11:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2010-01-22 11:50:01 UTC

Size: 4.40 KB

patch

obsolete

>Index: x11-toolkits/qt4pas/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- x11-toolkits/qt4pas/Makefile	14 Aug 2009 10:46:22 -0000	1.2
>+++ x11-toolkits/qt4pas/Makefile	22 Jan 2010 11:19:46 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	qt4pas
>-PORTVERSION=	1.70
>+PORTVERSION=	2.0
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	http://users.telenet.be/Jan.Van.hijfte/qtforfpc/
> DISTNAME=	${PORTNAME}-${PORTVERSION:S/^/V/}_Qt${QT4_VER_MIN}
>@@ -18,7 +18,7 @@
> USE_QT_VER=	4
> QT_COMPONENTS=	corelib gui network script webkit
> 
>-QT4_VER_MIN=	4.5.0
>+QT4_VER_MIN=	4.5.3
> 
> .include <bsd.port.pre.mk>
> 
>@@ -26,16 +26,7 @@
> IGNORE=	Please update your current qt4 version to ${QT4_VER_MIN}
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|%%QT_INCDIR%%|${QT_INCDIR}|' -e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g' -e \
>-		's|%%CXX%%|${CXX}|g' -e 's|%%STRIP_CMD%%|${STRIP_CMD}|g' -e 's|bash|sh|g' ${WRKSRC}/compile_lib.sh
>-
>-do-build:
>-	@cd ${WRKSRC} && \
>-		${SH} compile_lib.sh
>-
>-do-install:
>-	@${MKDIR} ${PREFIX}/lib/qt4
>-	${INSTALL_PROGRAM} ${WRKSRC}/libqt4intf.so ${PREFIX}/lib/qt4
>+pre-build:
>+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}
> 
> .include <bsd.port.post.mk>
>Index: x11-toolkits/qt4pas/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- x11-toolkits/qt4pas/distinfo	14 Aug 2009 10:46:22 -0000	1.2
>+++ x11-toolkits/qt4pas/distinfo	22 Jan 2010 11:00:44 -0000
>@@ -1,3 +1,3 @@
>-MD5 (qt4pas-V1.70_Qt4.5.0.tar.gz) = 1b44cd72a6c226524a54afe93b68ecb8
>-SHA256 (qt4pas-V1.70_Qt4.5.0.tar.gz) = d20c6cf48b854074a5449e621aaf1f3fde7d38f13abb945887ef9b642fcbd01e
>-SIZE (qt4pas-V1.70_Qt4.5.0.tar.gz) = 403932
>+MD5 (qt4pas-V2.0_Qt4.5.3.tar.gz) = 56afc2d3e4088c27fbffbc08b2e3862c
>+SHA256 (qt4pas-V2.0_Qt4.5.3.tar.gz) = 06486792523ea01b89a3985f844015a93a353719c85e700e5c56d3504ac8a428
>+SIZE (qt4pas-V2.0_Qt4.5.3.tar.gz) = 347301
>Index: x11-toolkits/qt4pas/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/pkg-plist,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-plist
>--- x11-toolkits/qt4pas/pkg-plist	22 Jan 2009 02:23:42 -0000	1.1
>+++ x11-toolkits/qt4pas/pkg-plist	22 Jan 2010 11:39:42 -0000
>@@ -1,2 +1,4 @@
>-lib/qt4/libqt4intf.so
>-@dirrmtry lib/qt4
>+lib/qt4/libQt4Pas.so
>+lib/qt4/libQt4Pas.so.5
>+lib/qt4/libQt4Pas.so.5.2
>+lib/qt4/libQt4Pas.so.5.2.0
>Index: x11-toolkits/qt4pas/files/patch-compile_lib.sh
>===================================================================
>RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/files/patch-compile_lib.sh,v
>retrieving revision 1.2
>diff -u -r1.2 patch-compile_lib.sh
>--- x11-toolkits/qt4pas/files/patch-compile_lib.sh	14 Aug 2009 10:46:23 -0000	1.2
>+++ x11-toolkits/qt4pas/files/patch-compile_lib.sh	22 Jan 2010 11:01:56 -0000
>@@ -1,33 +0,0 @@
>---- ./compile_lib.sh.orig	2009-04-20 17:59:59.000000000 +0400
>-+++ ./compile_lib.sh	2009-07-12 15:18:58.000000000 +0400
>-@@ -1,4 +1,4 @@
>--#!/bin/env bash
>-+#!/bin/env sh
>- # get latest from http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html
>- # for more info, you can visit the links on above page to FreePascal and Lazarus wiki
>- 
>-@@ -7,18 +7,16 @@
>- # do configure and gmake in that Qt4 dir
>- 
>- NAME=libqt4intf.so
>--QTDIR=../qt-all-opensource-src-4.5.0
>--INCLUDE_PATH="-I. -I$QTDIR/include -I$QTDIR/include/Qt -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore -Iqlcl "
>--LIB_PATH=$QTDIR/lib
>--export LD_LIBRARY_PATH=$LIB_PATH
>-+QTDIR=%%QT_INCDIR%%
>-+INCLUDE_PATH="-I. -I$QTDIR -I$QTDIR/Qt -I$QTDIR/QtGui -I$QTDIR/QtCore -Iqlcl "
>-+LIB_PATH=%%QT_LIBDIR%%
>-+
>- if [ -e "$LIB_PATH/libQtCore.so.4" ]
>- then
>-   echo please wait for compile to finish ...
>--  g++ -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit  -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH
>--  echo Showing used Qt libraries when LD_LIBRARY_PATH=$LD_LIBRARY_PATH
>--  ldd $NAME | grep libQt
>-+  %%CXX%% -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit  -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH
>-   echo stripping library
>--  strip --strip-all $NAME
>-+  %%STRIP_CMD%% --strip-all $NAME
>-   echo Done
>- else
>-   echo "Please Modify location of Qt4 in this script"

Actions: View | Diff

Attachments on bug 143081: 103191