--- mod_spdy.orig/files/mod_spdy-0.9.3.3-2.2_to_2.4.patch 1970-01-01 01:00:00.000000000 +0100 +++ mod_spdy.orig/files/mod_spdy-0.9.3.3-2.2_to_2.4.patch 2013-05-28 13:45:00.044225227 +0200 @@ -0,0 +1,283 @@ +source: https://code.google.com/p/mod-spdy/issues/detail?id=64 + +diff -Naur mod_spdy-0.9.3.3.orig/src/build_modssl_with_npn.sh mod_spdy-0.9.3.3/src/build_modssl_with_npn.sh +--- mod_spdy-0.9.3.3.orig/src/build_modssl_with_npn.sh 2013-05-28 01:53:11.000000000 +0200 @@ -0,0 +1,38 @@ +source: https://github.com/pld-linux/apache-mod_spdy/blob/master/log-constants.patch +fix: third_party/chromium/src/base/logging.h:292:19: error: expected unqualified-id before numeric constant + +"fix": +mod_spdy/mod_spdy.cc: In function 'void {anonymous}::ChildInit(apr_pool_t*, server_rec*)': +mod_spdy/mod_spdy.cc:253:31: error: 'LOG_INFO' was not declared in this scope +mod_spdy/mod_spdy.cc:253:31: note: suggested alternative: +In file included from third_party/chromium/src/net/spdy/spdy_protocol.h:13:0, + from third_party/chromium/src/net/spdy/spdy_framer.h:19, + from ./mod_spdy/common/http_to_spdy_converter.h:24, + from ./mod_spdy/apache/filters/http_to_spdy_filter.h:24, + from mod_spdy/mod_spdy.cc:40: +third_party/chromium/src/base/logging.h:290:19: note: 'logging::LOG_INFO' +mod_spdy/mod_spdy.cc:253:45: error: template argument 1 is invalid +mod_spdy/mod_spdy.cc:253:108: error: invalid type in declaration before ';' token +--- src/third_party/chromium/src/base/logging.h 2013-03-04 11:44:06.000000000 +0200 @@ -0,0 +1,25 @@ +source: https://github.com/pld-linux/apache-mod_spdy/blob/master/gyp.patch +fix: Exception: Target third_party/apache/aprutil/aprutil.gyp:aprutil#target has an invalid target type 'settings'. Must be one of executable/loadable_module/static_library/shared_library/none. + +--- src/third_party/apache/apr/apr.gyp 2013-03-04 11:24:34.000000000 +0200 @@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86" fi -DESCRIPTION="Apache module for rewriting web pages to reduce latency and bandwidth" -HOMEPAGE="http://code.google.com/p/modpagespeed" +DESCRIPTION="Apache SPDY module" +HOMEPAGE="https://code.google.com/p/mod-spdy" LICENSE="Apache-2.0" SLOT="0" @@ -30,7 +30,7 @@ DEPEND+=" net-misc/rsync" fi -need_apache2_2 +need_apache2_4 e() { echo "$@"; "$@" || die; } @@ -56,6 +56,14 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.9.3.3-execinfo.patch + epatch "${FILESDIR}"/${PN}-0.9.3.3-2.2_to_2.4.patch + epatch "${FILESDIR}"/${PN}-0.9.3.3-gyp.patch + epatch "${FILESDIR}"/${PN}-0.9.3.3-compile-fix.patch + + # Make sure the system apr/apr-util and apache2 are used. + find src/third_party/apache/apr{,util}/src/include/ -name '*.[ch]' -delete + find src/third_party/apache/httpd/src/include/ -name '*.[ch]' -delete + # Make sure the system zlib is used. epatch "${FILESDIR}"/${PN}-0.9.3.3-system-zlib.patch find src/third_party/zlib/ -name '*.[ch]' -delete @@ -66,6 +74,10 @@ tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX local myconf=( + -Dsystem_include_path_apr=/usr/include/apr-1 + -Dsystem_include_path_aprutil=/usr/include/apr-1 + -Dsystem_include_path_httpd=/usr/include/apache2 + -Duse_system_apache_dev=1 -Duse_system_zlib=1 -Duse_system_ssl=1 -Dwerror=