diff --git a/anyterm-1.1.29-boostclassic.patch b/anyterm-1.1.29-boostclassic.patch new file mode 100644 index 0000000..22eb1ad --- /dev/null +++ b/anyterm-1.1.29-boostclassic.patch @@ -0,0 +1,58 @@ +diff -ur anyterm-1.1.29/libpbe/src/parse_http_request.cc anyterm-1.1.29.boostclassic/libpbe/src/parse_http_request.cc +--- anyterm-1.1.29/libpbe/src/parse_http_request.cc 2008-11-09 15:18:30.000000000 +0100 ++++ anyterm-1.1.29.boostclassic/libpbe/src/parse_http_request.cc 2013-02-23 18:00:30.599265737 +0100 +@@ -18,11 +18,11 @@ + + #include "parse_http_request.hh" + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +@@ -31,7 +31,7 @@ + + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + namespace pbe { +diff -ur anyterm-1.1.29/libpbe/src/URI.cc anyterm-1.1.29.boostclassic/libpbe/src/URI.cc +--- anyterm-1.1.29/libpbe/src/URI.cc 2008-11-09 15:16:16.000000000 +0100 ++++ anyterm-1.1.29.boostclassic/libpbe/src/URI.cc 2013-02-23 18:00:22.860322952 +0100 +@@ -18,11 +18,11 @@ + + #include "URI.hh" + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +@@ -30,7 +30,7 @@ + #include + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + namespace pbe { diff --git a/anyterm.spec b/anyterm.spec index 0f9b550..7c2e7fc 100644 --- a/anyterm.spec +++ b/anyterm.spec @@ -1,6 +1,6 @@ Name: anyterm Version: 1.1.29 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A web-based terminal emulator Group: Applications/Internet @@ -18,6 +18,9 @@ Patch0: anyterm-change-url-prefix.patch # http://anyterm.org/forums/viewtopic.php?id=581 Patch1: anyterm-libpbe-fix.patch +# boost 1.53 compatibility +Patch2: anyterm-1.1.29-boostclassic.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: boost-devel BuildRequires: zlib-devel @@ -52,6 +55,8 @@ The httpd configuration necessary to proxy anyterm. %patch0 -p0 cd libpbe/ %patch1 -p0 +cd .. +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -142,6 +147,9 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/anyterm.conf %changelog +* Sat Feb 23 2013 Alexander Boström - 1.1.29-18 +- Add patch to build with boost 1.53 (rhbz #913877) + * Wed Feb 13 2013 Fedora Release Engineering - 1.1.29-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild