summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2022-02-03 09:54:24 +0100
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-04 17:53:36 +0700
commitba05e0d9dc82fd9e18bd7e87bb9c4c18336a5c07 (patch)
tree9a33c8ada0c4fa3deea00e5fbdc66d0ff08e3c50
parent3f8e5cedc29091b9859cb4e64d330982fe2e3750 (diff)
downloadslackbuilds-ba05e0d9dc82fd9e18bd7e87bb9c4c18336a5c07.tar.gz
slackbuilds-ba05e0d9dc82fd9e18bd7e87bb9c4c18336a5c07.tar.xz
misc/subsurface: Add an include for the newer qt5.
Remove the grantlee hack now that the qt5 version is in the distro Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--misc/subsurface/subsurface.SlackBuild10
1 files changed, 2 insertions, 8 deletions
diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild
index e27cdcd8e4..5aa202fbde 100644
--- a/misc/subsurface/subsurface.SlackBuild
+++ b/misc/subsurface/subsurface.SlackBuild
@@ -83,17 +83,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' desktop-widgets/groupedlineedit.cpp
+
# Fix building against newer versions of libgit2
patch -p1 < $CWD/libgit2-version.patch
-# Ugly hack to avoid header collision between grantlee and grantlee-qt5.
-# https://mail.kde.org/pipermail/release-team/2015-August/008911.html
-sed -i 's|#include <grantlee_templates.h>|#include "grantlee_templates_local.h"|' \
- desktop-widgets/templatelayout.h
-sed -e 's|grantlee/|Grantlee5/grantlee/|' \
- /usr/include/Grantlee5/grantlee_templates.h \
- > grantlee_templates_local.h
-
# Fix the location detection of googlemaps
sed -i "s|../install-root|googlemaps-v.${GOOGLEMAPSVER}|" CMakeLists.txt