update to 6.2.4

davidbannon · Dec 22, 2022 · e974cd5 · e974cd5
1 parent fd260fc
commit e974cd5
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -137,6 +137,30 @@ Upload the packages, do the git stuff !
 
 
 
+**Another Approach (Experimental)**
+--------
+By using an experimental PPA we can install Qt6.2.2 (not 6.2.3) on a U2004 so, avoid the dreaded libc and get a Qt6 almost exactly as Zeljko want. So far, seems to work. This model is a credit to **salvadorbs** who worked out how to do this as a github action.
+
+* Build a U2004 VM, bring it up to date
+
+* Add the Qt6.2.2 PPA -
+
+* sudo add-apt-repository ppa:okirby/qt6-backports; sudo apt update;
+
+ * sudo apt install qt6-base-dev build-essential libgl1-mesa-dev rpm lintian devscripts vim
+
+* Then, pull down a git copy of this repo into ~/Pascal
+
+* Run the script,  qt6update.bash in the above, ~/Pascal/cbindings/package/scripts - it will update the ~/Pascal/libqt6pas source tree (if necessary).
+
+* cd down into the ~/Pascal/libqt6pas/cbindings and run qmake6; make to build the library, slow !
+
+* cd down into packages and run the script package-lib, it should build the packages for you.
+
+
+
+Now, push the changes you made to the source earlier up to github, create a new release page and git it an appropriate version tag. Upload the files.
+
 
 
 

diff --git a/README.note b/README.note
@@ -76,19 +76,31 @@ Then copy the resulting library back somewhere where it can be used on build the
 Upload the packages, do the git stuff !
 
 
+<size:large><bold>Another Approach (Experimental)</bold></size:large>
+By using an experimental PPA we can install Qt6.2.2 (not 6.2.3) on a U2004 so, avoid the dreaded libc and get a Qt6 almost exactly as Zeljko want. So far, seems to work. This model is a credit to <bold>salvadorbs</bold> who worked out how to do this as a github action.
+<list><list-item dir="ltr">Build a U2004 VM, bring it up to date</list-item></list>
+<list><list-item dir="ltr">Add the Qt6.2.2 PPA -</list-item></list>
+<list><list-item dir="ltr">sudo add-apt-repository ppa:okirby/qt6-backports; sudo apt update;</list-item></list>
+ <list><list-item dir="ltr">sudo apt install qt6-base-dev build-essential libgl1-mesa-dev rpm lintian devscripts vim</list-item></list>
+<list><list-item dir="ltr">Then, pull down a git copy of this repo into ~/Pascal</list-item></list>
+<list><list-item dir="ltr">Run the script,  qt6update.bash in the above, ~/Pascal/cbindings/package/scripts - it will update the ~/Pascal/libqt6pas source tree (if necessary).</list-item></list>
+<list><list-item dir="ltr">cd down into the ~/Pascal/libqt6pas/cbindings and run qmake6; make to build the library, slow !</list-item></list>
+<list><list-item dir="ltr">cd down into packages and run the script package-lib, it should build the packages for you.</list-item></list>
+
+Now, push the changes you made to the source earlier up to github, create a new release page and git it an appropriate version tag. Upload the files.
 
 
 
 
 </note-content></text>
-  <last-change-date>2022-11-25T16:14:36.9003720+11:00</last-change-date>
-  <last-metadata-change-date>2022-11-25T16:14:36.9003720+11:00</last-metadata-change-date>
+  <last-change-date>2022-12-22T22:05:52.2319659+11:00</last-change-date>
+  <last-metadata-change-date>2022-12-22T22:05:52.2319659+11:00</last-metadata-change-date>
   <create-date>2022-11-08T13:46:34.2510486+11:00</create-date>
   <cursor-position>1</cursor-position>
   <selection-bound-position>1</selection-bound-position>
   <width>1000</width>
   <height>626</height>
