[arch-commits] Commit in wt/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Wednesday, May 26, 2021 @ 06:44:34
  Author: svenstaro
Revision: 946613

upgpkg: wt 4.5.0-2: Build using gcc11

Added:
  wt/trunk/wt-gcc11.patch
Modified:
  wt/trunk/PKGBUILD
Deleted:
  wt/trunk/5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch

------------------------------------------------+
 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch |   31 -----------------------
 PKGBUILD                                       |   14 ++++++++--
 wt-gcc11.patch                                 |   12 ++++++++
 3 files changed, 23 insertions(+), 34 deletions(-)

Deleted: 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch
===================================================================
--- 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch	2021-05-26 06:40:01 UTC (rev 946612)
+++ 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch	2021-05-26 06:44:34 UTC (rev 946613)
@@ -1,31 +0,0 @@
-From 5611d045c3e279c1101afdc07ab7ee1bdd5203e3 Mon Sep 17 00:00:00 2001
-From: Roel Standaert <roel at emweb.be>
-Date: Wed, 14 Aug 2019 12:19:35 +0200
-Subject: [PATCH] Issue #7193: Pango 1.44 fix: add harfbuzz include dir
-
----
- cmake/WtFindPangoFt2.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
-index 5dae4cbf7..d64eeeecc 100644
---- a/cmake/WtFindPangoFt2.txt
-+++ b/cmake/WtFindPangoFt2.txt
-@@ -14,6 +14,9 @@ FIND_PATH(FT2BUILD_INCLUDE_DIR ft2build.h
- FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
-           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
- 
-+FIND_PATH(HARFBUZZ_INCLUDE_DIR hb.h
-+          HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
-+
- FIND_PATH(GLIB2_INCLUDE_DIR glib.h
-           HINTS ${PC_PANGO_FT2_INCLUDE_DIRS})
- 
-@@ -40,6 +43,7 @@ SET(PANGO_FT2_INCLUDE_DIRS
-     ${FT2_INCLUDE_DIR}
-     ${FT2BUILD_INCLUDE_DIR}
-     ${FONTCONFIG_INCLUDE_DIR}
-+    ${HARFBUZZ_INCLUDE_DIR}
-     ${GLIB2_INCLUDE_DIR}
-     ${GLIB2_CONFIG_INCLUDE_DIR})
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-26 06:40:01 UTC (rev 946612)
+++ PKGBUILD	2021-05-26 06:44:34 UTC (rev 946613)
@@ -4,7 +4,7 @@
 
 pkgname=wt
 pkgver=4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('x86_64')
 url="http://www.webtoolkit.eu/"
@@ -20,9 +20,17 @@
 	    'sqlite: for Sqlite Dbo support'
 	    'mysql++: for the hangman example')
 backup=('etc/wt/wt_config.xml')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/kdeforche/wt/archive/${pkgver}.tar.gz")
-sha512sums=('4cb8d822c4be4f120c1718410d1f493c9a81f8356eaa1b8dd5aea5095b7258bb950706c7871a2be89b1068ad34fe4153c02fb5ca6d5cc5870cb34107bfc5fcc9')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/kdeforche/wt/archive/${pkgver}.tar.gz"
+        wt-gcc11.patch)
+sha512sums=('4cb8d822c4be4f120c1718410d1f493c9a81f8356eaa1b8dd5aea5095b7258bb950706c7871a2be89b1068ad34fe4153c02fb5ca6d5cc5870cb34107bfc5fcc9'
+            'f79028388ccd61ce8d8486fdaf6a253ada81b6308998a902e9fe8946f8cefcf19b5fa3bf8a3c37f1e4c4ef1f47fdeaf8c55f1b02e458b149d7cb69d5a174c720')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -Np1 -i "${srcdir}"/wt-gcc11.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 

Added: wt-gcc11.patch
===================================================================
--- wt-gcc11.patch	                        (rev 0)
+++ wt-gcc11.patch	2021-05-26 06:44:34 UTC (rev 946613)
@@ -0,0 +1,12 @@
+diff --git a/src/Wt/Render/WTextRenderer.C b/src/Wt/Render/WTextRenderer.C
+index 98f5085..ae5ac67 100644
+--- a/src/Wt/Render/WTextRenderer.C
++++ b/src/Wt/Render/WTextRenderer.C
+@@ -15,6 +15,7 @@
+ 
+ #include <fstream>
+ #include <string>
++#include <limits>
+ 
+ namespace {
+   const double EPSILON = 1e-4;