Author: krejzi Date: Fri Apr 24 01:31:39 2015 New Revision: 3197 Log: Add some patches that may be useful later.
Added: trunk/qt/qt-5.4.1-gcc5_fixes-1.patch (contents, props changed) trunk/samba/samba-4.2.1-gnutls34.patch (contents, props changed) trunk/thunderbird/thunderbird-31.6.0-gcc5_fixes.patch (contents, props changed) trunk/thunderbird/thunderbird-31.6.0-libvpx_modern.patch trunk/webkitgtk/webkitgtk-2.4.8-gcc5_fixes-1.patch Added: trunk/qt/qt-5.4.1-gcc5_fixes-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/qt/qt-5.4.1-gcc5_fixes-1.patch Fri Apr 24 01:31:39 2015 (r3197) @@ -0,0 +1,21 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-04-24 +Initial Package Version: 5.4.1 +Upstream Status: Fixed upstream +Origin: Upstream +Description: Fixes building with GCC 5. + +--- a/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-02-17 05:57:11.000000000 +0100 ++++ b/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp 2015-04-10 09:22:01.141481012 +0200 +@@ -1909,6 +1909,11 @@ + } + } + ++// Used in JSArray.cpp so we must instantiate explicit ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + VM& vm = exec->vm(); Added: trunk/samba/samba-4.2.1-gnutls34.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/samba/samba-4.2.1-gnutls34.patch Fri Apr 24 01:31:39 2015 (r3197) @@ -0,0 +1,58 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-04-24 +Initial Package Version: 4.2.1 +Upstream Status: Unknown +Origin: Archlinux +Description: Fixes building with gnutls-3.4.0. + +--- a/source4/lib/tls/tls.c 2014-10-01 11:16:21.000000000 +0200 ++++ b/source4/lib/tls/tls.c 2015-04-16 20:39:57.678772224 +0200 +@@ -572,7 +572,6 @@ + { + struct tls_context *tls; + int ret = 0; +- const int cert_type_priority[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; + struct socket_context *new_sock; + NTSTATUS nt_status; + +@@ -597,8 +596,7 @@ + gnutls_certificate_allocate_credentials(&tls->xcred); + gnutls_certificate_set_x509_trust_file(tls->xcred, ca_path, GNUTLS_X509_FMT_PEM); + TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT)); +- TLSCHECK(gnutls_set_default_priority(tls->session)); +- gnutls_certificate_type_set_priority(tls->session, cert_type_priority); ++ TLSCHECK(gnutls_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL)); + TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred)); + + talloc_set_destructor(tls, tls_destructor); +--- a/source4/lib/tls/tls_tstream.c 2014-10-01 11:16:21.000000000 +0200 ++++ b/source4/lib/tls/tls_tstream.c 2015-04-16 20:39:57.678772224 +0200 +@@ -967,11 +967,6 @@ + #if ENABLE_GNUTLS + struct tstream_tls *tlss; + int ret; +- static const int cert_type_priority[] = { +- GNUTLS_CRT_X509, +- GNUTLS_CRT_OPENPGP, +- 0 +- }; + #endif /* ENABLE_GNUTLS */ + + req = tevent_req_create(mem_ctx, &state, +@@ -1007,15 +1002,13 @@ + return tevent_req_post(req, ev); + } + +- ret = gnutls_set_default_priority(tlss->tls_session); ++ ret = gnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL); + if (ret != GNUTLS_E_SUCCESS) { + DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret))); + tevent_req_error(req, EINVAL); + return tevent_req_post(req, ev); + } + +- gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority); +- + ret = gnutls_credentials_set(tlss->tls_session, + GNUTLS_CRD_CERTIFICATE, + tls_params->x509_cred); Added: trunk/thunderbird/thunderbird-31.6.0-gcc5_fixes.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/thunderbird/thunderbird-31.6.0-gcc5_fixes.patch Fri Apr 24 01:31:39 2015 (r3197) @@ -0,0 +1,180 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-04-24 +Initial Package Version: 31.6.0 +Upstream Status: Unknown +Origin: Self +Description: Fixes building with GCC 5. + +--- a/mozilla/js/src/builtin/TypedObject.cpp 2015-03-30 18:48:16.000000000 +0200 ++++ b/mozilla/js/src/builtin/TypedObject.cpp 2015-04-10 21:06:02.629917801 +0200 +@@ -710,12 +710,12 @@ + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Extract ArrayType.prototype + RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); + if (!arrayTypePrototype) +- return nullptr; ++ return false; + + // Create the instance of ArrayType + Rooted<UnsizedArrayTypeDescr *> obj(cx); +@@ -728,7 +728,7 @@ + if (!JSObject::defineProperty(cx, obj, cx->names().length, + UndefinedHandleValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -762,7 +762,7 @@ + if (!size.isValid()) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, + JSMSG_TYPEDOBJECT_TOO_BIG); +- return nullptr; ++ return false; + } + + // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: +@@ -775,7 +775,7 @@ + contents.append(")"); + RootedAtom stringRepr(cx, contents.finishAtom()); + if (!stringRepr) +- return nullptr; ++ return false; + + // Create the sized type object. + Rooted<SizedArrayTypeDescr*> obj(cx); +@@ -793,7 +793,7 @@ + if (!JSObject::defineProperty(cx, obj, cx->names().length, + lengthVal, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Add `unsized` property, which is a link from the sized + // array to the unsized array. +@@ -801,7 +801,7 @@ + if (!JSObject::defineProperty(cx, obj, cx->names().unsized, + unsizedTypeDescrValue, nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + args.rval().setObject(*obj); + return true; +@@ -1253,7 +1253,7 @@ + Rooted<TypedProto*> proto(cx); + proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); + if (!proto) +- return nullptr; ++ return false; + proto->initTypeDescrSlot(*descr); + descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); + +@@ -1358,14 +1358,14 @@ + #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) + #undef BINARYDATA_SCALAR_DEFINE + + #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ + if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ + cx->names().name_)) \ +- return nullptr; ++ return false; + JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) + #undef BINARYDATA_REFERENCE_DEFINE + +@@ -1375,14 +1375,14 @@ + arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); + if (!arrayType) +- return nullptr; ++ return false; + + RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); + if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, + arrayTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // StructType. + +@@ -1390,14 +1390,14 @@ + structType = DefineMetaTypeDescr<StructMetaTypeDescr>( + cx, global, module, TypedObjectModuleObject::StructTypePrototype); + if (!structType) +- return nullptr; ++ return false; + + RootedValue structTypeValue(cx, ObjectValue(*structType)); + if (!JSObject::defineProperty(cx, module, cx->names().StructType, + structTypeValue, + nullptr, nullptr, + JSPROP_READONLY | JSPROP_PERMANENT)) +- return nullptr; ++ return false; + + // Everything is setup, install module on the global object: + RootedValue moduleValue(cx, ObjectValue(*module)); +@@ -1407,7 +1407,7 @@ + nullptr, nullptr, + 0)) + { +- return nullptr; ++ return false; + } + + return module; +@@ -2466,7 +2466,7 @@ + if (length < 0) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, + nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); +- return nullptr; ++ return false; + } + Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); + if (!obj) +--- a/mozilla/js/src/frontend/BytecodeCompiler.cpp 2015-03-30 18:48:17.000000000 +0200 ++++ b/mozilla/js/src/frontend/BytecodeCompiler.cpp 2015-04-10 21:06:45.991784284 +0200 +@@ -544,7 +544,7 @@ + + RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); + if (!sourceObject) +- return nullptr; ++ return false; + ScriptSource *ss = sourceObject->source(); + + SourceCompressionTask sct(cx); +--- a/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp 2015-03-30 18:48:09.000000000 +0200 ++++ b/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp 2015-04-10 21:29:16.381036189 +0200 +@@ -351,7 +351,7 @@ + { + JSAutoCompartment ac(cx, target); + if (!JS_GetClassPrototype(cx, key, protop)) +- return nullptr; ++ return false; + } + return JS_WrapObject(cx, protop); + } +--- a/mozilla/netwerk/ipc/NeckoParent.cpp 2015-03-30 18:48:13.000000000 +0200 ++++ b/mozilla/netwerk/ipc/NeckoParent.cpp 2015-04-10 21:23:07.143575131 +0200 +@@ -359,7 +359,7 @@ + RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); + return p->Init(aConnectArgs); + #else +- return nullptr; ++ return false; + #endif + } + Added: trunk/thunderbird/thunderbird-31.6.0-libvpx_modern.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/thunderbird/thunderbird-31.6.0-libvpx_modern.patch Fri Apr 24 01:31:39 2015 (r3197) @@ -0,0 +1,32 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-04-24 +Initial Package Version: 31.6.0 +Upstream Status: Unknown +Origin: Fedora +Description: Fixes building with libvpx-1.4.0. + +--- a/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-03-30 18:48:09.000000000 +0200 ++++ b/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-10 21:37:36.611608719 +0200 +@@ -180,7 +180,7 @@ + // Creating a wrapper to the image - setting image data to NULL. Actual + // pointer will be set in encode. Setting align to 1, as it is meaningless + // (actual memory is not allocated). +- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, ++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, + 1, NULL); + // populate encoder configuration with default values + if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { +@@ -349,9 +349,9 @@ + } + // Image in vpx_image_t format. + // Input image is const. VP8's raw image is not defined as const. +- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); +- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); +- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); ++ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane)); ++ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane)); ++ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane)); + // TODO(mikhal): Stride should be set in initialization. + raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane); + raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane); + Added: trunk/webkitgtk/webkitgtk-2.4.8-gcc5_fixes-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/webkitgtk/webkitgtk-2.4.8-gcc5_fixes-1.patch Fri Apr 24 01:31:39 2015 (r3197) @@ -0,0 +1,79 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-04-24 +Initial Package Version: 2.4.8 +Upstream Status: Unknown +Origin: Fedora +Description: Fixes building with GCC 5. + +/* After applying the patch, run: touch aclocal.m4 autotoolsconfig.h.in configure configure.ac GNUmakefile.in */ + +--- a/configure 2015-01-07 10:47:51.000000000 +0100 ++++ b/configure 2015-04-10 09:31:05.976990302 +0200 +@@ -4890,7 +4890,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #error Not a supported GCC compiler + #endif + +@@ -4909,7 +4909,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) ++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) + #error Not a supported Clang compiler + #endif + +@@ -4948,7 +4948,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #error Not a supported G++ compiler + #endif + +@@ -4967,7 +4967,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) ++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) + #error Not a supported Clang++ compiler + #endif + +--- a/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-01-07 10:45:43.000000000 +0100 ++++ b/Source/autotools/CheckSystemAndBasicDependencies.m4 2015-04-10 09:31:05.977990323 +0200 +@@ -87,12 +87,12 @@ + c_compiler="unknown" + AC_LANG_PUSH([C]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #error Not a supported GCC compiler + #endif + ])], [c_compiler="gcc"], []) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) ++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) + #error Not a supported Clang compiler + #endif + ])], [c_compiler="clang"], []) +@@ -106,12 +106,12 @@ + cxx_compiler="unknown" + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) + #error Not a supported G++ compiler + #endif + ])], [cxx_compiler="g++"], []) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) ++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))))) + #error Not a supported Clang++ compiler + #endif + ])], [cxx_compiler="clang++"], []) -- http://lists.linuxfromscratch.org/listinfo/patches FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page