From 1f94520cb590bf4316dcb9352bbeb6a4e42daf88 Mon Sep 17 00:00:00 2001 From: circular17 Date: Sun, 25 May 2025 16:26:02 +0200 Subject: [PATCH 1/3] Clone submodules as HTTPS instead of SSH --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b0432302..745ca4e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "use/bgrabitmap"] path = use/bgrabitmap - url = git@github.com:bgrabitmap/bgrabitmap.git + url = https://github.com/bgrabitmap/bgrabitmap.git [submodule "use/bgracontrols"] path = use/bgracontrols - url = git@github.com:bgrabitmap/bgracontrols.git + url = https://github.com/bgrabitmap/bgracontrols.git From 8e55a0be04ee20e7aaeca34139cfee5d282f9585 Mon Sep 17 00:00:00 2001 From: Chronos Date: Sun, 25 May 2025 21:45:36 +0200 Subject: [PATCH 2/3] Updated Flatpak and Snap packaging files for version 7.3. Added AppImage packaging. --- .../flatpak/0001-515-runtime-fix-for-Qt.patch | 45 ----------- Install/flatpak/0001-avoid-crash-on-Qt5.patch | 37 --------- Install/snap/local/build.sh | 9 --- lazpaint/release/appimage/AppRun | 2 + lazpaint/release/appimage/build.sh | 21 ++++++ .../release/common}/lazpaint.xml | 0 .../release}/flatpak/build.sh | 0 ...io.github.bgrabitmap.LazPaint.metainfo.xml | 28 +++++++ .../flatpak/io.github.bgrabitmap.LazPaint.yml | 13 ++-- .../flatpak/no-image-browser-by-default.patch | 0 lazpaint/release/snap/local/build.sh | 9 +++ .../release}/snap/snapcraft.yaml | 75 ++++++++++++++----- 12 files changed, 121 insertions(+), 118 deletions(-) delete mode 100644 Install/flatpak/0001-515-runtime-fix-for-Qt.patch delete mode 100644 Install/flatpak/0001-avoid-crash-on-Qt5.patch delete mode 100755 Install/snap/local/build.sh create mode 100755 lazpaint/release/appimage/AppRun create mode 100755 lazpaint/release/appimage/build.sh rename {Install/snap/local => lazpaint/release/common}/lazpaint.xml (100%) rename {Install => lazpaint/release}/flatpak/build.sh (100%) rename {Install => lazpaint/release}/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml (88%) rename {Install => lazpaint/release}/flatpak/io.github.bgrabitmap.LazPaint.yml (87%) rename {Install => lazpaint/release}/flatpak/no-image-browser-by-default.patch (100%) create mode 100755 lazpaint/release/snap/local/build.sh rename {Install => lazpaint/release}/snap/snapcraft.yaml (81%) diff --git a/Install/flatpak/0001-515-runtime-fix-for-Qt.patch b/Install/flatpak/0001-515-runtime-fix-for-Qt.patch deleted file mode 100644 index 00ad3579..00000000 --- a/Install/flatpak/0001-515-runtime-fix-for-Qt.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 11b9c647dd96edaf4a3240a3683493fb37a0e0e0 Mon Sep 17 00:00:00 2001 -From: Johann ELSASS -Date: Thu, 28 Dec 2023 16:40:48 +0100 -Subject: [PATCH] #515 runtime fix for Qt - ---- - lazpaint/lazpaintmainform.lfm | 1 + - lazpaint/lazpaintmainform.pas | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/lazpaint/lazpaintmainform.lfm b/lazpaint/lazpaintmainform.lfm -index a2dffa1..2765760 100644 ---- a/lazpaint/lazpaintmainform.lfm -+++ b/lazpaint/lazpaintmainform.lfm -@@ -5769,6 +5769,7 @@ object FMain: TFMain - Top = 514 - end - object TimerUpdate: TTimer -+ Enabled = False - Interval = 50 - OnTimer = TimerUpdateTimer - Left = 653 -diff --git a/lazpaint/lazpaintmainform.pas b/lazpaint/lazpaintmainform.pas -index 708cb24..551c7d0 100644 ---- a/lazpaint/lazpaintmainform.pas -+++ b/lazpaint/lazpaintmainform.pas -@@ -1251,6 +1251,7 @@ begin - UpdateToolBar; - FShouldArrange := true; - QueryArrange; -+ TimerUpdate.Enabled := true; - end; - - procedure TFMain.OnLatestVersionUpdate(ANewVersion: string); -@@ -2593,6 +2594,7 @@ end; - - procedure TFMain.FormHide(Sender: TObject); - begin -+ TimerUpdate.Enabled := false; - FShouldArrange := false; - FTopMostInfo := LazPaintInstance.HideTopmost; - LazPaintInstance.SaveMainWindowPosition; --- -2.43.0 - diff --git a/Install/flatpak/0001-avoid-crash-on-Qt5.patch b/Install/flatpak/0001-avoid-crash-on-Qt5.patch deleted file mode 100644 index b0e8ce2d..00000000 --- a/Install/flatpak/0001-avoid-crash-on-Qt5.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d73455025d71226472e7eb880da36f6fb85c5df0 Mon Sep 17 00:00:00 2001 -From: Johann ELSASS -Date: Thu, 6 Oct 2022 21:44:47 +0200 -Subject: [PATCH] avoid crash on Qt5 - ---- - lazpaint/lazpaintinstance.pas | 1 + - lazpaint/lazpaintmainform.pas | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/lazpaint/lazpaintinstance.pas b/lazpaint/lazpaintinstance.pas -index 5da9ac6..b5f624b 100644 ---- a/lazpaint/lazpaintinstance.pas -+++ b/lazpaint/lazpaintinstance.pas -@@ -374,6 +374,7 @@ procedure TLazPaintInstance.ReportActionProgress(AProgressPercent: integer); - var - delay: Integer; - begin -+ {$IFDEF LCLqt5}exit;{$ENDIF} - if AProgressPercent < 100 then delay := 10000 else delay := 1000; - if Assigned(FMain) then FMain.UpdatingPopup:= true; - try -diff --git a/lazpaint/lazpaintmainform.pas b/lazpaint/lazpaintmainform.pas -index 0fe875c..708cb24 100644 ---- a/lazpaint/lazpaintmainform.pas -+++ b/lazpaint/lazpaintmainform.pas -@@ -2695,6 +2695,7 @@ end; - - procedure TFMain.TimerUpdateTimer(Sender: TObject); - begin -+ if FLazPaintInstance = nil then exit; - TimerUpdate.Enabled := false; - if ToolManager.ToolSleeping and not spacePressed and - ([ssLeft,ssRight,ssMiddle] * FLayout.MouseButtonState = []) then --- -2.43.0 - diff --git a/Install/snap/local/build.sh b/Install/snap/local/build.sh deleted file mode 100755 index bb78ccdb..00000000 --- a/Install/snap/local/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -ln -s Install/snap ../../../snap - -pushd ../../.. -snapcraft --debug --use-lxd $@ -popd - -rm ../../../snap diff --git a/lazpaint/release/appimage/AppRun b/lazpaint/release/appimage/AppRun new file mode 100755 index 00000000..508722cc --- /dev/null +++ b/lazpaint/release/appimage/AppRun @@ -0,0 +1,2 @@ +#!/bin/bash +exec $APPDIR/usr/bin/lazpaint diff --git a/lazpaint/release/appimage/build.sh b/lazpaint/release/appimage/build.sh new file mode 100755 index 00000000..a8b105ed --- /dev/null +++ b/lazpaint/release/appimage/build.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +sudo apt-get install zsync +wget -nc https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage +chmod +x appimagetool-x86_64.AppImage +lazbuild --build-mode=Release ../../../use/bgrabitmap/bgrabitmap/bgrabitmappack.lpk +lazbuild --build-mode=Release ../../../use/bgracontrols/bgracontrols.lpk +lazbuild --build-mode=Release ../../../lazpaintcontrols/lazpaintcontrols.lpk +lazbuild --build-mode=Release ../../../lazpaint/lazpaint.lpi +install -Dm755 ../bin/lazpaint -t AppDir/usr/bin +install -Dm644 ../debian/applications/lazpaint.desktop AppDir/io.github.bgrabitmap.LazPaint.desktop +install -Dm644 ../debian/applications/lazpaint.desktop AppDir/usr/share/applications/io.github.bgrabitmap.LazPaint.desktop +install -Dm644 ../../../resources/icon/256x256.png AppDir/usr/share/icons/hicolor/256x256/apps/io.github.bgrabitmap.LazPaint.png +install -Dm644 ../../../resources/icon/256x256.png AppDir/lazpaint.png +install -Dm644 ../bin/i18n/*.po -t AppDir/usr/share/lazpaint/i18n +cp -r ../../../resources/scripts AppDir/usr/share/lazpaint +cp -r ../bin/models AppDir/usr/share/lazpaint +install -Dm644 ../common/lazpaint.xml AppDir/usr/share/mime/packages/io.github.bgrabitmap.LazPaint.xml +install -Dm644 ../flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml AppDir/usr/share/metainfo/io.github.bgrabitmap.LazPaint.metainfo.xml +install -Dm755 AppRun -t AppDir +ARCH=x86_64 ./appimagetool-x86_64.AppImage AppDir LazPaint.AppImage diff --git a/Install/snap/local/lazpaint.xml b/lazpaint/release/common/lazpaint.xml similarity index 100% rename from Install/snap/local/lazpaint.xml rename to lazpaint/release/common/lazpaint.xml diff --git a/Install/flatpak/build.sh b/lazpaint/release/flatpak/build.sh similarity index 100% rename from Install/flatpak/build.sh rename to lazpaint/release/flatpak/build.sh diff --git a/Install/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml b/lazpaint/release/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml similarity index 88% rename from Install/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml rename to lazpaint/release/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml index 5cb92d73..bbe6c1f3 100644 --- a/Install/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml +++ b/lazpaint/release/flatpak/io.github.bgrabitmap.LazPaint.metainfo.xml @@ -86,6 +86,34 @@ Filters can be applied to the whole image or to the active selection. + + https://github.com/bgrabitmap/lazpaint/releases/tag/v7.3 + +
    +
  • fixes for high DPI
    • +
  • binding keys (digits) to colors
    • +
  • compilation fix for newer FPC / LCL
    • +
  • runtime fix for Qt
    • +
  • improve safety of Python scripts
    • +
  • enable or disable preview in filter windows
    • +
  • Turkish translation
    • +
  • add hypocycloid in Render menu
    • +
  • increase maximum shape per layer
    • +
  • auto-switch between selection tools
    • +
  • fixed deformation grid error
    • +
  • fixed blank print error
    • +
  • adapt print UI on Linux
    • +
  • fix selection with vertical text alignment
    • +
  • fix euro symbol with AltGr
    • +
  • add superformula layer
    • +
  • easy of use for beginners
    • +
  • aliasing option for shapes
    • +
  • increase canvas size when pasting
    • +
  • increase max shape count
    • +
  • complete translations
    • +
