- Update to 1.8.0

- Add QT5 option
- Connect editors/lazarus-lcl-qt5 port
This commit is contained in:
Jose Alonso Cardenas Marquez 2018-02-01 07:18:26 +00:00
parent 962ad1ea2e
commit 2e1465a00c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=460561
6 changed files with 39 additions and 10 deletions

View file

@ -77,6 +77,7 @@
SUBDIR += lazarus-lcl-gtk2 SUBDIR += lazarus-lcl-gtk2
SUBDIR += lazarus-lcl-nogui SUBDIR += lazarus-lcl-nogui
SUBDIR += lazarus-lcl-qt SUBDIR += lazarus-lcl-qt
SUBDIR += lazarus-lcl-qt5
SUBDIR += lazarus-lcl-units SUBDIR += lazarus-lcl-units
SUBDIR += le SUBDIR += le
SUBDIR += leafpad SUBDIR += leafpad

View file

@ -6,7 +6,7 @@ PKGNAMESUFFIX= -lcl-units
COMMENT= Lazarus components library units COMMENT= Lazarus components library units
USE_FPC= fcl-base fcl-db fcl-image fcl-json fcl-registry \ USE_FPC= fcl-base fcl-db fcl-image fcl-json fcl-registry \
fcl-res fcl-xml iconvenc pasjpeg fcl-res fcl-xml iconvenc pasjpeg regexpr
LCL_INTERFACE= # LCL_INTERFACE= #

View file

@ -2,11 +2,10 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= lazarus PORTNAME= lazarus
PORTVERSION= 1.6.4 PORTVERSION= 1.8.0
DISTVERSIONSUFFIX= -0
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= editors devel CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \ MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
LOCAL/acm/freepascal LOCAL/acm/freepascal
DIST_SUBDIR= freepascal DIST_SUBDIR= freepascal
@ -33,11 +32,12 @@ DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION}
.if !defined(PKGNAMESUFFIX) .if !defined(PKGNAMESUFFIX)
OPTIONS_DEFINE= GDB OPTIONS_DEFINE= GDB
OPTIONS_SINGLE= LCL OPTIONS_SINGLE= LCL
OPTIONS_SINGLE_LCL= GTK2 QT4 OPTIONS_SINGLE_LCL= GTK2 QT4 QT5
GDB_DESC= Install a newest version of gdb GDB_DESC= Install a newest version of gdb
GTK2_DESC= Use gtk20 interface GTK2_DESC= Use gtk20 interface
QT4_DESC= Use qt4 interface QT4_DESC= Use qt4 interface
QT5_DESC= Use qt5 interface
OPTIONS_DEFAULT= GTK2 GDB OPTIONS_DEFAULT= GTK2 GDB
.endif .endif
@ -82,6 +82,13 @@ BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-
RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
.endif .endif
.if ${PORT_OPTIONS:MQT5}
LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas
LCL_PLATFORM= qt5
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
.endif
post-extract: post-extract:
@${MKDIR} ${WRKDIR}/man1 @${MKDIR} ${WRKDIR}/man1
@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
@ -92,7 +99,7 @@ post-extract:
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
-e 's|tools: lcl|tools:|g' -e '3080d' -e '3082d' -e '3083d' -e '3084d' -e '3085d' -e '3086d' ${WRKSRC}/${MAKEFILE} -e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE}
pre-build: pre-build:
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1488377664 TIMESTAMP = 1513100874
SHA256 (freepascal/lazarus-1.6.4-0.tar.gz) = 336654c5ad32244e64a56511108965b6b8eb25fe5882f61b2c15a24d8435a5e2 SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844
SIZE (freepascal/lazarus-1.6.4-0.tar.gz) = 57180961 SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372

View file

@ -0,0 +1,20 @@
--- components/synedit/synedit.pp 2018-01-30 13:41:54.904942000 -0500
+++ components/synedit/synedit.pp 2018-01-30 13:40:23.811860000 -0500
@@ -8945,7 +8945,7 @@
while not Highlighter.GetEol do begin
Start := Highlighter.GetTokenPos + 1;
Token := Highlighter.GetToken;
- if (PosX >= Start) and (PosX <= Start + Length(Token)) then begin
+ if (PosX >= Start) and (PosX < Start + Length(Token)) then begin
Attri := Highlighter.GetTokenAttribute;
TokenType := Highlighter.GetTokenKind;
exit(True);
@@ -8990,7 +8990,7 @@
//TokenType := Highlighter.GetTokenKind;
Attri := Highlighter.GetTokenAttribute;
//DebugLn([' TCustomSynEdit.CaretAtIdentOrString: Start=', Start, ', Token=', Token]);
- if (PosX >= Start) and (PosX <= Start + Length(Token)) then
+ if (PosX >= Start) and (PosX < Start + Length(Token)) then
begin
AtIdent := Attri = Highlighter.IdentifierAttribute;
NearString := (Attri = Highlighter.StringAttribute)

View file

@ -27,8 +27,9 @@ The Lazarus RAD was installed
editors/lazarus-lcl-nogui editors/lazarus-lcl-nogui
editors/lazarus-lcl-gtk2 editors/lazarus-lcl-gtk2
editors/lazarus-lcl-qt editors/lazarus-lcl-qt
editors/lazarus-lcl-qt5
You can added those ports if you want support for nogui, gtk2 or qt You can added those ports if you want support for nogui, gtk2, qt or qt5
interfaces. Please look at net-p2p/transmission-remote-gui like a example of interfaces. Please look at net-p2p/transmission-remote-gui like a example of
how use it how use it