Control: tags -1 patch
Control: unblock -1 by 967564
Am 13.08.23 um 17:44 schrieb Bastian Germann:
Please consider switching to lcl=qt5 to build with qt5 interface.
I have implemented this and have attached a patch.
diff -Nru optgeo-2.25/debian/changelog optgeo-2.25/debian/changelog
--- optgeo-2.25/debian/changelog 2023-09-17 11:18:42.000000000 +0200
+++ optgeo-2.25/debian/changelog 2023-09-20 14:55:20.000000000 +0200
@@ -1,3 +1,10 @@
+optgeo (2.25-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Build with Qt5 (Closes: #967674)
+
+ -- Bastian Germann <[email protected]> Wed, 20 Sep 2023 14:55:20 +0200
+
optgeo (2.25-3) unstable; urgency=medium
* bumped Standards-Version: 4.2.0
diff -Nru optgeo-2.25/debian/control optgeo-2.25/debian/control
--- optgeo-2.25/debian/control 2023-09-17 11:18:42.000000000 +0200
+++ optgeo-2.25/debian/control 2023-09-20 14:51:48.000000000 +0200
@@ -3,20 +3,13 @@
Priority: extra
Maintainer: Georges Khaznadar <[email protected]>
Build-Depends: debhelper (>= 10),
- lazarus-ide-gtk2,
- lcl-gtk2,
+ lcl-qt5,
lcl-units,
lcl-utils,
fp-units-misc,
fp-units-gfx,
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.2.0
Homepage: http://jeanmarie.biansan.free.fr/optgeo.html
diff -Nru optgeo-2.25/debian/patches/20-Makefile.patch
optgeo-2.25/debian/patches/20-Makefile.patch
--- optgeo-2.25/debian/patches/20-Makefile.patch 2023-09-17
11:15:31.000000000 +0200
+++ optgeo-2.25/debian/patches/20-Makefile.patch 2023-09-20
14:55:07.000000000 +0200
@@ -10,12 +10,12 @@
+
+
+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)/packager/units/$(ARCH)/
-+UNITLIBS +=
-Fu/usr/lib/lazarus/$(FPC_VERSION)/components/printers/lib/$(ARCH)/gtk2/
++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/usr/lib/lazarus/$(FPC_VERSION)/components/cairocanvas/lib/$(ARCH)/gtk2/
++UNITLIBS +=
-Fu/usr/lib/lazarus/$(FPC_VERSION)/components/cairocanvas/lib/$(ARCH)/qt5/
+UNITLIBS += -Fu.
+TARGET = -TLINUX
+MODE = -MObjFPC
@@ -25,7 +25,7 @@
+VERBOSE = -vewnhi
+LOGO = -l
+INCPATH = -Fi/
-+DEFINES = -dLCL -dLCLgtk2
++DEFINES = -dLCL -dLCLqt5
+
+# lrs files to let without recompilation
+RESERVED_LRS = curseurs.lrs optgeo.lrs