+ + https://github.com/bgrabitmap/lazpaint/releases/tag/v7.2.2 diff --git a/Install/flatpak/io.github.bgrabitmap.LazPaint.yml b/lazpaint/release/flatpak/io.github.bgrabitmap.LazPaint.yml similarity index 87% rename from Install/flatpak/io.github.bgrabitmap.LazPaint.yml rename to lazpaint/release/flatpak/io.github.bgrabitmap.LazPaint.yml index 549602fd..d1627bb5 100644 --- a/Install/flatpak/io.github.bgrabitmap.LazPaint.yml +++ b/lazpaint/release/flatpak/io.github.bgrabitmap.LazPaint.yml @@ -26,21 +26,20 @@ modules: sources: - type: git url: https://github.com/bgrabitmap/bgrabitmap.git - commit: f9748a37f5382b18d1cd197293d1032a522e8561 + commit: 6ada359c45fe2230b8af6e108bd6c660bf9202ec dest: 'bgrabitmap' + disable-submodules: true - type: git url: https://github.com/bgrabitmap/bgracontrols.git - commit: f5efbf8b79d0725d33b88c5bd41857d9139428bd + commit: 20dbed8ca89620721dc3028c221c91609db53fe2 dest: 'bgracontrols' + disable-submodules: true - type: git url: https://github.com/bgrabitmap/lazpaint.git - commit: 501d44c511fb49ca166dc0ec101305dddbf3aee6 + commit: a11930b418c7d9050886bd7d321fe78acfcd7ea6 + disable-submodules: true - type: file path: io.github.bgrabitmap.LazPaint.metainfo.xml - - type: patch - path: 0001-515-runtime-fix-for-Qt.patch - - type: patch - path: 0001-avoid-crash-on-Qt5.patch - type: patch path: no-image-browser-by-default.patch buildsystem: simple diff --git a/Install/flatpak/no-image-browser-by-default.patch b/lazpaint/release/flatpak/no-image-browser-by-default.patch similarity index 100% rename from Install/flatpak/no-image-browser-by-default.patch rename to lazpaint/release/flatpak/no-image-browser-by-default.patch diff --git a/lazpaint/release/snap/local/build.sh b/lazpaint/release/snap/local/build.sh new file mode 100755 index 00000000..f798b0f5 --- /dev/null +++ b/lazpaint/release/snap/local/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +ln -s lazpaint/release/snap ../../../../snap + +pushd ../../../.. +snapcraft --debug --use-lxd -v $@ +popd + +rm ../../../../snap diff --git a/Install/snap/snapcraft.yaml b/lazpaint/release/snap/snapcraft.yaml similarity index 81% rename from Install/snap/snapcraft.yaml rename to lazpaint/release/snap/snapcraft.yaml index 7ee4079a..15ffa7e5 100644 --- a/Install/snap/snapcraft.yaml +++ b/lazpaint/release/snap/snapcraft.yaml @@ -1,22 +1,22 @@ name: lazpaint title: LazPaint -version: '7.2.2' +version: '7.3.0' summary: Image editor with raster and vector layers. description: | Free cross-platform image editor with raster and vector layers, written in Lazarus (Free Pascal). Can read layered files (lzp, ora, pdn, oXo, flat psd), multi-images (gif, ico, tiff), flat files (bmp, jpeg, pcx, png, tga, webp, xpm, xwd), raw images (dng, cr2, nef, arw...), vectorial (svg), 3D (obj). Has drawing tools, vector shapes, phong shading, curve adjustments, filters, render some textures, Python scripting. Uses Qt5 widgetset. - + **Features** * Files: read and write a variety of file formats, including layered bitmaps and 3D files. * Tools: many tools are available to draw on the layers. * Edit/Select: select parts of an image with antialiasing and modify the selection as a mask. * View: color window, layer stack window and toolbox window. * Command line: call LazPaint from a console. - + **Image manipulation** * An image can be resampled, flipped horizontally and vertically. * Smart zoom x3 : resize the image x3 and detects borders; this provides a useful zoom with ancient games sprites. - + **Color manipulation** * Colorize : set the color of an image while preserving intensities * Shift colors : cycle colors and change colorness (saturation) @@ -26,7 +26,7 @@ description: | * Negative : invert colors (with gamma correction) * Linear negative : invert colors (without gamma correction) * Grayscale : converts colors to grayscale with gamma correction - + **Filters** Filters can be applied to the whole image or to the active selection. * Radial blur : non directional blur @@ -40,9 +40,9 @@ description: | * Sphere : spherical projection * Cylinder : cylinder projection * Clouds : add clouds of the current pen color - * Scripts: scripts are provided to do layer effects. You can as well write your own Python scripts. + * Scripts: scripts are provided to do layer effects. You can as well write your own Python scripts. confinement: strict -base: core20 +base: core24 grade: stable icon: "resources/icon/64x64.png" license: NLPL @@ -52,15 +52,47 @@ parts: plugin: nil source: . source-type: local - build-packages: + build-packages: - wget - libgtk2.0-dev override-build: | - wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.2/lazarus-project_2.2.2-0_amd64.deb - wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.2/fpc-laz_3.2.2-210709_amd64.deb - wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.2/fpc-src_3.2.2-210709_amd64.deb - apt install ./lazarus-project_2.2.2-0_amd64.deb ./fpc-laz_3.2.2-210709_amd64.deb ./fpc-src_3.2.2-210709_amd64.deb + wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/lazarus-project_4.0.0-0_amd64.deb + wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/fpc-laz_3.2.2-210709_amd64.deb + wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%204.0/fpc-src_3.2.2-210709_amd64.deb + apt install ./lazarus-project_4.0.0-0_amd64.deb ./fpc-laz_3.2.2-210709_amd64.deb ./fpc-src_3.2.2-210709_amd64.deb prime: [-*] + bgrabitmap: + plugin: nil + source: use/bgrabitmap + source-type: local + override-build: | + snapcraftctl build + cd bgrabitmap + lazbuild --build-mode=Release bgrabitmappack.lpk + after: + - lazarus + - desktop-gtk2 + bgracontrols: + plugin: nil + source: use/bgracontrols + source-type: local + override-build: | + snapcraftctl build + lazbuild --build-mode=Release bgracontrols.lpk + after: + - lazarus + - desktop-gtk2 + lazpaintcontrols: + plugin: nil + source: . + source-type: local + override-build: | + snapcraftctl build + cd lazpaintcontrols + lazbuild --build-mode=Release lazpaintcontrols.lpk + after: + - lazarus + - desktop-gtk2 lazpaint: plugin: nil source: . @@ -80,10 +112,13 @@ parts: install -m 755 ../resources/icon/64x64.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/lazpaint.png cp -r ../resources/scripts $SNAPCRAFT_PART_INSTALL/usr/share/lazpaint install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages - install -m 755 ../Install/snap/local/lazpaint.xml $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages + install -m 755 ../packaging/common/lazpaint.xml $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages after: - lazarus - desktop-gtk2 + - bgrabitmap + - bgracontrols + - lazpaintcontrols stage: - etc - usr @@ -134,11 +169,11 @@ parts: - libgtk2.0-dev stage-packages: - libxkbcommon0 # XKB_CONFIG_ROOT - - ttf-ubuntu-font-family + #- ttf-ubuntu-font-family - dmz-cursor-theme - light-themes - adwaita-icon-theme - - gnome-themes-standard + #- gnome-themes-standard - shared-mime-info - libgtk2.0-0 - libgdk-pixbuf2.0-0 @@ -146,13 +181,13 @@ parts: - libgtk2.0-bin - unity-gtk2-module - locales-all - - libappindicator1 + #- libappindicator1 - xdg-user-dirs - ibus-gtk - libibus-1.0-5 - + # Additional plugs to pick up the GTK theme and icons from the system -plugs: +plugs: icon-themes: interface: content target: $SNAP/data-dir/icons @@ -173,13 +208,13 @@ plugs: environment: XDG_DATA_DIRS: $SNAP/usr/share:$XDG_DATA_DIRS GTK_PATH: $SNAP/lib/gtk-2.0 - + apps: lazpaint: command: usr/bin/lazpaint command-chain: - bin/desktop-launch - desktop: usr/share/applications/lazpaint.desktop + desktop: usr/share/applications/lazpaint.desktop plugs: - desktop - x11 From 106986f9704f77b45a748599d38237ed78b6d2a7 Mon Sep 17 00:00:00 2001 From: circular17 Date: Mon, 26 May 2025 01:07:38 +0200 Subject: [PATCH 3/3] Update changelog for v7.3 --- lazpaint/release/debian/debian/changelog | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lazpaint/release/debian/debian/changelog b/lazpaint/release/debian/debian/changelog index 0f116062..092b28b8 100644 --- a/lazpaint/release/debian/debian/changelog +++ b/lazpaint/release/debian/debian/changelog @@ -1,3 +1,29 @@ +lazpaint (7.3) stable; urgency=low + + * fixes for high DPI + * binding keys (digits) to colors + * compilation fix for newer FPC / LCL + * runtime fix for Qt + * improve safety of Python scripts + * enable or disable preview in filter windows + * Turkish translation + * add hypocycloid in Render menu + * increase maximum shape per layer + * auto-switch between selection tools + * fixed deformation grid error + * fixed blank print error + * adapt print UI on Linux + * fix selection with vertical text alignment + * fix euro symbol with AltGr + * add superformula layer + * easy of use for beginners + * aliasing option for shapes + * increase canvas size when pasting + * increase max shape count + * complete translations + + -- circular Mon, 26 May 2025 01:04:00 +0100 + lazpaint (7.2.2) stable; urgency=low * Linux: fix compilation for Qt5 and older LCL