[arch-commits] Commit in wt/repos/community-x86_64 (3 files)

[Sven-Hendrik Haase]

    Date: Wednesday, August 14, 2019 @ 13:27:53
  Author: svenstaro
Revision: 499202

archrelease: copy trunk to community-x86_64

Added:
  wt/repos/community-x86_64/5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch
    (from rev 499201, wt/trunk/5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch)
  wt/repos/community-x86_64/PKGBUILD
    (from rev 499201, wt/trunk/PKGBUILD)
Deleted:
  wt/repos/community-x86_64/PKGBUILD

------------------------------------------------+
 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch |   31 ++++++
 PKGBUILD                                       |  102 ++++++++++++-----------
 2 files changed, 85 insertions(+), 48 deletions(-)

Copied: wt/repos/community-x86_64/5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch (from rev 499201, wt/trunk/5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch)
===================================================================
--- 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch	                        (rev 0)
+++ 5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch	2019-08-14 13:27:53 UTC (rev 499202)
@@ -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})
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-14 13:27:47 UTC (rev 499201)
+++ PKGBUILD	2019-08-14 13:27:53 UTC (rev 499202)
@@ -1,48 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Denis Martinez <deuns.martinez at gmail.com>
-
-pkgname=wt
-pkgver=4.0.5
-pkgrel=4
-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')
-optdepends=('openssl: for SSL support in built-in webserver'
-	    'fcgi: for FastCGI support'
-	    'postgresql-libs: for PostgreSQL Dbo support'
-        'mariadb-libs: for MySQL Dbo support'
-	    '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')
-
-prepare() {
-  mkdir "$srcdir"/${pkgname}-${pkgver}/build
-}
-
-build() {
-  cd "$srcdir"/${pkgname}-${pkgver}/build
-
-  cmake \
-      -DCONNECTOR_HTTP=ON \
-      -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DWEBUSER=http \
-      -DWEBGROUP=http \
-      -DUSE_SYSTEM_SQLITE3=ON \
-      -DINSTALL_EXAMPLES=ON \
-      -DBUILD_EXAMPLES=ON \
-      ..
-  make
-}
-
-package() {
-  cd "$srcdir"/${pkgname}-${pkgver}/build
-
-  make DESTDIR="$pkgdir" install
-}

Copied: wt/repos/community-x86_64/PKGBUILD (from rev 499201, wt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-08-14 13:27:53 UTC (rev 499202)
@@ -0,0 +1,54 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Denis Martinez <deuns.martinez at gmail.com>
+
+pkgname=wt
+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' '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'
+        'mariadb-libs: for MySQL Dbo support'
+	    '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"
+        5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch)
+sha512sums=('99570bec1e4d7184dd236d50f6c05d93207548152695d66c6bafc82be3632985ca830b7393471efda429d2e5a08707cb9236961c50cc99fbd84120598bd09c31'
+            '46564c8fd7c7faacdab423a72dfb624ab0422db4c6f3ab74098a802ab8914e2964514e9c27add49a7d6aba418e849585e7c883c4a83aa7e25333fd1d394b73c2')
+
+prepare() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  patch -Np1 -i "$srcdir/"5611d045c3e279c1101afdc07ab7ee1bdd5203e3.patch
+
+  mkdir "$srcdir"/${pkgname}-${pkgver}/build
+}
+
+build() {
+  cd "$srcdir"/${pkgname}-${pkgver}/build
+
+  cmake \
+      -DCONNECTOR_HTTP=ON \
+      -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWEBUSER=http \
+      -DWEBGROUP=http \
+      -DUSE_SYSTEM_SQLITE3=ON \
+      -DINSTALL_EXAMPLES=ON \
+      -DBUILD_EXAMPLES=ON \
+      ..
+  VERBOSE=1 make
+}
+
+package() {
+  cd "$srcdir"/${pkgname}-${pkgver}/build
+
+  make DESTDIR="$pkgdir" install
+}