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

[Sven-Hendrik Haase]

    Date: Wednesday, August 14, 2019 @ 13:27:47
  Author: svenstaro
Revision: 499201

upgpkg: wt 4.1.0-1

Added:
  wt/trunk/5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch
Modified:
  wt/trunk/PKGBUILD

------------------------------------------------+
 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch |   31 +++++++++++++++++++++++
 PKGBUILD                                       |   20 +++++++++-----
 2 files changed, 44 insertions(+), 7 deletions(-)

Added: 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch
===================================================================
--- 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch	                        (rev 0)
+++ 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch	2019-08-14 13:27:47 UTC (rev 499201)
@@ -0,0 +1,31 @@
+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	2019-08-14 12:31:24 UTC (rev 499200)
+++ PKGBUILD	2019-08-14 13:27:47 UTC (rev 499201)
@@ -3,14 +3,14 @@
 # Contributor: Denis Martinez <deuns.martinez at gmail.com>
 
 pkgname=wt
-pkgver=4.0.5
-pkgrel=4
+pkgver=4.1.0
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('x86_64')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
-depends=('boost-libs' 'libharu' 'graphicsmagick' 'pango' 'zlib' 'libgl')
-makedepends=('boost' 'cmake' 'postgresql-libs' 'fcgi' 'sqlite' 'mysql++' 'doxygen' 'mesa' 'glu')
+depends=('boost-libs' 'libharu' 'graphicsmagick' 'pango' 'zlib' 'libgl' 'harfbuzz' 'qt5-base')
+makedepends=('boost' 'cmake' 'postgresql-libs' 'fcgi' 'sqlite' 'mysql++' 'doxygen' 'graphviz' 'mesa' 'glu')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'fcgi: for FastCGI support'
 	    'postgresql-libs: for PostgreSQL Dbo support'
@@ -18,10 +18,16 @@
 	    '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=('5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/kdeforche/wt/archive/${pkgver}.tar.gz"
+        5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch)
+sha512sums=('99570bec1e4d7184dd236d50f6c05d93207548152695d66c6bafc82be3632985ca830b7393471efda429d2e5a08707cb9236961c50cc99fbd84120598bd09c31'
+            '46564c8fd7c7faacdab423a72dfb624ab0422db4c6f3ab74098a802ab8914e2964514e9c27add49a7d6aba418e849585e7c883c4a83aa7e25333fd1d394b73c2')
 
 prepare() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  patch -Np1 -i "$srcdir/"5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch
+
   mkdir "$srcdir"/${pkgname}-${pkgver}/build
 }
 
@@ -38,7 +44,7 @@
       -DINSTALL_EXAMPLES=ON \
       -DBUILD_EXAMPLES=ON \
       ..
-  make
+  VERBOSE=1 make
 }
 
 package() {