diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile index 3ed06ed432..c54cecd374 100644 --- a/graphics/lazpaint/Makefile +++ b/graphics/lazpaint/Makefile @@ -11,7 +11,7 @@ WWW= https://wiki.freepascal.org/LazPaint LICENSE= GPLv3 -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 aarch64 gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5 ${PORTNAME}-qt6 qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt6 @@ -19,7 +19,7 @@ qt6_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 USES= desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg USE_XORG= x11 -DOS2UNIX_REGEX= .*\.([txt]|pas|lpi|txt) +DOS2UNIX_REGEX= .*\.([txt]|pas|lpi|txt|inc) USE_GITHUB= yes GH_TAGNAME= a11930b GH_ACCOUNT= bgrabitmap diff --git a/graphics/lazpaint/files/patch-lazpaint_ugraph.pas b/graphics/lazpaint/files/patch-lazpaint_ugraph.pas index 14726d6d64..aa4f42e10b 100644 --- a/graphics/lazpaint/files/patch-lazpaint_ugraph.pas +++ b/graphics/lazpaint/files/patch-lazpaint_ugraph.pas @@ -1,6 +1,6 @@ ---- lazpaint/ugraph.pas 2025-06-03 00:14:12.239399000 -0700 -+++ lazpaint/ugraph.pas 2025-06-03 00:14:45.095187000 -0700 -@@ -1206,7 +1206,7 @@ +--- lazpaint/ugraph.pas.orig 2026-08-12 11:47:26 UTC ++++ lazpaint/ugraph.pas +@@ -1206,7 +1206,7 @@ begin w := FramePenWidth*ACanvasScale/10 / 2 + 1; rF := EmptyRectF; for pt in APoints do diff --git a/graphics/lazpaint/files/patch-lazpaint_utranslation.pas b/graphics/lazpaint/files/patch-lazpaint_utranslation.pas index fffd78029a..c5960ec900 100644 --- a/graphics/lazpaint/files/patch-lazpaint_utranslation.pas +++ b/graphics/lazpaint/files/patch-lazpaint_utranslation.pas @@ -1,15 +1,30 @@ ---- lazpaint/utranslation.pas 2021-02-18 08:49:03.053438000 -0500 -+++ lazpatin/utranslation.pas 2021-02-18 09:04:38.021589000 -0500 -@@ -85,7 +85,11 @@ +--- lazpaint/utranslation.pas.orig 2026-08-12 11:47:26 UTC ++++ lazpaint/utranslation.pas +@@ -85,7 +85,11 @@ begin else {$ENDIF} {$ENDIF} - result:=ExtractFilePath(Application.ExeName)+AResource+PathDelim; + {$IFDEF FREEBSD} -+ result:='%%DATADIR%%'+PathDelim+AResource+PathDelim; ++ result:='/usr/local/share/lazpaint'+PathDelim+AResource+PathDelim; + {$ELSE} + result:=ExtractFilePath(Application.ExeName)+AResource+PathDelim; + {$ENDIF} {$ENDIF} end; +@@ -165,11 +169,12 @@ var Lang,FallbackLang: string; + + function FallbackLanguage: string; + var Lang,FallbackLang: string; ++var LanguageInfo: TLanguageID; + begin + Lang:=''; + FallbackLang:=''; +- LazGetLanguageIDs(Lang,FallbackLang); +- result := FallbackLang; ++ LanguageInfo := GetLanguageID; ++ result := LanguageInfo.LanguageCode; + end; + + //translate program diff --git a/graphics/lazpaint/files/patch-lazpaint_getfilesindir.inc b/graphics/lazpaint/files/patch-lazpaint_getfilesindir.inc new file mode 100644 index 0000000..588f0e7 --- /dev/null +++ b/graphics/lazpaint/files/patch-lazpaint_getfilesindir.inc @@ -0,0 +1,11 @@ +--- lazpaint/getfilesindir.inc.orig 2026-08-12 11:47:26 UTC ++++ lazpaint/getfilesindir.inc +@@ -94,7 +94,7 @@ begin + if (ACaseSensitivity <> mcsCaseInsensitive) then + MaskOptions := [moDisableSets, moCaseSensitive]; + {$endif} +- MaskList := TMaskList.Create(AMask, ';', MaskOptions); //False by default ++ MaskList := TMaskList.Create(AMask); //False by default + end; + + try diff --git a/graphics/lazpaint/files/patch-lazpaint_uconfig.pas b/graphics/lazpaint/files/patch-lazpaint_uconfig.pas new file mode 100644 index 0000000..52f328f --- /dev/null +++ b/graphics/lazpaint/files/patch-lazpaint_uconfig.pas @@ -0,0 +1,20 @@ +--- lazpaint/uconfig.pas.orig 2026-08-12 11:47:26 UTC ++++ lazpaint/uconfig.pas +@@ -371,7 +371,7 @@ implementation + + implementation + +-uses uparse, LCLProc, BGRAUTF8, LazFileUtils, UFileSystem, UDarkTheme; ++uses uparse, LCLProc, BGRAUTF8, LazFileUtils, UFileSystem, UDarkTheme, GraphMath; + + const maxRecentFiles = 10; + maxRecentDirectories = 10; +@@ -1841,7 +1841,7 @@ begin + begin + currentScreenSize := rect(0,0,screen.Width,screen.Height); + previousScreenSize := DefaultScreenSize; +- if not CompareRect(@previousScreenSize,@currentScreenSize.left) then ++ if not SameRect(@previousScreenSize,@currentScreenSize.left) then + begin + SetDefaultScreenSize(currentScreenSize); + result := true;