Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -0,0 +1,49 @@ +# $FreeBSD$ + +PORTNAME= lazpaint +PORTVERSION= 6.4.1 +DISTVERSIONPREFIX= v +CATEGORIES= graphics +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} + +MAINTAINER= acm@FreeBSD.org +COMMENT= Image editor written in Lazarus + +LICENSE= GPLv3 + +USES= dos2unix fpc lazarus:flavors +USE_FPC= chm fcl-base fcl-image fcl-json fcl-net fcl-web fcl-xml \ + opengl openssl pasjpeg rtl-extra rtl-objpas x11 +USE_XORG= x11 +DOS2UNIX_REGEX= .*\.([txt]|pas|lpi|txt) +USE_GITHUB= yes +GH_ACCOUNT= bgrabitmap +GH_PROJECT= lazpaint +GH_TAGNAME= 4fc4381 +GH_TUPLE= bgrabitmap:bgracontrols:8e9d32a:bgracontrols/bgracontrols \ + bgrabitmap:bgrabitmap:dffb32a:bgrabitmap/bgrabitmapnew + +USE_FPC_gtk2= cairo +USE_GNOME_gtk2= cairo +USE_FPC+= ${USE_FPC_${FLAVOR}} +USE_GNOME+= ${USE_GNOME_${FLAVOR}} + +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 + +LAZARUS_PROJECT_FILES= bgrabitmapnew/bgrabitmap/bgrabitmappack.lpk +LAZARUS_PROJECT_FILES+= bgracontrols/bgracontrols.lpk +LAZARUS_PROJECT_FILES+= lazpaint/lazpaint.lpi + +LAZBUILD_ARGS= -d + +post-patch: + ${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/lazpaint/utranslation.pas + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/lazpaint/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/lazpaint/release && ${COPYTREE_SHARE} "i18n models" ${STAGEDIR}${DATADIR} + +.include Index: distinfo =================================================================== --- distinfo +++ distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1533562481 +SHA256 (bgrabitmap-lazpaint-v6.4.1-4fc4381_GH0.tar.gz) = 87112a2d0175dc314433a1cd2d5abb051eeb75e07075fc22e50e78e7ab870bfd +SIZE (bgrabitmap-lazpaint-v6.4.1-4fc4381_GH0.tar.gz) = 8905571 +SHA256 (bgrabitmap-bgracontrols-8e9d32a_GH0.tar.gz) = f6345a07bf18a4d3eec88e14bd605d1a0d4b3d72e20bbd52b641398178a28a31 +SIZE (bgrabitmap-bgracontrols-8e9d32a_GH0.tar.gz) = 2730812 +SHA256 (bgrabitmap-bgrabitmap-dffb32a_GH0.tar.gz) = 568b17f77ae3e83b9d3ddc6d5d73417d8d5aa68dc3cda024ce1315df46752dca +SIZE (bgrabitmap-bgrabitmap-dffb32a_GH0.tar.gz) = 3176400 Index: files/patch-lazpaint_lazpaintmainform.pas =================================================================== --- files/patch-lazpaint_lazpaintmainform.pas +++ files/patch-lazpaint_lazpaintmainform.pas @@ -0,0 +1,11 @@ +--- lazpaint/lazpaintmainform.pas 2018-04-25 23:51:57.849654000 -0500 ++++ lazpaint/lazpaintmainform.pas 2018-04-25 23:52:24.210190000 -0500 +@@ -17,7 +17,7 @@ + + LazPaintType, UMainFormLayout, UTool, UImage, UImageAction, ULayerAction, UZoom, + UImageObservation, UConfig, UScaleDPI, UResourceStrings, +- UMenu, uscripting, ubrowseimages, UToolPolygon, UBarUpDown; ++ UMenu, uscripting, ubrowseimages, UToolPolygon, UBarUpDown, LazFileUtils, LazUTF8; + + const + MinPenWidthValue = 10; Index: files/patch-lazpaint_lazpainttype.pas =================================================================== --- files/patch-lazpaint_lazpainttype.pas +++ files/patch-lazpaint_lazpainttype.pas @@ -0,0 +1,11 @@ +--- lazpaint/lazpainttype.pas 2018-04-25 23:41:19.922862000 -0500 ++++ lazpaint/lazpainttype.pas 2018-04-25 23:41:36.179325000 -0500 +@@ -6,7 +6,7 @@ + + uses + Classes, SysUtils, Inifiles, BGRABitmap, BGRABitmapTypes, uconfig, uimage, utool, Forms, BGRALayers, Graphics, Menus, +- uscripting, Dialogs, Controls ++ uscripting, Dialogs, LazUTF8, LazFileUtils, Controls + {$IFDEF LINUX}, InterfaceBase{$ENDIF}; + + const Index: files/patch-lazpaint_uadjustcurves.pas =================================================================== --- files/patch-lazpaint_uadjustcurves.pas +++ files/patch-lazpaint_uadjustcurves.pas @@ -0,0 +1,30 @@ +--- lazpaint/uadjustcurves.pas 2018-04-25 23:53:59.146788000 -0500 ++++ lazpaint/uadjustcurves.pas 2018-04-25 23:57:23.786990000 -0500 +@@ -156,8 +156,8 @@ + begin + with CoordToBitmap(i/FNbGrid,i/FNbGrid) do + begin +- Bitmap.DrawLineAntialias(round(FPoint0.x),round(y),Bitmap.Width,round(y),FGridColor,BGRAPixelTransparent,FTickSize,false); +- Bitmap.DrawLineAntialias(round(x),round(FPoint0.y),round(x),0,FGridColor,BGRAPixelTransparent,FTickSize,false); ++ Bitmap.DrawLineAntialias(System.round(FPoint0.x),System.round(y),Bitmap.Width,System.round(y),FGridColor,BGRAPixelTransparent,FTickSize,false); ++ Bitmap.DrawLineAntialias(System.round(x),System.round(FPoint0.y),System.round(x),0,FGridColor,BGRAPixelTransparent,FTickSize,false); + end; + end; + curve := SelectedCurve; +@@ -515,14 +515,14 @@ + with GetCoord(0,i/high(labels)) do + begin + Bitmap.TextOut(x-FTickSize,y-th div 2,labels[i],axesColor,taRightJustify); +- Bitmap.DrawLine(round(x),round(y),round(x-FTickSize),round(y),axesColor,False); ++ Bitmap.DrawLine(System.round(x),System.round(y),System.round(x-FTickSize),System.round(y),axesColor,False); + end; + with GetCoord(i/high(labels),0) do + begin + if i = 0 then + Bitmap.TextOut(x,y+FTickSize,labels[i],axesColor,taLeftJustify) else + Bitmap.TextOut(x,y+FTickSize,labels[i],axesColor,taCenter); +- Bitmap.DrawLine(round(x),round(y),round(x),round(y+FTickSize),axesColor,False); ++ Bitmap.DrawLine(System.round(x),System.round(y),System.round(x),System.round(y+FTickSize),axesColor,False); + end; + end; + Bitmap.DrawLine(leftMargin, 0, leftMargin, Bitmap.Height - bottomMargin, axesColor, False); Index: files/patch-lazpaint_ubrowseimages.pas =================================================================== --- files/patch-lazpaint_ubrowseimages.pas +++ files/patch-lazpaint_ubrowseimages.pas @@ -0,0 +1,11 @@ +--- lazpaint/ubrowseimages.pas 2018-04-25 23:50:38.459232000 -0500 ++++ lazpaint/ubrowseimages.pas 2018-04-25 23:50:47.539703000 -0500 +@@ -7,7 +7,7 @@ + uses + Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, + ComCtrls, ExtCtrls, Buttons, StdCtrls, BGRAVirtualScreen, BGRABitmap, +- BGRABitmapTypes, BGRAAnimatedGif, UMySLV, LazPaintType, Masks, LCLType; ++ BGRABitmapTypes, BGRAAnimatedGif, UMySLV, LazPaintType, Masks, LCLType, LazFileUtils; + + const + MaxIconCacheCount = 512; Index: files/patch-lazpaint_ucommandline.pas =================================================================== --- files/patch-lazpaint_ucommandline.pas +++ files/patch-lazpaint_ucommandline.pas @@ -0,0 +1,11 @@ +--- lazpaint/ucommandline.pas 2018-04-26 00:01:03.521298000 -0500 ++++ lazpaint/ucommandline.pas 2018-04-26 00:01:21.335693000 -0500 +@@ -4,7 +4,7 @@ + + interface + +-uses classes, LazpaintType, uresourcestrings; ++uses classes, LazpaintType, uresourcestrings, LazUTF8, LazFileUtils; + + procedure ProcessCommands(instance: TLazPaintCustomInstance; commandsUTF8: TStringList; out errorEncountered, fileSaved: boolean); + function ParamStrUTF8(AIndex: integer): string; Index: files/patch-lazpaint_uconfig.pas =================================================================== --- files/patch-lazpaint_uconfig.pas +++ files/patch-lazpaint_uconfig.pas @@ -0,0 +1,11 @@ +--- lazpaint/uconfig.pas 2018-04-25 23:39:35.445237000 -0500 ++++ lazpaint/uconfig.pas 2018-04-25 23:39:48.185933000 -0500 +@@ -5,7 +5,7 @@ + interface + + uses +- Classes, SysUtils, IniFiles, BGRABitmapTypes, Graphics, LCLType, uscripting; ++ Classes, SysUtils, IniFiles, BGRABitmapTypes, Graphics, LCLType, uscripting, LazUTF8, LazUTF8Sysutils, LazFileUtils; + + type + TLazPaintConfig = class; Index: files/patch-lazpaint_ucustomblur.pas =================================================================== --- files/patch-lazpaint_ucustomblur.pas +++ files/patch-lazpaint_ucustomblur.pas @@ -0,0 +1,11 @@ +--- lazpaint/ucustomblur.pas 2018-04-25 23:58:21.378496000 -0500 ++++ lazpaint/ucustomblur.pas 2018-04-25 23:58:39.088932000 -0500 +@@ -7,7 +7,7 @@ + uses + Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, + StdCtrls, ExtCtrls, ExtDlgs, bgrabitmap, LazPaintType, UScaleDPI, +- UResourceStrings, UFilterConnector, UFilterThread, ubrowseimages; ++ UResourceStrings, UFilterConnector, UFilterThread, ubrowseimages, LazFileUtils; + + type + Index: files/patch-lazpaint_ugraph.pas =================================================================== --- files/patch-lazpaint_ugraph.pas +++ files/patch-lazpaint_ugraph.pas @@ -0,0 +1,11 @@ +--- lazpaint/ugraph.pas 2018-04-26 00:33:20.456108000 -0500 ++++ lazpaint/ugraph.pas 2018-04-26 00:33:27.797858000 -0500 +@@ -6,7 +6,7 @@ + + uses + Classes, SysUtils, bgrabitmap, bgrabitmaptypes, LazPaintType, Graphics, BGRALayers, LCLType, +- BCButton; ++ BCButton, LazUTF8; + + const FrameDashLength = 4; + NicePointMaxRadius = 4; Index: files/patch-lazpaint_uimage.pas =================================================================== --- files/patch-lazpaint_uimage.pas +++ files/patch-lazpaint_uimage.pas @@ -0,0 +1,11 @@ +--- lazpaint/uimage.pas 2018-04-25 23:44:24.819000000 -0500 ++++ lazpaint/uimage.pas 2018-04-25 23:44:47.194779000 -0500 +@@ -7,7 +7,7 @@ + uses + Classes, SysUtils, BGRABitmap, BGRABitmapTypes, types, + UImageState, UStateType, Graphics, BGRALayers, UImageObservation, FPWriteBMP, +- UImageType, BGRALzpCommon, UZoom; ++ UImageType, BGRALzpCommon, UZoom, LazUTF8; + + const + MaxLayersToAdd = 99; Index: files/patch-lazpaint_uimagelist.pas =================================================================== --- files/patch-lazpaint_uimagelist.pas +++ files/patch-lazpaint_uimagelist.pas @@ -0,0 +1,11 @@ +--- lazpaint/uimagelist.pas 2018-04-25 23:59:46.369724000 -0500 ++++ lazpaint/uimagelist.pas 2018-04-26 00:00:08.521184000 -0500 +@@ -7,7 +7,7 @@ + + uses + Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, +- Grids, StdCtrls, Buttons, ComCtrls, ExtCtrls, Menus, ++ Grids, StdCtrls, Buttons, ComCtrls, ExtCtrls, Menus, LazFileUtils, + LazPaintType, UResourceStrings, UConfig, BGRAImageList, ubrowseimages; + + type Index: files/patch-lazpaint_umenu.pas =================================================================== --- files/patch-lazpaint_umenu.pas +++ files/patch-lazpaint_umenu.pas @@ -0,0 +1,11 @@ +--- lazpaint/umenu.pas 2018-04-25 23:45:43.826606000 -0500 ++++ lazpaint/umenu.pas 2018-04-25 23:46:07.106133000 -0500 +@@ -5,7 +5,7 @@ + interface + + uses +- Classes, SysUtils, ActnList, Forms, Menus, UTool, LCLType, ExtCtrls, UConfig; ++ Classes, SysUtils, ActnList, Forms, Menus, UTool, LCLType, ExtCtrls, UConfig, LazUTF8; + + type + Index: files/patch-lazpaint_umyslv.pas =================================================================== --- files/patch-lazpaint_umyslv.pas +++ files/patch-lazpaint_umyslv.pas @@ -0,0 +1,11 @@ +--- lazpaint/umyslv.pas 2018-04-25 23:49:08.994450000 -0500 ++++ lazpaint/umyslv.pas 2018-04-25 23:49:18.561675000 -0500 +@@ -6,7 +6,7 @@ + + uses + Classes, Types, SysUtils, ComCtrls, ShellCtrls, Controls, Graphics, BGRABitmap, +- BGRAVirtualScreen, BGRABitmapTypes, UVolatileScrollBar; ++ BGRAVirtualScreen, BGRABitmapTypes, UVolatileScrollBar, LazFileUtils; + + type + PMyShellListViewItemData = ^TMyShellListViewItemData; Index: files/patch-lazpaint_uobject3d.pas =================================================================== --- files/patch-lazpaint_uobject3d.pas +++ files/patch-lazpaint_uobject3d.pas @@ -0,0 +1,11 @@ +--- lazpaint/uobject3d.pas 2018-04-25 23:47:42.778665000 -0500 ++++ lazpaint/uobject3d.pas 2018-04-25 23:47:53.371177000 -0500 +@@ -8,7 +8,7 @@ + Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, + StdCtrls, Spin, ExtCtrls, ComCtrls, BGRAVirtualScreen, BGRAKnob, + BGRAImageList, BGRABitmap, BGRAScene3D, LazPaintType, BGRABitmapTypes, +- UConfig; ++ UConfig, LazFileUtils; + + const + AntialiasingLevelWhenFixed = 2; Index: files/patch-lazpaint_uonline.pas =================================================================== --- files/patch-lazpaint_uonline.pas +++ files/patch-lazpaint_uonline.pas @@ -0,0 +1,11 @@ +--- lazpaint/uonline.pas 2018-04-26 00:04:51.587890000 -0500 ++++ lazpaint/uonline.pas 2018-04-26 00:05:12.232466000 -0500 +@@ -6,7 +6,7 @@ + + uses + fphttpclient, Classes, SysUtils, +- UConfig, LazPaintType; ++ UConfig, LazPaintType, LazFileUtils; + + type + { THttpGetThread } Index: files/patch-lazpaint_utooltext =================================================================== --- files/patch-lazpaint_utooltext +++ files/patch-lazpaint_utooltext @@ -0,0 +1,11 @@ +--- lazpaint/utooltext.pas 2018-04-26 00:06:41.961489000 -0500 ++++ lazpaint/utooltext.pas 2018-04-26 00:06:59.416755000 -0500 +@@ -6,7 +6,7 @@ + + uses + Types, Classes, SysUtils, utool, utoolbasic, LCLType, Graphics, BGRABitmap, BGRABitmapTypes, BGRATextFX, +- BGRAGradients, ULayerAction; ++ BGRAGradients, ULayerAction, LazUTF8; + + type + Index: files/patch-lazpaint_utranslation.pas =================================================================== --- files/patch-lazpaint_utranslation.pas +++ files/patch-lazpaint_utranslation.pas @@ -0,0 +1,29 @@ +--- lazpaint/utranslation.pas 2018-04-26 00:02:18.729349000 -0500 ++++ lazpaint/utranslation.pas 2018-04-26 00:17:20.943460000 -0500 +@@ -8,7 +8,7 @@ + {$ifdef Darwin} + MacOSAll, + {$endif} +- Classes, SysUtils, UConfig, IniFiles; ++ Classes, SysUtils, UConfig, IniFiles, LazFileUtils, LazUTF8; + + {*************** Language ****************} + const +@@ -62,7 +62,7 @@ + result := GetResourcesPath+'i18n'+PathDelim + else + {$ENDIF} +- result:='i18n'+PathDelim; ++ result:='%%DATADIR%%'+PathDelim+'i18n'+PathDelim; + {$ENDIF} + end; + +@@ -76,7 +76,7 @@ + begin + Lang:=''; + FallbackLang:=''; +- LCLGetLanguageIDs(Lang,FallbackLang); ++ LazGetLanguageIDs(Lang,FallbackLang); + result := FallbackLang; + end; + Index: pkg-descr =================================================================== --- pkg-descr +++ pkg-descr @@ -0,0 +1,4 @@ +LazPaint is an image editor with layers and transparency. It supports the +format OpenRaster so it can interoperate with MyPaint, Gimp and Krita + +WWW: http://wiki.freepascal.org/LazPaint Index: pkg-plist =================================================================== --- pkg-plist +++ pkg-plist @@ -0,0 +1,41 @@ +bin/lazpaint +%%DATADIR%%/i18n/lazpaint.ar.po +%%DATADIR%%/i18n/lazpaint.cs.po +%%DATADIR%%/i18n/lazpaint.de.po +%%DATADIR%%/i18n/lazpaint.es.po +%%DATADIR%%/i18n/lazpaint.fi.po +%%DATADIR%%/i18n/lazpaint.fr.po +%%DATADIR%%/i18n/lazpaint.ja.po +%%DATADIR%%/i18n/lazpaint.lv.po +%%DATADIR%%/i18n/lazpaint.nl.po +%%DATADIR%%/i18n/lazpaint.po +%%DATADIR%%/i18n/lazpaint.pt_BR.po +%%DATADIR%%/i18n/lazpaint.ru.po +%%DATADIR%%/i18n/lazpaint.sv.po +%%DATADIR%%/i18n/lclstrconsts.ca.po +%%DATADIR%%/i18n/lclstrconsts.cs.po +%%DATADIR%%/i18n/lclstrconsts.de.po +%%DATADIR%%/i18n/lclstrconsts.es.po +%%DATADIR%%/i18n/lclstrconsts.fi.po +%%DATADIR%%/i18n/lclstrconsts.fr.po +%%DATADIR%%/i18n/lclstrconsts.he.po +%%DATADIR%%/i18n/lclstrconsts.id.po +%%DATADIR%%/i18n/lclstrconsts.it.po +%%DATADIR%%/i18n/lclstrconsts.lt.po +%%DATADIR%%/i18n/lclstrconsts.nl.po +%%DATADIR%%/i18n/lclstrconsts.pb.po +%%DATADIR%%/i18n/lclstrconsts.pl.po +%%DATADIR%%/i18n/lclstrconsts.po +%%DATADIR%%/i18n/lclstrconsts.ru.po +%%DATADIR%%/i18n/lclstrconsts.sk.po +%%DATADIR%%/i18n/lclstrconsts.tr.po +%%DATADIR%%/i18n/lclstrconsts.ua.po +%%DATADIR%%/i18n/lclstrconsts.zh_CN.po +%%DATADIR%%/models/cube.obj +%%DATADIR%%/models/dodecahedron.obj +%%DATADIR%%/models/greek_vase.jpg +%%DATADIR%%/models/greek_vase.mtl +%%DATADIR%%/models/greek_vase.obj +%%DATADIR%%/models/table.jpg +%%DATADIR%%/models/table.mtl +%%DATADIR%%/models/table.obj