From 07718e90c27d64e7c42e1e530246e98d6ba76f00 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 11 Jun 2014 12:13:17 +0200 Subject: [PATCH 1/2] new upstream version 3.3.3 --- .gitignore | 1 + install-mysql.patch | 15 --------------- sources | 2 +- ...GE-LICENSING => wt-3.3.3-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 0 wt.spec | 19 ++++++++++--------- 6 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 install-mysql.patch rename wt-3.3.2-PACKAGE-LICENSING => wt-3.3.3-PACKAGE-LICENSING (100%) mode change 100644 => 100755 wt-generate-tarball.sh diff --git a/.gitignore b/.gitignore index 3d355bb..c8cd48d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /wt-3.3.2-free.tar.xz +/wt-3.3.3-free.tar.xz diff --git a/install-mysql.patch b/install-mysql.patch deleted file mode 100644 index 9cf47e5..0000000 --- a/install-mysql.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: wt-3.3.1-rc1/src/Wt/Dbo/backend/CMakeLists.txt -=================================================================== ---- wt-3.3.1-rc1.orig/src/Wt/Dbo/backend/CMakeLists.txt -+++ wt-3.3.1-rc1/src/Wt/Dbo/backend/CMakeLists.txt -@@ -203,8 +203,8 @@ IF(ENABLE_MYSQL AND MYSQL_FOUND) - - INSTALL(TARGETS wtdbomysql - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) - - SET_TARGET_PROPERTIES( - wtdbomysql diff --git a/sources b/sources index 972daa9..0ca071c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5fc06a3e72654ef7d341e4c2c18152a wt-3.3.2-free.tar.xz +61ed3b79c409efffeb749a9fe103d7e2 wt-3.3.3-free.tar.xz diff --git a/wt-3.3.2-PACKAGE-LICENSING b/wt-3.3.3-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.2-PACKAGE-LICENSING rename to wt-3.3.3-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh old mode 100644 new mode 100755 diff --git a/wt.spec b/wt.spec index 8d223fc..f56fdf6 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.2 -Release: 2%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -14,8 +14,8 @@ Group: Development/Libraries License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib URL: http://www.webtoolkit.eu/wt # Following archive was made from upstream tarball downloaded from -# http://citylan.dl.sourceforge.net/project/witty/wt/3.3.1/wt-3.3.1-rc1.tar.gz -# by running ./wt-generate-tarball.sh 3.3.1-rc1 from tarball's directory +# http://citylan.dl.sourceforge.net/project/witty/wt/3.3.3/wt-3.3.3.tar.gz +# by running ./wt-generate-tarball.sh 3.3.3 from tarball's directory Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. @@ -26,11 +26,10 @@ Source3: README.fedora # Therefore we use this script to remove its code before shipping it. # Download the upstream tarball and invoke this script while in the # tarball's directory: -# sh wt-generate-tarball.sh UPSTREAM_VERSION +# ./wt-generate-tarball.sh UPSTREAM_VERSION Source4: wt-generate-tarball.sh Patch0: find-mysql.patch -Patch1: install-mysql.patch -Patch2: use-system-sqlite.patch +Patch1: use-system-sqlite.patch BuildRequires: cmake >= 2.6 boost-devel%{_isa} >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel @@ -102,8 +101,7 @@ This package contains the documents for Wt API and examples. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql -%patch1 -p1 -b .install-mysql -%patch2 -p1 -b .use-system-sqlite +%patch1 -p1 -b .use-system-sqlite # static files like javascript and css should not be executable for d in src resources examples; do @@ -279,6 +277,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Wed Jun 11 2014 Michal Minar 3.3.3-1 +- New upstream version 3.3.3. + * Fri Mar 21 2014 Michal Minar 3.3.2-2 - Got rid of bundled sqlite libraries. From 000584626fa3984576028bc1e152b459cc7a81c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 9 Feb 2015 07:37:28 +0100 Subject: [PATCH 2/2] New. --- wt-3.3.3-boost-1.57.patch | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 wt-3.3.3-boost-1.57.patch diff --git a/wt-3.3.3-boost-1.57.patch b/wt-3.3.3-boost-1.57.patch new file mode 100644 index 0000000..e37240a --- /dev/null +++ b/wt-3.3.3-boost-1.57.patch @@ -0,0 +1,58 @@ +diff -Naur wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C +--- wt-3.3.3.orig/src/Wt/Dbo/SqlQueryParse.C 2012-02-27 22:14:29.000000000 +0100 ++++ wt-3.3.3/src/Wt/Dbo/SqlQueryParse.C 2015-02-08 15:15:27.820770357 +0100 +@@ -20,7 +20,11 @@ + #include + #include + #include ++#if BOOST_VERSION < 105600 + #include ++#else ++#include ++#endif + #include + #include + +diff -Naur wt-3.3.3.orig/src/Wt/Json/Parser.C wt-3.3.3/src/Wt/Json/Parser.C +--- wt-3.3.3.orig/src/Wt/Json/Parser.C 2013-02-03 22:26:10.000000000 +0100 ++++ wt-3.3.3/src/Wt/Json/Parser.C 2015-02-08 15:18:41.573842062 +0100 +@@ -24,7 +24,11 @@ + #include + #include + #include ++#if BOOST_VERSION < 105600 + #include ++#else ++#include ++#endif + #include + + #endif // JSON_PARSER +diff -Naur wt-3.3.3.orig/src/Wt/Render/CssParser.C wt-3.3.3/src/Wt/Render/CssParser.C +--- wt-3.3.3.orig/src/Wt/Render/CssParser.C 2013-08-08 20:43:18.000000000 +0200 ++++ wt-3.3.3/src/Wt/Render/CssParser.C 2015-02-08 15:15:27.821770347 +0100 +@@ -34,7 +34,11 @@ + #include + #include + #include ++#if BOOST_VERSION < 105600 + #include ++#else ++#include ++#endif + #include + + #include +@@ -157,8 +161,12 @@ + template< typename Iterator > + struct ErrorReporting + { ++#if BOOST_VERSION < 105600 + template< typename, typename, typename, typename, typename > // Phoenix v2 + struct result { typedef void type;}; ++#else ++ typedef void result_type; ++#endif + + ErrorReporting(CssGrammer< Iterator >* grammer) + : grammer_(grammer)