From 10a485cc2ebe93b64c1cd3daf29feb8b61a79c74 Mon Sep 17 00:00:00 2001
From: Vijay Marcel <vijaymarcel@outlook.com>
Date: Tue, 4 Jun 2024 09:16:54 +0700
Subject: libraries/libqtpas: Updated for version 3.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libqtpas/changelog           |  6 ++++++
 libraries/libqtpas/libqtpas.SlackBuild | 19 ++++++-------------
 libraries/libqtpas/libqtpas.info       |  6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/libraries/libqtpas/changelog b/libraries/libqtpas/changelog
index 24df36ea70..c1a7b09f14 100644
--- a/libraries/libqtpas/changelog
+++ b/libraries/libqtpas/changelog
@@ -28,3 +28,9 @@ version 2.2.6-0 in SBo.
 26/04/2024:
 
 Update to use lazarus version 3.2-0
+
+03/06/2024:
+
+Updraded to version 3.0.
+This will use the latest lazarus version 3.4-0
+Removed the Hardening flags.
diff --git a/libraries/libqtpas/libqtpas.SlackBuild b/libraries/libqtpas/libqtpas.SlackBuild
index b42fadb75f..2518717355 100644
--- a/libraries/libqtpas/libqtpas.SlackBuild
+++ b/libraries/libqtpas/libqtpas.SlackBuild
@@ -24,12 +24,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libqtpas
-VERSION=${VERSION:-2.15}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 SRCNAM=${SRCNAM:-lazarus}
-SRCVER=${SRCVER:-3.2}
+SRCVER=${SRCVER:-3.4}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
@@ -48,20 +48,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PREPROCESS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS"
-
-HARDENING="-fexceptions -fstack-protector-strong -fstack-clash-protection -mindirect-branch=thunk -mfunction-return=thunk"
-
-SLDFLAGS="-Wl,-shared -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-z,defs"
-
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="$PREPROCESS -march=i586 -mtune=i686 -O2 -fPIC $HARDENING"
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="$PREPROCESS -march=i686 -mtune=i686 -O2 -fPIC $HARDENING"
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="$PREPROCESS -march=x86-64 -mtune=generic -O2 -fPIC $HARDENING"
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -89,7 +83,6 @@ find -L . \
 qmake-qt5 "QT += x11extras" \
 QMAKE_CXXFLAGS\ +=\ "$SLKCFLAGS" \
 QMAKE_CFLAGS\ +=\ "$SLKCFLAGS" \
-QMAKE_LFLAGS\ +=\ "$SLDFLAGS" \
 Qt5Pas.pro
 make
 make INSTALL_ROOT=$PKG install
@@ -97,7 +90,7 @@ make INSTALL_ROOT=$PKG install
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING.TXT README.TXT TODO  $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libqtpas/libqtpas.info b/libraries/libqtpas/libqtpas.info
index ec0dc8139a..245a5acefa 100644
--- a/libraries/libqtpas/libqtpas.info
+++ b/libraries/libqtpas/libqtpas.info
@@ -1,8 +1,8 @@
 PRGNAM="libqtpas"
-VERSION="2.15"
+VERSION="3.0"
 HOMEPAGE="http://www.lazarus.freepascal.org/"
-DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-3.2-0.tar.gz"
-MD5SUM="75b871d4d19d08570d2f282b0d8fed0e"
+DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-3.4-0.tar.gz"
+MD5SUM="05abcb08be9c7ea19c8a4d12d954f406"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3-80-g2a13