Control: tags -1 patch
Control: unblock -1 by 967564
Am 13.08.23 um 17:51 schrieb Bastian Germann:
Please consider switching to lcl=qt5 to build with qt5 interface.
I have implemented this and have attached a patch.
From ec676695f74b8bd8fcf79e9aae06bf811cbe209b Mon Sep 17 00:00:00 2001
From: Bastian Germann <b...@debian.org>
Date: Wed, 20 Sep 2023 15:22:44 +0200
Subject: [PATCH] Build with Qt5 (Closes: #967318)
---
debian/control | 10 +---------
debian/patches/20-Makefile.patch | 8 ++++----
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/debian/control b/debian/control
index 6779ff7..d618cac 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: science
Priority: extra
Maintainer: Georges Khaznadar <georg...@debian.org>
Build-Depends: debhelper-compat (= 13),
- lazarus,
- lcl-gtk2,
+ lcl-qt5,
lcl-units,
lcl-utils,
fp-units-misc,
@@ -12,13 +11,6 @@ Build-Depends: debhelper-compat (= 13),
fp-utils,
fpc,
libx11-dev,
- libgdk-pixbuf-2.0-dev,
- libgtk2.0-dev,
- libglib2.0-dev,
- libpango1.0-dev,
- libatk1.0-dev,
- libcairo2-dev,
- librsvg2-bin
Standards-Version: 4.6.2
Homepage: http://jeanmarie.biansan.free.fr/dozzzaqueux.html
Vcs-Browser: https://salsa.debian.org/science-team/dozzaqueux
diff --git a/debian/patches/20-Makefile.patch b/debian/patches/20-Makefile.patch
index d5285b7..0e06e19 100644
--- a/debian/patches/20-Makefile.patch
+++ b/debian/patches/20-Makefile.patch
@@ -10,12 +10,12 @@ Index: dozzaqueux-3.51/Makefile
+
+
+UNITLIBS = -Fu/usr/lib/lazarus/$(FPC_VERSION)/lcl/units/$(ARCH)/
-+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/lcl/units/$(ARCH)/gtk2/
++UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/lcl/units/$(ARCH)/qt5/
+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/lazutils/lib/$(ARCH)/
+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/synedit/units/$(ARCH)/nogui/
+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/packager/units/$(ARCH)/
-+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/cairocanvas/lib/$(ARCH)/gtk2/
-+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/printers/lib/$(ARCH)/gtk2/
++UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/cairocanvas/lib/$(ARCH)/qt5/
++UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/printers/lib/$(ARCH)/qt5/
+UNITLIBS += -Fu/usr/lib/lazarus/$(FPC_VERSION)/components/synedit/units/$(ARCH)/
+UNITLIBS += -Fu.
+TARGET = -TLINUX
@@ -26,7 +26,7 @@ Index: dozzaqueux-3.51/Makefile
+VERBOSE = -vewnhi
+LOGO = -l
+INCPATH = -Fi/
-+DEFINES = -dLCL -dLCLgtk2
++DEFINES = -dLCL -dLCLqt5
+
+all: dozzaqueux
+
--
2.40.1
