wok-current rev 25727

Add miss stuff folder for libxml++, dbus-c++
author Stanislas Leduc <shann@slitaz.org>
date Tue Nov 05 13:46:37 2024 +0000 (6 weeks ago)
parents 45e49949a208
children ce316b1ccf3c
files dbus-c++/stuff/dbus-c++-0.9.0-copy_data_from_received_message.patch dbus-c++/stuff/dbus-c++-0.9.0-disable-threading.patch dbus-c++/stuff/dbus-c++-0.9.0-fix-writechar.patch dbus-c++/stuff/dbus-c++-0.9.0-gcc47.patch dbus-c++/stuff/dbus-c++-0.9.0-template-operators.patch libxml++/stuff/build_with_gcc6.patch
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-copy_data_from_received_message.patch	Tue Nov 05 13:46:37 2024 +0000
     1.3 @@ -0,0 +1,27 @@
     1.4 +From 2a770f61c060d19f7fe118c2a066306fa3e9ec3d Mon Sep 17 00:00:00 2001
     1.5 +From: =?UTF-8?q?Th=C3=A9o=20Goudout?= <theo.goudout@mydatakeeper.fr>
     1.6 +Date: Thu, 1 Aug 2019 08:24:29 +0000
     1.7 +Subject: [PATCH] Fix assert fail when copying data from received message
     1.8 +
     1.9 +---
    1.10 + src/message.cpp | 4 +++-
    1.11 + 1 file changed, 3 insertions(+), 1 deletion(-)
    1.12 +
    1.13 +diff --git a/src/message.cpp b/src/message.cpp
    1.14 +index 3f0cac4..1c4caab 100644
    1.15 +--- a/src/message.cpp
    1.16 ++++ b/src/message.cpp
    1.17 +@@ -350,7 +350,9 @@ void MessageIter::copy_data(MessageIter &to)
    1.18 +       (
    1.19 +         (DBusMessageIter *) & (to._iter),
    1.20 +         from.type(),
    1.21 +-        from.type() == DBUS_TYPE_VARIANT ? NULL : sig,
    1.22 ++        (from.type() == DBUS_TYPE_STRUCT || from.type() == DBUS_TYPE_DICT_ENTRY)
    1.23 ++            ? NULL
    1.24 ++            : sig,
    1.25 +         (DBusMessageIter *) & (to_container._iter)
    1.26 +       );
    1.27 + 
    1.28 +-- 
    1.29 +2.22.0
    1.30 +
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-disable-threading.patch	Tue Nov 05 13:46:37 2024 +0000
     2.3 @@ -0,0 +1,45 @@
     2.4 +--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.threading	2017-02-15 13:40:53.796004263 +0000
     2.5 ++++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h	2017-02-15 13:40:46.907000493 +0000
     2.6 +@@ -188,6 +188,7 @@
     2.7 + /* classes for multithreading support
     2.8 + */
     2.9 + 
    2.10 ++#if 0
    2.11 + class DXXAPI Mutex
    2.12 + {
    2.13 + public:
    2.14 +@@ -243,9 +244,11 @@
    2.15 + typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout);
    2.16 + typedef void (*CondVarWakeOneFn)(CondVar *cv);
    2.17 + typedef void (*CondVarWakeAllFn)(CondVar *cv);
    2.18 ++#endif
    2.19 + 
    2.20 + void DXXAPI _init_threading();
    2.21 + 
    2.22 ++#if 0
    2.23 + void DXXAPI _init_threading(
    2.24 +   MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn,
    2.25 +   CondVarNewFn, CondVarFreeFn, CondVarWaitFn, CondVarWaitTimeoutFn, CondVarWakeOneFn, CondVarWakeAllFn
    2.26 +@@ -312,6 +315,7 @@
    2.27 +     cv->wake_all();
    2.28 +   }
    2.29 + };
    2.30 ++#endif
    2.31 + 
    2.32 + } /* namespace DBus */
    2.33 + 
    2.34 +--- libdbus-c++-0.9.0/src/dispatcher.cpp.threading	2017-02-15 13:48:22.627249868 +0000
    2.35 ++++ libdbus-c++-0.9.0/src/dispatcher.cpp	2017-02-15 13:48:29.164253445 +0000
    2.36 +@@ -253,6 +253,7 @@
    2.37 + #endif//DBUS_HAS_THREADS_INIT_DEFAULT
    2.38 + }
    2.39 + 
    2.40 ++#if 0
    2.41 + void DBus::_init_threading(
    2.42 +   MutexNewFn m1,
    2.43 +   MutexFreeFn m2,
    2.44 +@@ -318,3 +319,4 @@
    2.45 + #endif//DBUS_HAS_RECURSIVE_MUTEX
    2.46 +   dbus_threads_init(&functions);
    2.47 + }
    2.48 ++#endif
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-fix-writechar.patch	Tue Nov 05 13:46:37 2024 +0000
     3.3 @@ -0,0 +1,9 @@
     3.4 +--- libdbus-c++-0.9.0/src/pipe.cpp.writechar	2017-02-16 11:07:13.591950169 +0000
     3.5 ++++ libdbus-c++-0.9.0/src/pipe.cpp	2017-02-16 11:04:17.158796092 +0000
     3.6 +@@ -83,5 +83,5 @@
     3.7 + void Pipe::signal()
     3.8 + {
     3.9 +   // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
    3.10 +-  ::write(_fd_write, '\0', 1);
    3.11 ++  ::write(_fd_write, "", 1);
    3.12 + }
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-gcc47.patch	Tue Nov 05 13:46:37 2024 +0000
     4.3 @@ -0,0 +1,10 @@
     4.4 +--- src/eventloop-integration.cpp.orig	2012-05-09 11:22:09.683290763 +0200
     4.5 ++++ src/eventloop-integration.cpp	2012-05-09 11:22:44.313288912 +0200
     4.6 +@@ -38,6 +38,7 @@
     4.7 + #include <cassert>
     4.8 + #include <sys/poll.h>
     4.9 + #include <fcntl.h>
    4.10 ++#include <unistd.h>
    4.11 + 
    4.12 + using namespace DBus;
    4.13 + using namespace std;
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-template-operators.patch	Tue Nov 05 13:46:37 2024 +0000
     5.3 @@ -0,0 +1,88 @@
     5.4 +commit a0b9ef3b469ca23c6a3229d8abb967cbbddcee38
     5.5 +Author: Peter Williams <peter@newton.cx>
     5.6 +Date:   Sat Dec 19 21:12:46 2015 -0500
     5.7 +
     5.8 +    Fix some weird template/operator issues on OS X.
     5.9 +    
    5.10 +    I frankly don't understand at all what's going on here. These fixes
    5.11 +    derive from:
    5.12 +    
    5.13 +    https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/c3f69f6be02e31521474dce7eadf6ba4f4a7ce94
    5.14 +    https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/7104857773f790a549d399715482fa23d9b736cd
    5.15 +    
    5.16 +    Except I've dropped some changes that break the OS X build for me. Frankly, if
    5.17 +    it compiles, that's good enough for me.
    5.18 +
    5.19 +diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h
    5.20 +index 044e72b..7b3108f 100644
    5.21 +--- a/include/dbus-c++/types.h
    5.22 ++++ b/include/dbus-c++/types.h
    5.23 +@@ -89,13 +89,7 @@ public:
    5.24 +   }
    5.25 + 
    5.26 +   template <typename T>
    5.27 +-  operator T() const
    5.28 +-  {
    5.29 +-    T cast;
    5.30 +-    MessageIter ri = _msg.reader();
    5.31 +-    ri >> cast;
    5.32 +-    return cast;
    5.33 +-  }
    5.34 ++  operator T() const;
    5.35 + 
    5.36 + private:
    5.37 + 
    5.38 +@@ -316,7 +310,7 @@ struct type< Struct<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
    5.39 +   }
    5.40 + };
    5.41 + 
    5.42 +-} /* namespace DBus */
    5.43 ++extern DXXAPI DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Variant &val);
    5.44 + 
    5.45 + inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Invalid &)
    5.46 + {
    5.47 +@@ -551,6 +545,8 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Signature
    5.48 +   return ++iter;
    5.49 + }
    5.50 + 
    5.51 ++extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
    5.52 ++
    5.53 + template<typename E>
    5.54 + inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::vector<E>& val)
    5.55 + {
    5.56 +@@ -644,7 +640,16 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Struct<T1,
    5.57 +   return ++iter;
    5.58 + }
    5.59 + 
    5.60 +-extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
    5.61 ++template <typename T>
    5.62 ++inline DBus::Variant::operator T() const
    5.63 ++{
    5.64 ++  T cast;
    5.65 ++  DBus::MessageIter ri = _msg.reader();
    5.66 ++  ri >> cast;
    5.67 ++  return cast;
    5.68 ++}
    5.69 ++
    5.70 ++} /* namespace DBus */
    5.71 + 
    5.72 + #endif//__DBUSXX_TYPES_H
    5.73 + 
    5.74 +diff --git a/src/types.cpp b/src/types.cpp
    5.75 +index d414a3e..70f9ac0 100644
    5.76 +--- a/src/types.cpp
    5.77 ++++ b/src/types.cpp
    5.78 +@@ -34,7 +34,7 @@
    5.79 + #include "message_p.h"
    5.80 + #include "internalerror.h"
    5.81 + 
    5.82 +-using namespace DBus;
    5.83 ++namespace DBus {
    5.84 + 
    5.85 + Variant::Variant()
    5.86 +   : _msg(CallMessage()) // dummy message used as temporary storage for variant data
    5.87 +@@ -104,3 +104,4 @@ MessageIter &operator >> (MessageIter &iter, Variant &val)
    5.88 +   return ++iter;
    5.89 + }
    5.90 + 
    5.91 ++} /* namespace DBus */
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/libxml++/stuff/build_with_gcc6.patch	Tue Nov 05 13:46:37 2024 +0000
     6.3 @@ -0,0 +1,28 @@
     6.4 +--- a/libxml++/io/istreamparserinputbuffer.cc
     6.5 ++++ b/libxml++/io/istreamparserinputbuffer.cc
     6.6 +@@ -39,6 +39,6 @@
     6.7 + 
     6.8 +   bool IStreamParserInputBuffer::do_close()
     6.9 +   {
    6.10 +-    return input_;
    6.11 ++    return bool(input_);
    6.12 +   }
    6.13 + }
    6.14 +--- a/libxml++/io/ostreamoutputbuffer.cc
    6.15 ++++ b/libxml++/io/ostreamoutputbuffer.cc
    6.16 +@@ -29,13 +29,13 @@
    6.17 +     // here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded.
    6.18 +     if(output_)
    6.19 +       output_.write(buffer, len);
    6.20 +-    return output_;
    6.21 ++    return bool(output_);
    6.22 +   }
    6.23 + 
    6.24 +   bool OStreamOutputBuffer::do_close()
    6.25 +   {
    6.26 +     if(output_)
    6.27 +         output_.flush();
    6.28 +-    return output_;
    6.29 ++    return bool(output_);
    6.30 +   }
    6.31 + }