-  <x>204</x>
-  <y>45</y>
+  <x>137</x>
+  <y>29</y>
   <open-on-startup>False</open-on-startup>
 </note>
diff --git a/cbindings/Qt6Pas.pro b/cbindings/Qt6Pas.pro
@@ -10,13 +10,13 @@
 
 
 
-# Binding Release Version 6.2.3 against Qt6 6.2 LTS release.
+# Binding Release Version 6.2.4 against Qt6 6.2 LTS release.
 
-win32:VERSION = 6.2.3.0
-else:VERSION = 6.2.3
+win32:VERSION = 6.2.4.0
+else:VERSION = 6.2.4
 VER_MAJ = 6
 VER_MIN = 2
-VER_PAT = 3
+VER_PAT = 4
 win32:VERSION_PE_HEADER = 6.2
 
 QT += gui printsupport

diff --git a/cbindings/package/scripts/qt6update.bash b/cbindings/package/scripts/qt6update.bash
@@ -6,7 +6,7 @@ set -e
 # checks version number and if required, updates the relevent files.
 # No license, use as you see fit. David Bannon 2022-12-17
 
-GIT_REPO="libqt6pas"
+GIT_REPO="Pascal/libqt6pas"
 DOWNLOAD="lazarus-main-lcl-interfaces-qt6"
 DOWNLOAD_SUBS="lcl/interfaces/qt6"
 TAR_FILE="lazarus-main-lcl-interfaces-qt6-cbindings-src.tar.gz"

diff --git a/cbindings/qt62.pas b/cbindings/qt62.pas
@@ -2604,10 +2604,6 @@ procedure QAbstractEventDispatcher_closingDown(handle: QAbstractEventDispatcherH
 procedure QAbstractEventDispatcher_installNativeEventFilter(handle: QAbstractEventDispatcherH; filterObj: QAbstractNativeEventFilterH); cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_installNativeEventFilter';
 procedure QAbstractEventDispatcher_removeNativeEventFilter(handle: QAbstractEventDispatcherH; filterObj: QAbstractNativeEventFilterH); cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_removeNativeEventFilter';
 function QAbstractEventDispatcher_filterNativeEvent(handle: QAbstractEventDispatcherH; eventType: QByteArrayH; message: Pointer; result: PLong): Boolean; cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_filterNativeEvent';
-{$ifdef MSWINDOWS }
-function QAbstractEventDispatcher_registerEventNotifier(handle: QAbstractEventDispatcherH; notifier: QWinEventNotifierH): Boolean; cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_registerEventNotifier';
-procedure QAbstractEventDispatcher_unregisterEventNotifier(handle: QAbstractEventDispatcherH; notifier: QWinEventNotifierH); cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_unregisterEventNotifier';
-{$endif}
 
 function QMimeData_Create(): QMimeDataH; cdecl; external Qt6PasLib name 'QMimeData_Create';
 procedure QMimeData_Destroy(handle: QMimeDataH); cdecl; external Qt6PasLib name 'QMimeData_Destroy'; 
@@ -8080,10 +8076,6 @@ procedure QPrinter_setPrintRange(handle: QPrinterH; range: QPrinterPrintRange);
 function QPrinter_printRange(handle: QPrinterH): QPrinterPrintRange; cdecl; external Qt6PasLib name 'QPrinter_printRange';
 procedure QPrinter_setPageMargins(handle: QPrinterH; left: qreal; top: qreal; right: qreal; bottom: qreal; _unit: QPrinterUnit); cdecl; external Qt6PasLib name 'QPrinter_setPageMargins';
 procedure QPrinter_getPageMargins(handle: QPrinterH; left: PQReal; top: PQReal; right: PQReal; bottom: PQReal; _unit: QPrinterUnit); cdecl; external Qt6PasLib name 'QPrinter_getPageMargins';
-{$ifdef MSWINDOWS }
-procedure QPrinter_setWinPageSize(handle: QPrinterH; winPageSize: Integer); cdecl; external Qt6PasLib name 'QPrinter_setWinPageSize';
-function QPrinter_winPageSize(handle: QPrinterH): Integer; cdecl; external Qt6PasLib name 'QPrinter_winPageSize';
-{$endif}
 
 function QPrinterInfo_Create(): QPrinterInfoH; cdecl; external Qt6PasLib name 'QPrinterInfo_Create';
 procedure QPrinterInfo_Destroy(handle: QPrinterInfoH); cdecl; external Qt6PasLib name 'QPrinterInfo_Destroy'; 

diff --git a/cbindings/src/qabstracteventdispatcher_c.cpp b/cbindings/src/qabstracteventdispatcher_c.cpp
@@ -91,15 +91,3 @@ bool QAbstractEventDispatcher_filterNativeEvent(QAbstractEventDispatcherH handle
 	return (bool) ((QAbstractEventDispatcher *)handle)->filterNativeEvent(*(const QByteArray*)eventType, message, result);
 }
 
-#if defined MSWINDOWS
-bool QAbstractEventDispatcher_registerEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier)
-{
-	return (bool) ((QAbstractEventDispatcher *)handle)->registerEventNotifier((QWinEventNotifier*)notifier);
-}
-
-void QAbstractEventDispatcher_unregisterEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier)
-{
-	((QAbstractEventDispatcher *)handle)->unregisterEventNotifier((QWinEventNotifier*)notifier);
-}
-
-#endif
diff --git a/cbindings/src/qabstracteventdispatcher_c.h b/cbindings/src/qabstracteventdispatcher_c.h
@@ -31,9 +31,5 @@ C_EXPORT void QAbstractEventDispatcher_closingDown(QAbstractEventDispatcherH han
 C_EXPORT void QAbstractEventDispatcher_installNativeEventFilter(QAbstractEventDispatcherH handle, QAbstractNativeEventFilterH filterObj);
 C_EXPORT void QAbstractEventDispatcher_removeNativeEventFilter(QAbstractEventDispatcherH handle, QAbstractNativeEventFilterH filterObj);
 C_EXPORT bool QAbstractEventDispatcher_filterNativeEvent(QAbstractEventDispatcherH handle, const QByteArrayH eventType, void* message, long* result);
-#if defined MSWINDOWS
-C_EXPORT bool QAbstractEventDispatcher_registerEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier);
-C_EXPORT void QAbstractEventDispatcher_unregisterEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier);
-#endif
 
 #endif
diff --git a/cbindings/src/qprinter_c.cpp b/cbindings/src/qprinter_c.cpp
@@ -363,15 +363,3 @@ void QPrinter_setPageSize(QPrinterH handle, const QPageSizeH pageSize)
 }
 
 
-#if defined MSWINDOWS
-void QPrinter_setWinPageSize(QPrinterH handle, int winPageSize)
-{
-	((QPrinter *)handle)->setWinPageSize(winPageSize);
-}
-
-int QPrinter_winPageSize(QPrinterH handle)
-{
-	return (int) ((QPrinter *)handle)->winPageSize();
-}
-
-#endif
diff --git a/cbindings/src/qprinter_c.h b/cbindings/src/qprinter_c.h
@@ -84,9 +84,4 @@ C_EXPORT void QPrinter_pageSize(QPrinterH handle, QPageSizeH retval);
 C_EXPORT void QPrinter_setPageLayout(QPrinterH handle, const QPageLayoutH pageLayout);
 C_EXPORT void QPrinter_setPageSize(QPrinterH handle, const QPageSizeH pageSize);
 
-#if defined MSWINDOWS
-C_EXPORT void QPrinter_setWinPageSize(QPrinterH handle, int winPageSize);
-C_EXPORT int QPrinter_winPageSize(QPrinterH handle);
-#endif
-
 #endif