Skip to content

Commit

Permalink
update to Qt5 1.2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbannon committed Dec 24, 2022
1 parent 4a8eff8 commit 8751999
Show file tree
Hide file tree
Showing 10 changed files with 232 additions and 15,144 deletions.
11 changes: 7 additions & 4 deletions cbindings/Qt5Pas.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@



# Binding Release Version 1.2.11 against Qt5 5.6 LTS release.
# Binding Release Version 1.2.12 against Qt5 5.6 LTS release.
# WebKit widgets are disabled until webenginewidgets are implemented.

VERSION = 1.2.11
VERSION = 1.2.12
VER_MAJ = 1
VER_MIN = 2
VER_PAT = 11
VER_PAT = 12
win32:VERSION_PE_HEADER = 1.2

QT += gui network printsupport
Expand Down Expand Up @@ -751,5 +751,8 @@ SOURCES += \
qtcpsocket_hook_c.cpp \
qtcpserver_hook_c.cpp \
qnetworkaccessmanager_hook_c.cpp \
qnetworkreply_hook_c.cpp
qnetworkreply_hook_c.cpp \
qnativeeventfilter_hook_c.cpp \
qnativeeventfilter_hook.h \
qnativeeventfilter_hook_c.h
# end of file
3 changes: 2 additions & 1 deletion cbindings/package/libqt5pas.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Lazarus main, current release versions do not need it.

%files

/usr/%{_lib}/libQt5Pas.so.1.2.11
/usr/%{_lib}/libQt5Pas.so.1.2.12
/usr/%{_lib}/libQt5Pas.so.1.2
/usr/%{_lib}/libQt5Pas.so.1
%dir "/usr/share/doc/libqt5pas/"
Expand All @@ -33,3 +33,4 @@ Lazarus main, current release versions do not need it.
%changelog
* Sat Dec 3 2022 David Bannon <tomboy-ng@bannons.id.au> - INSERT_FULL_VER
- Follow release of Qt5 bindings 1.2.11 in lazarus-main, lib Package
- Please see github for real history, this is just to suppress warnings.
69 changes: 69 additions & 0 deletions cbindings/package/scripts/qt5update.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/usr/bin/bash
set -e

# Download model is different from Qt6 version, run it from
# the scripts dir, it will find its way ....
# Small script to update the git controlled tree of libqt6pas
# it downloads the relevent files (initially only needs Qt5Pas.pro)
# checks version number and if required, updates the relevent files.
# No license, use as you see fit. David Bannon 2022-12-17

GIT_REPO="../../.."
DOWNLOAD="lazarus-main-lcl-interfaces-qt5"
DOWNLOAD_SUBS="lcl/interfaces/qt5"
TAR_FILE="lazarus-main-lcl-interfaces-qt5-cbindings-src.tar.gz"
DOWNFILE=""
# lazarus-main-lcl-interfaces-qt5
if [ "$DOWNLOAD" == "" ]; then
echo "ERROR - Download dir not defined"
exit
fi

if [ -d "$GIT_REPO""/cbindings" ]; then
echo "Git dir OK"
else
echo "Not finding git repo"
ls -l "$GIT_REPO"
exit
fi

#cd
if [ -e "$TAR_FILE" ]; then
rm "$TAR_FILE"
echo "Removing old download"
fi

if [ -d "$DOWNLOAD" ]; then
rm -Rf "$DOWNLOAD"
echo "Removing old download dir"
else
echo "$DOWNLOAD was not found"
fi

wget -O "$TAR_FILE" https://gitlab.com/freepascal.org/lazarus/lazarus/-/archive/main/lazarus-main.tar.gz?path=lcl/interfaces/qt5
tar xzf "$TAR_FILE"
grep VER_PAT "$DOWNLOAD"/"$DOWNLOAD_SUBS"/cbindings/Qt5Pas.pro
grep VER_PAT "$GIT_REPO"/cbindings/Qt5Pas.pro

DOWN_VER=`grep VER_PAT "$DOWNLOAD"/"$DOWNLOAD_SUBS"/cbindings/Qt5Pas.pro`
GIT_VER=`grep VER_PAT "$GIT_REPO"/cbindings/Qt5Pas.pro`

if [ "$DOWN_VER" != "$GIT_VER" ]; then
echo "Update required"
rm -f "$GIT_REPO"/cbindings/package/*.deb
rm -f "$GIT_REPO"/cbindings/package/*.rpm
rm -f "$GIT_REPO"/cbindings/package/*.gz
rm -f "$GIT_REPO"/cbindings/libQt5Pas.so*
rm -Rf "$GIT_REPO"/cbindings/src
cp -R "$DOWNLOAD"/"$DOWNLOAD_SUBS"/cbindings/src "$GIT_REPO"/cbindings/src
cp "$DOWNLOAD"/"$DOWNLOAD_SUBS"/qt5.pas "$GIT_REPO"/cbindings/.
cp "$DOWNLOAD"/"$DOWNLOAD_SUBS"/cbindings/Qt5Pas.pro "$GIT_REPO"/cbindings/.
echo "OK, done, now you go and do the build stuff ! eg -"
echo " cd ../../ <enter>"
echo " qmake -qt=qt5 <enter>"
echo " make <enter>"
(wait awhile)
else
echo "Update NOT required"
fi

Loading

0 comments on commit 8751999

Please sign in to comment.