From ba05e0d9dc82fd9e18bd7e87bb9c4c18336a5c07 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Thu, 3 Feb 2022 09:54:24 +0100 Subject: 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 Signed-off-by: Willy Sudiarto Raharjo --- misc/subsurface/subsurface.SlackBuild | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'misc') diff --git a/misc/subsurface/subsurface.SlackBuild b/misc/subsurface/subsurface.SlackBuild index e27cdcd8e4d6..5aa202fbde81 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 $/a #include ' 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 |#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 -- cgit v1.2.3