Bump sdbus-c++ to version v1.0.0

Signed-off-by: Khem Raj <raj.khem@gmail.com>
openembedded · Nov 3, 2021 · b26b66e · b26b66e
1 parent b44f288
commit b26b66e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 94 deletions.
diff --git a/...-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch b/...-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Do-not-download-gtest-automatically.patch
diff --git a/...cipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch b/...cipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-test-Check-for-googletest-on-system-first.patch
diff --git a/...-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest → ...-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest b/...-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest → ...-core/sdbus-c++/sdbus-c++-1.0.0/run-ptest
diff --git a/...s-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb → ...s-core/sdbus-c++/sdbus-c++-tools_1.0.0.bb b/...s-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb → ...s-core/sdbus-c++/sdbus-c++-tools_1.0.0.bb
@@ -8,7 +8,7 @@ inherit cmake
 
 DEPENDS += "expat"
 
-SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd"
+SRCREV = "65782bbf435d91e5eb6af9ddab110df406a824a9"
 SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools"
 
 S = "${WORKDIR}/tools"

diff --git a/...recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb → ...recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb b/...recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb → ...recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb
@@ -12,18 +12,13 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-exte
                    ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
 PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap"
 PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd"
-PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF"
+PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF,googletest gmock"
 
 DEPENDS += "expat"
 
-SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd"
-SRCREV_gtest = "a3460d1aeeaa43fdf137a6adefef10ba0b59fe4b"
-SRCREV_FORMAT = "default_gtest"
+SRCREV = "65782bbf435d91e5eb6af9ddab110df406a824a9"
 
-SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
-           git://github.com/google/googletest.git;protocol=https;branch=master;name=gtest;destsuffix=git/tests/googletest-src \
-           file://0001-Do-not-download-gtest-automatically.patch \
-"
+SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master"
 SRC_URI += "file://run-ptest"
 
 EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \