All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0
@ 2022-03-28 12:29 Lang Daniel via buildroot
  2022-03-28 19:52 ` Arnout Vandecappelle
  0 siblings, 1 reply; 2+ messages in thread
From: Lang Daniel via buildroot @ 2022-03-28 12:29 UTC (permalink / raw)
  To: buildroot

- License has been changed from GPL to LGPL or BSD-3-Clause
- Drop upstream patches

Signed-off-by: Daniel Lang <d.lang@abatec.at>
---
 .../0001-gcc11-include-typeinfo.patch         | 29 ------
 .../0002-cmake-improve-include-paths.patch    | 91 -------------------
 package/dbus-cxx/0003-sasl-use-uid_t.patch    | 41 ---------
 package/dbus-cxx/dbus-cxx.hash                |  4 +-
 package/dbus-cxx/dbus-cxx.mk                  |  4 +-
 5 files changed, 4 insertions(+), 165 deletions(-)
 delete mode 100644 package/dbus-cxx/0001-gcc11-include-typeinfo.patch
 delete mode 100644 package/dbus-cxx/0002-cmake-improve-include-paths.patch
 delete mode 100644 package/dbus-cxx/0003-sasl-use-uid_t.patch

diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch
deleted file mode 100644
index b4b7d83de2..0000000000
--- a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001
-From: Oleksandr Kravchuk <sashko@users.noreply.github.com>
-Date: Mon, 13 Dec 2021 03:42:44 +0100
-Subject: [PATCH] Include typeinfo for typeid() (#83)
-
-Otherwise fails with:
-    error: must '#include <typeinfo>' before using 'typeid'
-
-Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83
-Upstream-Status: Accepted
-Signed-off-by: Daniel Lang <d.lang@abatec.at>
-
----
- dbus-cxx/demangle.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h
-index b71bcb9..9a4e99b 100644
---- a/dbus-cxx/demangle.h
-+++ b/dbus-cxx/demangle.h
-@@ -21,6 +21,7 @@
- #define DBUSCXX_DEMANGLE_H
- 
- #include <string>
-+#include <typeinfo>
- #include <dbus-cxx/dbus-cxx-config.h>
- 
- #if DBUS_CXX_HAS_CXXABI_H
-
diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch
deleted file mode 100644
index 1f6a36a2c0..0000000000
--- a/package/dbus-cxx/0002-cmake-improve-include-paths.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001
-From: Lang Daniel <d.lang@abatec.at>
-Date: Mon, 17 Jan 2022 13:57:55 +0100
-Subject: [PATCH] cmake: improve include paths
-
-Adding the dbus-cxx subfolders as an include path might override system
-headers (signal.h for gcc 10).
-By removing the subfolders, includes can happen via #include "..." or
-via #include <dbus-cxx/...>.
-
-Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86
-Upstream-Status: Accepted
-Signed-off-by: Daniel Lang <d.lang@abatec.at>
-
----
- CMakeLists.txt                | 4 +---
- dbus-cxx/matchrule.h          | 2 +-
- dbus-cxx/sasl.h               | 2 +-
- dbus-cxx/sendmsgtransport.cpp | 2 +-
- dbus-cxx/simpletransport.cpp  | 2 +-
- 5 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b6d28c..e76cd61 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS
- 
- set( DBUS_CXX_INCLUDE_DIRECTORIES 
-     ${PROJECT_SOURCE_DIR} 
--    ${PROJECT_SOURCE_DIR}/dbus-cxx
--    ${PROJECT_BINARY_DIR}
--    ${PROJECT_BINARY_DIR}/dbus-cxx )
-+    ${PROJECT_BINARY_DIR} )
- include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} 
-     ${dbus_INCLUDE_DIRS} 
-     ${sigc_INCLUDE_DIRS} )
-diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h
-index 69fdab7..18c9e81 100644
---- a/dbus-cxx/matchrule.h
-+++ b/dbus-cxx/matchrule.h
-@@ -20,7 +20,7 @@
- #define DBUSCXX_MATCH_RULE_H
- 
- #include <memory>
--#include "dbus-cxx-config.h"
-+#include <dbus-cxx/dbus-cxx-config.h>
- 
- namespace DBus {
- 
-diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h
-index d7429a3..44edd6e 100644
---- a/dbus-cxx/sasl.h
-+++ b/dbus-cxx/sasl.h
-@@ -19,7 +19,7 @@
- #ifndef DBUSCXX_SASL_H
- #define DBUSCXX_SASL_H
- 
--#include <dbus-cxx-config.h>
-+#include <dbus-cxx/dbus-cxx-config.h>
- 
- #include <memory>
- #include <stdint.h>
-diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp
-index ae053ff..a10ae66 100644
---- a/dbus-cxx/sendmsgtransport.cpp
-+++ b/dbus-cxx/sendmsgtransport.cpp
-@@ -21,8 +21,8 @@
- #include "dbus-cxx-private.h"
- #include "utility.h"
- #include "validator.h"
-+#include "message.h"
- 
--#include <message.h>
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp
-index f291d9f..fed4364 100644
---- a/dbus-cxx/simpletransport.cpp
-+++ b/dbus-cxx/simpletransport.cpp
-@@ -18,7 +18,7 @@
-  ***************************************************************************/
- #include "simpletransport.h"
- 
--#include <dbus-cxx-private.h>
-+#include "dbus-cxx-private.h"
- #include "demarshaling.h"
- #include "message.h"
- #include "utility.h"
-
diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch
deleted file mode 100644
index f08769b6c5..0000000000
--- a/package/dbus-cxx/0003-sasl-use-uid_t.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001
-From: Lang Daniel <d.lang@abatec.at>
-Date: Fri, 28 Jan 2022 07:53:13 +0100
-Subject: [PATCH] use uid_t instead of __uid_t
-
-uclibc and glibc define getuid() as
-extern __uid_t getuid (void) __THROW;
-https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698
-which is a typedef for unsigned int.
-
-musl uses uid_t as return type
-uid_t getuid(void);
-https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108
-which is a typedef to unsigned.
-
-glibc and uclibc include typedefs from __uid_t to uid_t,
-which means one should be able to use uid_t as a replacement
-for __uid_t and make compiling with all three c standard libraries
-possible.
-
-Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87
-Signed-off-by: Daniel Lang <d.lang@abatec.at>
-
----
- dbus-cxx/sasl.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp
-index e8a6060..7a76af6 100644
---- a/dbus-cxx/sasl.cpp
-+++ b/dbus-cxx/sasl.cpp
-@@ -70,7 +70,7 @@ std::tuple<bool, bool, std::vector<uint8_t>> SASL::authenticate() {
-     bool success = false;
-     bool negotiatedFD = false;
-     std::vector<uint8_t> serverGUID;
--    __uid_t uid = getuid();
-+    uid_t uid = getuid();
-     std::string line;
-     std::smatch regex_match;
- 
-
diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash
index 907de1866f..5b3a6188fc 100644
--- a/package/dbus-cxx/dbus-cxx.hash
+++ b/package/dbus-cxx/dbus-cxx.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a  dbus-cxx-2.1.0.tar.gz
-sha256  e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d  COPYING
+sha256  55b2541b9c3f3fa705e51e12e6971f66826ebc7185071e0cd1bb6ec9e5adf47f  dbus-cxx-2.2.0.tar.gz
+sha256  99e5d0ad951d96567a6f9a17f3f17ac000c0582f53357c7f3601851c2dcbb786  COPYING
 sha256  c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  cmake-modules/LICENSE_1_0.txt
 sha256  c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08  tools/libcppgenerate/LICENSE
diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk
index 3e89fc9db7..b850d45003 100644
--- a/package/dbus-cxx/dbus-cxx.mk
+++ b/package/dbus-cxx/dbus-cxx.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DBUS_CXX_VERSION = 2.1.0
+DBUS_CXX_VERSION = 2.2.0
 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION))
-DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate)
+DBUS_CXX_LICENSE = LGPL-3.0 or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate)
 DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE
 DBUS_CXX_INSTALL_STAGING = YES
 DBUS_CXX_DEPENDENCIES = libsigc
-- 
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0
  2022-03-28 12:29 [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0 Lang Daniel via buildroot
@ 2022-03-28 19:52 ` Arnout Vandecappelle
  0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2022-03-28 19:52 UTC (permalink / raw)
  To: Lang Daniel, buildroot



