From 9ca9cf407ea720cb70ab950fc54ce3faf5d5ddd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 20 May 2019 09:40:23 +0000 Subject: [PATCH 1/2] New upstream version 4.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.0.5-1 Resolves: bz#1676221 Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- use-system-sqlite.patch | 10 +++++----- ...0.3-PACKAGE-LICENSING => wt-4.0.5-PACKAGE-LICENSING | 0 wt.spec | 7 +++++-- 5 files changed, 12 insertions(+), 9 deletions(-) rename wt-4.0.3-PACKAGE-LICENSING => wt-4.0.5-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 5a1c3e4..7ed034c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.3-free.tar.xz +/wt-4.0.5-free.tar.xz diff --git a/sources b/sources index 40315a2..67b5afa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.3-free.tar.xz) = 80d9c24bec270692324f1db22618875cb514d7f54a4ce285f3517d98c25798619b9c74bd8e717eb83db43edb6cd2da992ded8629d0d239bfdbc5052d56cb19fa +SHA512 (wt-4.0.5-free.tar.xz) = c46fd59a3cfe288d3ebdd2a40538d8b507583041e505b4df4c21c966be80c1f0c9c631863b4af207c7b46f4074ac0e5da308e97f88b32a32c8dcc2d94d6cc2fb diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch index ec29ff0..6e7e760 100644 --- a/use-system-sqlite.patch +++ b/use-system-sqlite.patch @@ -1,9 +1,9 @@ -Index: wt-3.3.2/src/CMakeLists.txt +Index: wt-4.0.5/src/CMakeLists.txt =================================================================== ---- wt-3.3.2.orig/src/CMakeLists.txt -+++ wt-3.3.2/src/CMakeLists.txt -@@ -5,9 +5,12 @@ INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR} +--- wt-4.0.5.orig/src/CMakeLists.txt ++++ wt-4.0.5/src/CMakeLists.txt +@@ -6,9 +6,12 @@ INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/Wt/Date/include ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h ${BOOST_INCLUDE_DIRS} - Wt/Dbo/backend/amalgamation # for sqlite3.h diff --git a/wt-4.0.3-PACKAGE-LICENSING b/wt-4.0.5-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.3-PACKAGE-LICENSING rename to wt-4.0.5-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index d0f4439..189905a 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.3 -Release: 4%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -280,6 +280,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon May 20 2019 Michal Minář - 4.0.5-1 +- New upstream version 4.0.5 + * Sun Feb 03 2019 Fedora Release Engineering - 4.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d91064202681314d957e83a636488c41693976bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 19 Aug 2019 08:11:09 +0000 Subject: [PATCH 2/2] new upstream version: 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.1.0-1 Resolves: bz#1742106 Signed-off-by: Michal Minář --- .gitignore | 2 +- find-mysql.patch | 13 -------- pango-add-harfbuzz-include.patch | 31 +++++++++++++++++++ sources | 2 +- ...GE-LICENSING => wt-4.1.0-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 24 +++++++++----- wt.spec | 7 ++++- 7 files changed, 55 insertions(+), 24 deletions(-) delete mode 100644 find-mysql.patch create mode 100644 pango-add-harfbuzz-include.patch rename wt-4.0.5-PACKAGE-LICENSING => wt-4.1.0-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 7ed034c..947ac12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.5-free.tar.xz +/wt-4.1.0-free.tar.xz diff --git a/find-mysql.patch b/find-mysql.patch deleted file mode 100644 index 6ceedf3..0000000 --- a/find-mysql.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wt-3.3.1-rc1/cmake/WtFindMysql.txt -=================================================================== ---- wt-3.3.1-rc1.orig/cmake/WtFindMysql.txt -+++ wt-3.3.1-rc1/cmake/WtFindMysql.txt -@@ -25,6 +25,8 @@ FIND_LIBRARY(MYSQL_LIB - PATHS - ${MYSQL_PREFIX}/lib - ${MYSQL_PREFIX}/lib/opt -+ ${MYSQL_PREFIX}/lib/mysql -+ ${MYSQL_PREFIX}/lib64/mysql - /usr/lib - /usr/local/lib - /opt/local/lib diff --git a/pango-add-harfbuzz-include.patch b/pango-add-harfbuzz-include.patch new file mode 100644 index 0000000..72bea9c --- /dev/null +++ b/pango-add-harfbuzz-include.patch @@ -0,0 +1,31 @@ +From 20e552a69e3cf3f1c3e77c9cab05e3ce191c5e3b Mon Sep 17 00:00:00 2001 +From: Roel Standaert +Date: Wed, 14 Aug 2019 12:19:11 +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}) + diff --git a/sources b/sources index 67b5afa..5b3454d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.5-free.tar.xz) = c46fd59a3cfe288d3ebdd2a40538d8b507583041e505b4df4c21c966be80c1f0c9c631863b4af207c7b46f4074ac0e5da308e97f88b32a32c8dcc2d94d6cc2fb +SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1 diff --git a/wt-4.0.5-PACKAGE-LICENSING b/wt-4.1.0-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.5-PACKAGE-LICENSING rename to wt-4.1.0-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index dbde0e4..f5f8dbf 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -4,16 +4,24 @@ set -euo pipefail IFS=$'\n\t' NAME="wt" -VERSION=$1 +VERSION="$1" tmp=`mktemp -d` -tar -xzvf $VERSION.tar.gz -C $tmp -pushd $tmp -pushd $NAME-$VERSION/src/Wt/Dbo/backend +archiveName="$VERSION.tar.gz" +[[ -f "${archiveName}" ]] || archiveName="$NAME-$VERSION.tar.gz" +if [[ ! -f "${archiveName}" ]]; then + printf 'Could not find source archive %s!\n' "$archiveName" >&2 + exit 1 +fi + +dirName="$NAME-$VERSION" +tar -xzvf "$archiveName" -C "$tmp" +pushd "$tmp" +pushd "$dirName/src/Wt/Dbo/backend" rm -r ibpp popd # backend -rm -r $NAME-$VERSION/resources/jPlayer -tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION +rm -r "$dirName/resources/jPlayer" +tar -cJvf "$dirName-free.tar.xz" "$dirName" popd # tmp -mv $tmp/$NAME-$VERSION-free.tar.xz . -rm -r $tmp +mv "$tmp/$dirName-free.tar.xz" . +rm -r "$tmp" diff --git a/wt.spec b/wt.spec index 189905a..060e49d 100644 --- a/wt.spec +++ b/wt.spec @@ -5,7 +5,7 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.5 +Version: 4.1.0 Release: 1%{?dist} Summary: C++ library for developing web applications @@ -29,6 +29,8 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch +# fix for pango 1.44: https://github.com/Pandinosaurus/wt/pull/66 +Patch1: pango-add-harfbuzz-include.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel @@ -280,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Aug 19 2019 Michal Minář - 4.1.0-1 +- New upstream version. + * Mon May 20 2019 Michal Minář - 4.0.5-1 - New upstream version 4.0.5