From 0ef1e2f7d43e104c9a43da53b2ce5b63851bc847 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Thu, 13 Sep 2012 13:57:07 +0200 Subject: [PATCH 01/69] initial srpm import for f18 --- .gitignore | 1 + sources | 1 + wt-3.2.2-PACKAGE-LICENSING | 13 ++ wt-generate-tarball.sh | 16 +++ wt.spec | 263 +++++++++++++++++++++++++++++++++++++ 5 files changed, 294 insertions(+) create mode 100644 wt-3.2.2-PACKAGE-LICENSING create mode 100644 wt-generate-tarball.sh create mode 100644 wt.spec diff --git a/.gitignore b/.gitignore index e69de29..e4213a0 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/wt-3.2.2-p1-free.tar.gz diff --git a/sources b/sources index e69de29..eed2a13 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dbf753792c27247ca3a52e3198b178f4 wt-3.2.2-p1-free.tar.gz diff --git a/wt-3.2.2-PACKAGE-LICENSING b/wt-3.2.2-PACKAGE-LICENSING new file mode 100644 index 0000000..ca03558 --- /dev/null +++ b/wt-3.2.2-PACKAGE-LICENSING @@ -0,0 +1,13 @@ +The entire source code is GPLv2 except for these files: + * Boost Software License (BSL v1.0) + * src/http/* + * src/web/random_device.cpp + * src/rapidxml/* (dual licensed with MIT/X11 (BSD like)) + * MIT/X11 (BSD like) + * examples/wtwithqt/* + * BSD + * src/Wt/Auth/passwdqc.h + * src/Wt/Auth/passwdqc_check.h + * zlib/libpng + * src/web/md5.[ch] + * src/web/base64.h diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh new file mode 100644 index 0000000..4605c69 --- /dev/null +++ b/wt-generate-tarball.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +NAME="wt" +VERSION=$1 + +tmp=`mktemp -d` +tar -xzvf $NAME-$VERSION.tar.gz -C $tmp +pushd $tmp +pushd $NAME-$VERSION/src/Wt/Dbo/backend +rm -r ibpp +popd # backend +tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION +popd # tmp +mv $tmp/$NAME-$VERSION-free.tar.gz . +rm -r $tmp + diff --git a/wt.spec b/wt.spec new file mode 100644 index 0000000..697c3c8 --- /dev/null +++ b/wt.spec @@ -0,0 +1,263 @@ +%global WTSRVDIR /var/spool/wt +%global WTRUNDIR %{WTSRVDIR}/run + +%global WTRUNUSER apache +%global WTRUNGROUP apache + +%global _version 3.2.2 +%global patchlevel 1 +%global posttag p%{patchlevel} +%global upstreamver %{_version}-%{posttag} + +Name: wt +Version: %{_version} +Release: 5.%{posttag}%{?dist} +Summary: C++ library for developing web applications + +Group: Development/Libraries +# For a breakdown of the licensing, see PACKAGE-LICENSING +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.2.2/wt-3.2.2-p1.tar.gz +# by running generate-tarball.sh 3.2.2-p1 from tarball's directory +Source0: %{name}-%{upstreamver}-free.tar.gz +Source1: %{name}-%{_version}-PACKAGE-LICENSING +# wt toolkit contains bundled non-free library (IBPP) that we cannot ship. +# 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 +Source2: wt-generate-tarball.sh + +BuildRequires: cmake boost-devel%{_isa} >= 1.41 openssl-devel libharu-devel +BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel +BuildRequires: fcgi-devel zlib-devel qt-devel + +%description +Web C++ library with widget oriented API that uses well-tested patterns of +desktop GUI development tailored to the web. To the developer, it offers +abstraction of web-specific implementation details, including client-server +protocols, event handling, graphics support, graceful degradation (or +progressive enhancement), and URL handling. + +%package dbo +Summary: Wt::Dbo ORM library and Sqlite3 back-end +Group: Development/Libraries + +%description dbo +This package contains the Wt::Dbo Object-Relational Mapping library +and Sqlite3 back-end of it. + +%package dbo-postgres +Summary: PostgreSQL back-end for the Wt::Dbo ORM library +Group: Development/Libraries +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} + +%description dbo-postgres +This package contains the PostgresSQL back-end for the Wt::Dbo ORM library. + +%package devel +Summary: Libraries and header files for witty web development +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo-postgres%{?_isa} = %{version}-%{release} +Requires: cmake + +%description devel +This package contains the files necessary to develop +applications using the Wt toolkit and the Wt::Dbo ORM library. + +%package examples +Summary: Examples for Wt +Group: Development/Libraries +License: GPLv2 and MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} + +%description examples +This package contains programming examples distributed with official Wt +release. + +%package doc +Summary: Documents for the Wt toolkit +Group: Documentation +BuildArch: noarch + +%description doc +This package contains the documents for Wt API and examples. + +%prep +%setup -q -n %{name}-%{upstreamver} +for d in src resources examples; do + find $d -type f \( -iregex '.*\.\([hc]\|js\|css\)' -o -executable \) | \ + xargs -r chmod -v 0644 +done +find examples -type f -name .htaccess | while read f; do + mv -v $f `dirname $f`/htaccess +done +# conversion to UTF-8 +convdir=`mktemp -d` +for f in examples/style/CornerImage.h; do + tmpf=${convdir}/`basename $f` + iconv -f iso-8859-2 -t UTF-8 $f >$tmpf + mv $tmpf $f +done +rmdir $convdir + +%build +mkdir wt-build +cd wt-build +## wtdbofirebird library bundles IBPP c++ client library for firebird +## that is licensed under IBPP License, which is marked as Non-Free +## by Red Hat Legal +## let's not package it, until licensing issues are solved +%cmake .. \ + -DCONNECTOR_HTTP=ON \ + -DCONNECTOR_FCGI=ON \ + -DUSE_SYSTEM_SQLITE3=ON \ + -DWEBUSER="%{WTRUNUSER}" \ + -DWEBGROUP="%{WTRUNGROUP}" \ + -DRUNDIR="%{WTRUNDIR}" \ + -DINSTALL_EXAMPLES=ON \ + -DENABLE_FIREBIRD=OFF \ + -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples +make %{?_smp_mflags} + +%install +pushd wt-build +make install DESTDIR=$RPM_BUILD_ROOT +install -v -m 0755 -d ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} +cp -v wt_config.xml ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} + +# makes an absolute symlink to resources directory +make_rsc_link() { + ln -vs "%{_datadir}/Wt/resources" \ + "${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/$1" +} + +# installation of examples +pushd examples +for d in `find . -maxdepth 1 -mindepth 1 -type d | \ + grep -v '^\(CMakeFiles\|feature\)$'`; do + # create a symlink for each example pointing on resources dir + make_rsc_link $d +done +for d in `find feature -maxdepth 1 -mindepth 1 -type d | grep -v 'CMakeFiles'`; +do # create a symlink for each feature example pointing on resources dir + make_rsc_link $d +done +popd # examples +popd # wt-build + +# installation of documentation +for d in %{name} %{name}-dbo %{name}-doc; do + install -v -m 0755 -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/ + cp -v LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/ + install -vm 644 %{SOURCE1} \ + ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/PACKAGE-LICENSING +done +cp -vr README.md ReleaseNotes.html Changelog \ + ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/ +cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}/ + +pushd ${RPM_BUILD_ROOT} +mkdir -vp .%{WTSRVDIR} +mkdir -vp .%{WTRUNDIR} +install -v -m 0755 -d .%{_datadir}/cmake/Modules +mv -v .%{_prefix}/cmake/*.cmake .%{_datadir}/cmake/Modules + +# cleanup +rm -rfv ${_prefix}/cmake +for d in examples reference; do + rm -v .%{_defaultdocdir}/%{name}-doc-%{version}/$d/html/installdox +done +rm -v .%{_defaultdocdir}/%{name}-doc-%{version}/main +find .%{_libdir}/Wt/examples -regex '.*/\(CMakeFiles\|.*\.cmake\|Doxygen\)' | \ + xargs rm -rfv +# these scripts were used to generate pictures +find .%{_datadir}/Wt/resources -name 'generate.sh' | xargs rm -v +popd + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post dbo -p /sbin/ldconfig +%postun dbo -p /sbin/ldconfig +%post dbo-postgres -p /sbin/ldconfig +%postun dbo-postgres -p /sbin/ldconfig + +%files +%config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml +%{_libdir}/libwt.so.* +%{_libdir}/libwtext.so.* +%{_libdir}/libwtfcgi.so.* +%{_libdir}/libwthttp.so.* +%{_libdir}/libwttest.so.* +%dir %{_defaultdocdir}/%{name}-%{version} +%doc %{_defaultdocdir}/%{name}-%{version}/README.md +%doc %{_defaultdocdir}/%{name}-%{version}/LICENSE +%doc %{_defaultdocdir}/%{name}-%{version}/ReleaseNotes.html +%doc %{_defaultdocdir}/%{name}-%{version}/Changelog +%doc %{_defaultdocdir}/%{name}-%{version}/PACKAGE-LICENSING +%dir %{_datadir}/Wt +%dir %{_datadir}/Wt/resources +%{_datadir}/Wt/resources/* +%dir %{WTSRVDIR} +%dir %{WTRUNDIR} + +%files dbo +%dir %{_defaultdocdir}/%{name}-dbo-%{version} +%doc %{_defaultdocdir}/%{name}-dbo-%{version}/LICENSE +%doc %{_defaultdocdir}/%{name}-dbo-%{version}/PACKAGE-LICENSING +%{_libdir}/libwtdbo.so.* +%{_libdir}/libwtdbosqlite3.so.* + +%files dbo-postgres +%{_libdir}/libwtdbopostgres.so.* + +%files devel +# header files +%dir %{_includedir}/Wt +%{_includedir}/Wt/* +%{_libdir}/*.so +%{_datadir}/cmake/Modules/*.cmake + +%files examples +%dir %{_libdir}/Wt +%dir %{_libdir}/Wt/examples +%{_libdir}/Wt/examples/* + +%files doc +%dir %{_defaultdocdir}/%{name}-doc-%{version} +%doc %{_defaultdocdir}/%{name}-doc-%{version}/LICENSE +%doc %{_defaultdocdir}/%{name}-doc-%{version}/PACKAGE-LICENSING +%{_defaultdocdir}/%{name}-doc-%{version}/*.html +%dir %{_defaultdocdir}/%{name}-doc-%{version}/images +%dir %{_defaultdocdir}/%{name}-doc-%{version}/reference +%dir %{_defaultdocdir}/%{name}-doc-%{version}/tutorial +%dir %{_defaultdocdir}/%{name}-doc-%{version}/examples +%{_defaultdocdir}/%{name}-doc-%{version}/images/* +%{_defaultdocdir}/%{name}-doc-%{version}/reference/* +%{_defaultdocdir}/%{name}-doc-%{version}/tutorial/* +%{_defaultdocdir}/%{name}-doc-%{version}/examples/* + +%changelog +* Wed Sep 12 2012 Michal Minář - 3.2.2-5.p1 +- Added wt-generate-tarball.sh script for source tarball generation + from upstream tarball, in order to remove the IBPP non-free library + from source. + +* Mon Sep 03 2012 Michal Minar - 3.2.2-4.p1 +- separated doc dirs for independent subpackages -dbo and -doc + +* Fri Aug 24 2012 Michal Minar - 3.2.2-3.p1 +- Own examples directory. +- Include a copy of license in wt-doc. +- Added License tag for wt-examples. + +* Fri Aug 24 2012 Michal Minar - 3.2.2-2.p1 +- Not packaging back-end due to licensing issues. + +* Tue Aug 21 2012 Michal Minar - 3.2.2-1.p1 +- Initial Package for FE. From 79ba4c7f0716b2ba6630af75a74ca0cd784e8521 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Thu, 13 Sep 2012 14:49:03 +0200 Subject: [PATCH 02/69] fixed changelog line removed diacritic and added missing email --- wt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 697c3c8..c12e9cf 100644 --- a/wt.spec +++ b/wt.spec @@ -11,7 +11,7 @@ Name: wt Version: %{_version} -Release: 5.%{posttag}%{?dist} +Release: 6.%{posttag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -243,7 +243,10 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog -* Wed Sep 12 2012 Michal Minář - 3.2.2-5.p1 +* Thu Sep 13 2012 Michal Minar - 3.2.2-6.p1 +- fixed changelog line + +* Wed Sep 12 2012 Michal Minar - 3.2.2-5.p1 - Added wt-generate-tarball.sh script for source tarball generation from upstream tarball, in order to remove the IBPP non-free library from source. From 174469068d72cbafb875242465a370644265bfb7 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 26 Sep 2012 15:25:45 +0200 Subject: [PATCH 03/69] wt-3.2.2 uploaded for rawhide --- .gitignore | 1 + sources | 1 + wt-3.2.2-PACKAGE-LICENSING | 13 ++ wt-generate-tarball.sh | 16 +++ wt.spec | 266 +++++++++++++++++++++++++++++++++++++ 5 files changed, 297 insertions(+) create mode 100644 wt-3.2.2-PACKAGE-LICENSING create mode 100644 wt-generate-tarball.sh create mode 100644 wt.spec diff --git a/.gitignore b/.gitignore index e69de29..e4213a0 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/wt-3.2.2-p1-free.tar.gz diff --git a/sources b/sources index e69de29..eed2a13 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dbf753792c27247ca3a52e3198b178f4 wt-3.2.2-p1-free.tar.gz diff --git a/wt-3.2.2-PACKAGE-LICENSING b/wt-3.2.2-PACKAGE-LICENSING new file mode 100644 index 0000000..ca03558 --- /dev/null +++ b/wt-3.2.2-PACKAGE-LICENSING @@ -0,0 +1,13 @@ +The entire source code is GPLv2 except for these files: + * Boost Software License (BSL v1.0) + * src/http/* + * src/web/random_device.cpp + * src/rapidxml/* (dual licensed with MIT/X11 (BSD like)) + * MIT/X11 (BSD like) + * examples/wtwithqt/* + * BSD + * src/Wt/Auth/passwdqc.h + * src/Wt/Auth/passwdqc_check.h + * zlib/libpng + * src/web/md5.[ch] + * src/web/base64.h diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh new file mode 100644 index 0000000..4605c69 --- /dev/null +++ b/wt-generate-tarball.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +NAME="wt" +VERSION=$1 + +tmp=`mktemp -d` +tar -xzvf $NAME-$VERSION.tar.gz -C $tmp +pushd $tmp +pushd $NAME-$VERSION/src/Wt/Dbo/backend +rm -r ibpp +popd # backend +tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION +popd # tmp +mv $tmp/$NAME-$VERSION-free.tar.gz . +rm -r $tmp + diff --git a/wt.spec b/wt.spec new file mode 100644 index 0000000..c12e9cf --- /dev/null +++ b/wt.spec @@ -0,0 +1,266 @@ +%global WTSRVDIR /var/spool/wt +%global WTRUNDIR %{WTSRVDIR}/run + +%global WTRUNUSER apache +%global WTRUNGROUP apache + +%global _version 3.2.2 +%global patchlevel 1 +%global posttag p%{patchlevel} +%global upstreamver %{_version}-%{posttag} + +Name: wt +Version: %{_version} +Release: 6.%{posttag}%{?dist} +Summary: C++ library for developing web applications + +Group: Development/Libraries +# For a breakdown of the licensing, see PACKAGE-LICENSING +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.2.2/wt-3.2.2-p1.tar.gz +# by running generate-tarball.sh 3.2.2-p1 from tarball's directory +Source0: %{name}-%{upstreamver}-free.tar.gz +Source1: %{name}-%{_version}-PACKAGE-LICENSING +# wt toolkit contains bundled non-free library (IBPP) that we cannot ship. +# 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 +Source2: wt-generate-tarball.sh + +BuildRequires: cmake boost-devel%{_isa} >= 1.41 openssl-devel libharu-devel +BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel +BuildRequires: fcgi-devel zlib-devel qt-devel + +%description +Web C++ library with widget oriented API that uses well-tested patterns of +desktop GUI development tailored to the web. To the developer, it offers +abstraction of web-specific implementation details, including client-server +protocols, event handling, graphics support, graceful degradation (or +progressive enhancement), and URL handling. + +%package dbo +Summary: Wt::Dbo ORM library and Sqlite3 back-end +Group: Development/Libraries + +%description dbo +This package contains the Wt::Dbo Object-Relational Mapping library +and Sqlite3 back-end of it. + +%package dbo-postgres +Summary: PostgreSQL back-end for the Wt::Dbo ORM library +Group: Development/Libraries +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} + +%description dbo-postgres +This package contains the PostgresSQL back-end for the Wt::Dbo ORM library. + +%package devel +Summary: Libraries and header files for witty web development +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo-postgres%{?_isa} = %{version}-%{release} +Requires: cmake + +%description devel +This package contains the files necessary to develop +applications using the Wt toolkit and the Wt::Dbo ORM library. + +%package examples +Summary: Examples for Wt +Group: Development/Libraries +License: GPLv2 and MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} + +%description examples +This package contains programming examples distributed with official Wt +release. + +%package doc +Summary: Documents for the Wt toolkit +Group: Documentation +BuildArch: noarch + +%description doc +This package contains the documents for Wt API and examples. + +%prep +%setup -q -n %{name}-%{upstreamver} +for d in src resources examples; do + find $d -type f \( -iregex '.*\.\([hc]\|js\|css\)' -o -executable \) | \ + xargs -r chmod -v 0644 +done +find examples -type f -name .htaccess | while read f; do + mv -v $f `dirname $f`/htaccess +done +# conversion to UTF-8 +convdir=`mktemp -d` +for f in examples/style/CornerImage.h; do + tmpf=${convdir}/`basename $f` + iconv -f iso-8859-2 -t UTF-8 $f >$tmpf + mv $tmpf $f +done +rmdir $convdir + +%build +mkdir wt-build +cd wt-build +## wtdbofirebird library bundles IBPP c++ client library for firebird +## that is licensed under IBPP License, which is marked as Non-Free +## by Red Hat Legal +## let's not package it, until licensing issues are solved +%cmake .. \ + -DCONNECTOR_HTTP=ON \ + -DCONNECTOR_FCGI=ON \ + -DUSE_SYSTEM_SQLITE3=ON \ + -DWEBUSER="%{WTRUNUSER}" \ + -DWEBGROUP="%{WTRUNGROUP}" \ + -DRUNDIR="%{WTRUNDIR}" \ + -DINSTALL_EXAMPLES=ON \ + -DENABLE_FIREBIRD=OFF \ + -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples +make %{?_smp_mflags} + +%install +pushd wt-build +make install DESTDIR=$RPM_BUILD_ROOT +install -v -m 0755 -d ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} +cp -v wt_config.xml ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} + +# makes an absolute symlink to resources directory +make_rsc_link() { + ln -vs "%{_datadir}/Wt/resources" \ + "${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/$1" +} + +# installation of examples +pushd examples +for d in `find . -maxdepth 1 -mindepth 1 -type d | \ + grep -v '^\(CMakeFiles\|feature\)$'`; do + # create a symlink for each example pointing on resources dir + make_rsc_link $d +done +for d in `find feature -maxdepth 1 -mindepth 1 -type d | grep -v 'CMakeFiles'`; +do # create a symlink for each feature example pointing on resources dir + make_rsc_link $d +done +popd # examples +popd # wt-build + +# installation of documentation +for d in %{name} %{name}-dbo %{name}-doc; do + install -v -m 0755 -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/ + cp -v LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/ + install -vm 644 %{SOURCE1} \ + ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/PACKAGE-LICENSING +done +cp -vr README.md ReleaseNotes.html Changelog \ + ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/ +cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}/ + +pushd ${RPM_BUILD_ROOT} +mkdir -vp .%{WTSRVDIR} +mkdir -vp .%{WTRUNDIR} +install -v -m 0755 -d .%{_datadir}/cmake/Modules +mv -v .%{_prefix}/cmake/*.cmake .%{_datadir}/cmake/Modules + +# cleanup +rm -rfv ${_prefix}/cmake +for d in examples reference; do + rm -v .%{_defaultdocdir}/%{name}-doc-%{version}/$d/html/installdox +done +rm -v .%{_defaultdocdir}/%{name}-doc-%{version}/main +find .%{_libdir}/Wt/examples -regex '.*/\(CMakeFiles\|.*\.cmake\|Doxygen\)' | \ + xargs rm -rfv +# these scripts were used to generate pictures +find .%{_datadir}/Wt/resources -name 'generate.sh' | xargs rm -v +popd + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post dbo -p /sbin/ldconfig +%postun dbo -p /sbin/ldconfig +%post dbo-postgres -p /sbin/ldconfig +%postun dbo-postgres -p /sbin/ldconfig + +%files +%config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml +%{_libdir}/libwt.so.* +%{_libdir}/libwtext.so.* +%{_libdir}/libwtfcgi.so.* +%{_libdir}/libwthttp.so.* +%{_libdir}/libwttest.so.* +%dir %{_defaultdocdir}/%{name}-%{version} +%doc %{_defaultdocdir}/%{name}-%{version}/README.md +%doc %{_defaultdocdir}/%{name}-%{version}/LICENSE +%doc %{_defaultdocdir}/%{name}-%{version}/ReleaseNotes.html +%doc %{_defaultdocdir}/%{name}-%{version}/Changelog +%doc %{_defaultdocdir}/%{name}-%{version}/PACKAGE-LICENSING +%dir %{_datadir}/Wt +%dir %{_datadir}/Wt/resources +%{_datadir}/Wt/resources/* +%dir %{WTSRVDIR} +%dir %{WTRUNDIR} + +%files dbo +%dir %{_defaultdocdir}/%{name}-dbo-%{version} +%doc %{_defaultdocdir}/%{name}-dbo-%{version}/LICENSE +%doc %{_defaultdocdir}/%{name}-dbo-%{version}/PACKAGE-LICENSING +%{_libdir}/libwtdbo.so.* +%{_libdir}/libwtdbosqlite3.so.* + +%files dbo-postgres +%{_libdir}/libwtdbopostgres.so.* + +%files devel +# header files +%dir %{_includedir}/Wt +%{_includedir}/Wt/* +%{_libdir}/*.so +%{_datadir}/cmake/Modules/*.cmake + +%files examples +%dir %{_libdir}/Wt +%dir %{_libdir}/Wt/examples +%{_libdir}/Wt/examples/* + +%files doc +%dir %{_defaultdocdir}/%{name}-doc-%{version} +%doc %{_defaultdocdir}/%{name}-doc-%{version}/LICENSE +%doc %{_defaultdocdir}/%{name}-doc-%{version}/PACKAGE-LICENSING +%{_defaultdocdir}/%{name}-doc-%{version}/*.html +%dir %{_defaultdocdir}/%{name}-doc-%{version}/images +%dir %{_defaultdocdir}/%{name}-doc-%{version}/reference +%dir %{_defaultdocdir}/%{name}-doc-%{version}/tutorial +%dir %{_defaultdocdir}/%{name}-doc-%{version}/examples +%{_defaultdocdir}/%{name}-doc-%{version}/images/* +%{_defaultdocdir}/%{name}-doc-%{version}/reference/* +%{_defaultdocdir}/%{name}-doc-%{version}/tutorial/* +%{_defaultdocdir}/%{name}-doc-%{version}/examples/* + +%changelog +* Thu Sep 13 2012 Michal Minar - 3.2.2-6.p1 +- fixed changelog line + +* Wed Sep 12 2012 Michal Minar - 3.2.2-5.p1 +- Added wt-generate-tarball.sh script for source tarball generation + from upstream tarball, in order to remove the IBPP non-free library + from source. + +* Mon Sep 03 2012 Michal Minar - 3.2.2-4.p1 +- separated doc dirs for independent subpackages -dbo and -doc + +* Fri Aug 24 2012 Michal Minar - 3.2.2-3.p1 +- Own examples directory. +- Include a copy of license in wt-doc. +- Added License tag for wt-examples. + +* Fri Aug 24 2012 Michal Minar - 3.2.2-2.p1 +- Not packaging back-end due to licensing issues. + +* Tue Aug 21 2012 Michal Minar - 3.2.2-1.p1 +- Initial Package for FE. From 5e2e8a3fe9ebc15e41036edcb54ee0333d9a58af Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Dec 2012 09:18:16 -0600 Subject: [PATCH 04/69] rebuild (GraphicsMagick) --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index c12e9cf..ddae3d5 100644 --- a/wt.spec +++ b/wt.spec @@ -11,7 +11,7 @@ Name: wt Version: %{_version} -Release: 6.%{posttag}%{?dist} +Release: 7.%{posttag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -243,6 +243,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Mon Dec 24 2012 Rex Dieter 3.2.2-7.p1 +- rebuild (GraphicsMagick) + * Thu Sep 13 2012 Michal Minar - 3.2.2-6.p1 - fixed changelog line From 11ac1b79e40c007c42805f8b95cb449b9f16e8d4 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 26 Dec 2012 12:29:20 +0100 Subject: [PATCH 05/69] new upstream version 3.2.3 --- .gitignore | 1 + sources | 1 + ...GE-LICENSING => wt-3.2.3-PACKAGE-LICENSING | 0 wt.spec | 26 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) rename wt-3.2.2-PACKAGE-LICENSING => wt-3.2.3-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index e4213a0..5037c86 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /wt-3.2.2-p1-free.tar.gz +/wt-3.2.3-free.tar.gz diff --git a/sources b/sources index eed2a13..ed222f5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ dbf753792c27247ca3a52e3198b178f4 wt-3.2.2-p1-free.tar.gz +234e3d21d7fa7407d3784bb757d8e3cd wt-3.2.3-free.tar.gz diff --git a/wt-3.2.2-PACKAGE-LICENSING b/wt-3.2.3-PACKAGE-LICENSING similarity index 100% rename from wt-3.2.2-PACKAGE-LICENSING rename to wt-3.2.3-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index c12e9cf..0d121ac 100644 --- a/wt.spec +++ b/wt.spec @@ -4,14 +4,9 @@ %global WTRUNUSER apache %global WTRUNGROUP apache -%global _version 3.2.2 -%global patchlevel 1 -%global posttag p%{patchlevel} -%global upstreamver %{_version}-%{posttag} - Name: wt -Version: %{_version} -Release: 6.%{posttag}%{?dist} +Version: 3.2.3 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -19,10 +14,10 @@ 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.2.2/wt-3.2.2-p1.tar.gz -# by running generate-tarball.sh 3.2.2-p1 from tarball's directory -Source0: %{name}-%{upstreamver}-free.tar.gz -Source1: %{name}-%{_version}-PACKAGE-LICENSING +# http://citylan.dl.sourceforge.net/project/witty/wt/3.2.3/wt-3.2.3.tar.gz +# by running generate-tarball.sh 3.2.3 from tarball's directory +Source0: %{name}-%{version}-free.tar.gz +Source1: %{name}-%{version}-PACKAGE-LICENSING # wt toolkit contains bundled non-free library (IBPP) that we cannot ship. # Therefore we use this script to remove its code before shipping it. # Download the upstream tarball and invoke this script while in the @@ -30,9 +25,9 @@ Source1: %{name}-%{_version}-PACKAGE-LICENSING # sh wt-generate-tarball.sh UPSTREAM_VERSION Source2: wt-generate-tarball.sh -BuildRequires: cmake boost-devel%{_isa} >= 1.41 openssl-devel libharu-devel +BuildRequires: cmake >= 2.6 boost-devel%{_isa} >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel -BuildRequires: fcgi-devel zlib-devel qt-devel +BuildRequires: libharu-devel fcgi-devel zlib-devel qt-devel %description Web C++ library with widget oriented API that uses well-tested patterns of @@ -89,7 +84,7 @@ BuildArch: noarch This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{upstreamver} +%setup -q -n %{name}-%{version} for d in src resources examples; do find $d -type f \( -iregex '.*\.\([hc]\|js\|css\)' -o -executable \) | \ xargs -r chmod -v 0644 @@ -243,6 +238,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Wed Dec 26 2012 Michal Minar - 3.2.3-1 +- Version 3.2.3 + * Thu Sep 13 2012 Michal Minar - 3.2.2-6.p1 - fixed changelog line From 5987bddec4fcbddacc9725afda69a35b772ed043 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 26 Dec 2012 12:45:51 +0100 Subject: [PATCH 06/69] removed redundant file --- wt-3.2.2-PACKAGE-LICENSING | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 wt-3.2.2-PACKAGE-LICENSING diff --git a/wt-3.2.2-PACKAGE-LICENSING b/wt-3.2.2-PACKAGE-LICENSING deleted file mode 100644 index ca03558..0000000 --- a/wt-3.2.2-PACKAGE-LICENSING +++ /dev/null @@ -1,13 +0,0 @@ -The entire source code is GPLv2 except for these files: - * Boost Software License (BSL v1.0) - * src/http/* - * src/web/random_device.cpp - * src/rapidxml/* (dual licensed with MIT/X11 (BSD like)) - * MIT/X11 (BSD like) - * examples/wtwithqt/* - * BSD - * src/Wt/Auth/passwdqc.h - * src/Wt/Auth/passwdqc_check.h - * zlib/libpng - * src/web/md5.[ch] - * src/web/base64.h From 6642f2600fc862b3f058de1e942a7abaa92ed161 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 Feb 2013 23:24:33 +0100 Subject: [PATCH 07/69] Rebuild for Boost-1.53.0 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index b9ca54b..1a7b917 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -238,6 +238,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Sat Feb 09 2013 Denis Arnaud - 3.2.3-2 +- Rebuild for Boost-1.53.0 + * Wed Dec 26 2012 Michal Minar - 3.2.3-1 - Version 3.2.3 From 712c99c8c2b0d39ee987cb3063899252e7da21ad Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Thu, 20 Jun 2013 15:32:31 +0200 Subject: [PATCH 08/69] update to 3.3.0 removed deprecated libwtext lib --- .gitignore | 1 + sources | 2 +- ...2.3-PACKAGE-LICENSING => wt-3.3.0-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 0 wt.spec | 10 ++++++---- 5 files changed, 8 insertions(+), 5 deletions(-) rename wt-3.2.3-PACKAGE-LICENSING => wt-3.3.0-PACKAGE-LICENSING (100%) mode change 100644 => 100755 wt-generate-tarball.sh diff --git a/.gitignore b/.gitignore index 5037c86..aaf9455 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /wt-3.2.2-p1-free.tar.gz /wt-3.2.3-free.tar.gz +/wt-3.3.0-free.tar.gz diff --git a/sources b/sources index ed222f5..3e60ef2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dbf753792c27247ca3a52e3198b178f4 wt-3.2.2-p1-free.tar.gz 234e3d21d7fa7407d3784bb757d8e3cd wt-3.2.3-free.tar.gz +506c639db4c7e7e0880cb34d931eda12 wt-3.3.0-free.tar.gz diff --git a/wt-3.2.3-PACKAGE-LICENSING b/wt-3.3.0-PACKAGE-LICENSING similarity index 100% rename from wt-3.2.3-PACKAGE-LICENSING rename to wt-3.3.0-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 b9ca54b..12d4f39 100644 --- a/wt.spec +++ b/wt.spec @@ -5,7 +5,7 @@ %global WTRUNGROUP apache Name: wt -Version: 3.2.3 +Version: 3.3.0 Release: 1%{?dist} Summary: C++ library for developing web applications @@ -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.2.3/wt-3.2.3.tar.gz -# by running generate-tarball.sh 3.2.3 from tarball's directory +# http://citylan.dl.sourceforge.net/project/witty/wt/3.3.0/wt-3.3.0.tar.gz +# by running ./wt-generate-tarball.sh 3.3.0 from tarball's directory Source0: %{name}-%{version}-free.tar.gz Source1: %{name}-%{version}-PACKAGE-LICENSING # wt toolkit contains bundled non-free library (IBPP) that we cannot ship. @@ -185,7 +185,6 @@ popd %files %config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml %{_libdir}/libwt.so.* -%{_libdir}/libwtext.so.* %{_libdir}/libwtfcgi.so.* %{_libdir}/libwthttp.so.* %{_libdir}/libwttest.so.* @@ -238,6 +237,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Thu Jun 20 2013 Michal Minar 3.3.0-1 +- Version 3.3.0 + * Wed Dec 26 2012 Michal Minar - 3.2.3-1 - Version 3.2.3 From 3124295ed3dc91edf98986e67ebe56b9e03a54cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 25 Jun 2013 22:56:53 +0300 Subject: [PATCH 09/69] Avoid having to download old tarballs. --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 3e60ef2..7efabe4 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -234e3d21d7fa7407d3784bb757d8e3cd wt-3.2.3-free.tar.gz 506c639db4c7e7e0880cb34d931eda12 wt-3.3.0-free.tar.gz From 85f6485c4201ebf87383bba55ac4563dce328215 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 26 Jun 2013 14:21:14 +0200 Subject: [PATCH 10/69] using lzma2 compression for source archive --- .gitignore | 1 + sources | 2 +- wt-generate-tarball.sh | 4 ++-- wt.spec | 7 +++++-- 4 files changed, 9 insertions(+), 5 deletions(-) mode change 100755 => 100644 wt-generate-tarball.sh diff --git a/.gitignore b/.gitignore index aaf9455..fce75f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /wt-3.2.2-p1-free.tar.gz /wt-3.2.3-free.tar.gz /wt-3.3.0-free.tar.gz +/wt-3.3.0-free.tar.xz diff --git a/sources b/sources index 7efabe4..9b8bb89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -506c639db4c7e7e0880cb34d931eda12 wt-3.3.0-free.tar.gz +13d8bcefb52972c2f3ebf328a26f20ee wt-3.3.0-free.tar.xz diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh old mode 100755 new mode 100644 index 4605c69..1cede7f --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -9,8 +9,8 @@ pushd $tmp pushd $NAME-$VERSION/src/Wt/Dbo/backend rm -r ibpp popd # backend -tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION +tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION popd # tmp -mv $tmp/$NAME-$VERSION-free.tar.gz . +mv $tmp/$NAME-$VERSION-free.tar.xz . rm -r $tmp diff --git a/wt.spec b/wt.spec index 9c42c59..10383ec 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -16,7 +16,7 @@ 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.0/wt-3.3.0.tar.gz # by running ./wt-generate-tarball.sh 3.3.0 from tarball's directory -Source0: %{name}-%{version}-free.tar.gz +Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # wt toolkit contains bundled non-free library (IBPP) that we cannot ship. # Therefore we use this script to remove its code before shipping it. @@ -237,6 +237,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Wed Jun 26 2013 Michal Minar 3.3.0-2 +- Using LZMA2 compression for source archive. + * Thu Jun 20 2013 Michal Minar 3.3.0-1 - Version 3.3.0 From 56db7b2c156f6d2ad87a439a1d8cd96421edc325 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sat, 27 Jul 2013 14:32:12 +0200 Subject: [PATCH 11/69] Rebuild for boost 1.54.0 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 10383ec..521c14a 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -237,6 +237,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Sat Jul 27 2013 pmachata@redhat.com - 3.3.0-3 +- Rebuild for boost 1.54.0 + * Wed Jun 26 2013 Michal Minar 3.3.0-2 - Using LZMA2 compression for source archive. From 8fd3366922d6c073e8e747cb5e457dad51fa047a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:21:50 -0500 Subject: [PATCH 12/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 521c14a..a447cd5 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -237,6 +237,9 @@ popd %{_defaultdocdir}/%{name}-doc-%{version}/examples/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Jul 27 2013 pmachata@redhat.com - 3.3.0-3 - Rebuild for boost 1.54.0 From 7cdce46db4964fde454de33ddaad35347fd3582a Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Sun, 22 Sep 2013 14:27:05 +0200 Subject: [PATCH 13/69] update to 3.3.1-rc1 added dbo-mysql subpackage unversioned doc directories --- .gitignore | 5 +- README.fedora | 21 +++ find-mysql.patch | 13 ++ install-mysql.patch | 15 +++ sources | 2 +- timezone-README.fedora | 3 + ...GE-LICENSING => wt-3.3.1-PACKAGE-LICENSING | 4 + wt-generate-tarball.sh | 1 + wt.spec | 120 ++++++++++++------ 9 files changed, 142 insertions(+), 42 deletions(-) create mode 100644 README.fedora create mode 100644 find-mysql.patch create mode 100644 install-mysql.patch create mode 100644 timezone-README.fedora rename wt-3.3.0-PACKAGE-LICENSING => wt-3.3.1-PACKAGE-LICENSING (79%) diff --git a/.gitignore b/.gitignore index fce75f5..40a13df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/wt-3.2.2-p1-free.tar.gz -/wt-3.2.3-free.tar.gz -/wt-3.3.0-free.tar.gz -/wt-3.3.0-free.tar.xz +/wt-3.3.1-rc1-free.tar.xz diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..d8f2c52 --- /dev/null +++ b/README.fedora @@ -0,0 +1,21 @@ +======================================================================== +User Information for the Fedora wt package +======================================================================== + +Wt source package includes some thrid-party components which can not be +distributed with source rpm package in Fedora. One such component is a +JavaScript widget jPlayer available at: + + http://www.jplayer.org/ + +This script is needed by Wt::WMediaPlayer widget. To make it work, you +need to manually download jPlayer and install its static files into + + /usr/share/Wt/resources/jPlayer/ + +Or you may copy the contents of /usr/share/Wt/resources to your deployment +directory and install there jPlayer when needed. + +To read more about this change, see the: + + https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries diff --git a/find-mysql.patch b/find-mysql.patch new file mode 100644 index 0000000..6ceedf3 --- /dev/null +++ b/find-mysql.patch @@ -0,0 +1,13 @@ +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/install-mysql.patch b/install-mysql.patch new file mode 100644 index 0000000..9cf47e5 --- /dev/null +++ b/install-mysql.patch @@ -0,0 +1,15 @@ +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 9b8bb89..a4ddc60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13d8bcefb52972c2f3ebf328a26f20ee wt-3.3.0-free.tar.xz +211a824045a36e28cb7f8b2866d4c813 wt-3.3.1-rc1-free.tar.xz diff --git a/timezone-README.fedora b/timezone-README.fedora new file mode 100644 index 0000000..6fca520 --- /dev/null +++ b/timezone-README.fedora @@ -0,0 +1,3 @@ +This example is named *locale* in source archive. It is renamed in the process +of package build in order to prevent build failures due to a conflict between +header file resulting base script with the same name. diff --git a/wt-3.3.0-PACKAGE-LICENSING b/wt-3.3.1-PACKAGE-LICENSING similarity index 79% rename from wt-3.3.0-PACKAGE-LICENSING rename to wt-3.3.1-PACKAGE-LICENSING index ca03558..6af2c1b 100644 --- a/wt-3.3.0-PACKAGE-LICENSING +++ b/wt-3.3.1-PACKAGE-LICENSING @@ -11,3 +11,7 @@ The entire source code is GPLv2 except for these files: * zlib/libpng * src/web/md5.[ch] * src/web/base64.h + * SIL OFL 1.1 + * resources/font-awesome/font/* + * MIT License + * resources/font-awesome/css/* diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index 1cede7f..e4027ed 100644 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -9,6 +9,7 @@ pushd $tmp pushd $NAME-$VERSION/src/Wt/Dbo/backend rm -r ibpp popd # backend +rm -r $NAME-$VERSION/resources/jPlayer tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION popd # tmp mv $tmp/$NAME-$VERSION-free.tar.xz . diff --git a/wt.spec b/wt.spec index a447cd5..da64c4d 100644 --- a/wt.spec +++ b/wt.spec @@ -3,10 +3,11 @@ %global WTRUNUSER apache %global WTRUNGROUP apache +%global alphatag rc1 Name: wt -Version: 3.3.0 -Release: 4%{?dist} +Version: 3.3.1 +Release: 0.1.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -14,20 +15,26 @@ 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.0/wt-3.3.0.tar.gz -# by running ./wt-generate-tarball.sh 3.3.0 from tarball's directory -Source0: %{name}-%{version}-free.tar.xz +# 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 +Source0: %{name}-%{version}-%{alphatag}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING +# Explain why the locale example is renamed to timezone. +Source2: timezone-README.fedora +# Explain why the jPlayer static files are missing. +Source3: README.fedora # wt toolkit contains bundled non-free library (IBPP) that we cannot ship. # 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 -Source2: wt-generate-tarball.sh +Source4: wt-generate-tarball.sh +Patch0: find-mysql.patch +Patch1: install-mysql.patch BuildRequires: cmake >= 2.6 boost-devel%{_isa} >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel -BuildRequires: libharu-devel fcgi-devel zlib-devel qt-devel +BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel %description Web C++ library with widget oriented API that uses well-tested patterns of @@ -44,6 +51,14 @@ Group: Development/Libraries This package contains the Wt::Dbo Object-Relational Mapping library and Sqlite3 back-end of it. +%package dbo-mysql +Summary: MySQL back-end for the Wt::Dbo ORM library +Group: Development/Libraries +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} + +%description dbo-mysql +This package contains the MySQL back-end for the Wt::Dbo ORM library. + %package dbo-postgres Summary: PostgreSQL back-end for the Wt::Dbo ORM library Group: Development/Libraries @@ -58,6 +73,7 @@ Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-dbo%{?_isa} = %{version}-%{release} Requires: %{name}-dbo-postgres%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo-mysql%{?_isa} = %{version}-%{release} Requires: cmake %description devel @@ -84,11 +100,24 @@ BuildArch: noarch This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-%{alphatag} +%patch0 -p1 -b .find-mysql +%patch1 -p1 -b .install-mysql + +# static files like javascript and css should not be executable for d in src resources examples; do find $d -type f \( -iregex '.*\.\([hc]\|js\|css\)' -o -executable \) | \ xargs -r chmod -v 0644 done +# locale script created in build directory causes build to fail because some +# dependent headers try to include header which is found in current +# directory. Let's rename it to timezone. +mv examples/feature/locale examples/feature/timezone +mv examples/feature/timezone/{locale,timezone}.C +sed -i 's/locale/timezone/g' \ + examples/feature/CMakeLists.txt \ + examples/feature/timezone/CMakeLists.txt + find examples -type f -name .htaccess | while read f; do mv -v $f `dirname $f`/htaccess done @@ -117,6 +146,8 @@ cd wt-build -DRUNDIR="%{WTRUNDIR}" \ -DINSTALL_EXAMPLES=ON \ -DENABLE_FIREBIRD=OFF \ + -DENABLE_MYSQL=ON \ + -DMYSQL_LIBRARY=mysqlclient \ -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples make %{?_smp_mflags} @@ -145,17 +176,19 @@ do # create a symlink for each feature example pointing on resources dir done popd # examples popd # wt-build +install -vm 644 %{SOURCE2} \ + ${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/feature/timezone/README.fedora # installation of documentation for d in %{name} %{name}-dbo %{name}-doc; do - install -v -m 0755 -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/ - cp -v LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/ + install -v -m 0755 -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/ + cp -v LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/ install -vm 644 %{SOURCE1} \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d-%{version}/PACKAGE-LICENSING + ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/PACKAGE-LICENSING done -cp -vr README.md ReleaseNotes.html Changelog \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-%{version}/ -cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc-%{version}/ +cp -vr README.md %{SOURCE3} ReleaseNotes.html Changelog \ + ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/ +cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc/ pushd ${RPM_BUILD_ROOT} mkdir -vp .%{WTSRVDIR} @@ -166,9 +199,11 @@ mv -v .%{_prefix}/cmake/*.cmake .%{_datadir}/cmake/Modules # cleanup rm -rfv ${_prefix}/cmake for d in examples reference; do - rm -v .%{_defaultdocdir}/%{name}-doc-%{version}/$d/html/installdox + if [[ -e .%{_defaultdocdir}/%{name}-doc/$d/html/installdox ]]; then + rm -v .%{_defaultdocdir}/%{name}-doc/$d/html/installdox + fi done -rm -v .%{_defaultdocdir}/%{name}-doc-%{version}/main +rm -v .%{_defaultdocdir}/%{name}-doc/main find .%{_libdir}/Wt/examples -regex '.*/\(CMakeFiles\|.*\.cmake\|Doxygen\)' | \ xargs rm -rfv # these scripts were used to generate pictures @@ -179,6 +214,8 @@ popd %postun -p /sbin/ldconfig %post dbo -p /sbin/ldconfig %postun dbo -p /sbin/ldconfig +%post dbo-mysql -p /sbin/ldconfig +%postun dbo-mysql -p /sbin/ldconfig %post dbo-postgres -p /sbin/ldconfig %postun dbo-postgres -p /sbin/ldconfig @@ -188,12 +225,13 @@ popd %{_libdir}/libwtfcgi.so.* %{_libdir}/libwthttp.so.* %{_libdir}/libwttest.so.* -%dir %{_defaultdocdir}/%{name}-%{version} -%doc %{_defaultdocdir}/%{name}-%{version}/README.md -%doc %{_defaultdocdir}/%{name}-%{version}/LICENSE -%doc %{_defaultdocdir}/%{name}-%{version}/ReleaseNotes.html -%doc %{_defaultdocdir}/%{name}-%{version}/Changelog -%doc %{_defaultdocdir}/%{name}-%{version}/PACKAGE-LICENSING +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/README.md +%doc %{_defaultdocdir}/%{name}/README.fedora +%doc %{_defaultdocdir}/%{name}/LICENSE +%doc %{_defaultdocdir}/%{name}/ReleaseNotes.html +%doc %{_defaultdocdir}/%{name}/Changelog +%doc %{_defaultdocdir}/%{name}/PACKAGE-LICENSING %dir %{_datadir}/Wt %dir %{_datadir}/Wt/resources %{_datadir}/Wt/resources/* @@ -201,12 +239,15 @@ popd %dir %{WTRUNDIR} %files dbo -%dir %{_defaultdocdir}/%{name}-dbo-%{version} -%doc %{_defaultdocdir}/%{name}-dbo-%{version}/LICENSE -%doc %{_defaultdocdir}/%{name}-dbo-%{version}/PACKAGE-LICENSING +%dir %{_defaultdocdir}/%{name}-dbo +%doc %{_defaultdocdir}/%{name}-dbo/LICENSE +%doc %{_defaultdocdir}/%{name}-dbo/PACKAGE-LICENSING %{_libdir}/libwtdbo.so.* %{_libdir}/libwtdbosqlite3.so.* +%files dbo-mysql +%{_libdir}/libwtdbomysql.so.* + %files dbo-postgres %{_libdir}/libwtdbopostgres.so.* @@ -223,20 +264,25 @@ popd %{_libdir}/Wt/examples/* %files doc -%dir %{_defaultdocdir}/%{name}-doc-%{version} -%doc %{_defaultdocdir}/%{name}-doc-%{version}/LICENSE -%doc %{_defaultdocdir}/%{name}-doc-%{version}/PACKAGE-LICENSING -%{_defaultdocdir}/%{name}-doc-%{version}/*.html -%dir %{_defaultdocdir}/%{name}-doc-%{version}/images -%dir %{_defaultdocdir}/%{name}-doc-%{version}/reference -%dir %{_defaultdocdir}/%{name}-doc-%{version}/tutorial -%dir %{_defaultdocdir}/%{name}-doc-%{version}/examples -%{_defaultdocdir}/%{name}-doc-%{version}/images/* -%{_defaultdocdir}/%{name}-doc-%{version}/reference/* -%{_defaultdocdir}/%{name}-doc-%{version}/tutorial/* -%{_defaultdocdir}/%{name}-doc-%{version}/examples/* +%dir %{_defaultdocdir}/%{name}-doc +%doc %{_defaultdocdir}/%{name}-doc/LICENSE +%doc %{_defaultdocdir}/%{name}-doc/PACKAGE-LICENSING +%{_defaultdocdir}/%{name}-doc/*.html +%dir %{_defaultdocdir}/%{name}-doc/images +%dir %{_defaultdocdir}/%{name}-doc/reference +%dir %{_defaultdocdir}/%{name}-doc/tutorial +%dir %{_defaultdocdir}/%{name}-doc/examples +%{_defaultdocdir}/%{name}-doc/images/* +%{_defaultdocdir}/%{name}-doc/reference/* +%{_defaultdocdir}/%{name}-doc/tutorial/* +%{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sun Sep 22 2013 Michal Minar 3.3.1-0.1.rc1 +- Update to 3.3.1-rc1. +- Added dbo-mysql subpackage with MySQL backend library. +- Unversioned doc directories. + * Sun Aug 04 2013 Fedora Release Engineering - 3.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a97601350debdd9a662a201b931219c04435f849 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Fri, 14 Mar 2014 10:30:44 +0100 Subject: [PATCH 14/69] update to 3.3.2 --- .gitignore | 2 +- sources | 2 +- ...1-PACKAGE-LICENSING => wt-3.3.2-PACKAGE-LICENSING | 0 wt.spec | 12 +++++++----- 4 files changed, 9 insertions(+), 7 deletions(-) rename wt-3.3.1-PACKAGE-LICENSING => wt-3.3.2-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 40a13df..3d355bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.1-rc1-free.tar.xz +/wt-3.3.2-free.tar.xz diff --git a/sources b/sources index a4ddc60..972daa9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -211a824045a36e28cb7f8b2866d4c813 wt-3.3.1-rc1-free.tar.xz +d5fc06a3e72654ef7d341e4c2c18152a wt-3.3.2-free.tar.xz diff --git a/wt-3.3.1-PACKAGE-LICENSING b/wt-3.3.2-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.1-PACKAGE-LICENSING rename to wt-3.3.2-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index da64c4d..141beb1 100644 --- a/wt.spec +++ b/wt.spec @@ -3,11 +3,10 @@ %global WTRUNUSER apache %global WTRUNGROUP apache -%global alphatag rc1 Name: wt -Version: 3.3.1 -Release: 0.1.%{alphatag}%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -17,7 +16,7 @@ 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 -Source0: %{name}-%{version}-%{alphatag}-free.tar.xz +Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. Source2: timezone-README.fedora @@ -100,7 +99,7 @@ BuildArch: noarch This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .install-mysql @@ -278,6 +277,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Mar 14 2014 Michal Minar 3.3.2-1 +- Update to 3.3.2 + * Sun Sep 22 2013 Michal Minar 3.3.1-0.1.rc1 - Update to 3.3.1-rc1. - Added dbo-mysql subpackage with MySQL backend library. From 89d263cc015df00c2e1b4287b63e5a2a256e1a5e Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Fri, 21 Mar 2014 10:47:24 +0100 Subject: [PATCH 15/69] got rid of bundled sqlite3 libraries Although option USE_SYSTEM_SQLITE3 is on, bundled sqlite3 library got compiled and linked with shipped dbo backend library. Added patch fixing this issue. Resolves: bz#1077919 --- use-system-sqlite.patch | 18 ++++++++++++++++++ wt.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 use-system-sqlite.patch diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch new file mode 100644 index 0000000..ec29ff0 --- /dev/null +++ b/use-system-sqlite.patch @@ -0,0 +1,18 @@ +Index: wt-3.3.2/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} + ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h + ${BOOST_INCLUDE_DIRS} +- Wt/Dbo/backend/amalgamation # for sqlite3.h + ) + ++IF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3) ++ INCLUDE_DIRECTORIES(Wt/Dbo/backend/amalgamation) # sqlite 3 ++ENDIF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3) ++ + LINK_DIRECTORIES(${BOOST_LIB_DIRS}) + + MACRO (FILE_TO_STRING infile outfile var) diff --git a/wt.spec b/wt.spec index 141beb1..8d223fc 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -30,6 +30,7 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: install-mysql.patch +Patch2: 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,6 +103,7 @@ This package contains the documents for Wt API and examples. %setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .install-mysql +%patch2 -p1 -b .use-system-sqlite # static files like javascript and css should not be executable for d in src resources examples; do @@ -277,6 +279,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Mar 21 2014 Michal Minar 3.3.2-2 +- Got rid of bundled sqlite libraries. + * Fri Mar 14 2014 Michal Minar 3.3.2-1 - Update to 3.3.2 From 7eeec595f96ddf2cc1f1d5e34f8ccc543410df51 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 May 2014 12:19:03 +0200 Subject: [PATCH 16/69] rebuild for boost 1.55.0 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 8d223fc..29c59e5 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -279,6 +279,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri May 23 2014 David Tardon - 3.3.2-3 +- rebuild for boost 1.55.0 + * Fri Mar 21 2014 Michal Minar 3.3.2-2 - Got rid of bundled sqlite libraries. From ea518cfc3540ea1c9461f1185eafbd7010f2338e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:58:39 -0500 Subject: [PATCH 17/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 29c59e5..20b9836 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -279,6 +279,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 David Tardon - 3.3.2-3 - rebuild for boost 1.55.0 From 4193249c96987aff682466472d7753f9b5ac5170 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 11 Jun 2014 12:13:17 +0200 Subject: [PATCH 18/69] 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 20b9836..b9ab897 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.2 -Release: 4%{?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. + * Sun Jun 08 2014 Fedora Release Engineering - 3.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f3a4cb05e599198b1b5a04c80a019ae8ab9d59b2 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Sun, 15 Jun 2014 09:15:13 +0200 Subject: [PATCH 19/69] enable raster image support Resolves: #1108929 --- wt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index b9ab897..1fe7271 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -140,6 +140,7 @@ cd wt-build -DCONNECTOR_HTTP=ON \ -DCONNECTOR_FCGI=ON \ -DUSE_SYSTEM_SQLITE3=ON \ + -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \ -DWEBUSER="%{WTRUNUSER}" \ -DWEBGROUP="%{WTRUNGROUP}" \ -DRUNDIR="%{WTRUNDIR}" \ @@ -277,6 +278,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Jun 13 2014 Michal Minar 3.3.3-2 +- Reenabled raster image support. + * Wed Jun 11 2014 Michal Minar 3.3.3-1 - New upstream version 3.3.3. From 9df102dbee054c964a65bf52b2e6714b3d87068f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:58:44 +0000 Subject: [PATCH 20/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 1fe7271..83ab3b5 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -278,6 +278,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 13 2014 Michal Minar 3.3.3-2 - Reenabled raster image support. From ecfe3ca48af9a8753cf7330932a4451a7fc21077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 9 Feb 2015 05:49:29 +0100 Subject: [PATCH 21/69] Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. --- wt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 83ab3b5..08764a2 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -31,7 +31,7 @@ Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: use-system-sqlite.patch -BuildRequires: cmake >= 2.6 boost-devel%{_isa} >= 1.41 openssl-devel +BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel @@ -278,6 +278,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Feb 09 2015 Ralf Corsépius - 3.3.3-4 +- Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. + * Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 8c7676bfe1b83267089c9b67c43c2e8780e4af6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 9 Feb 2015 05:54:13 +0100 Subject: [PATCH 22/69] Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS). --- wt.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wt.spec b/wt.spec index 08764a2..9cbc8df 100644 --- a/wt.spec +++ b/wt.spec @@ -30,6 +30,9 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: use-system-sqlite.patch +# boost-1.57 compatibility patches +# from https://github.com/kdeforche/wt +Patch2: wt-3.3.3-boost-1.57.patch BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel @@ -102,6 +105,7 @@ This package contains the documents for Wt API and examples. %setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .use-system-sqlite +%patch2 -p1 # static files like javascript and css should not be executable for d in src resources examples; do @@ -279,6 +283,7 @@ popd %changelog * Mon Feb 09 2015 Ralf Corsépius - 3.3.3-4 +- Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS). - Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. * Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 From a03f9e11952c1280cfa5fcbf4d58ff6b48b36d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 9 Feb 2015 05:56:28 +0100 Subject: [PATCH 23/69] Unbundle GLEW. --- wt.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/wt.spec b/wt.spec index 9cbc8df..fb24b4c 100644 --- a/wt.spec +++ b/wt.spec @@ -38,6 +38,15 @@ BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel +# Don't use bundled glew on fedora >= 21 +%if 0%{?fedora} >= 21 +%global use_system_glew 1 +BuildRequires: glew-devel +%endif + +# Denote the fact of bundling glew +%{!?use_system_glew:Provides: bundled(glew) = 1.10.0} + %description Web C++ library with widget oriented API that uses well-tested patterns of desktop GUI development tailored to the web. To the developer, it offers @@ -133,6 +142,9 @@ for f in examples/style/CornerImage.h; do done rmdir $convdir +# Make sure not to be using bundled glew +%{?use_system_glew:rm -rf src/3rdparty/glew-1.10.0} + %build mkdir wt-build cd wt-build @@ -152,6 +164,7 @@ cd wt-build -DENABLE_FIREBIRD=OFF \ -DENABLE_MYSQL=ON \ -DMYSQL_LIBRARY=mysqlclient \ + %{?use_system_glew:-DUSE_SYSTEM_GLEW=1} \ -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples make %{?_smp_mflags} @@ -285,6 +298,7 @@ popd * Mon Feb 09 2015 Ralf Corsépius - 3.3.3-4 - Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS). - Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. +- Unbundle GLEW. * Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 451636ba993452ac2bc15cabcc49ee9f32520625 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 24/69] 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) From a042f6e1da20b2ef4d25930a8e6feeaee31229c8 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Mon, 20 Apr 2015 10:50:49 +0200 Subject: [PATCH 25/69] New upstream version 3.3.4 Signed-off-by: Michal Minar --- .gitignore | 3 +- sources | 2 +- wt-3.3.3-boost-1.57.patch | 58 ------------------- ...GE-LICENSING => wt-3.3.4-PACKAGE-LICENSING | 0 wt.spec | 15 +++-- 5 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 wt-3.3.3-boost-1.57.patch rename wt-3.3.3-PACKAGE-LICENSING => wt-3.3.4-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index c8cd48d..67f0dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/wt-3.3.2-free.tar.xz -/wt-3.3.3-free.tar.xz +/wt-3.3.4-free.tar.xz diff --git a/sources b/sources index 0ca071c..f22de67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61ed3b79c409efffeb749a9fe103d7e2 wt-3.3.3-free.tar.xz +8d5e7670a7acaa225aea516931cffb8c wt-3.3.4-free.tar.xz diff --git a/wt-3.3.3-boost-1.57.patch b/wt-3.3.3-boost-1.57.patch deleted file mode 100644 index e37240a..0000000 --- a/wt-3.3.3-boost-1.57.patch +++ /dev/null @@ -1,58 +0,0 @@ -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) diff --git a/wt-3.3.3-PACKAGE-LICENSING b/wt-3.3.4-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.3-PACKAGE-LICENSING rename to wt-3.3.4-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index fb24b4c..b09b681 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.3 -Release: 4%{?dist} +Version: 3.3.4 +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.3/wt-3.3.3.tar.gz -# by running ./wt-generate-tarball.sh 3.3.3 from tarball's directory +# http://citylan.dl.sourceforge.net/project/witty/wt/3.3.4/wt-3.3.4.tar.gz +# by running ./wt-generate-tarball.sh 3.3.4 from tarball's directory Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. @@ -30,9 +30,6 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: use-system-sqlite.patch -# boost-1.57 compatibility patches -# from https://github.com/kdeforche/wt -Patch2: wt-3.3.3-boost-1.57.patch BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel @@ -114,7 +111,6 @@ This package contains the documents for Wt API and examples. %setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .use-system-sqlite -%patch2 -p1 # static files like javascript and css should not be executable for d in src resources examples; do @@ -295,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Apr 20 2015 Michal Minar 3.3.4-1 +- New upstream version 3.3.4 + * Mon Feb 09 2015 Ralf Corsépius - 3.3.3-4 - Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS). - Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. From 5a8464d5c953771d4fa97b40124adadb946f21c3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:37:51 +0000 Subject: [PATCH 26/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index b09b681..ee7be93 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Apr 20 2015 Michal Minar 3.3.4-1 - New upstream version 3.3.4 From 22c2320ccee99f4155644a5589221e6329060fab Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 22:37:51 +0200 Subject: [PATCH 27/69] rebuild for Boost 1.58 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index ee7be93..5915e02 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Wed Jul 22 2015 David Tardon - 3.3.4-3 +- rebuild for Boost 1.58 + * Fri Jun 19 2015 Fedora Release Engineering - 3.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bce8bcdb5fe2f2c93f8a3940f17ddbba6bddab96 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 13:35:58 -0500 Subject: [PATCH 28/69] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 5915e02..054461a 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 3.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 3.3.4-3 - rebuild for Boost 1.58 From 07230f59c5e48b3db45c2b35e407aaad96e59ce2 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 17:42:07 +0100 Subject: [PATCH 29/69] Rebuilt for Boost 1.59 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 054461a..0af4052 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Aug 27 2015 Jonathan Wakely - 3.3.4-5 +- Rebuilt for Boost 1.59 + * Wed Jul 29 2015 Fedora Release Engineering - 3.3.4-4 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From d513c22a5a71e57d700b9f1908e009e19a51657d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 18:04:31 +0100 Subject: [PATCH 30/69] Rebuilt for Boost 1.59 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 0af4052..2e90dac 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Aug 27 2015 Jonathan Wakely - 3.3.4-6 +- Rebuilt for Boost 1.59 + * Thu Aug 27 2015 Jonathan Wakely - 3.3.4-5 - Rebuilt for Boost 1.59 From e7d21663e7c36829505e2909a53c84868816bb85 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Mon, 16 Nov 2015 07:46:12 +0100 Subject: [PATCH 31/69] New upstream version NVR: wt-3.3.5-0.1.rc2 - added BR doxygen - fixed narrowing build issue on arm with gcc 5.x - use C++ standard c++11 for compilation Signed-off-by: Michal Minar --- .gitignore | 2 +- fix-narrowing-issue-on-arm.patch | 42 +++++++++++++++++++ sources | 2 +- ...GE-LICENSING => wt-3.3.5-PACKAGE-LICENSING | 0 wt.spec | 27 +++++++----- 5 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 fix-narrowing-issue-on-arm.patch rename wt-3.3.4-PACKAGE-LICENSING => wt-3.3.5-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 67f0dc5..4f0cd24 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.4-free.tar.xz +/wt-3.3.5-rc2-free.tar.xz diff --git a/fix-narrowing-issue-on-arm.patch b/fix-narrowing-issue-on-arm.patch new file mode 100644 index 0000000..1a489b4 --- /dev/null +++ b/fix-narrowing-issue-on-arm.patch @@ -0,0 +1,42 @@ +Index: wt-3.3.5-rc2/src/web/base64.cpp +=================================================================== +--- wt-3.3.5-rc2.orig/src/web/base64.cpp ++++ wt-3.3.5-rc2/src/web/base64.cpp +@@ -18,24 +18,26 @@ namespace base64 + const char* to_table_end = + _to_table + sizeof(_to_table); + ++ const char _o = (char)(-1); ++ + const char _from_table[128] = + { +- -1, -1, -1, -1, -1, -1, -1, -1, // 0 +- -1, -1, -1, -1, -1, -1, -1, -1, // 8 +- -1, -1, -1, -1, -1, -1, -1, -1, // 16 +- -1, -1, -1, -1, -1, -1, -1, -1, // 24 +- -1, -1, -1, -1, -1, -1, -1, -1, // 32 +- -1, -1, -1, 62, -1, -1, -1, 63, // 40 ++ _o, _o, _o, _o, _o, _o, _o, _o, // 0 ++ _o, _o, _o, _o, _o, _o, _o, _o, // 8 ++ _o, _o, _o, _o, _o, _o, _o, _o, // 16 ++ _o, _o, _o, _o, _o, _o, _o, _o, // 24 ++ _o, _o, _o, _o, _o, _o, _o, _o, // 32 ++ _o, _o, _o, 62, _o, _o, _o, 63, // 40 + 52, 53, 54, 55, 56, 57, 58, 59, // 48 +- 60, 61, -1, -1, -1, 0, -1, -1, // 56 +- -1, 0, 1, 2, 3, 4, 5, 6, // 64 ++ 60, 61, _o, _o, _o, 0, _o, _o, // 56 ++ _o, 0, 1, 2, 3, 4, 5, 6, // 64 + 7, 8, 9, 10, 11, 12, 13, 14, // 72 + 15, 16, 17, 18, 19, 20, 21, 22, // 80 +- 23, 24, 25, -1, -1, -1, -1, -1, // 88 +- -1, 26, 27, 28, 29, 30, 31, 32, // 96 ++ 23, 24, 25, _o, _o, _o, _o, _o, // 88 ++ _o, 26, 27, 28, 29, 30, 31, 32, // 96 + 33, 34, 35, 36, 37, 38, 39, 40, // 104 + 41, 42, 43, 44, 45, 46, 47, 48, // 112 +- 49, 50, 51, -1, -1, -1, -1, -1 // 120 ++ 49, 50, 51, _o, _o, _o, _o, _o // 120 + }; + const char* from_table = _from_table; + } diff --git a/sources b/sources index f22de67..c2f526e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d5e7670a7acaa225aea516931cffb8c wt-3.3.4-free.tar.xz +2473eed623c93a6d40b823bbc6e0e9c2 wt-3.3.5-rc2-free.tar.xz diff --git a/wt-3.3.4-PACKAGE-LICENSING b/wt-3.3.5-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.4-PACKAGE-LICENSING rename to wt-3.3.5-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index 2e90dac..77f4b70 100644 --- a/wt.spec +++ b/wt.spec @@ -3,10 +3,11 @@ %global WTRUNUSER apache %global WTRUNGROUP apache +%global alphatag rc2 Name: wt -Version: 3.3.4 -Release: 6%{?dist} +Version: 3.3.5 +Release: 0.1.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -15,8 +16,8 @@ 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.4/wt-3.3.4.tar.gz -# by running ./wt-generate-tarball.sh 3.3.4 from tarball's directory -Source0: %{name}-%{version}-free.tar.xz +# by running ./wt-generate-tarball.sh 3.3.5-rc2 from tarball's directory +Source0: %{name}-%{version}-%{alphatag}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. Source2: timezone-README.fedora @@ -28,10 +29,13 @@ Source3: README.fedora # tarball's directory: # ./wt-generate-tarball.sh UPSTREAM_VERSION Source4: wt-generate-tarball.sh + Patch0: find-mysql.patch Patch1: use-system-sqlite.patch +# Fixes compilation on armv7hl with gcc 5.x +Patch2: fix-narrowing-issue-on-arm.patch -BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel +BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel @@ -108,9 +112,10 @@ BuildArch: noarch This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-%{alphatag} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .use-system-sqlite +%patch2 -p1 -b .fix-narrowing-issue-on-arm # static files like javascript and css should not be executable for d in src resources examples; do @@ -149,6 +154,7 @@ cd wt-build ## by Red Hat Legal ## let's not package it, until licensing issues are solved %cmake .. \ + -DWT_CPP_11_MODE=-std=c++11 \ -DCONNECTOR_HTTP=ON \ -DCONNECTOR_FCGI=ON \ -DUSE_SYSTEM_SQLITE3=ON \ @@ -156,6 +162,7 @@ cd wt-build -DWEBUSER="%{WTRUNUSER}" \ -DWEBGROUP="%{WTRUNGROUP}" \ -DRUNDIR="%{WTRUNDIR}" \ + -DCONFIGDIR="%{_sysconfdir}/%{name}" \ -DINSTALL_EXAMPLES=ON \ -DENABLE_FIREBIRD=OFF \ -DENABLE_MYSQL=ON \ @@ -163,6 +170,7 @@ cd wt-build %{?use_system_glew:-DUSE_SYSTEM_GLEW=1} \ -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples make %{?_smp_mflags} +make doc %install pushd wt-build @@ -206,11 +214,8 @@ cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc/ pushd ${RPM_BUILD_ROOT} mkdir -vp .%{WTSRVDIR} mkdir -vp .%{WTRUNDIR} -install -v -m 0755 -d .%{_datadir}/cmake/Modules -mv -v .%{_prefix}/cmake/*.cmake .%{_datadir}/cmake/Modules # cleanup -rm -rfv ${_prefix}/cmake for d in examples reference; do if [[ -e .%{_defaultdocdir}/%{name}-doc/$d/html/installdox ]]; then rm -v .%{_defaultdocdir}/%{name}-doc/$d/html/installdox @@ -269,7 +274,6 @@ popd %dir %{_includedir}/Wt %{_includedir}/Wt/* %{_libdir}/*.so -%{_datadir}/cmake/Modules/*.cmake %files examples %dir %{_libdir}/Wt @@ -291,6 +295,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Wed Nov 18 2015 Michal Minar 3.3.5-0.1.rc2 +- New upstream version 3.3.5-rc2 + * Thu Aug 27 2015 Jonathan Wakely - 3.3.4-6 - Rebuilt for Boost 1.59 From b0428f889ee15291a1012daf097ffe1d0bccf70c Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 18 Nov 2015 16:49:37 +0100 Subject: [PATCH 32/69] Made wt-doc package archful The output of doxygen is different on arm architecture. Signed-off-by: Michal Minar --- wt.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 77f4b70..18287af 100644 --- a/wt.spec +++ b/wt.spec @@ -7,7 +7,7 @@ Name: wt Version: 3.3.5 -Release: 0.1.%{alphatag}%{?dist} +Release: 0.2.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -106,7 +106,9 @@ release. %package doc Summary: Documents for the Wt toolkit Group: Documentation -BuildArch: noarch +# Unfortunately there are differences in doxygen output between arm and other +# architectures. +#BuildArch: noarch %description doc This package contains the documents for Wt API and examples. @@ -295,6 +297,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Wed Nov 18 2015 Michal Minar 3.3.5-0.2.rc2 +- Made doc package archfull. + * Wed Nov 18 2015 Michal Minar 3.3.5-0.1.rc2 - New upstream version 3.3.5-rc2 From a7b3cd0fbf3c7ad8f3201e2318d37dcd6f6a835a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 14 Jan 2016 13:11:16 -0500 Subject: [PATCH 33/69] Rebuild for glew 1.13 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 18287af..b13f3c2 100644 --- a/wt.spec +++ b/wt.spec @@ -7,7 +7,7 @@ Name: wt Version: 3.3.5 -Release: 0.2.%{alphatag}%{?dist} +Release: 0.3.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -297,6 +297,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Jan 14 2016 Adam Jackson - 3.3.5-0.3.rc2 +- Rebuild for glew 1.13 + * Wed Nov 18 2015 Michal Minar 3.3.5-0.2.rc2 - Made doc package archfull. From 08ad5bac6b2bd48cadb1a70217c3f08c64714ad4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 03:55:08 +0000 Subject: [PATCH 34/69] Rebuilt for Boost 1.60 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index b13f3c2..de90ad6 100644 --- a/wt.spec +++ b/wt.spec @@ -7,7 +7,7 @@ Name: wt Version: 3.3.5 -Release: 0.3.%{alphatag}%{?dist} +Release: 0.4.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -297,6 +297,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Jan 16 2016 Jonathan Wakely - 3.3.5-0.4.rc2 +- Rebuilt for Boost 1.60 + * Thu Jan 14 2016 Adam Jackson - 3.3.5-0.3.rc2 - Rebuild for glew 1.13 From 1e300237e5f43bfb880780fd042aa61d00ecc1f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:11:29 +0000 Subject: [PATCH 35/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index de90ad6..5c2a92a 100644 --- a/wt.spec +++ b/wt.spec @@ -7,7 +7,7 @@ Name: wt Version: 3.3.5 -Release: 0.4.%{alphatag}%{?dist} +Release: 0.5.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -297,6 +297,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.3.5-0.5.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 3.3.5-0.4.rc2 - Rebuilt for Boost 1.60 From 70ccdf4efa0a7bedc654da022d13c1870f3481e0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 17 May 2016 14:53:55 +0100 Subject: [PATCH 36/69] Rebuilt for linker errors in boost (#1331983) --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 5c2a92a..85a7cf8 100644 --- a/wt.spec +++ b/wt.spec @@ -7,7 +7,7 @@ Name: wt Version: 3.3.5 -Release: 0.5.%{alphatag}%{?dist} +Release: 0.6.%{alphatag}%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -297,6 +297,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Tue May 17 2016 Jonathan Wakely - 3.3.5-0.6.rc2 +- Rebuilt for linker errors in boost (#1331983) + * Fri Feb 05 2016 Fedora Release Engineering - 3.3.5-0.5.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From cdc1a2b75af85c3f62c56ca7a44fb766f5d9f993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 8 Aug 2016 13:22:00 +0200 Subject: [PATCH 37/69] New upstream version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NV: wt-3.3.6 Signed-off-by: Michal Minář --- .gitignore | 2 +- fix-narrowing-issue-on-arm.patch | 42 ------------------- sources | 2 +- ...GE-LICENSING => wt-3.3.6-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 5 ++- wt.spec | 16 +++---- 6 files changed, 12 insertions(+), 55 deletions(-) delete mode 100644 fix-narrowing-issue-on-arm.patch rename wt-3.3.5-PACKAGE-LICENSING => wt-3.3.6-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 4f0cd24..969a17d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.5-rc2-free.tar.xz +/wt-3.3.6-free.tar.xz diff --git a/fix-narrowing-issue-on-arm.patch b/fix-narrowing-issue-on-arm.patch deleted file mode 100644 index 1a489b4..0000000 --- a/fix-narrowing-issue-on-arm.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: wt-3.3.5-rc2/src/web/base64.cpp -=================================================================== ---- wt-3.3.5-rc2.orig/src/web/base64.cpp -+++ wt-3.3.5-rc2/src/web/base64.cpp -@@ -18,24 +18,26 @@ namespace base64 - const char* to_table_end = - _to_table + sizeof(_to_table); - -+ const char _o = (char)(-1); -+ - const char _from_table[128] = - { -- -1, -1, -1, -1, -1, -1, -1, -1, // 0 -- -1, -1, -1, -1, -1, -1, -1, -1, // 8 -- -1, -1, -1, -1, -1, -1, -1, -1, // 16 -- -1, -1, -1, -1, -1, -1, -1, -1, // 24 -- -1, -1, -1, -1, -1, -1, -1, -1, // 32 -- -1, -1, -1, 62, -1, -1, -1, 63, // 40 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 0 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 8 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 16 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 24 -+ _o, _o, _o, _o, _o, _o, _o, _o, // 32 -+ _o, _o, _o, 62, _o, _o, _o, 63, // 40 - 52, 53, 54, 55, 56, 57, 58, 59, // 48 -- 60, 61, -1, -1, -1, 0, -1, -1, // 56 -- -1, 0, 1, 2, 3, 4, 5, 6, // 64 -+ 60, 61, _o, _o, _o, 0, _o, _o, // 56 -+ _o, 0, 1, 2, 3, 4, 5, 6, // 64 - 7, 8, 9, 10, 11, 12, 13, 14, // 72 - 15, 16, 17, 18, 19, 20, 21, 22, // 80 -- 23, 24, 25, -1, -1, -1, -1, -1, // 88 -- -1, 26, 27, 28, 29, 30, 31, 32, // 96 -+ 23, 24, 25, _o, _o, _o, _o, _o, // 88 -+ _o, 26, 27, 28, 29, 30, 31, 32, // 96 - 33, 34, 35, 36, 37, 38, 39, 40, // 104 - 41, 42, 43, 44, 45, 46, 47, 48, // 112 -- 49, 50, 51, -1, -1, -1, -1, -1 // 120 -+ 49, 50, 51, _o, _o, _o, _o, _o // 120 - }; - const char* from_table = _from_table; - } diff --git a/sources b/sources index c2f526e..67ed5f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2473eed623c93a6d40b823bbc6e0e9c2 wt-3.3.5-rc2-free.tar.xz +22537188d09d50c218c373026ee482e0 wt-3.3.6-free.tar.xz diff --git a/wt-3.3.5-PACKAGE-LICENSING b/wt-3.3.6-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.5-PACKAGE-LICENSING rename to wt-3.3.6-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index e4027ed..8e4d5f6 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -1,10 +1,13 @@ #!/bin/sh +set -euo pipefail +IFS=$'\n\t' + NAME="wt" VERSION=$1 tmp=`mktemp -d` -tar -xzvf $NAME-$VERSION.tar.gz -C $tmp +tar -xzvf $VERSION.tar.gz -C $tmp pushd $tmp pushd $NAME-$VERSION/src/Wt/Dbo/backend rm -r ibpp diff --git a/wt.spec b/wt.spec index 85a7cf8..7888f66 100644 --- a/wt.spec +++ b/wt.spec @@ -3,11 +3,10 @@ %global WTRUNUSER apache %global WTRUNGROUP apache -%global alphatag rc2 Name: wt -Version: 3.3.5 -Release: 0.6.%{alphatag}%{?dist} +Version: 3.3.6 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -15,9 +14,9 @@ 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.4/wt-3.3.4.tar.gz +# https://github.com/kdeforche/wt/archive/3.3.6.tar.gz # by running ./wt-generate-tarball.sh 3.3.5-rc2 from tarball's directory -Source0: %{name}-%{version}-%{alphatag}-free.tar.xz +Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. Source2: timezone-README.fedora @@ -32,10 +31,8 @@ Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: use-system-sqlite.patch -# Fixes compilation on armv7hl with gcc 5.x -Patch2: fix-narrowing-issue-on-arm.patch -BuildRequires: cmake >= 2.6 boost-devel >= 1.41 openssl-devel doxygen +BuildRequires: cmake >= 2.6 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel @@ -114,10 +111,9 @@ Group: Documentation This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .find-mysql %patch1 -p1 -b .use-system-sqlite -%patch2 -p1 -b .fix-narrowing-issue-on-arm # static files like javascript and css should not be executable for d in src resources examples; do From 7abdc7fc9ce3611a135d5b5c49fa857ec5fd6b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 8 Aug 2016 15:05:26 +0200 Subject: [PATCH 38/69] Changelog update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- wt.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wt.spec b/wt.spec index 7888f66..c3ad337 100644 --- a/wt.spec +++ b/wt.spec @@ -293,6 +293,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Aug 08 2016 Michal Minar 3.3.6-1 +- New upstream version 3.3.6 + * Tue May 17 2016 Jonathan Wakely - 3.3.5-0.6.rc2 - Rebuilt for linker errors in boost (#1331983) From eb48851aa013d7b9ceba43e173828557501a5317 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Jan 2017 08:56:23 -0700 Subject: [PATCH 39/69] Rebuild for glew 2.0.0 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index c3ad337..4c2ff63 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -293,6 +293,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Tue Jan 10 2017 Orion Poplawski - 3.3.6-2 +- Rebuild for glew 2.0.0 + * Mon Aug 08 2016 Michal Minar 3.3.6-1 - New upstream version 3.3.6 From 4ef3c73e7a446510f2bc1a0fa47512a57c2106a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:34:16 +0000 Subject: [PATCH 40/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 4c2ff63..d3ba92e 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -293,6 +293,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 10 2017 Orion Poplawski - 3.3.6-2 - Rebuild for glew 2.0.0 From 7dc1e2cdcdb8c1bd100cce7657428fca424ac4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Sun, 23 Apr 2017 16:13:33 +0200 Subject: [PATCH 41/69] New upstream version 3.3.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- ...CKAGE-LICENSING => wt-3.3.7-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 1 - wt.spec | 16 +++++++++++----- 5 files changed, 13 insertions(+), 8 deletions(-) rename wt-3.3.6-PACKAGE-LICENSING => wt-3.3.7-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 969a17d..eddc251 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.6-free.tar.xz +/wt-3.3.7-free.tar.xz diff --git a/sources b/sources index 67ed5f5..97a8fca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22537188d09d50c218c373026ee482e0 wt-3.3.6-free.tar.xz +SHA512 (wt-3.3.7-free.tar.xz) = 4dcc7ac3e222a7056026004213422d571af7ed7066a50ab2bd90c432450f8da3456f45cdf0dee877d46cd11ccb03716de5b81cd2d6daa6520b07a54fa8dd1a47 diff --git a/wt-3.3.6-PACKAGE-LICENSING b/wt-3.3.7-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.6-PACKAGE-LICENSING rename to wt-3.3.7-PACKAGE-LICENSING diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh index 8e4d5f6..dbde0e4 100755 --- a/wt-generate-tarball.sh +++ b/wt-generate-tarball.sh @@ -17,4 +17,3 @@ tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION popd # tmp mv $tmp/$NAME-$VERSION-free.tar.xz . rm -r $tmp - diff --git a/wt.spec b/wt.spec index d3ba92e..6449271 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.6 -Release: 3%{?dist} +Version: 3.3.7 +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 -# https://github.com/kdeforche/wt/archive/3.3.6.tar.gz -# by running ./wt-generate-tarball.sh 3.3.5-rc2 from tarball's directory +# https://github.com/kdeforche/wt/archive/3.3.7.tar.gz +# by running ./wt-generate-tarball.sh 3.3.7 from tarball's directory Source0: %{name}-%{version}-free.tar.xz Source1: %{name}-%{version}-PACKAGE-LICENSING # Explain why the locale example is renamed to timezone. @@ -172,7 +172,7 @@ make doc %install pushd wt-build -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=${RPM_BUILD_ROOT} install -v -m 0755 -d ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} cp -v wt_config.xml ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} @@ -195,6 +195,8 @@ do # create a symlink for each feature example pointing on resources dir done popd # examples popd # wt-build +install -vm 0755 -d ${RPM_BUILD_ROOT}/%{_datadir}/cmake/Modules +install -vm 0644 cmake/FindWt.cmake ${RPM_BUILD_ROOT}/%{_datadir}/cmake/Modules install -vm 644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/feature/timezone/README.fedora @@ -272,6 +274,7 @@ popd %dir %{_includedir}/Wt %{_includedir}/Wt/* %{_libdir}/*.so +%{_datadir}/cmake/Modules/*.cmake %files examples %dir %{_libdir}/Wt @@ -293,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sun Apr 23 2017 Michal Minar 3.3.7-1 +- New upstream version 3.3.7 + * Sat Feb 11 2017 Fedora Release Engineering - 3.3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b39d8388f3cf27f49298c64b150e96be6a51f3e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:51:41 +0000 Subject: [PATCH 42/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 6449271..9501361 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon May 15 2017 Fedora Release Engineering - 3.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Sun Apr 23 2017 Michal Minar 3.3.7-1 - New upstream version 3.3.7 From 0d911dc901d83f193bd67b7efca468edfa762084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 23 Jul 2017 21:54:44 +0200 Subject: [PATCH 43/69] Rebuilt for Boost 1.64 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 9501361..704c193 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sun Jul 23 2017 Björn Esser - 3.3.7-3 +- Rebuilt for Boost 1.64 + * Mon May 15 2017 Fedora Release Engineering - 3.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From d6c6a0403cac3074390fa7a0c354361e9e118eff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:47:47 +0000 Subject: [PATCH 44/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 704c193..91ac4d6 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.3.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jul 23 2017 Björn Esser - 3.3.7-3 - Rebuilt for Boost 1.64 From 4ea5ac5ab8f4323e6329b6dce169d21956c573fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:23:59 +0000 Subject: [PATCH 45/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 91ac4d6..b211f78 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.3.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.3.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d7ead1bba92ba804c9e8e6b375ec3c8b01ae9a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:08:42 +0100 Subject: [PATCH 46/69] Rebuilt for switch to libxcrypt --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index b211f78..c94fff9 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Jan 20 2018 Björn Esser - 3.3.7-6 +- Rebuilt for switch to libxcrypt + * Thu Aug 03 2017 Fedora Release Engineering - 3.3.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 35c266b483d070b025b12ed8d998f8b7ab93a7fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:12:35 +0000 Subject: [PATCH 47/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index c94fff9..1046d14 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 3.3.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -296,6 +296,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.3.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 3.3.7-6 - Rebuilt for switch to libxcrypt From 5057160a56d7aa60fa7857dfffdbdad5c978ae42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Thu, 15 Mar 2018 10:53:54 +0000 Subject: [PATCH 48/69] initial 4.0.2 commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- ...AGE-LICENSING => wt-4.0.2-PACKAGE-LICENSING | 0 wt.spec | 18 ++++++++++-------- 4 files changed, 12 insertions(+), 10 deletions(-) rename wt-3.3.7-PACKAGE-LICENSING => wt-4.0.2-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index eddc251..5d2347a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-3.3.7-free.tar.xz +/wt-4.0.2-free.tar.xz diff --git a/sources b/sources index 97a8fca..2305083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-3.3.7-free.tar.xz) = 4dcc7ac3e222a7056026004213422d571af7ed7066a50ab2bd90c432450f8da3456f45cdf0dee877d46cd11ccb03716de5b81cd2d6daa6520b07a54fa8dd1a47 +SHA512 (wt-4.0.2-free.tar.xz) = 8bd6fc043fe7316cafb484200b0f2827b64dcb1336c55f385d6e082baec4affbc31493b4a1155c8710c8ac08ccd11ad6aefa0e944679da65bcb18ffe5017c596 diff --git a/wt-3.3.7-PACKAGE-LICENSING b/wt-4.0.2-PACKAGE-LICENSING similarity index 100% rename from wt-3.3.7-PACKAGE-LICENSING rename to wt-4.0.2-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index 1046d14..a56a526 100644 --- a/wt.spec +++ b/wt.spec @@ -5,14 +5,14 @@ %global WTRUNGROUP apache Name: wt -Version: 3.3.7 -Release: 7%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib -URL: http://www.webtoolkit.eu/wt +URL: https://www.webtoolkit.eu/wt # Following archive was made from upstream tarball downloaded from # https://github.com/kdeforche/wt/archive/3.3.7.tar.gz # by running ./wt-generate-tarball.sh 3.3.7 from tarball's directory @@ -152,7 +152,6 @@ cd wt-build ## by Red Hat Legal ## let's not package it, until licensing issues are solved %cmake .. \ - -DWT_CPP_11_MODE=-std=c++11 \ -DCONNECTOR_HTTP=ON \ -DCONNECTOR_FCGI=ON \ -DUSE_SYSTEM_SQLITE3=ON \ @@ -161,11 +160,12 @@ cd wt-build -DWEBGROUP="%{WTRUNGROUP}" \ -DRUNDIR="%{WTRUNDIR}" \ -DCONFIGDIR="%{_sysconfdir}/%{name}" \ - -DINSTALL_EXAMPLES=ON \ -DENABLE_FIREBIRD=OFF \ -DENABLE_MYSQL=ON \ -DMYSQL_LIBRARY=mysqlclient \ %{?use_system_glew:-DUSE_SYSTEM_GLEW=1} \ + -DBUILD_EXAMPLES=ON \ + -DINSTALL_EXAMPLES=ON \ -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples make %{?_smp_mflags} make doc @@ -195,8 +195,6 @@ do # create a symlink for each feature example pointing on resources dir done popd # examples popd # wt-build -install -vm 0755 -d ${RPM_BUILD_ROOT}/%{_datadir}/cmake/Modules -install -vm 0644 cmake/FindWt.cmake ${RPM_BUILD_ROOT}/%{_datadir}/cmake/Modules install -vm 644 %{SOURCE2} \ ${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/feature/timezone/README.fedora @@ -274,7 +272,8 @@ popd %dir %{_includedir}/Wt %{_includedir}/Wt/* %{_libdir}/*.so -%{_datadir}/cmake/Modules/*.cmake +%dir %{_libdir}/cmake/wt +%{_libdir}/cmake/wt/*.cmake %files examples %dir %{_libdir}/Wt @@ -296,6 +295,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Mar 15 2018 Michal Minář - 4.0.2-1 +- New upstream version 4.0.2 + * Fri Feb 09 2018 Fedora Release Engineering - 3.3.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e0a07ae1087ac5fc44699fd8fbeac8de4ff45a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Thu, 15 Mar 2018 13:33:30 +0000 Subject: [PATCH 49/69] boost 1.66 compatibility fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- boost-166-compat.patch | 605 +++++++++++++++++++++++++++++++++++++++++ examples-crypt.patch | 24 ++ wt.spec | 13 +- 3 files changed, 638 insertions(+), 4 deletions(-) create mode 100644 boost-166-compat.patch create mode 100644 examples-crypt.patch diff --git a/boost-166-compat.patch b/boost-166-compat.patch new file mode 100644 index 0000000..db09374 --- /dev/null +++ b/boost-166-compat.patch @@ -0,0 +1,605 @@ +Index: wt-4.0.2/examples/filetreetable/CMakeLists.txt +=================================================================== +--- wt-4.0.2.orig/examples/filetreetable/CMakeLists.txt ++++ wt-4.0.2/examples/filetreetable/CMakeLists.txt +@@ -10,6 +10,7 @@ ELSE(NOT BOOST_FS_LIB) + + TARGET_LINK_LIBRARIES(filetreetable.wt + ${BOOST_FS_LIB} ++ ${BOOST_SYSTEM_LIB} + ) + + INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src) +Index: wt-4.0.2/examples/gitmodel/CMakeLists.txt +=================================================================== +--- wt-4.0.2.orig/examples/gitmodel/CMakeLists.txt ++++ wt-4.0.2/examples/gitmodel/CMakeLists.txt +@@ -7,7 +7,7 @@ IF(BOOST_FS_LIB) + ../wt-homepage/SourceView.C + GitView.C + ) +- TARGET_LINK_LIBRARIES(gitview.wt ${BOOST_FS_LIB}) ++ TARGET_LINK_LIBRARIES(gitview.wt ${BOOST_FS_LIB} ${BOOST_SYSTEM_LIB}) + + INCLUDE_DIRECTORIES( + ${WT_SOURCE_DIR}/src +Index: wt-4.0.2/examples/wt-homepage/CMakeLists.txt +=================================================================== +--- wt-4.0.2.orig/examples/wt-homepage/CMakeLists.txt ++++ wt-4.0.2/examples/wt-homepage/CMakeLists.txt +@@ -34,7 +34,7 @@ ENDIF(WT_EMWEB_BUILD) + + WT_ADD_EXAMPLE(Home.wt ${SRC}) + +-TARGET_LINK_LIBRARIES(Home.wt ${EXAMPLES_DBO_LIBS} ${BOOST_FS_LIB}) ++TARGET_LINK_LIBRARIES(Home.wt ${EXAMPLES_DBO_LIBS} ${BOOST_FS_LIB} ${BOOST_SYSTEM_LIB}) + + # Test whether crypt(3) is provided by libc. If it's not, check if + # libcrypt exists and if it provides crypt(3). +Index: wt-4.0.2/src/Wt/AsioWrapper/strand.hpp +=================================================================== +--- wt-4.0.2.orig/src/Wt/AsioWrapper/strand.hpp ++++ wt-4.0.2/src/Wt/AsioWrapper/strand.hpp +@@ -12,10 +12,29 @@ + #ifdef WT_ASIO_IS_BOOST_ASIO + + #include ++namespace Wt { ++ namespace AsioWrapper { ++#if BOOST_VERSION >= 106600 ++ using strand = boost::asio::io_context::strand; ++#else ++ using strand = boost::asio::strand; ++#endif ++ } ++} + + #else // WT_ASIO_IS_STANDALONE_ASIO + ++#include + #include ++namespace Wt { ++ namespace AsioWrapper { ++#if ASIO_VERSION >= 101100 ++ using strand = asio::io_service::strand; ++#else ++ using strand = asio::strand; ++#endif ++ } ++} + + #endif // WT_ASIO_IS_BOOST_ASIO + +Index: wt-4.0.2/src/Wt/Http/Client.C +=================================================================== +--- wt-4.0.2.orig/src/Wt/Http/Client.C ++++ wt-4.0.2/src/Wt/Http/Client.C +@@ -642,7 +642,7 @@ private: + + protected: + asio::io_service& ioService_; +- asio::strand strand_; ++ AsioWrapper::strand strand_; + tcp::resolver resolver_; + asio::streambuf requestBuf_; + asio::streambuf responseBuf_; +@@ -929,8 +929,14 @@ bool Client::request(Http::Method method + + #ifdef WT_WITH_SSL + } else if (parsedUrl.protocol == "https") { ++#if defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600 ++ asio::ssl::context context(asio::ssl::context::tls); ++#elif defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100 ++ asio::ssl::context context(asio::ssl::context::sslv23); ++#else + asio::ssl::context context + (*ioService, asio::ssl::context::sslv23); ++#endif + long sslOptions = asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3; + context.set_options(sslOptions); + +Index: wt-4.0.2/src/Wt/Http/Client.h +=================================================================== +--- wt-4.0.2.orig/src/Wt/Http/Client.h ++++ wt-4.0.2/src/Wt/Http/Client.h +@@ -23,7 +23,12 @@ + #ifdef WT_ASIO_IS_BOOST_ASIO + namespace boost { + namespace asio { ++#if BOOST_VERSION >= 106600 ++ class io_context; ++ typedef io_context io_service; ++#else + class io_service; ++#endif + } + } + #else // WT_ASIO_IS_STANDALONE_ASIO +Index: wt-4.0.2/src/Wt/Json/Value.h +=================================================================== +--- wt-4.0.2.orig/src/Wt/Json/Value.h ++++ wt-4.0.2/src/Wt/Json/Value.h +@@ -23,7 +23,7 @@ class Array; + * \brief A JSON representation and parsing library. + * + * The JSON library contains data types to represent a JSON data +- * structure (Value, Object and Array), and a JSON parser. ++ * structure (Value, Object and Array), a JSON parser, and a JSON serializer. + * + * Usage example: + * \code +@@ -39,6 +39,9 @@ class Array; + * bool b = result.get("b"); + * std::cerr << "a: " << s << ", b: " << b << std::endl; // a: That's great, b: true + * \endcode ++ * ++ * Include the header for Wt::Json::parse(), and ++ * the header for Wt::Json::serialize(). + */ + + /*! \brief Enumeration for the type of a JSON value. +Index: wt-4.0.2/src/Wt/WDialog.C +=================================================================== +--- wt-4.0.2.orig/src/Wt/WDialog.C ++++ wt-4.0.2/src/Wt/WDialog.C +@@ -436,8 +436,10 @@ void WDialog::render(WFlags + if (!isModal()) + impl_->mouseWentDown().connect(this, &WDialog::bringToFront); + +- if ( flags.test(RenderFlag::Full) && autoFocus_) +- impl_->setFirstFocus(); ++ if ( flags.test(RenderFlag::Full) && autoFocus_) { ++ if (!impl_->findById(Wt::WApplication::instance()->focus())) ++ impl_->setFirstFocus(); ++ } + + WPopupWidget::render(flags); + } +Index: wt-4.0.2/src/Wt/WDialog.h +=================================================================== +--- wt-4.0.2.orig/src/Wt/WDialog.h ++++ wt-4.0.2/src/Wt/WDialog.h +@@ -337,6 +337,9 @@ public: + bool closable() const { return closeIcon_ != nullptr; } + + /*! \brief Set focus on the first widget in the dialog. ++ * ++ * Autofocus is enabled by default. If a widget inside of ++ * this dialog already has focus, the focus will not be changed. + */ + void setAutoFocus(bool enable){ autoFocus_ = enable;} + +Index: wt-4.0.2/src/Wt/WWebWidget.C +=================================================================== +--- wt-4.0.2.orig/src/Wt/WWebWidget.C ++++ wt-4.0.2/src/Wt/WWebWidget.C +@@ -1983,9 +1983,13 @@ bool WWebWidget::setFirstFocus() + return true; + } + +- for (unsigned i = 0; i < children().size(); i++) +- if (children()[i]->setFirstFocus()) +- return true; ++ bool result = false; ++ iterateChildren([&result](Wt::WWidget *w){ ++ if (!result) ++ result = w->setFirstFocus(); ++ }); ++ if (result) ++ return true; + + return false; + } else +@@ -2207,6 +2211,8 @@ WWidget *WWebWidget::findById(const std: + if (!result) + result = c->findById(id); + }); ++ if (result) ++ return result; + } + + return nullptr; +Index: wt-4.0.2/src/http/Connection.C +=================================================================== +--- wt-4.0.2.orig/src/http/Connection.C ++++ wt-4.0.2/src/http/Connection.C +@@ -61,6 +61,15 @@ Connection::~Connection() + LOG_DEBUG("~Connection"); + } + ++asio::ip::tcp::socket::native_handle_type Connection::native() ++{ ++#if (defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600) || (defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100) ++ return socket().native_handle(); ++#else ++ return socket().native(); ++#endif ++} ++ + void Connection::finishReply() + { + if (!request_.uri.empty()) { +@@ -78,7 +87,7 @@ void Connection::scheduleStop() + + void Connection::start() + { +- LOG_DEBUG(socket().native() << ": start()"); ++ LOG_DEBUG(native() << ": start()"); + + request_parser_.reset(); + request_.reset(); +@@ -106,7 +115,7 @@ void Connection::stop() + void Connection::setReadTimeout(int seconds) + { + if (seconds != 0) { +- LOG_DEBUG(socket().native() << " setting read timeout (ws: " ++ LOG_DEBUG(native() << " setting read timeout (ws: " + << request_.webSocketVersion << ")"); + state_ |= Reading; + +@@ -118,7 +127,7 @@ void Connection::setReadTimeout(int seco + + void Connection::setWriteTimeout(int seconds) + { +- LOG_DEBUG(socket().native() << " setting write timeout (ws: " ++ LOG_DEBUG(native() << " setting write timeout (ws: " + << request_.webSocketVersion << ")"); + state_ |= Writing; + +@@ -129,7 +138,7 @@ void Connection::setWriteTimeout(int sec + + void Connection::cancelReadTimer() + { +- LOG_DEBUG(socket().native() << " cancel read timeout"); ++ LOG_DEBUG(native() << " cancel read timeout"); + state_.clear(Reading); + + readTimer_.cancel(); +@@ -137,7 +146,7 @@ void Connection::cancelReadTimer() + + void Connection::cancelWriteTimer() + { +- LOG_DEBUG(socket().native() << " cancel write timeout"); ++ LOG_DEBUG(native() << " cancel write timeout"); + state_.clear(Writing); + + writeTimer_.cancel(); +@@ -163,7 +172,7 @@ void Connection::handleReadRequest0() + + #ifdef DEBUG + try { +- LOG_DEBUG(socket().native() << "incoming request: " ++ LOG_DEBUG(socket().native_handle() << "incoming request: " + << socket().remote_endpoint().port() << " (avail= " + << (rcv_buffer_size_ - (rcv_remaining_ - buffer.data())) << "): " + << std::string(rcv_remaining_, +@@ -189,7 +198,7 @@ void Connection::handleReadRequest0() + if (doWebSockets) + request_.enableWebSocket(); + +- LOG_DEBUG(socket().native() << "request: " << status); ++ LOG_DEBUG(native() << "request: " << status); + + if (status >= 300) + sendStockReply(status); +@@ -242,7 +251,7 @@ void Connection::sendStockReply(StockRep + void Connection::handleReadRequest(const Wt::AsioWrapper::error_code& e, + std::size_t bytes_transferred) + { +- LOG_DEBUG(socket().native() << ": handleReadRequest(): " << e.message()); ++ LOG_DEBUG(native() << ": handleReadRequest(): " << e.message()); + + cancelReadTimer(); + +@@ -261,7 +270,7 @@ void Connection::close() + cancelReadTimer(); + cancelWriteTimer(); + +- LOG_DEBUG(socket().native() << ": close()"); ++ LOG_DEBUG(native() << ": close()"); + + ConnectionManager_.stop(shared_from_this()); + } +@@ -274,7 +283,7 @@ bool Connection::closed() const + + void Connection::handleError(const Wt::AsioWrapper::error_code& e) + { +- LOG_DEBUG(socket().native() << ": error: " << e.message()); ++ LOG_DEBUG(native() << ": error: " << e.message()); + + close(); + } +@@ -349,7 +358,7 @@ void Connection::handleReadBody0(ReplyPt + const Wt::AsioWrapper::error_code& e, + std::size_t bytes_transferred) + { +- LOG_DEBUG(socket().native() << ": handleReadBody0(): " << e.message()); ++ LOG_DEBUG(native() << ": handleReadBody0(): " << e.message()); + + if (disconnectCallback_) { + if (e && e != asio::error::operation_aborted) { +@@ -357,7 +366,7 @@ void Connection::handleReadBody0(ReplyPt + disconnectCallback_ = boost::function(); + f(); + } else if (!e) { +- LOG_ERROR(socket().native() ++ LOG_ERROR(native() + << ": handleReadBody(): while waiting for disconnect, " + "received unexpected data, closing"); + close(); +@@ -410,7 +419,7 @@ void Connection::startWriteResponse(Repl + } + #endif + +- LOG_DEBUG(socket().native() << " sending: " << s << "(buffers: " ++ LOG_DEBUG(native() << " sending: " << s << "(buffers: " + << buffers.size() << ")"); + + if (!buffers.empty()) { +@@ -423,7 +432,7 @@ void Connection::startWriteResponse(Repl + + void Connection::handleWriteResponse(ReplyPtr reply) + { +- LOG_DEBUG(socket().native() << ": handleWriteResponse() " << ++ LOG_DEBUG(native() << ": handleWriteResponse() " << + haveResponse_ << " " << responseDone_); + if (haveResponse_) + startWriteResponse(reply); +@@ -458,7 +467,7 @@ void Connection::handleWriteResponse0(Re + const Wt::AsioWrapper::error_code& e, + std::size_t bytes_transferred) + { +- LOG_DEBUG(socket().native() << ": handleWriteResponse0(): " ++ LOG_DEBUG(native() << ": handleWriteResponse0(): " + << bytes_transferred << " ; " << e.message()); + + cancelWriteTimer(); +Index: wt-4.0.2/src/http/Connection.h +=================================================================== +--- wt-4.0.2.orig/src/http/Connection.h ++++ wt-4.0.2/src/http/Connection.h +@@ -18,6 +18,7 @@ + #define HTTP_CONNECTION_HPP + + #include ++#include + #include + + #include "Buffer.h" +@@ -61,7 +62,7 @@ public: + virtual ~Connection(); + + Server *server() const { return server_; } +- asio::strand& strand() { return strand_; } ++ Wt::AsioWrapper::strand& strand() { return strand_; } + + /// Stop all asynchronous operations associated with the connection. + void scheduleStop(); +@@ -86,6 +87,9 @@ public: + const std::function& callback); + + protected: ++ /// Get the native handle of the socket ++ asio::ip::tcp::socket::native_handle_type native(); ++ + void handleWriteResponse0(ReplyPtr reply, + const Wt::AsioWrapper::error_code& e, + std::size_t bytes_transferred); +@@ -104,7 +108,7 @@ protected: + /// The manager for this connection. + ConnectionManager& ConnectionManager_; + +- asio::strand strand_; ++ Wt::AsioWrapper::strand strand_; + + void finishReply(); + +Index: wt-4.0.2/src/http/Reply.C +=================================================================== +--- wt-4.0.2.orig/src/http/Reply.C ++++ wt-4.0.2/src/http/Reply.C +@@ -596,7 +596,8 @@ bool Reply::encodeNextContentBuffer( + originalSize += bs; + + gzipStrm_.avail_in = bs; +- gzipStrm_.next_in = (unsigned char *)asio::detail::buffer_cast_helper(b); ++ gzipStrm_.next_in = const_cast( ++ asio::buffer_cast(b)); + + unsigned char out[16*1024]; + do { +Index: wt-4.0.2/src/http/Server.C +=================================================================== +--- wt-4.0.2.orig/src/http/Server.C ++++ wt-4.0.2/src/http/Server.C +@@ -116,7 +116,11 @@ Server::Server(const Configuration& conf + accept_strand_(wt_.ioService()), + // post_strand_(ioService_), + #ifdef HTTP_WITH_SSL ++#if (defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600) || (defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100) ++ ssl_context_(asio::ssl::context::sslv23), ++#else + ssl_context_(wt_.ioService(), asio::ssl::context::sslv23), ++#endif + #endif // HTTP_WITH_SSL + connection_manager_(), + sessionManager_(0), +Index: wt-4.0.2/src/http/Server.h +=================================================================== +--- wt-4.0.2.orig/src/http/Server.h ++++ wt-4.0.2/src/http/Server.h +@@ -129,7 +129,7 @@ private: + Wt::WLogger accessLogger_; + + /// The strand for handleTcpAccept(), handleSslAccept() and handleStop() +- asio::strand accept_strand_; ++ Wt::AsioWrapper::strand accept_strand_; + + /// Acceptors used to listen for incoming http connections. + std::vector tcp_listeners_; +Index: wt-4.0.2/src/http/SessionProcess.C +=================================================================== +--- wt-4.0.2.orig/src/http/SessionProcess.C ++++ wt-4.0.2/src/http/SessionProcess.C +@@ -16,6 +16,7 @@ + #include + #endif // WT_WIN32 + ++#include "Wt/WConfig.h" + #include "Wt/WLogger.h" + + namespace Wt { +@@ -80,7 +81,11 @@ void SessionProcess::asyncExec(const Con + if (!ec) + acceptor_->listen(0, ec); + #ifndef WT_WIN32 ++#if (defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600) || (defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100) ++ fcntl(acceptor_->native_handle(), F_SETFD, FD_CLOEXEC); ++#else + fcntl(acceptor_->native(), F_SETFD, FD_CLOEXEC); ++#endif + #endif // !WT_WIN32 + if (ec) { + LOG_ERROR("Couldn't create listening socket: " << ec.message()); +Index: wt-4.0.2/src/http/SslConnection.C +=================================================================== +--- wt-4.0.2.orig/src/http/SslConnection.C ++++ wt-4.0.2/src/http/SslConnection.C +@@ -81,9 +81,9 @@ void SslConnection::handleHandshake(cons + + void SslConnection::stop() + { +- LOG_DEBUG(socket().native() << ": stop()"); ++ LOG_DEBUG(native() << ": stop()"); + finishReply(); +- LOG_DEBUG(socket().native() << ": SSL shutdown"); ++ LOG_DEBUG(native() << ": SSL shutdown"); + + Connection::stop(); + +@@ -108,20 +108,20 @@ void SslConnection::stopNextLayer(const + // In case of timeout, we will get here twice. + sslShutdownTimer_.cancel(); + if (ec) { +- LOG_DEBUG(socket().native() << ": ssl_shutdown failed:" ++ LOG_DEBUG(native() << ": ssl_shutdown failed:" + << ec.message()); + } + try { + if (socket().is_open()) { + Wt::AsioWrapper::error_code ignored_ec; +- LOG_DEBUG(socket().native() << ": socket shutdown"); ++ LOG_DEBUG(native() << ": socket shutdown"); + socket().shutdown(asio::ip::tcp::socket::shutdown_both, + ignored_ec); +- LOG_DEBUG(socket().native() << "closing socket"); ++ LOG_DEBUG(native() << "closing socket"); + socket().close(); + } + } catch (Wt::AsioWrapper::system_error& e) { +- LOG_DEBUG(socket().native() << ": error " << e.what()); ++ LOG_DEBUG(native() << ": error " << e.what()); + } + } + +@@ -161,7 +161,7 @@ void SslConnection::startAsyncReadBody(R + Buffer& buffer, int timeout) + { + if (state_ & Reading) { +- LOG_DEBUG(socket().native() << ": state_ = " ++ LOG_DEBUG(native() << ": state_ = " + << (state_ & Reading ? "reading " : "") + << (state_ & Writing ? "writing " : "")); + stop(); +@@ -198,7 +198,7 @@ void SslConnection + int timeout) + { + if (state_ & Writing) { +- LOG_DEBUG(socket().native() << ": state_ = " ++ LOG_DEBUG(native() << ": state_ = " + << (state_ & Reading ? "reading " : "") + << (state_ & Writing ? "writing " : "")); + stop(); +Index: wt-4.0.2/src/http/TcpConnection.C +=================================================================== +--- wt-4.0.2.orig/src/http/TcpConnection.C ++++ wt-4.0.2/src/http/TcpConnection.C +@@ -38,17 +38,17 @@ asio::ip::tcp::socket& TcpConnection::so + + void TcpConnection::stop() + { +- LOG_DEBUG(socket().native() << ": stop()"); ++ LOG_DEBUG(native() << ": stop()"); + + finishReply(); + + try { + Wt::AsioWrapper::error_code ignored_ec; + socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec); +- LOG_DEBUG(socket().native() << ": closing socket"); ++ LOG_DEBUG(native() << ": closing socket"); + socket_.close(); + } catch (Wt::AsioWrapper::system_error& e) { +- LOG_DEBUG(socket().native() << ": error " << e.what()); ++ LOG_DEBUG(native() << ": error " << e.what()); + } + + Connection::stop(); +@@ -56,10 +56,10 @@ void TcpConnection::stop() + + void TcpConnection::startAsyncReadRequest(Buffer& buffer, int timeout) + { +- LOG_DEBUG(socket().native() << ": startAsyncReadRequest"); ++ LOG_DEBUG(native() << ": startAsyncReadRequest"); + + if (state_ & Reading) { +- LOG_DEBUG(socket().native() << ": state_ = " ++ LOG_DEBUG(native() << ": state_ = " + << (state_ & Reading ? "reading " : "") + << (state_ & Writing ? "writing " : "")); + stop(); +@@ -81,10 +81,10 @@ void TcpConnection::startAsyncReadReques + void TcpConnection::startAsyncReadBody(ReplyPtr reply, + Buffer& buffer, int timeout) + { +- LOG_DEBUG(socket().native() << ": startAsyncReadBody"); ++ LOG_DEBUG(native() << ": startAsyncReadBody"); + + if (state_ & Reading) { +- LOG_DEBUG(socket().native() << ": state_ = " ++ LOG_DEBUG(native() << ": state_ = " + << (state_ & Reading ? "reading " : "") + << (state_ & Writing ? "writing " : "")); + stop(); +@@ -109,10 +109,10 @@ void TcpConnection::startAsyncWriteRespo + const std::vector& buffers, + int timeout) + { +- LOG_DEBUG(socket().native() << ": startAsyncWriteResponse"); ++ LOG_DEBUG(native() << ": startAsyncWriteResponse"); + + if (state_ & Writing) { +- LOG_DEBUG(socket().native() << ": state_ = " ++ LOG_DEBUG(native() << ": state_ = " + << (state_ & Reading ? "reading " : "") + << (state_ & Writing ? "writing " : "")); + stop(); +Index: wt-4.0.2/src/web/Configuration.C +=================================================================== +--- wt-4.0.2.orig/src/web/Configuration.C ++++ wt-4.0.2/src/web/Configuration.C +@@ -825,14 +825,10 @@ void Configuration::readApplicationSetti + runDirectory_ = singleChildElementValue(fcgi, "run-directory", + runDirectory_); + +- setInt(fcgi, "num-threads", numThreads_); // backward compatibility < 3.2.0 +- + xml_node<> *isapi = singleChildElement(app, "connector-isapi"); + if (!isapi) + isapi = app; // backward compatibility + +- setInt(isapi, "num-threads", numThreads_); // backward compatibility < 3.2.0 +- + std::string maxMemoryRequestSizeStr = + singleChildElementValue(isapi, "max-memory-request-size", ""); + if (!maxMemoryRequestSizeStr.empty()) { diff --git a/examples-crypt.patch b/examples-crypt.patch new file mode 100644 index 0000000..dea05a2 --- /dev/null +++ b/examples-crypt.patch @@ -0,0 +1,24 @@ +Index: wt-4.0.2/examples/blog/model/BlogSession.C +=================================================================== +--- wt-4.0.2.orig/examples/blog/model/BlogSession.C ++++ wt-4.0.2/examples/blog/model/BlogSession.C +@@ -28,6 +28,7 @@ + + #if !defined(WT_WIN32) && !defined(__CYGWIN__) && !defined(ANDROID) + #define HAVE_CRYPT ++#include + #endif + + namespace { +Index: wt-4.0.2/examples/hangman/Session.C +=================================================================== +--- wt-4.0.2.orig/examples/hangman/Session.C ++++ wt-4.0.2/examples/hangman/Session.C +@@ -24,6 +24,7 @@ + + #if !defined(WT_WIN32) && !defined(__CYGWIN__) && !defined(ANDROID) + #define HAVE_CRYPT ++#include + #endif + + namespace dbo = Wt::Dbo; diff --git a/wt.spec b/wt.spec index a56a526..ad3ba7b 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -31,6 +31,10 @@ Source4: wt-generate-tarball.sh Patch0: find-mysql.patch Patch1: use-system-sqlite.patch +# taken from https://github.com/emweb/wt/commit/960e8d017b264710e344c63f9feb6ea1fa593eeb.patch +# author of the patch: Roel Standaert +Patch2: boost-166-compat.patch +Patch3: examples-crypt.patch BuildRequires: cmake >= 2.6 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel @@ -111,9 +115,7 @@ Group: Documentation This package contains the documents for Wt API and examples. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .find-mysql -%patch1 -p1 -b .use-system-sqlite +%autosetup -p1 # static files like javascript and css should not be executable for d in src resources examples; do @@ -295,6 +297,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Mar 15 2018 Michal Minář - 4.0.2-2 +- Compatibility fix for boost 1.66 + * Thu Mar 15 2018 Michal Minář - 4.0.2-1 - New upstream version 4.0.2 From a30c3b108df4a3dcc12457cd711ec80fae16f71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Thu, 15 Mar 2018 15:50:48 +0000 Subject: [PATCH 50/69] Depend on mariadb-connector-c-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: bz#1493662 Signed-off-by: Michal Minář --- wt.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/wt.spec b/wt.spec index ad3ba7b..b39420f 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -29,16 +29,15 @@ Source3: README.fedora # ./wt-generate-tarball.sh UPSTREAM_VERSION Source4: wt-generate-tarball.sh -Patch0: find-mysql.patch -Patch1: use-system-sqlite.patch +Patch0: use-system-sqlite.patch # taken from https://github.com/emweb/wt/commit/960e8d017b264710e344c63f9feb6ea1fa593eeb.patch # author of the patch: Roel Standaert -Patch2: boost-166-compat.patch -Patch3: examples-crypt.patch +Patch1: boost-166-compat.patch +Patch2: examples-crypt.patch -BuildRequires: cmake >= 2.6 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen +BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel -BuildRequires: mysql-devel libharu-devel fcgi-devel zlib-devel qt-devel +BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt-devel # Don't use bundled glew on fedora >= 21 %if 0%{?fedora} >= 21 @@ -164,7 +163,6 @@ cd wt-build -DCONFIGDIR="%{_sysconfdir}/%{name}" \ -DENABLE_FIREBIRD=OFF \ -DENABLE_MYSQL=ON \ - -DMYSQL_LIBRARY=mysqlclient \ %{?use_system_glew:-DUSE_SYSTEM_GLEW=1} \ -DBUILD_EXAMPLES=ON \ -DINSTALL_EXAMPLES=ON \ @@ -297,11 +295,10 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog -* Thu Mar 15 2018 Michal Minář - 4.0.2-2 -- Compatibility fix for boost 1.66 - -* Thu Mar 15 2018 Michal Minář - 4.0.2-1 +* Thu Mar 15 2018 Michal Minář - 4.0.2-3 - New upstream version 4.0.2 +- Compatibility fix for boost 1.66 +- Depend on mariadb-connector-c-devel * Fri Feb 09 2018 Fedora Release Engineering - 3.3.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d9e851d161377337176c05a52a0b7bb8d661f6c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:01:31 +0000 Subject: [PATCH 51/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index b39420f..1261a42 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -295,6 +295,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 15 2018 Michal Minář - 4.0.2-3 - New upstream version 4.0.2 - Compatibility fix for boost 1.66 From 8b3b948b98e0ade1c34b5bf2d305ef36e76ec600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 23 Jul 2018 10:15:36 +0000 Subject: [PATCH 52/69] New upstream version 4.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NVR: wt-4.0.3-1 Signed-off-by: Michal Minář --- .gitignore | 2 +- boost-166-compat.patch | 605 ------------------ examples-crypt.patch | 24 - sources | 2 +- ...GE-LICENSING => wt-4.0.3-PACKAGE-LICENSING | 0 wt.spec | 11 +- 6 files changed, 7 insertions(+), 637 deletions(-) delete mode 100644 boost-166-compat.patch delete mode 100644 examples-crypt.patch rename wt-4.0.2-PACKAGE-LICENSING => wt-4.0.3-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 5d2347a..5a1c3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.0.2-free.tar.xz +/wt-4.0.3-free.tar.xz diff --git a/boost-166-compat.patch b/boost-166-compat.patch deleted file mode 100644 index db09374..0000000 --- a/boost-166-compat.patch +++ /dev/null @@ -1,605 +0,0 @@ -Index: wt-4.0.2/examples/filetreetable/CMakeLists.txt -=================================================================== ---- wt-4.0.2.orig/examples/filetreetable/CMakeLists.txt -+++ wt-4.0.2/examples/filetreetable/CMakeLists.txt -@@ -10,6 +10,7 @@ ELSE(NOT BOOST_FS_LIB) - - TARGET_LINK_LIBRARIES(filetreetable.wt - ${BOOST_FS_LIB} -+ ${BOOST_SYSTEM_LIB} - ) - - INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src) -Index: wt-4.0.2/examples/gitmodel/CMakeLists.txt -=================================================================== ---- wt-4.0.2.orig/examples/gitmodel/CMakeLists.txt -+++ wt-4.0.2/examples/gitmodel/CMakeLists.txt -@@ -7,7 +7,7 @@ IF(BOOST_FS_LIB) - ../wt-homepage/SourceView.C - GitView.C - ) -- TARGET_LINK_LIBRARIES(gitview.wt ${BOOST_FS_LIB}) -+ TARGET_LINK_LIBRARIES(gitview.wt ${BOOST_FS_LIB} ${BOOST_SYSTEM_LIB}) - - INCLUDE_DIRECTORIES( - ${WT_SOURCE_DIR}/src -Index: wt-4.0.2/examples/wt-homepage/CMakeLists.txt -=================================================================== ---- wt-4.0.2.orig/examples/wt-homepage/CMakeLists.txt -+++ wt-4.0.2/examples/wt-homepage/CMakeLists.txt -@@ -34,7 +34,7 @@ ENDIF(WT_EMWEB_BUILD) - - WT_ADD_EXAMPLE(Home.wt ${SRC}) - --TARGET_LINK_LIBRARIES(Home.wt ${EXAMPLES_DBO_LIBS} ${BOOST_FS_LIB}) -+TARGET_LINK_LIBRARIES(Home.wt ${EXAMPLES_DBO_LIBS} ${BOOST_FS_LIB} ${BOOST_SYSTEM_LIB}) - - # Test whether crypt(3) is provided by libc. If it's not, check if - # libcrypt exists and if it provides crypt(3). -Index: wt-4.0.2/src/Wt/AsioWrapper/strand.hpp -=================================================================== ---- wt-4.0.2.orig/src/Wt/AsioWrapper/strand.hpp -+++ wt-4.0.2/src/Wt/AsioWrapper/strand.hpp -@@ -12,10 +12,29 @@ - #ifdef WT_ASIO_IS_BOOST_ASIO - - #include -+namespace Wt { -+ namespace AsioWrapper { -+#if BOOST_VERSION >= 106600 -+ using strand = boost::asio::io_context::strand; -+#else -+ using strand = boost::asio::strand; -+#endif -+ } -+} - - #else // WT_ASIO_IS_STANDALONE_ASIO - -+#include - #include -+namespace Wt { -+ namespace AsioWrapper { -+#if ASIO_VERSION >= 101100 -+ using strand = asio::io_service::strand; -+#else -+ using strand = asio::strand; -+#endif -+ } -+} - - #endif // WT_ASIO_IS_BOOST_ASIO - -Index: wt-4.0.2/src/Wt/Http/Client.C -=================================================================== ---- wt-4.0.2.orig/src/Wt/Http/Client.C -+++ wt-4.0.2/src/Wt/Http/Client.C -@@ -642,7 +642,7 @@ private: - - protected: - asio::io_service& ioService_; -- asio::strand strand_; -+ AsioWrapper::strand strand_; - tcp::resolver resolver_; - asio::streambuf requestBuf_; - asio::streambuf responseBuf_; -@@ -929,8 +929,14 @@ bool Client::request(Http::Method method - - #ifdef WT_WITH_SSL - } else if (parsedUrl.protocol == "https") { -+#if defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600 -+ asio::ssl::context context(asio::ssl::context::tls); -+#elif defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100 -+ asio::ssl::context context(asio::ssl::context::sslv23); -+#else - asio::ssl::context context - (*ioService, asio::ssl::context::sslv23); -+#endif - long sslOptions = asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3; - context.set_options(sslOptions); - -Index: wt-4.0.2/src/Wt/Http/Client.h -=================================================================== ---- wt-4.0.2.orig/src/Wt/Http/Client.h -+++ wt-4.0.2/src/Wt/Http/Client.h -@@ -23,7 +23,12 @@ - #ifdef WT_ASIO_IS_BOOST_ASIO - namespace boost { - namespace asio { -+#if BOOST_VERSION >= 106600 -+ class io_context; -+ typedef io_context io_service; -+#else - class io_service; -+#endif - } - } - #else // WT_ASIO_IS_STANDALONE_ASIO -Index: wt-4.0.2/src/Wt/Json/Value.h -=================================================================== ---- wt-4.0.2.orig/src/Wt/Json/Value.h -+++ wt-4.0.2/src/Wt/Json/Value.h -@@ -23,7 +23,7 @@ class Array; - * \brief A JSON representation and parsing library. - * - * The JSON library contains data types to represent a JSON data -- * structure (Value, Object and Array), and a JSON parser. -+ * structure (Value, Object and Array), a JSON parser, and a JSON serializer. - * - * Usage example: - * \code -@@ -39,6 +39,9 @@ class Array; - * bool b = result.get("b"); - * std::cerr << "a: " << s << ", b: " << b << std::endl; // a: That's great, b: true - * \endcode -+ * -+ * Include the header for Wt::Json::parse(), and -+ * the header for Wt::Json::serialize(). - */ - - /*! \brief Enumeration for the type of a JSON value. -Index: wt-4.0.2/src/Wt/WDialog.C -=================================================================== ---- wt-4.0.2.orig/src/Wt/WDialog.C -+++ wt-4.0.2/src/Wt/WDialog.C -@@ -436,8 +436,10 @@ void WDialog::render(WFlags - if (!isModal()) - impl_->mouseWentDown().connect(this, &WDialog::bringToFront); - -- if ( flags.test(RenderFlag::Full) && autoFocus_) -- impl_->setFirstFocus(); -+ if ( flags.test(RenderFlag::Full) && autoFocus_) { -+ if (!impl_->findById(Wt::WApplication::instance()->focus())) -+ impl_->setFirstFocus(); -+ } - - WPopupWidget::render(flags); - } -Index: wt-4.0.2/src/Wt/WDialog.h -=================================================================== ---- wt-4.0.2.orig/src/Wt/WDialog.h -+++ wt-4.0.2/src/Wt/WDialog.h -@@ -337,6 +337,9 @@ public: - bool closable() const { return closeIcon_ != nullptr; } - - /*! \brief Set focus on the first widget in the dialog. -+ * -+ * Autofocus is enabled by default. If a widget inside of -+ * this dialog already has focus, the focus will not be changed. - */ - void setAutoFocus(bool enable){ autoFocus_ = enable;} - -Index: wt-4.0.2/src/Wt/WWebWidget.C -=================================================================== ---- wt-4.0.2.orig/src/Wt/WWebWidget.C -+++ wt-4.0.2/src/Wt/WWebWidget.C -@@ -1983,9 +1983,13 @@ bool WWebWidget::setFirstFocus() - return true; - } - -- for (unsigned i = 0; i < children().size(); i++) -- if (children()[i]->setFirstFocus()) -- return true; -+ bool result = false; -+ iterateChildren([&result](Wt::WWidget *w){ -+ if (!result) -+ result = w->setFirstFocus(); -+ }); -+ if (result) -+ return true; - - return false; - } else -@@ -2207,6 +2211,8 @@ WWidget *WWebWidget::findById(const std: - if (!result) - result = c->findById(id); - }); -+ if (result) -+ return result; - } - - return nullptr; -Index: wt-4.0.2/src/http/Connection.C -=================================================================== ---- wt-4.0.2.orig/src/http/Connection.C -+++ wt-4.0.2/src/http/Connection.C -@@ -61,6 +61,15 @@ Connection::~Connection() - LOG_DEBUG("~Connection"); - } - -+asio::ip::tcp::socket::native_handle_type Connection::native() -+{ -+#if (defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600) || (defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100) -+ return socket().native_handle(); -+#else -+ return socket().native(); -+#endif -+} -+ - void Connection::finishReply() - { - if (!request_.uri.empty()) { -@@ -78,7 +87,7 @@ void Connection::scheduleStop() - - void Connection::start() - { -- LOG_DEBUG(socket().native() << ": start()"); -+ LOG_DEBUG(native() << ": start()"); - - request_parser_.reset(); - request_.reset(); -@@ -106,7 +115,7 @@ void Connection::stop() - void Connection::setReadTimeout(int seconds) - { - if (seconds != 0) { -- LOG_DEBUG(socket().native() << " setting read timeout (ws: " -+ LOG_DEBUG(native() << " setting read timeout (ws: " - << request_.webSocketVersion << ")"); - state_ |= Reading; - -@@ -118,7 +127,7 @@ void Connection::setReadTimeout(int seco - - void Connection::setWriteTimeout(int seconds) - { -- LOG_DEBUG(socket().native() << " setting write timeout (ws: " -+ LOG_DEBUG(native() << " setting write timeout (ws: " - << request_.webSocketVersion << ")"); - state_ |= Writing; - -@@ -129,7 +138,7 @@ void Connection::setWriteTimeout(int sec - - void Connection::cancelReadTimer() - { -- LOG_DEBUG(socket().native() << " cancel read timeout"); -+ LOG_DEBUG(native() << " cancel read timeout"); - state_.clear(Reading); - - readTimer_.cancel(); -@@ -137,7 +146,7 @@ void Connection::cancelReadTimer() - - void Connection::cancelWriteTimer() - { -- LOG_DEBUG(socket().native() << " cancel write timeout"); -+ LOG_DEBUG(native() << " cancel write timeout"); - state_.clear(Writing); - - writeTimer_.cancel(); -@@ -163,7 +172,7 @@ void Connection::handleReadRequest0() - - #ifdef DEBUG - try { -- LOG_DEBUG(socket().native() << "incoming request: " -+ LOG_DEBUG(socket().native_handle() << "incoming request: " - << socket().remote_endpoint().port() << " (avail= " - << (rcv_buffer_size_ - (rcv_remaining_ - buffer.data())) << "): " - << std::string(rcv_remaining_, -@@ -189,7 +198,7 @@ void Connection::handleReadRequest0() - if (doWebSockets) - request_.enableWebSocket(); - -- LOG_DEBUG(socket().native() << "request: " << status); -+ LOG_DEBUG(native() << "request: " << status); - - if (status >= 300) - sendStockReply(status); -@@ -242,7 +251,7 @@ void Connection::sendStockReply(StockRep - void Connection::handleReadRequest(const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred) - { -- LOG_DEBUG(socket().native() << ": handleReadRequest(): " << e.message()); -+ LOG_DEBUG(native() << ": handleReadRequest(): " << e.message()); - - cancelReadTimer(); - -@@ -261,7 +270,7 @@ void Connection::close() - cancelReadTimer(); - cancelWriteTimer(); - -- LOG_DEBUG(socket().native() << ": close()"); -+ LOG_DEBUG(native() << ": close()"); - - ConnectionManager_.stop(shared_from_this()); - } -@@ -274,7 +283,7 @@ bool Connection::closed() const - - void Connection::handleError(const Wt::AsioWrapper::error_code& e) - { -- LOG_DEBUG(socket().native() << ": error: " << e.message()); -+ LOG_DEBUG(native() << ": error: " << e.message()); - - close(); - } -@@ -349,7 +358,7 @@ void Connection::handleReadBody0(ReplyPt - const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred) - { -- LOG_DEBUG(socket().native() << ": handleReadBody0(): " << e.message()); -+ LOG_DEBUG(native() << ": handleReadBody0(): " << e.message()); - - if (disconnectCallback_) { - if (e && e != asio::error::operation_aborted) { -@@ -357,7 +366,7 @@ void Connection::handleReadBody0(ReplyPt - disconnectCallback_ = boost::function(); - f(); - } else if (!e) { -- LOG_ERROR(socket().native() -+ LOG_ERROR(native() - << ": handleReadBody(): while waiting for disconnect, " - "received unexpected data, closing"); - close(); -@@ -410,7 +419,7 @@ void Connection::startWriteResponse(Repl - } - #endif - -- LOG_DEBUG(socket().native() << " sending: " << s << "(buffers: " -+ LOG_DEBUG(native() << " sending: " << s << "(buffers: " - << buffers.size() << ")"); - - if (!buffers.empty()) { -@@ -423,7 +432,7 @@ void Connection::startWriteResponse(Repl - - void Connection::handleWriteResponse(ReplyPtr reply) - { -- LOG_DEBUG(socket().native() << ": handleWriteResponse() " << -+ LOG_DEBUG(native() << ": handleWriteResponse() " << - haveResponse_ << " " << responseDone_); - if (haveResponse_) - startWriteResponse(reply); -@@ -458,7 +467,7 @@ void Connection::handleWriteResponse0(Re - const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred) - { -- LOG_DEBUG(socket().native() << ": handleWriteResponse0(): " -+ LOG_DEBUG(native() << ": handleWriteResponse0(): " - << bytes_transferred << " ; " << e.message()); - - cancelWriteTimer(); -Index: wt-4.0.2/src/http/Connection.h -=================================================================== ---- wt-4.0.2.orig/src/http/Connection.h -+++ wt-4.0.2/src/http/Connection.h -@@ -18,6 +18,7 @@ - #define HTTP_CONNECTION_HPP - - #include -+#include - #include - - #include "Buffer.h" -@@ -61,7 +62,7 @@ public: - virtual ~Connection(); - - Server *server() const { return server_; } -- asio::strand& strand() { return strand_; } -+ Wt::AsioWrapper::strand& strand() { return strand_; } - - /// Stop all asynchronous operations associated with the connection. - void scheduleStop(); -@@ -86,6 +87,9 @@ public: - const std::function& callback); - - protected: -+ /// Get the native handle of the socket -+ asio::ip::tcp::socket::native_handle_type native(); -+ - void handleWriteResponse0(ReplyPtr reply, - const Wt::AsioWrapper::error_code& e, - std::size_t bytes_transferred); -@@ -104,7 +108,7 @@ protected: - /// The manager for this connection. - ConnectionManager& ConnectionManager_; - -- asio::strand strand_; -+ Wt::AsioWrapper::strand strand_; - - void finishReply(); - -Index: wt-4.0.2/src/http/Reply.C -=================================================================== ---- wt-4.0.2.orig/src/http/Reply.C -+++ wt-4.0.2/src/http/Reply.C -@@ -596,7 +596,8 @@ bool Reply::encodeNextContentBuffer( - originalSize += bs; - - gzipStrm_.avail_in = bs; -- gzipStrm_.next_in = (unsigned char *)asio::detail::buffer_cast_helper(b); -+ gzipStrm_.next_in = const_cast( -+ asio::buffer_cast(b)); - - unsigned char out[16*1024]; - do { -Index: wt-4.0.2/src/http/Server.C -=================================================================== ---- wt-4.0.2.orig/src/http/Server.C -+++ wt-4.0.2/src/http/Server.C -@@ -116,7 +116,11 @@ Server::Server(const Configuration& conf - accept_strand_(wt_.ioService()), - // post_strand_(ioService_), - #ifdef HTTP_WITH_SSL -+#if (defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600) || (defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100) -+ ssl_context_(asio::ssl::context::sslv23), -+#else - ssl_context_(wt_.ioService(), asio::ssl::context::sslv23), -+#endif - #endif // HTTP_WITH_SSL - connection_manager_(), - sessionManager_(0), -Index: wt-4.0.2/src/http/Server.h -=================================================================== ---- wt-4.0.2.orig/src/http/Server.h -+++ wt-4.0.2/src/http/Server.h -@@ -129,7 +129,7 @@ private: - Wt::WLogger accessLogger_; - - /// The strand for handleTcpAccept(), handleSslAccept() and handleStop() -- asio::strand accept_strand_; -+ Wt::AsioWrapper::strand accept_strand_; - - /// Acceptors used to listen for incoming http connections. - std::vector tcp_listeners_; -Index: wt-4.0.2/src/http/SessionProcess.C -=================================================================== ---- wt-4.0.2.orig/src/http/SessionProcess.C -+++ wt-4.0.2/src/http/SessionProcess.C -@@ -16,6 +16,7 @@ - #include - #endif // WT_WIN32 - -+#include "Wt/WConfig.h" - #include "Wt/WLogger.h" - - namespace Wt { -@@ -80,7 +81,11 @@ void SessionProcess::asyncExec(const Con - if (!ec) - acceptor_->listen(0, ec); - #ifndef WT_WIN32 -+#if (defined(WT_ASIO_IS_BOOST_ASIO) && BOOST_VERSION >= 106600) || (defined(WT_ASIO_IS_STANDALONE_ASIO) && ASIO_VERSION >= 101100) -+ fcntl(acceptor_->native_handle(), F_SETFD, FD_CLOEXEC); -+#else - fcntl(acceptor_->native(), F_SETFD, FD_CLOEXEC); -+#endif - #endif // !WT_WIN32 - if (ec) { - LOG_ERROR("Couldn't create listening socket: " << ec.message()); -Index: wt-4.0.2/src/http/SslConnection.C -=================================================================== ---- wt-4.0.2.orig/src/http/SslConnection.C -+++ wt-4.0.2/src/http/SslConnection.C -@@ -81,9 +81,9 @@ void SslConnection::handleHandshake(cons - - void SslConnection::stop() - { -- LOG_DEBUG(socket().native() << ": stop()"); -+ LOG_DEBUG(native() << ": stop()"); - finishReply(); -- LOG_DEBUG(socket().native() << ": SSL shutdown"); -+ LOG_DEBUG(native() << ": SSL shutdown"); - - Connection::stop(); - -@@ -108,20 +108,20 @@ void SslConnection::stopNextLayer(const - // In case of timeout, we will get here twice. - sslShutdownTimer_.cancel(); - if (ec) { -- LOG_DEBUG(socket().native() << ": ssl_shutdown failed:" -+ LOG_DEBUG(native() << ": ssl_shutdown failed:" - << ec.message()); - } - try { - if (socket().is_open()) { - Wt::AsioWrapper::error_code ignored_ec; -- LOG_DEBUG(socket().native() << ": socket shutdown"); -+ LOG_DEBUG(native() << ": socket shutdown"); - socket().shutdown(asio::ip::tcp::socket::shutdown_both, - ignored_ec); -- LOG_DEBUG(socket().native() << "closing socket"); -+ LOG_DEBUG(native() << "closing socket"); - socket().close(); - } - } catch (Wt::AsioWrapper::system_error& e) { -- LOG_DEBUG(socket().native() << ": error " << e.what()); -+ LOG_DEBUG(native() << ": error " << e.what()); - } - } - -@@ -161,7 +161,7 @@ void SslConnection::startAsyncReadBody(R - Buffer& buffer, int timeout) - { - if (state_ & Reading) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(native() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -@@ -198,7 +198,7 @@ void SslConnection - int timeout) - { - if (state_ & Writing) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(native() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -Index: wt-4.0.2/src/http/TcpConnection.C -=================================================================== ---- wt-4.0.2.orig/src/http/TcpConnection.C -+++ wt-4.0.2/src/http/TcpConnection.C -@@ -38,17 +38,17 @@ asio::ip::tcp::socket& TcpConnection::so - - void TcpConnection::stop() - { -- LOG_DEBUG(socket().native() << ": stop()"); -+ LOG_DEBUG(native() << ": stop()"); - - finishReply(); - - try { - Wt::AsioWrapper::error_code ignored_ec; - socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec); -- LOG_DEBUG(socket().native() << ": closing socket"); -+ LOG_DEBUG(native() << ": closing socket"); - socket_.close(); - } catch (Wt::AsioWrapper::system_error& e) { -- LOG_DEBUG(socket().native() << ": error " << e.what()); -+ LOG_DEBUG(native() << ": error " << e.what()); - } - - Connection::stop(); -@@ -56,10 +56,10 @@ void TcpConnection::stop() - - void TcpConnection::startAsyncReadRequest(Buffer& buffer, int timeout) - { -- LOG_DEBUG(socket().native() << ": startAsyncReadRequest"); -+ LOG_DEBUG(native() << ": startAsyncReadRequest"); - - if (state_ & Reading) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(native() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -@@ -81,10 +81,10 @@ void TcpConnection::startAsyncReadReques - void TcpConnection::startAsyncReadBody(ReplyPtr reply, - Buffer& buffer, int timeout) - { -- LOG_DEBUG(socket().native() << ": startAsyncReadBody"); -+ LOG_DEBUG(native() << ": startAsyncReadBody"); - - if (state_ & Reading) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(native() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -@@ -109,10 +109,10 @@ void TcpConnection::startAsyncWriteRespo - const std::vector& buffers, - int timeout) - { -- LOG_DEBUG(socket().native() << ": startAsyncWriteResponse"); -+ LOG_DEBUG(native() << ": startAsyncWriteResponse"); - - if (state_ & Writing) { -- LOG_DEBUG(socket().native() << ": state_ = " -+ LOG_DEBUG(native() << ": state_ = " - << (state_ & Reading ? "reading " : "") - << (state_ & Writing ? "writing " : "")); - stop(); -Index: wt-4.0.2/src/web/Configuration.C -=================================================================== ---- wt-4.0.2.orig/src/web/Configuration.C -+++ wt-4.0.2/src/web/Configuration.C -@@ -825,14 +825,10 @@ void Configuration::readApplicationSetti - runDirectory_ = singleChildElementValue(fcgi, "run-directory", - runDirectory_); - -- setInt(fcgi, "num-threads", numThreads_); // backward compatibility < 3.2.0 -- - xml_node<> *isapi = singleChildElement(app, "connector-isapi"); - if (!isapi) - isapi = app; // backward compatibility - -- setInt(isapi, "num-threads", numThreads_); // backward compatibility < 3.2.0 -- - std::string maxMemoryRequestSizeStr = - singleChildElementValue(isapi, "max-memory-request-size", ""); - if (!maxMemoryRequestSizeStr.empty()) { diff --git a/examples-crypt.patch b/examples-crypt.patch deleted file mode 100644 index dea05a2..0000000 --- a/examples-crypt.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: wt-4.0.2/examples/blog/model/BlogSession.C -=================================================================== ---- wt-4.0.2.orig/examples/blog/model/BlogSession.C -+++ wt-4.0.2/examples/blog/model/BlogSession.C -@@ -28,6 +28,7 @@ - - #if !defined(WT_WIN32) && !defined(__CYGWIN__) && !defined(ANDROID) - #define HAVE_CRYPT -+#include - #endif - - namespace { -Index: wt-4.0.2/examples/hangman/Session.C -=================================================================== ---- wt-4.0.2.orig/examples/hangman/Session.C -+++ wt-4.0.2/examples/hangman/Session.C -@@ -24,6 +24,7 @@ - - #if !defined(WT_WIN32) && !defined(__CYGWIN__) && !defined(ANDROID) - #define HAVE_CRYPT -+#include - #endif - - namespace dbo = Wt::Dbo; diff --git a/sources b/sources index 2305083..40315a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.0.2-free.tar.xz) = 8bd6fc043fe7316cafb484200b0f2827b64dcb1336c55f385d6e082baec4affbc31493b4a1155c8710c8ac08ccd11ad6aefa0e944679da65bcb18ffe5017c596 +SHA512 (wt-4.0.3-free.tar.xz) = 80d9c24bec270692324f1db22618875cb514d7f54a4ce285f3517d98c25798619b9c74bd8e717eb83db43edb6cd2da992ded8629d0d239bfdbc5052d56cb19fa diff --git a/wt-4.0.2-PACKAGE-LICENSING b/wt-4.0.3-PACKAGE-LICENSING similarity index 100% rename from wt-4.0.2-PACKAGE-LICENSING rename to wt-4.0.3-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index 1261a42..d531d55 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.2 -Release: 4%{?dist} +Version: 4.0.3 +Release: 1%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -30,10 +30,6 @@ Source3: README.fedora Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch -# taken from https://github.com/emweb/wt/commit/960e8d017b264710e344c63f9feb6ea1fa593eeb.patch -# author of the patch: Roel Standaert -Patch1: boost-166-compat.patch -Patch2: examples-crypt.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel @@ -295,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Jul 23 2018 - 4.0.3-1 +- New upstream version 4.0.3 + * Sat Jul 14 2018 Fedora Release Engineering - 4.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 147cdf17f20f6212be2c9e4f529965acbe9b75cb Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 14:11:36 +0200 Subject: [PATCH 53/69] - Rebuilt for glew 2.1.0 --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index d531d55..a9afb37 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 4.0.3-2 +- Rebuilt for glew 2.1.0 + * Mon Jul 23 2018 - 4.0.3-1 - New upstream version 4.0.3 From 07b73c97570a23a437c7432df2c68f6ecf5b9f02 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 6 Sep 2018 10:33:52 +0200 Subject: [PATCH 54/69] BuildRequires: s/postgresql-devel/libpq-devel/ That's because we moved libpq.so.5 into libpq package. Related: rhbz#1618698, rhbz#1623764 --- wt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index a9afb37..dd4b3e4 100644 --- a/wt.spec +++ b/wt.spec @@ -32,7 +32,7 @@ Source4: wt-generate-tarball.sh Patch0: use-system-sqlite.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen -BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel +BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt-devel # Don't use bundled glew on fedora >= 21 From 3638a229877c1840ce76d19ead38c92f12380507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 14 Jan 2019 19:19:17 +0100 Subject: [PATCH 55/69] Rebuilt for libcrypt.so.2 (#1666033) --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index dd4b3e4..5121db8 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications Group: Development/Libraries @@ -291,6 +291,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Mon Jan 14 2019 Björn Esser - 4.0.3-3 +- Rebuilt for libcrypt.so.2 (#1666033) + * Thu Aug 23 2018 Nicolas Chauvet - 4.0.3-2 - Rebuilt for glew 2.1.0 From d45834e86c3ba66e57fd328efa0acfaaa6547a01 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:20 +0100 Subject: [PATCH 56/69] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- wt.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/wt.spec b/wt.spec index 5121db8..46033cf 100644 --- a/wt.spec +++ b/wt.spec @@ -222,14 +222,10 @@ find .%{_libdir}/Wt/examples -regex '.*/\(CMakeFiles\|.*\.cmake\|Doxygen\)' | \ find .%{_datadir}/Wt/resources -name 'generate.sh' | xargs rm -v popd -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%post dbo -p /sbin/ldconfig -%postun dbo -p /sbin/ldconfig -%post dbo-mysql -p /sbin/ldconfig -%postun dbo-mysql -p /sbin/ldconfig -%post dbo-postgres -p /sbin/ldconfig -%postun dbo-postgres -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets dbo +%ldconfig_scriptlets dbo-mysql +%ldconfig_scriptlets dbo-postgres %files %config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml From 173e7ce03989b3de142b60cd1d893089bb664c7c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 57/69] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- wt.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/wt.spec b/wt.spec index 46033cf..49548ed 100644 --- a/wt.spec +++ b/wt.spec @@ -9,7 +9,6 @@ Version: 4.0.3 Release: 3%{?dist} Summary: C++ library for developing web applications -Group: Development/Libraries # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib URL: https://www.webtoolkit.eu/wt @@ -53,7 +52,6 @@ progressive enhancement), and URL handling. %package dbo Summary: Wt::Dbo ORM library and Sqlite3 back-end -Group: Development/Libraries %description dbo This package contains the Wt::Dbo Object-Relational Mapping library @@ -61,7 +59,6 @@ and Sqlite3 back-end of it. %package dbo-mysql Summary: MySQL back-end for the Wt::Dbo ORM library -Group: Development/Libraries Requires: %{name}-dbo%{?_isa} = %{version}-%{release} %description dbo-mysql @@ -69,7 +66,6 @@ This package contains the MySQL back-end for the Wt::Dbo ORM library. %package dbo-postgres Summary: PostgreSQL back-end for the Wt::Dbo ORM library -Group: Development/Libraries Requires: %{name}-dbo%{?_isa} = %{version}-%{release} %description dbo-postgres @@ -77,7 +73,6 @@ This package contains the PostgresSQL back-end for the Wt::Dbo ORM library. %package devel Summary: Libraries and header files for witty web development -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-dbo%{?_isa} = %{version}-%{release} Requires: %{name}-dbo-postgres%{?_isa} = %{version}-%{release} @@ -90,7 +85,6 @@ applications using the Wt toolkit and the Wt::Dbo ORM library. %package examples Summary: Examples for Wt -Group: Development/Libraries License: GPLv2 and MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-dbo%{?_isa} = %{version}-%{release} @@ -101,7 +95,6 @@ release. %package doc Summary: Documents for the Wt toolkit -Group: Documentation # Unfortunately there are differences in doxygen output between arm and other # architectures. #BuildArch: noarch From 4da501232860d11ce315ddacb4ec815655ac9acb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:59:04 +0000 Subject: [PATCH 58/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 49548ed..d0f4439 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.3 -Release: 3%{?dist} +Release: 4%{?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 +* Sun Feb 03 2019 Fedora Release Engineering - 4.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Björn Esser - 4.0.3-3 - Rebuilt for libcrypt.so.2 (#1666033) From 442576575fab0de61c9ca29c6ec104a6c39bf83e 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 59/69] 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 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 0006433173ac9ecc6fef6c22113e11c3eac3592f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:46:03 +0000 Subject: [PATCH 60/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 189905a..a8e1436 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?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 +* Sat Jul 27 2019 Fedora Release Engineering - 4.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 20 2019 Michal Minář - 4.0.5-1 - New upstream version 4.0.5 From 3ec5ccf6eadcf382b155701ccabf911371ff5490 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 61/69] 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 ---------- sources | 2 +- ...GE-LICENSING => wt-4.1.0-PACKAGE-LICENSING | 0 wt-generate-tarball.sh | 24 ++++++++++++------- wt.spec | 9 +++++-- 6 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 find-mysql.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/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 a8e1436..569c3d2 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -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. + * Sat Jul 27 2019 Fedora Release Engineering - 4.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2feacff2b5324eb9540ce71600ad7fab832d6fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Mon, 19 Aug 2019 09:41:56 +0000 Subject: [PATCH 62/69] added missing patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- pango-add-harfbuzz-include.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pango-add-harfbuzz-include.patch 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}) + From 1fededcb8267a2d32573a2e507be0f2e05d3e9c6 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 14 Dec 2019 14:29:08 -0700 Subject: [PATCH 63/69] Add missing #include for gcc-10 --- gcc10.patch | 11 +++++++++++ wt.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc10.patch diff --git a/gcc10.patch b/gcc10.patch new file mode 100644 index 0000000..e3a602c --- /dev/null +++ b/gcc10.patch @@ -0,0 +1,11 @@ +diff -rup a/src/Wt/Core/observing_ptr_impl.hpp b/src/Wt/Core/observing_ptr_impl.hpp +--- a/src/Wt/Core/observing_ptr_impl.hpp 2019-07-31 07:07:38.000000000 -0600 ++++ b/src/Wt/Core/observing_ptr_impl.hpp 2019-10-13 09:05:52.032057543 -0600 +@@ -7,6 +7,7 @@ + #ifndef WT_CORE_OBSERVING_PTR_IMPL_H_ + #define WT_CORE_OBSERVING_PTR_IMPL_H_ + ++#include + #include "observable.hpp" + + namespace Wt { namespace Core { diff --git a/wt.spec b/wt.spec index 569c3d2..68042a2 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -31,6 +31,7 @@ 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 +Patch2: gcc10.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel @@ -282,6 +283,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Sat Dec 14 2019 Jeff Law - 4.1.0-2 +- Add missing #include for gcc-10 + * Mon Aug 19 2019 Michal Minář - 4.1.0-1 - New upstream version. From 36f0b9481625b49e163d8f274236c396954dc542 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:59:54 +0000 Subject: [PATCH 64/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wt.spec b/wt.spec index 68042a2..e4a3464 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -283,6 +283,9 @@ popd %{_defaultdocdir}/%{name}-doc/examples/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 14 2019 Jeff Law - 4.1.0-2 - Add missing #include for gcc-10 From ac262df76abe39cd60bbdd765924dacec007bbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Tue, 17 Mar 2020 14:19:13 +0000 Subject: [PATCH 65/69] new upstream version: 4.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit set default cipher list to PROFILE=SYSTEM cleanup Signed-off-by: Michal Minář --- .gitignore | 2 +- gcc10.patch | 11 ------- pango-add-harfbuzz-include.patch | 31 ------------------- sources | 2 +- ssl-default-cipher-list.patch | 13 ++++++++ ...GE-LICENSING => wt-4.2.2-PACKAGE-LICENSING | 0 wt.spec | 19 +++++++----- 7 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 gcc10.patch delete mode 100644 pango-add-harfbuzz-include.patch create mode 100644 ssl-default-cipher-list.patch rename wt-4.1.0-PACKAGE-LICENSING => wt-4.2.2-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 947ac12..28b4750 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.1.0-free.tar.xz +/wt-4.2.2-free.tar.xz diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index e3a602c..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup a/src/Wt/Core/observing_ptr_impl.hpp b/src/Wt/Core/observing_ptr_impl.hpp ---- a/src/Wt/Core/observing_ptr_impl.hpp 2019-07-31 07:07:38.000000000 -0600 -+++ b/src/Wt/Core/observing_ptr_impl.hpp 2019-10-13 09:05:52.032057543 -0600 -@@ -7,6 +7,7 @@ - #ifndef WT_CORE_OBSERVING_PTR_IMPL_H_ - #define WT_CORE_OBSERVING_PTR_IMPL_H_ - -+#include - #include "observable.hpp" - - namespace Wt { namespace Core { diff --git a/pango-add-harfbuzz-include.patch b/pango-add-harfbuzz-include.patch deleted file mode 100644 index 72bea9c..0000000 --- a/pango-add-harfbuzz-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 5b3454d..732f963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.1.0-free.tar.xz) = 663afdb0c16a2ca1218e3bae73d973c3120112b6f22db4726ff555547b2eaed2a42da8446969db1a2f83ba2c97f9d300da59111018c15bdbb8aed44b078064f1 +SHA512 (wt-4.2.2-free.tar.xz) = 79fd49b54f6e9c38b3949807d7b9b6fff86258fe3aa0076673c88aa32b1ce7d5610855e8245ba03e0c5c04f8c6cf2d4f205cf76aab19b085fa0fe7246e419110 diff --git a/ssl-default-cipher-list.patch b/ssl-default-cipher-list.patch new file mode 100644 index 0000000..9578a96 --- /dev/null +++ b/ssl-default-cipher-list.patch @@ -0,0 +1,13 @@ +Index: wt-4.2.2/src/http/Configuration.C +=================================================================== +--- wt-4.2.2.orig/src/http/Configuration.C ++++ wt-4.2.2/src/http/Configuration.C +@@ -58,7 +58,7 @@ Configuration::Configuration(Wt::WLogger + sslClientVerification_("none"), + sslVerifyDepth_(1), + sslCaCertificates_(), +- sslCipherList_(), ++ sslCipherList_("PROFILE=SYSTEM"), + sslPreferServerCiphers_(false), + sessionIdPrefix_(), + accessLog_(), diff --git a/wt-4.1.0-PACKAGE-LICENSING b/wt-4.2.2-PACKAGE-LICENSING similarity index 100% rename from wt-4.1.0-PACKAGE-LICENSING rename to wt-4.2.2-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index e4a3464..1f20f6d 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.1.0 -Release: 3%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -29,13 +29,11 @@ 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 -Patch2: gcc10.patch +Patch1: ssl-default-cipher-list.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel -BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt-devel +BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt5-devel # Don't use bundled glew on fedora >= 21 %if 0%{?fedora} >= 21 @@ -89,8 +87,9 @@ applications using the Wt toolkit and the Wt::Dbo ORM library. %package examples Summary: Examples for Wt License: GPLv2 and MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dbo%{?_isa} = %{version}-%{release} +Requires: %{name}-files{?_isa} = %{version}-%{release} %description examples This package contains programming examples distributed with official Wt @@ -281,8 +280,12 @@ popd %{_defaultdocdir}/%{name}-doc/reference/* %{_defaultdocdir}/%{name}-doc/tutorial/* %{_defaultdocdir}/%{name}-doc/examples/* +%{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Tue Mar 17 2020 Michal Minář - 4.2.2-1 +- New upstream version 4.2.2 + * Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 513361883df12a188a3cc034c5bcf40d6f18f005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Fri, 20 Mar 2020 04:07:14 +0000 Subject: [PATCH 66/69] fixed -examples dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- wt.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 1f20f6d..d9ee365 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -89,7 +89,6 @@ Summary: Examples for Wt License: GPLv2 and MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-dbo%{?_isa} = %{version}-%{release} -Requires: %{name}-files{?_isa} = %{version}-%{release} %description examples This package contains programming examples distributed with official Wt @@ -283,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Fri Mar 20 2020 Michal Minář - 4.2.2-2 +- Fixed -examples' dependencies + * Tue Mar 17 2020 Michal Minář - 4.2.2-1 - New upstream version 4.2.2 From dd19ab9e603ea9f3dbf8392cfe59958ca62423cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Thu, 26 Mar 2020 17:08:17 +0000 Subject: [PATCH 67/69] new upstream version 4.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- .gitignore | 2 +- sources | 2 +- wt-4.2.2-PACKAGE-LICENSING => wt-4.3.0-PACKAGE-LICENSING | 0 wt.spec | 7 +++++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename wt-4.2.2-PACKAGE-LICENSING => wt-4.3.0-PACKAGE-LICENSING (100%) diff --git a/.gitignore b/.gitignore index 28b4750..5b06a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wt-4.2.2-free.tar.xz +/wt-4.3.0-free.tar.xz diff --git a/sources b/sources index 732f963..d066df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wt-4.2.2-free.tar.xz) = 79fd49b54f6e9c38b3949807d7b9b6fff86258fe3aa0076673c88aa32b1ce7d5610855e8245ba03e0c5c04f8c6cf2d4f205cf76aab19b085fa0fe7246e419110 +SHA512 (wt-4.3.0-free.tar.xz) = ea2d2b1addb14656505b73d126b20308161ce7675cf73ff1e1271a3cfd17b4ef7302f59fb459a0302d35a42aa1a67dd7784d8b4df057d1df3e3e864ceb1ebf8e diff --git a/wt-4.2.2-PACKAGE-LICENSING b/wt-4.3.0-PACKAGE-LICENSING similarity index 100% rename from wt-4.2.2-PACKAGE-LICENSING rename to wt-4.3.0-PACKAGE-LICENSING diff --git a/wt.spec b/wt.spec index d9ee365..4bf13e4 100644 --- a/wt.spec +++ b/wt.spec @@ -5,8 +5,8 @@ %global WTRUNGROUP apache Name: wt -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -282,6 +282,9 @@ popd %{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Thu Mar 26 2020 Michal Minář - 4.3.0-1 +- New upstream version 4.3.0 + * Fri Mar 20 2020 Michal Minář - 4.2.2-2 - Fixed -examples' dependencies From c7b404be561feaf909409c8a4d621cf96ae2dbae Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 15 Jun 2020 13:33:24 +0100 Subject: [PATCH 68/69] Replace BuildRequires: qt5-devel with qt5-qtbase-devel --- wt.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wt.spec b/wt.spec index 4bf13e4..ac449fa 100644 --- a/wt.spec +++ b/wt.spec @@ -6,7 +6,7 @@ Name: wt Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for developing web applications # For a breakdown of the licensing, see PACKAGE-LICENSING @@ -33,7 +33,8 @@ Patch1: ssl-default-cipher-list.patch BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel -BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel qt5-devel +BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel +BuildRequires: qt5-qtbase-devel # Don't use bundled glew on fedora >= 21 %if 0%{?fedora} >= 21 @@ -282,6 +283,9 @@ popd %{_defaultdocdir}/%{name}-doc/*.dox %changelog +* Mon Jun 15 2020 Jonathan Wakely - 4.3.0-2 +- Replace BuildRequires: qt5-devel with qt5-qtbase-devel + * Thu Mar 26 2020 Michal Minář - 4.3.0-1 - New upstream version 4.3.0 From b510a06a00fbfc7741a832ac4c14304ed080d3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Jul 2020 10:22:56 +0200 Subject: [PATCH 69/69] Orphaned for 6+ weeks --- .gitignore | 1 - README.fedora | 21 -- dead.package | 1 + sources | 1 - ssl-default-cipher-list.patch | 13 - timezone-README.fedora | 3 - use-system-sqlite.patch | 18 -- wt-4.3.0-PACKAGE-LICENSING | 17 -- wt-generate-tarball.sh | 27 -- wt.spec | 471 ---------------------------------- 10 files changed, 1 insertion(+), 572 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.fedora create mode 100644 dead.package delete mode 100644 sources delete mode 100644 ssl-default-cipher-list.patch delete mode 100644 timezone-README.fedora delete mode 100644 use-system-sqlite.patch delete mode 100644 wt-4.3.0-PACKAGE-LICENSING delete mode 100755 wt-generate-tarball.sh delete mode 100644 wt.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5b06a1f..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wt-4.3.0-free.tar.xz diff --git a/README.fedora b/README.fedora deleted file mode 100644 index d8f2c52..0000000 --- a/README.fedora +++ /dev/null @@ -1,21 +0,0 @@ -======================================================================== -User Information for the Fedora wt package -======================================================================== - -Wt source package includes some thrid-party components which can not be -distributed with source rpm package in Fedora. One such component is a -JavaScript widget jPlayer available at: - - http://www.jplayer.org/ - -This script is needed by Wt::WMediaPlayer widget. To make it work, you -need to manually download jPlayer and install its static files into - - /usr/share/Wt/resources/jPlayer/ - -Or you may copy the contents of /usr/share/Wt/resources to your deployment -directory and install there jPlayer when needed. - -To read more about this change, see the: - - https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index d066df5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wt-4.3.0-free.tar.xz) = ea2d2b1addb14656505b73d126b20308161ce7675cf73ff1e1271a3cfd17b4ef7302f59fb459a0302d35a42aa1a67dd7784d8b4df057d1df3e3e864ceb1ebf8e diff --git a/ssl-default-cipher-list.patch b/ssl-default-cipher-list.patch deleted file mode 100644 index 9578a96..0000000 --- a/ssl-default-cipher-list.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wt-4.2.2/src/http/Configuration.C -=================================================================== ---- wt-4.2.2.orig/src/http/Configuration.C -+++ wt-4.2.2/src/http/Configuration.C -@@ -58,7 +58,7 @@ Configuration::Configuration(Wt::WLogger - sslClientVerification_("none"), - sslVerifyDepth_(1), - sslCaCertificates_(), -- sslCipherList_(), -+ sslCipherList_("PROFILE=SYSTEM"), - sslPreferServerCiphers_(false), - sessionIdPrefix_(), - accessLog_(), diff --git a/timezone-README.fedora b/timezone-README.fedora deleted file mode 100644 index 6fca520..0000000 --- a/timezone-README.fedora +++ /dev/null @@ -1,3 +0,0 @@ -This example is named *locale* in source archive. It is renamed in the process -of package build in order to prevent build failures due to a conflict between -header file resulting base script with the same name. diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch deleted file mode 100644 index 6e7e760..0000000 --- a/use-system-sqlite.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: wt-4.0.5/src/CMakeLists.txt -=================================================================== ---- 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 - ) - -+IF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3) -+ INCLUDE_DIRECTORIES(Wt/Dbo/backend/amalgamation) # sqlite 3 -+ENDIF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3) -+ - LINK_DIRECTORIES(${BOOST_LIB_DIRS}) - - MACRO (FILE_TO_STRING infile outfile var) diff --git a/wt-4.3.0-PACKAGE-LICENSING b/wt-4.3.0-PACKAGE-LICENSING deleted file mode 100644 index 6af2c1b..0000000 --- a/wt-4.3.0-PACKAGE-LICENSING +++ /dev/null @@ -1,17 +0,0 @@ -The entire source code is GPLv2 except for these files: - * Boost Software License (BSL v1.0) - * src/http/* - * src/web/random_device.cpp - * src/rapidxml/* (dual licensed with MIT/X11 (BSD like)) - * MIT/X11 (BSD like) - * examples/wtwithqt/* - * BSD - * src/Wt/Auth/passwdqc.h - * src/Wt/Auth/passwdqc_check.h - * zlib/libpng - * src/web/md5.[ch] - * src/web/base64.h - * SIL OFL 1.1 - * resources/font-awesome/font/* - * MIT License - * resources/font-awesome/css/* diff --git a/wt-generate-tarball.sh b/wt-generate-tarball.sh deleted file mode 100755 index f5f8dbf..0000000 --- a/wt-generate-tarball.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -set -euo pipefail -IFS=$'\n\t' - -NAME="wt" -VERSION="$1" - -tmp=`mktemp -d` -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 "$dirName/resources/jPlayer" -tar -cJvf "$dirName-free.tar.xz" "$dirName" -popd # tmp -mv "$tmp/$dirName-free.tar.xz" . -rm -r "$tmp" diff --git a/wt.spec b/wt.spec deleted file mode 100644 index ac449fa..0000000 --- a/wt.spec +++ /dev/null @@ -1,471 +0,0 @@ -%global WTSRVDIR /var/spool/wt -%global WTRUNDIR %{WTSRVDIR}/run - -%global WTRUNUSER apache -%global WTRUNGROUP apache - -Name: wt -Version: 4.3.0 -Release: 2%{?dist} -Summary: C++ library for developing web applications - -# For a breakdown of the licensing, see PACKAGE-LICENSING -License: GPLv2 and Boost and MIT and (Boost or MIT) and BSD and zlib -URL: https://www.webtoolkit.eu/wt -# Following archive was made from upstream tarball downloaded from -# https://github.com/kdeforche/wt/archive/3.3.7.tar.gz -# by running ./wt-generate-tarball.sh 3.3.7 from tarball's directory -Source0: %{name}-%{version}-free.tar.xz -Source1: %{name}-%{version}-PACKAGE-LICENSING -# Explain why the locale example is renamed to timezone. -Source2: timezone-README.fedora -# Explain why the jPlayer static files are missing. -Source3: README.fedora -# wt toolkit contains bundled non-free library (IBPP) that we cannot ship. -# 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: -# ./wt-generate-tarball.sh UPSTREAM_VERSION -Source4: wt-generate-tarball.sh - -Patch0: use-system-sqlite.patch -Patch1: ssl-default-cipher-list.patch - -BuildRequires: cmake >= 3.1 boost-devel >= 1.41 gcc-c++ openssl-devel doxygen -BuildRequires: GraphicsMagick-devel pango-devel sqlite-devel libpq-devel -BuildRequires: mariadb-connector-c-devel libharu-devel fcgi-devel zlib-devel -BuildRequires: qt5-qtbase-devel - -# Don't use bundled glew on fedora >= 21 -%if 0%{?fedora} >= 21 -%global use_system_glew 1 -BuildRequires: glew-devel -%endif - -# Denote the fact of bundling glew -%{!?use_system_glew:Provides: bundled(glew) = 1.10.0} - -%description -Web C++ library with widget oriented API that uses well-tested patterns of -desktop GUI development tailored to the web. To the developer, it offers -abstraction of web-specific implementation details, including client-server -protocols, event handling, graphics support, graceful degradation (or -progressive enhancement), and URL handling. - -%package dbo -Summary: Wt::Dbo ORM library and Sqlite3 back-end - -%description dbo -This package contains the Wt::Dbo Object-Relational Mapping library -and Sqlite3 back-end of it. - -%package dbo-mysql -Summary: MySQL back-end for the Wt::Dbo ORM library -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} - -%description dbo-mysql -This package contains the MySQL back-end for the Wt::Dbo ORM library. - -%package dbo-postgres -Summary: PostgreSQL back-end for the Wt::Dbo ORM library -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} - -%description dbo-postgres -This package contains the PostgresSQL back-end for the Wt::Dbo ORM library. - -%package devel -Summary: Libraries and header files for witty web development -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo-postgres%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo-mysql%{?_isa} = %{version}-%{release} -Requires: cmake - -%description devel -This package contains the files necessary to develop -applications using the Wt toolkit and the Wt::Dbo ORM library. - -%package examples -Summary: Examples for Wt -License: GPLv2 and MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dbo%{?_isa} = %{version}-%{release} - -%description examples -This package contains programming examples distributed with official Wt -release. - -%package doc -Summary: Documents for the Wt toolkit -# Unfortunately there are differences in doxygen output between arm and other -# architectures. -#BuildArch: noarch - -%description doc -This package contains the documents for Wt API and examples. - -%prep -%autosetup -p1 - -# static files like javascript and css should not be executable -for d in src resources examples; do - find $d -type f \( -iregex '.*\.\([hc]\|js\|css\)' -o -executable \) | \ - xargs -r chmod -v 0644 -done -# locale script created in build directory causes build to fail because some -# dependent headers try to include header which is found in current -# directory. Let's rename it to timezone. -mv examples/feature/locale examples/feature/timezone -mv examples/feature/timezone/{locale,timezone}.C -sed -i 's/locale/timezone/g' \ - examples/feature/CMakeLists.txt \ - examples/feature/timezone/CMakeLists.txt - -find examples -type f -name .htaccess | while read f; do - mv -v $f `dirname $f`/htaccess -done -# conversion to UTF-8 -convdir=`mktemp -d` -for f in examples/style/CornerImage.h; do - tmpf=${convdir}/`basename $f` - iconv -f iso-8859-2 -t UTF-8 $f >$tmpf - mv $tmpf $f -done -rmdir $convdir - -# Make sure not to be using bundled glew -%{?use_system_glew:rm -rf src/3rdparty/glew-1.10.0} - -%build -mkdir wt-build -cd wt-build -## wtdbofirebird library bundles IBPP c++ client library for firebird -## that is licensed under IBPP License, which is marked as Non-Free -## by Red Hat Legal -## let's not package it, until licensing issues are solved -%cmake .. \ - -DCONNECTOR_HTTP=ON \ - -DCONNECTOR_FCGI=ON \ - -DUSE_SYSTEM_SQLITE3=ON \ - -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick \ - -DWEBUSER="%{WTRUNUSER}" \ - -DWEBGROUP="%{WTRUNGROUP}" \ - -DRUNDIR="%{WTRUNDIR}" \ - -DCONFIGDIR="%{_sysconfdir}/%{name}" \ - -DENABLE_FIREBIRD=OFF \ - -DENABLE_MYSQL=ON \ - %{?use_system_glew:-DUSE_SYSTEM_GLEW=1} \ - -DBUILD_EXAMPLES=ON \ - -DINSTALL_EXAMPLES=ON \ - -DEXAMPLES_DESTINATION=%{_lib}/Wt/examples -make %{?_smp_mflags} -make doc - -%install -pushd wt-build -make install DESTDIR=${RPM_BUILD_ROOT} -install -v -m 0755 -d ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} -cp -v wt_config.xml ${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name} - -# makes an absolute symlink to resources directory -make_rsc_link() { - ln -vs "%{_datadir}/Wt/resources" \ - "${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/$1" -} - -# installation of examples -pushd examples -for d in `find . -maxdepth 1 -mindepth 1 -type d | \ - grep -v '^\(CMakeFiles\|feature\)$'`; do - # create a symlink for each example pointing on resources dir - make_rsc_link $d -done -for d in `find feature -maxdepth 1 -mindepth 1 -type d | grep -v 'CMakeFiles'`; -do # create a symlink for each feature example pointing on resources dir - make_rsc_link $d -done -popd # examples -popd # wt-build -install -vm 644 %{SOURCE2} \ - ${RPM_BUILD_ROOT}%{_libdir}/Wt/examples/feature/timezone/README.fedora - -# installation of documentation -for d in %{name} %{name}-dbo %{name}-doc; do - install -v -m 0755 -d ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/ - cp -v LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/ - install -vm 644 %{SOURCE1} \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/$d/PACKAGE-LICENSING -done -cp -vr README.md %{SOURCE3} ReleaseNotes.html Changelog \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/ -cp -vr INSTALL*.html doc/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-doc/ - -pushd ${RPM_BUILD_ROOT} -mkdir -vp .%{WTSRVDIR} -mkdir -vp .%{WTRUNDIR} - -# cleanup -for d in examples reference; do - if [[ -e .%{_defaultdocdir}/%{name}-doc/$d/html/installdox ]]; then - rm -v .%{_defaultdocdir}/%{name}-doc/$d/html/installdox - fi -done -rm -v .%{_defaultdocdir}/%{name}-doc/main -find .%{_libdir}/Wt/examples -regex '.*/\(CMakeFiles\|.*\.cmake\|Doxygen\)' | \ - xargs rm -rfv -# these scripts were used to generate pictures -find .%{_datadir}/Wt/resources -name 'generate.sh' | xargs rm -v -popd - -%ldconfig_scriptlets -%ldconfig_scriptlets dbo -%ldconfig_scriptlets dbo-mysql -%ldconfig_scriptlets dbo-postgres - -%files -%config(noreplace) %{_sysconfdir}/%{name}/wt_config.xml -%{_libdir}/libwt.so.* -%{_libdir}/libwtfcgi.so.* -%{_libdir}/libwthttp.so.* -%{_libdir}/libwttest.so.* -%dir %{_defaultdocdir}/%{name} -%doc %{_defaultdocdir}/%{name}/README.md -%doc %{_defaultdocdir}/%{name}/README.fedora -%doc %{_defaultdocdir}/%{name}/LICENSE -%doc %{_defaultdocdir}/%{name}/ReleaseNotes.html -%doc %{_defaultdocdir}/%{name}/Changelog -%doc %{_defaultdocdir}/%{name}/PACKAGE-LICENSING -%dir %{_datadir}/Wt -%dir %{_datadir}/Wt/resources -%{_datadir}/Wt/resources/* -%dir %{WTSRVDIR} -%dir %{WTRUNDIR} - -%files dbo -%dir %{_defaultdocdir}/%{name}-dbo -%doc %{_defaultdocdir}/%{name}-dbo/LICENSE -%doc %{_defaultdocdir}/%{name}-dbo/PACKAGE-LICENSING -%{_libdir}/libwtdbo.so.* -%{_libdir}/libwtdbosqlite3.so.* - -%files dbo-mysql -%{_libdir}/libwtdbomysql.so.* - -%files dbo-postgres -%{_libdir}/libwtdbopostgres.so.* - -%files devel -# header files -%dir %{_includedir}/Wt -%{_includedir}/Wt/* -%{_libdir}/*.so -%dir %{_libdir}/cmake/wt -%{_libdir}/cmake/wt/*.cmake - -%files examples -%dir %{_libdir}/Wt -%dir %{_libdir}/Wt/examples -%{_libdir}/Wt/examples/* - -%files doc -%dir %{_defaultdocdir}/%{name}-doc -%doc %{_defaultdocdir}/%{name}-doc/LICENSE -%doc %{_defaultdocdir}/%{name}-doc/PACKAGE-LICENSING -%{_defaultdocdir}/%{name}-doc/*.html -%dir %{_defaultdocdir}/%{name}-doc/images -%dir %{_defaultdocdir}/%{name}-doc/reference -%dir %{_defaultdocdir}/%{name}-doc/tutorial -%dir %{_defaultdocdir}/%{name}-doc/examples -%{_defaultdocdir}/%{name}-doc/images/* -%{_defaultdocdir}/%{name}-doc/reference/* -%{_defaultdocdir}/%{name}-doc/tutorial/* -%{_defaultdocdir}/%{name}-doc/examples/* -%{_defaultdocdir}/%{name}-doc/*.dox - -%changelog -* Mon Jun 15 2020 Jonathan Wakely - 4.3.0-2 -- Replace BuildRequires: qt5-devel with qt5-qtbase-devel - -* Thu Mar 26 2020 Michal Minář - 4.3.0-1 -- New upstream version 4.3.0 - -* Fri Mar 20 2020 Michal Minář - 4.2.2-2 -- Fixed -examples' dependencies - -* Tue Mar 17 2020 Michal Minář - 4.2.2-1 -- New upstream version 4.2.2 - -* Fri Jan 31 2020 Fedora Release Engineering - 4.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Dec 14 2019 Jeff Law - 4.1.0-2 -- Add missing #include for gcc-10 - -* Mon Aug 19 2019 Michal Minář - 4.1.0-1 -- New upstream version. - -* Sat Jul 27 2019 Fedora Release Engineering - 4.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* 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 - -* Mon Jan 14 2019 Björn Esser - 4.0.3-3 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Thu Aug 23 2018 Nicolas Chauvet - 4.0.3-2 -- Rebuilt for glew 2.1.0 - -* Mon Jul 23 2018 - 4.0.3-1 -- New upstream version 4.0.3 - -* Sat Jul 14 2018 Fedora Release Engineering - 4.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Mar 15 2018 Michal Minář - 4.0.2-3 -- New upstream version 4.0.2 -- Compatibility fix for boost 1.66 -- Depend on mariadb-connector-c-devel - -* Fri Feb 09 2018 Fedora Release Engineering - 3.3.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 3.3.7-6 -- Rebuilt for switch to libxcrypt - -* Thu Aug 03 2017 Fedora Release Engineering - 3.3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.3.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jul 23 2017 Björn Esser - 3.3.7-3 -- Rebuilt for Boost 1.64 - -* Mon May 15 2017 Fedora Release Engineering - 3.3.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Sun Apr 23 2017 Michal Minar 3.3.7-1 -- New upstream version 3.3.7 - -* Sat Feb 11 2017 Fedora Release Engineering - 3.3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 10 2017 Orion Poplawski - 3.3.6-2 -- Rebuild for glew 2.0.0 - -* Mon Aug 08 2016 Michal Minar 3.3.6-1 -- New upstream version 3.3.6 - -* Tue May 17 2016 Jonathan Wakely - 3.3.5-0.6.rc2 -- Rebuilt for linker errors in boost (#1331983) - -* Fri Feb 05 2016 Fedora Release Engineering - 3.3.5-0.5.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 3.3.5-0.4.rc2 -- Rebuilt for Boost 1.60 - -* Thu Jan 14 2016 Adam Jackson - 3.3.5-0.3.rc2 -- Rebuild for glew 1.13 - -* Wed Nov 18 2015 Michal Minar 3.3.5-0.2.rc2 -- Made doc package archfull. - -* Wed Nov 18 2015 Michal Minar 3.3.5-0.1.rc2 -- New upstream version 3.3.5-rc2 - -* Thu Aug 27 2015 Jonathan Wakely - 3.3.4-6 -- Rebuilt for Boost 1.59 - -* Thu Aug 27 2015 Jonathan Wakely - 3.3.4-5 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 3.3.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 3.3.4-3 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 20 2015 Michal Minar 3.3.4-1 -- New upstream version 3.3.4 - -* Mon Feb 09 2015 Ralf Corsépius - 3.3.3-4 -- Add wt-3.3.3-boost-1.57.patch (Fix boost-1.57 FTBFS). -- Replace bogus BR: boost-devel%%{_isa} with BR: boost-devel. -- Unbundle GLEW. - -* Mon Aug 18 2014 Fedora Release Engineering - 3.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 13 2014 Michal Minar 3.3.3-2 -- Reenabled raster image support. - -* Wed Jun 11 2014 Michal Minar 3.3.3-1 -- New upstream version 3.3.3. - -* Sun Jun 08 2014 Fedora Release Engineering - 3.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 David Tardon - 3.3.2-3 -- rebuild for boost 1.55.0 - -* Fri Mar 21 2014 Michal Minar 3.3.2-2 -- Got rid of bundled sqlite libraries. - -* Fri Mar 14 2014 Michal Minar 3.3.2-1 -- Update to 3.3.2 - -* Sun Sep 22 2013 Michal Minar 3.3.1-0.1.rc1 -- Update to 3.3.1-rc1. -- Added dbo-mysql subpackage with MySQL backend library. -- Unversioned doc directories. - -* Sun Aug 04 2013 Fedora Release Engineering - 3.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 27 2013 pmachata@redhat.com - 3.3.0-3 -- Rebuild for boost 1.54.0 - -* Wed Jun 26 2013 Michal Minar 3.3.0-2 -- Using LZMA2 compression for source archive. - -* Thu Jun 20 2013 Michal Minar 3.3.0-1 -- Version 3.3.0 - -* Sat Feb 09 2013 Denis Arnaud - 3.2.3-2 -- Rebuild for Boost-1.53.0 - -* Wed Dec 26 2012 Michal Minar - 3.2.3-1 -- Version 3.2.3 - -* Mon Dec 24 2012 Rex Dieter 3.2.2-7.p1 -- rebuild (GraphicsMagick) - -* Thu Sep 13 2012 Michal Minar - 3.2.2-6.p1 -- fixed changelog line - -* Wed Sep 12 2012 Michal Minar - 3.2.2-5.p1 -- Added wt-generate-tarball.sh script for source tarball generation - from upstream tarball, in order to remove the IBPP non-free library - from source. - -* Mon Sep 03 2012 Michal Minar - 3.2.2-4.p1 -- separated doc dirs for independent subpackages -dbo and -doc - -* Fri Aug 24 2012 Michal Minar - 3.2.2-3.p1 -- Own examples directory. -- Include a copy of license in wt-doc. -- Added License tag for wt-examples. - -* Fri Aug 24 2012 Michal Minar - 3.2.2-2.p1 -- Not packaging back-end due to licensing issues. - -* Tue Aug 21 2012 Michal Minar - 3.2.2-1.p1 -- Initial Package for FE.