On 28/03/2022 14:29, Lang Daniel via buildroot wrote:
> - License has been changed from GPL to LGPL or BSD-3-Clause
> - Drop upstream patches
> 
> Signed-off-by: Daniel Lang <d.lang@abatec.at>
[snip]
> diff --git a/package/dbus-cxx/dbus-cxx.mk b/package/dbus-cxx/dbus-cxx.mk
> index 3e89fc9db7..b850d45003 100644
> --- a/package/dbus-cxx/dbus-cxx.mk
> +++ b/package/dbus-cxx/dbus-cxx.mk
> @@ -4,9 +4,9 @@
>   #
>   ################################################################################
>   
> -DBUS_CXX_VERSION = 2.1.0
> +DBUS_CXX_VERSION = 2.2.0
>   DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION))
> -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate)
> +DBUS_CXX_LICENSE = LGPL-3.0 or BSD-3-Clause, Boost license (cmake-modules), Apache 2.0 (libcppgenerate)

  It's LGPL-3.0+ actually.
  Applied to master with that fixed, thanks.

  Regards,
  Arnout

>   DBUS_CXX_LICENSE_FILES = COPYING cmake-modules/LICENSE_1_0.txt tools/libcppgenerate/LICENSE
>   DBUS_CXX_INSTALL_STAGING = YES
>   DBUS_CXX_DEPENDENCIES = libsigc
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-28 19:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-28 12:29 [Buildroot] [PATCH 1/1] package/dbus-cxx: bump to version 2.2.0 Lang Daniel via buildroot
2022-03-28 19:52 ` Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.