head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.48
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.46
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.44
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.42
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.40
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.38
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.36
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.34
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.32
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.30
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.28
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.26
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.24
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.22
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.20
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.18
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.16
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.14
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.12
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.10
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.8
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.6
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.4
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.2
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.1.0.4
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.26
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.22
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.20
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.18
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.16
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.14
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.12
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.10
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.8
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.6
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.2
	pkgsrc-2017Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2020.05.24.23.06.47;	author joerg;	state Exp;
branches;
next	1.2;
commitid	sIDDySTEZlum2y9C;

1.2
date	2020.04.24.09.35.17;	author manu;	state Exp;
branches;
next	1.1;
commitid	NzPVPeFSt0xDvC5C;

1.1
date	2017.06.23.07.12.19;	author manu;	state Exp;
branches;
next	;
commitid	qVgGA393byf81tWz;


desc
@@


1.3
log
@Drop check for ancient GCC versions. Allow building with modern clang.
@
text
@$NetBSD: patch-qt_configure,v 1.2 2020/04/24 09:35:17 manu Exp $

Fix == operator in shell script
Allow building with recent GCC

--- qt/configure.orig	2016-08-23 06:13:28.000000000 +0000
+++ qt/configure
@@@@ -3571,7 +3573,7 @@@@ fi
 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
     # get the darwin version. 10.0.0 and up means snow leopard.
     VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
-    if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then
+    if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then
         echo
         echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
         echo
@@@@ -7203,7 +7205,7 @@@@ fi
 # select Carbon on 10.4 Tiger.
 if [ "$PLATFORM_MAC" = "yes" ]; then
     VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
-    if [ "$VERSION" == 8 ]; then
+    if [ "$VERSION" = 8 ]; then
         CFG_MAC_COCOA="no";
         CFG_MAC_CARBON="yes";
     fi
@@@@ -7211,7 +7213,7 @@@@ fi
 
 # select Carbon when using the 10.4u SDK
 if [ "$PLATFORM_MAC" = "yes" ] && [ -n "$CFG_SDK" ]; then
-    if [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ]; then
+    if [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ]; then
         echo "Carbon on";
         CFG_MAC_COCOA="no";
         CFG_MAC_CARBON="yes";
@@@@ -7732,18 +7734,6 @@@@ case "$XPLATFORM" in
 	canBuildQtXmlPatterns="no"
 	;;
     *-g++*)
-	# Check gcc's version
-	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
-	    5*|4*|3.4*)
-		;;
-            3.3*)
-                canBuildWebKit="no"
-                ;;
-	    *)
-		canBuildWebKit="no"
-		canBuildQtXmlPatterns="no"
-		;;
-	esac
 	;;
     solaris-cc*)
         # Check the compiler version
@


1.2
log
@Fix the build on NetBSD-9.0
@
text
@d1 1
a1 1
$NetBSD$
d7 2
a8 3
+++ qt/configure	2020-04-20 09:06:51.824967933 +0000
@@@@ -3570,9 +3570,9 @@@@
 # with the default mkspec. The 10.4u SDK does not support gcc 4.2.
d17 1
a17 3
     fi
@@@@ -7202,17 +7202,17 @@@@
 
d26 1
a26 1
 fi
d35 2
a36 2
     fi
@@@@ -7733,9 +7733,9 @@@@
d39 2
a40 2
 	# Check gcc's version
 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
d42 12
a53 5
+	    9*|8*|7*|6*|5*|4*|3.4*)
 		;;
             3.3*)
                 canBuildWebKit="no"
                 ;;
@


1.1
log
@Add wkhtmltopdf 0.12.4

wkhtmltopdf and wkhtmltoimage are open source (LGPLv3) command line
tools to render HTML into PDF and various image formats using the
Qt WebKit rendering engine. These run entirely "headless" and do
not require a display or display service.
@
text
@d4 1
d6 2
a7 2
--- qt/configure.orig	2017-06-20 10:22:29.000000000 +0200
+++ qt/configure	2017-06-20 10:23:03.000000000 +0200
d39 11
@