From 9482c4f4d8e67c81c6c309d4ff86b560dfb71dd0 Mon Sep 17 00:00:00 2001 From: David Flogeras Date: Fri, 9 Apr 2021 10:43:49 -0300 Subject: [PATCH 01/11] x11-misc/ksnip: add missing qtconcurrency DEPEND Closes: https://bugs.gentoo.org/781830 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Flogeras --- x11-misc/ksnip/ksnip-1.8.1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/ksnip/ksnip-1.8.1.ebuild b/x11-misc/ksnip/ksnip-1.8.1.ebuild index d76308c626..855a1b66ef 100644 --- a/x11-misc/ksnip/ksnip-1.8.1.ebuild +++ b/x11-misc/ksnip/ksnip-1.8.1.ebuild @@ -29,6 +29,7 @@ RDEPEND=" x11-libs/libX11 x11-libs/libxcb" DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 " BDEPEND=" From a7698b9752bf8f2a842ffe97d54fe06cca319ece Mon Sep 17 00:00:00 2001 From: David Flogeras Date: Fri, 9 Apr 2021 10:45:00 -0300 Subject: [PATCH 02/11] x11-misc/ksnip: remove old version Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Flogeras --- x11-misc/ksnip/Manifest | 1 - x11-misc/ksnip/ksnip-1.8.0-r1.ebuild | 43 ---------------------------- 2 files changed, 44 deletions(-) delete mode 100644 x11-misc/ksnip/ksnip-1.8.0-r1.ebuild diff --git a/x11-misc/ksnip/Manifest b/x11-misc/ksnip/Manifest index 1b288b1bfa..fa37276d1c 100644 --- a/x11-misc/ksnip/Manifest +++ b/x11-misc/ksnip/Manifest @@ -1,2 +1 @@ -DIST ksnip-1.8.0.tar.gz 427497 BLAKE2B d4661f7f2bc6d4623d496d5aeaa5fc456d62ac574c956092d371b052586e060066e1fd837727043775ac10a2c56f558a4258efde745e50d821b1efc82788c27d SHA512 9276b36932c6a87620f0ce125151e09eca0e20e8f504990acb11f1c321c7c6c223e47b7d20fd2d8e409a79a8f09589f7d644bb36d1c9d611a0ed92ee5302fdfe DIST ksnip-1.8.1.tar.gz 443044 BLAKE2B 4a6d79f4cb5f91302dd893bc2ecd1c641d096292d02c141cc91a01c9dcf9e630222ce40b689c31932b1dff7524443c83c2a977cb7ef75478841124817104d22d SHA512 f8e643fa04c32f02fdb91ab0f2bd9deb200d182712d3c094474a25a6a824057fb96b5bd833d6eb46b2d036ea437f90783611d1df9cdd569be54ab6aef7c39f5b diff --git a/x11-misc/ksnip/ksnip-1.8.0-r1.ebuild b/x11-misc/ksnip/ksnip-1.8.0-r1.ebuild deleted file mode 100644 index db803c4b3d..0000000000 --- a/x11-misc/ksnip/ksnip-1.8.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg cmake -# cmake has to be listed after xdg for src_prepare to work - -DESCRIPTION="Ksnip is a Qt based cross-platform screenshot tool" -HOMEPAGE="https://github.com/ksnip/ksnip" -SRC_URI="https://github.com/ksnip/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5[png] - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - >=media-libs/kcolorpicker-0.1.4 - >=media-libs/kimageannotator-0.4.0 - x11-libs/libX11 - x11-libs/libxcb" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -src_install() { - cmake_src_install - - doicon -s scalable desktop/${PN}.svg - domenu desktop/org.${PN}.${PN}.desktop -} From 38ee3703cd42b3ea89ff339b01970e1cd5079a13 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Fri, 9 Apr 2021 19:29:34 +0500 Subject: [PATCH 03/11] sys-fs/dwarfs: new version 0.5.2 See https://github.com/mhx/dwarfs/releases for changes. That release looks pretty good. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Denis Reva --- sys-fs/dwarfs/Manifest | 1 + sys-fs/dwarfs/dwarfs-0.5.2.ebuild | 94 +++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 sys-fs/dwarfs/dwarfs-0.5.2.ebuild diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest index 0ddfe0d6ac..e6a430ea48 100644 --- a/sys-fs/dwarfs/Manifest +++ b/sys-fs/dwarfs/Manifest @@ -1 +1,2 @@ DIST dwarfs-0.4.1.tar.bz2 11640169 BLAKE2B 3490d625fd718be4451d5a551b6931b0c9316d88cdda91b90a724f3ab732a3916431a13e343bcb79a2e0415ffc0a990d2546eeb1738c55282e9fb9c85d3ba1ae SHA512 ed7bfe13a9ed2450921a2caf47b4ee1f527fcd7ad154cee93d8674a2dd08c9110d62cfaff22f318bdb799eeea35b8bc4b7374d685537c82e70a0498d97a53307 +DIST dwarfs-0.5.2.tar.bz2 12153397 BLAKE2B b83b7df085afb39df3aa9b139ce7cfeee71287ad8ce83433a2c3cf17a096e479da95e76057379be81ec79a819dfe9754a8df44492044fc49fbd1e2d4371af878 SHA512 6ff8a8b9037740bc4a28f8069226db35ac0dad946059f9d42163f64e40e299efa0e79da08f44e45ac8dd2e8b9c43ed2a9d05fd54e51de8885f71137f877d456b diff --git a/sys-fs/dwarfs/dwarfs-0.5.2.ebuild b/sys-fs/dwarfs/dwarfs-0.5.2.ebuild new file mode 100644 index 0000000000..8c7493f14b --- /dev/null +++ b/sys-fs/dwarfs/dwarfs-0.5.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit cmake check-reqs python-single-r1 + +DESCRIPTION="A fast very high compression read-only FUSE file system" +HOMEPAGE="https://github.com/mhx/dwarfs" + +SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +IUSE="python +jemalloc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +#test IUSE disabled because there is no googletest in portage tree at this moment +#-DWITH_TESTS=$(usex test ON OFF) + +PYTHON_REQ_USE="python" + +DEPEND="sys-devel/flex + sys-devel/binutils:*" +RDEPEND="${PYTHON_DEPS} + dev-libs/boost[context,threads,python?] + dev-libs/double-conversion + dev-libs/libfmt + dev-libs/libevent + dev-libs/xxhash + jemalloc? ( >=dev-libs/jemalloc-5.2.1 ) + app-arch/libarchive + app-arch/zstd + app-arch/lz4 + app-arch/xz-utils + app-arch/snappy + dev-cpp/sparsehash + dev-cpp/gflags + dev-cpp/glog[gflags] + sys-fs/fuse:3 + sys-libs/binutils-libs + sys-libs/zlib + sys-libs/libunwind + !dev-cpp/folly" +BDEPEND="app-text/ronn + dev-util/cmake + sys-apps/sed + sys-devel/bison + virtual/pkgconfig" + +CHECKREQS_DISK_BUILD="1300M" + +DOCS=( "README.md" "CHANGES.md" "TODO" ) + +CMAKE_IN_SOURCE_BUILD=1 +CMAKE_WARN_UNUSED_CLI=0 + +src_prepare(){ + cmake_src_prepare + einfo "setting library path to $(get_libdir)" + sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die +} + +src_configure(){ + einfo "setting configuration flags to:" + mycmakeargs=( + -DUSE_JEMALLOC=$(usex jemalloc ON OFF) + -DWITH_PYTHON=$(usex python ON OFF) + -DPREFER_SYSTEM_ZSTD=1 + -DPREFER_SYSTEM_XXHASH=1 + -DWITH_LEGACY_FUSE=0 + ) + if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi + einfo ${mycmakeargs} + cmake_src_configure +} + +src_install(){ + cmake_src_install + dolib.so libmetadata_thrift.so libthrift_light.so + dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so +} + +pkg_postinst(){ + elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well" + elog "You may find more information in the" + elog "${HOMEPAGE}" + elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md" + elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md" +} From 3b913fd5b389640fd84fa371698fa112cc026450 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 9 Apr 2021 18:35:10 +0200 Subject: [PATCH 04/11] net-im/nheko: Fix dependencies. dev-libs/tweeny and dev-db/lmdb++ are build-time dependencies. There are 2 incompatible repositories for lmdb++. The old one is and the new one is . <=net-im/nheko-0.8.1 needs the old one. dev-db/lmdb++-0.9.14.0 installs the old one. dev-db/lmdb++-1.0.0 installs the new one. >net-im/nheko-0.8.1 will need the new one. So the version pinning will go away in the ebuild for the next version. Closes: https://bugs.gentoo.org/781662 Signed-off-by: Ronny (tastytea) Gutbrod --- net-im/nheko/nheko-0.8.0.ebuild | 4 ++-- net-im/nheko/nheko-0.8.1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/nheko/nheko-0.8.0.ebuild b/net-im/nheko/nheko-0.8.0.ebuild index ba84dfd69d..1d9735f03c 100644 --- a/net-im/nheko/nheko-0.8.0.ebuild +++ b/net-im/nheko/nheko-0.8.0.ebuild @@ -21,8 +21,6 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 app-text/cmark - dev-libs/tweeny - dev-db/lmdb++ >=dev-libs/mtxclient-0.4.0 dev-cpp/nlohmann_json dev-libs/qtkeychain @@ -30,6 +28,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} dev-libs/spdlog + dev-libs/tweeny + Date: Fri, 9 Apr 2021 20:03:13 +0200 Subject: [PATCH 05/11] dev-libs/open62541: Bump version to v1.2 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + .../files/open62541-1.2-headers.patch | 33 +++++ .../open62541/files/open62541-1.2-tests.patch | 126 ++++++++++++++++++ dev-libs/open62541/open62541-1.2.ebuild | 104 +++++++++++++++ 4 files changed, 264 insertions(+) create mode 100644 dev-libs/open62541/files/open62541-1.2-headers.patch create mode 100644 dev-libs/open62541/files/open62541-1.2-tests.patch create mode 100644 dev-libs/open62541/open62541-1.2.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 5aa6908b28..229988584a 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1,3 @@ DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955 DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880 +DIST open62541-1.2.tar.gz 3640972 BLAKE2B 0b27837ba953338923651919accfb30356d1ecd83c911586720c803bb5cfce193361111e962c79b0e1739e804bb2de25a74e6b105b80eb58b497d7f5fa7ed469 SHA512 f492db2fe1569cf831f67e55d633af13bac1026e4ab8a30c2e1c36ada9b635e0086f176cb8f53665b2254ca9ba8c8f46ea850b1a0430045b71502f166645613a diff --git a/dev-libs/open62541/files/open62541-1.2-headers.patch b/dev-libs/open62541/files/open62541-1.2-headers.patch new file mode 100644 index 0000000000..4a33c03b66 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.2-headers.patch @@ -0,0 +1,33 @@ +From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sun, 12 Jul 2020 10:39:31 +0200 +Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers + +When the corresponding features are enabled, the headers should be installed as +well. + +Signed-off-by: Kurt Kanzenbach +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +Index: open62541/CMakeLists.txt +=================================================================== +--- open62541.orig/CMakeLists.txt ++++ open62541/CMakeLists.txt +@@ -907,6 +907,7 @@ if(UA_ENABLE_PUBSUB) + list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c) + if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) ++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c) + endif() + if(UA_ENABLE_PUBSUB_ETH_UADP) +@@ -916,6 +917,7 @@ if(UA_ENABLE_PUBSUB) + if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) + if(EXISTS "${XDP_LIBRARY}") + list(APPEND open62541_LIBRARIES ${XDP_LIBRARY}) ++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c) + else() + MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP") diff --git a/dev-libs/open62541/files/open62541-1.2-tests.patch b/dev-libs/open62541/files/open62541-1.2-tests.patch new file mode 100644 index 0000000000..d5cf4d4041 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.2-tests.patch @@ -0,0 +1,126 @@ +From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sat, 20 Jun 2020 14:28:57 +0200 +Subject: [PATCH 1/3] cmake: pubsub: Disable failing tests within portage + +The Pub/Sub tests won't work within portage. Disable them. + +Signed-off-by: Kurt Kanzenbach +--- + tests/CMakeLists.txt | 78 -------------------------------------------- + 1 file changed, 78 deletions(-) + +Index: open62541/tests/CMakeLists.txt +=================================================================== +--- open62541.orig/tests/CMakeLists.txt ++++ open62541/tests/CMakeLists.txt +@@ -341,109 +341,6 @@ if(UA_ENABLE_DISCOVERY) + add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery) + endif() + +-if(UA_ENABLE_PUBSUB) +- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $ $) +- target_link_libraries(check_pubsub_encoding ${LIBS}) +- add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding) +- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $ $) +- target_link_libraries(check_pubsub_pds ${LIBS}) +- add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds) +- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $ $) +- target_link_libraries(check_pubsub_connection_udp ${LIBS}) +- add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp) +- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $ $) +- target_link_libraries(check_pubsub_publish ${LIBS}) +- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish) +- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $ $) +- target_link_libraries(check_pubsub_publish_uadp ${LIBS}) +- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp) +- add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $ $) +- target_link_libraries(check_pubsub_get_state ${LIBS}) +- add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state) +- +- #Link libraries for executing subscriber unit test +- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $ $) +- target_link_libraries(check_pubsub_subscribe ${LIBS}) +- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $) +- target_link_libraries(check_pubsub_publishspeed ${LIBS}) +- add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish) +- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $ $) +- target_link_libraries(check_pubsub_config_freeze ${LIBS}) +- add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze) +- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $ $) +- target_link_libraries(check_pubsub_publish_rt_levels ${LIBS}) +- add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels) +- add_executable(check_pubsub_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $ $) +- target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS}) +- add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze) +- add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $ $) +- target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS}) +- add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels) +- add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $ $) +- target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS}) +- add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_rt_levels) +- +- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $) +- target_link_libraries(check_pubsub_multiple_layer ${LIBS}) +- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer) +- +- if (UA_ENABLE_PUBSUB_MONITORING) +- add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c +- $ +- $) +- target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS}) +- add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout) +- endif() +- +- if(UA_ENABLE_PUBSUB_ETH_UADP) +- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF) +- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $) +- target_link_libraries(check_pubsub_connection_ethernet ${LIBS}) +- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet) +- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $ $) +- target_link_libraries(check_pubsub_publish_ethernet ${LIBS}) +- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet) +- endif() +- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) +- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $ $) +- target_link_libraries(check_pubsub_connection_xdp ${LIBS}) +- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp) +- endif() +- endif() +- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) +- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $ $) +- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS}) +- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf) +- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $ $) +- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS}) +- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf) +- endif() +- +- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL) +- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $ $) +- target_link_libraries(check_pubsub_informationmodel ${LIBS}) +- add_test_valgrind(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel) +- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS) +- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $ $) +- target_link_libraries(check_pubsub_informationmodel_methods ${LIBS}) +- add_test_valgrind(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods) +- +- endif() +- endif() +- if(UA_ENABLE_PUBSUB_MQTT) +- if(NOT WIN32) +- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $ $) +- target_link_libraries(check_pubsub_connection_mqtt ${LIBS}) +- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt) +- endif() +- endif() +- if(UA_ENABLE_PUBSUB_FILE_CONFIG) +- add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $ $) +- target_link_libraries(check_pubsub_configuration ${LIBS}) +- add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration) +- endif() +-endif() +- + add_executable(check_server_readspeed server/check_server_readspeed.c $ $) + target_link_libraries(check_server_readspeed ${LIBS}) + add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed) diff --git a/dev-libs/open62541/open62541-1.2.ebuild b/dev-libs/open62541/open62541-1.2.ebuild new file mode 100644 index 0000000000..7665253c86 --- /dev/null +++ b/dev-libs/open62541/open62541-1.2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Open source C implementation of OPC UA" +HOMEPAGE="https://open62541.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + encryption? ( || ( mbedtls openssl ) ) + etf? ( pubsub ) + xdp? ( pubsub ) +" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( + media-gfx/graphviz + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( + dev-libs/check + dev-util/valgrind + $(python_gen_cond_dep ' + dev-python/subunit[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND=" + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-tests.patch" +) + +src_prepare() { + # bug 780912 + sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOPEN62541_VERSION=v${PV} + -DUA_BUILD_EXAMPLES=OFF + -DUA_BUILD_TOOLS=$(usex tools) + -DUA_BUILD_UNIT_TESTS=$(usex test) + -DUA_ENABLE_ENCRYPTION=$(usex encryption) + -DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls) + -DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl) + -DUA_ENABLE_PUBSUB=$(usex pubsub) + -DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub) + -DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf) + -DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc +} + +src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) + cmake_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples/ + fi + + python_fix_shebang "${ED}" +} + +src_test() { + cmake_src_test -j1 +} From 15931f3a10a54646ae43dceef3912bb8888a0814 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Fri, 9 Apr 2021 20:06:00 +0200 Subject: [PATCH 06/11] dev-libs/open62541: Drop old Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 - .../open62541/files/open62541-1.1.5-etf.patch | 40 ------- .../files/open62541-1.1.5-headers.patch | 33 ------ .../files/open62541-1.1.5-tests.patch | 101 ----------------- dev-libs/open62541/open62541-1.1.5.ebuild | 105 ------------------ 5 files changed, 280 deletions(-) delete mode 100644 dev-libs/open62541/files/open62541-1.1.5-etf.patch delete mode 100644 dev-libs/open62541/files/open62541-1.1.5-headers.patch delete mode 100644 dev-libs/open62541/files/open62541-1.1.5-tests.patch delete mode 100644 dev-libs/open62541/open62541-1.1.5.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 229988584a..43c70fd575 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,3 +1,2 @@ DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955 -DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880 DIST open62541-1.2.tar.gz 3640972 BLAKE2B 0b27837ba953338923651919accfb30356d1ecd83c911586720c803bb5cfce193361111e962c79b0e1739e804bb2de25a74e6b105b80eb58b497d7f5fa7ed469 SHA512 f492db2fe1569cf831f67e55d633af13bac1026e4ab8a30c2e1c36ada9b635e0086f176cb8f53665b2254ca9ba8c8f46ea850b1a0430045b71502f166645613a diff --git a/dev-libs/open62541/files/open62541-1.1.5-etf.patch b/dev-libs/open62541/files/open62541-1.1.5-etf.patch deleted file mode 100644 index 09f47ed87d..0000000000 --- a/dev-libs/open62541/files/open62541-1.1.5-etf.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8cac173827297e936a24b4bdfe73f2498dfe483a Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Sun, 12 Jul 2020 10:57:08 +0200 -Subject: [PATCH 3/3] etf: Fix compiler warning/build error in etf plugin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the following warning/error: - -|In function ‘snprintf’, -| inlined from ‘UA_PubSubChannelEthernetETF_open’ at /var/tmp/portage/dev-libs/open62541-1.1/work/open62541-1.1/plugins/ua_pubsub_ethernet_etf.c:189:5, -| inlined from ‘TransportLayerEthernetETF_addChannel’ at /var/tmp/portage/dev-libs/open62541-1.1/work/open62541-1.1/plugins/ua_pubsub_ethernet_etf.c:563:40: -|/usr/include/bits/stdio2.h:67:10: error: ‘__builtin___snprintf_chk’ specified bound 40 exceeds destination size 16 [-Werror=stringop-overflow=] -| 67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 68 | __bos (__s), __fmt, __va_arg_pack ()); -| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| - -By using the correct size. - -Signed-off-by: Kurt Kanzenbach ---- - plugins/ua_pubsub_ethernet_etf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: open62541/plugins/ua_pubsub_ethernet_etf.c -=================================================================== ---- open62541.orig/plugins/ua_pubsub_ethernet_etf.c -+++ open62541/plugins/ua_pubsub_ethernet_etf.c -@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const U - struct ifreq ifreq; - memset(&ifreq, 0, sizeof(struct ifreq)); - UA_UInt64 len = UA_MIN(address->networkInterface.length, sizeof(ifreq.ifr_name)-1); -- UA_snprintf(ifreq.ifr_name, sizeof(struct ifreq), -+ UA_snprintf(ifreq.ifr_name, sizeof(ifreq.ifr_name), - "%.*s", (int)len, - (char*)address->networkInterface.data); - diff --git a/dev-libs/open62541/files/open62541-1.1.5-headers.patch b/dev-libs/open62541/files/open62541-1.1.5-headers.patch deleted file mode 100644 index 8cedc3f06d..0000000000 --- a/dev-libs/open62541/files/open62541-1.1.5-headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Sun, 12 Jul 2020 10:39:31 +0200 -Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers - -When the corresponding features are enabled, the headers should be installed as -well. - -Signed-off-by: Kurt Kanzenbach ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -Index: open62541/CMakeLists.txt -=================================================================== ---- open62541.orig/CMakeLists.txt -+++ open62541/CMakeLists.txt -@@ -877,6 +877,7 @@ if(UA_ENABLE_PUBSUB) - list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c) - if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) -+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c) - endif() - if(UA_ENABLE_PUBSUB_ETH_UADP) -@@ -886,6 +887,7 @@ if(UA_ENABLE_PUBSUB) - if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) - if(EXISTS "${XDP_LIBRARY}") - list(APPEND open62541_LIBRARIES ${XDP_LIBRARY}) -+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c) - else() - MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP") diff --git a/dev-libs/open62541/files/open62541-1.1.5-tests.patch b/dev-libs/open62541/files/open62541-1.1.5-tests.patch deleted file mode 100644 index 03a1bf081b..0000000000 --- a/dev-libs/open62541/files/open62541-1.1.5-tests.patch +++ /dev/null @@ -1,101 +0,0 @@ -From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Sat, 20 Jun 2020 14:28:57 +0200 -Subject: [PATCH 1/3] cmake: pubsub: Disable failing tests within portage - -The Pub/Sub tests won't work within portage. Disable them. - -Signed-off-by: Kurt Kanzenbach ---- - tests/CMakeLists.txt | 78 -------------------------------------------- - 1 file changed, 78 deletions(-) - -Index: open62541/tests/CMakeLists.txt -=================================================================== ---- open62541.orig/tests/CMakeLists.txt -+++ open62541/tests/CMakeLists.txt -@@ -331,84 +331,6 @@ if(UA_ENABLE_DISCOVERY) - add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery) - endif() - --if(UA_ENABLE_PUBSUB) -- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $ $) -- target_link_libraries(check_pubsub_encoding ${LIBS}) -- add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding) -- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $ $) -- target_link_libraries(check_pubsub_pds ${LIBS}) -- add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds) -- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $ $) -- target_link_libraries(check_pubsub_connection_udp ${LIBS}) -- add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp) -- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $ $) -- target_link_libraries(check_pubsub_publish ${LIBS}) -- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish) -- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $ $) -- target_link_libraries(check_pubsub_publish_uadp ${LIBS}) -- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp) -- -- #Link libraries for executing subscriber unit test -- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $ $) -- target_link_libraries(check_pubsub_subscribe ${LIBS}) -- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $) -- target_link_libraries(check_pubsub_publishspeed ${LIBS}) -- add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish) -- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $ $) -- target_link_libraries(check_pubsub_config_freeze ${LIBS}) -- add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze) -- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $ $) -- target_link_libraries(check_pubsub_publish_rt_levels ${LIBS}) -- add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels) -- -- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $) -- target_link_libraries(check_pubsub_multiple_layer ${LIBS}) -- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer) -- -- if(UA_ENABLE_PUBSUB_ETH_UADP) -- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF) -- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $) -- target_link_libraries(check_pubsub_connection_ethernet ${LIBS}) -- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet) -- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $ $) -- target_link_libraries(check_pubsub_publish_ethernet ${LIBS}) -- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet) -- endif() -- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) -- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $ $) -- target_link_libraries(check_pubsub_connection_xdp ${LIBS}) -- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp) -- endif() -- endif() -- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) -- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $ $) -- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS}) -- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf) -- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $ $) -- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS}) -- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf) -- endif() -- -- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL) -- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $ $) -- target_link_libraries(check_pubsub_informationmodel ${LIBS}) -- add_test_valgrind(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel) -- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS) -- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $ $) -- target_link_libraries(check_pubsub_informationmodel_methods ${LIBS}) -- add_test_valgrind(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods) -- -- endif() -- endif() -- if(UA_ENABLE_PUBSUB_MQTT) -- if(NOT WIN32) -- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $ $) -- target_link_libraries(check_pubsub_connection_mqtt ${LIBS}) -- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt) -- endif() -- endif() --endif() -- - add_executable(check_server_readspeed server/check_server_readspeed.c $ $) - target_link_libraries(check_server_readspeed ${LIBS}) - add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed) diff --git a/dev-libs/open62541/open62541-1.1.5.ebuild b/dev-libs/open62541/open62541-1.1.5.ebuild deleted file mode 100644 index f8658a8359..0000000000 --- a/dev-libs/open62541/open62541-1.1.5.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open source C implementation of OPC UA" -HOMEPAGE="https://open62541.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - encryption? ( || ( mbedtls openssl ) ) - etf? ( pubsub ) - xdp? ( pubsub ) -" - -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( - media-gfx/graphviz - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] - ') - ) - test? ( - dev-libs/check - dev-util/valgrind - $(python_gen_cond_dep ' - dev-python/subunit[${PYTHON_MULTI_USEDEP}] - ') - ) -" -DEPEND=" - mbedtls? ( net-libs/mbedtls:= ) - openssl? ( dev-libs/openssl:0= ) -" -RDEPEND=" - ${PYTHON_DEPS} - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}/${P}-etf.patch" - "${FILESDIR}/${P}-headers.patch" - "${FILESDIR}/${P}-tests.patch" -) - -src_prepare() { - # bug 780912 - sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DOPEN62541_VERSION=v${PV} - -DUA_BUILD_EXAMPLES=OFF - -DUA_BUILD_TOOLS=$(usex tools) - -DUA_BUILD_UNIT_TESTS=$(usex test) - -DUA_ENABLE_ENCRYPTION=$(usex encryption) - -DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls) - -DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl) - -DUA_ENABLE_PUBSUB=$(usex pubsub) - -DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub) - -DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf) - -DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build doc -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) - cmake_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples/ - fi - - python_fix_shebang "${ED}" -} - -src_test() { - cmake_src_test -j1 -} From e3696b0c6edfd8b2b2eb19799f7c10d43f0610f2 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 9 Apr 2021 20:44:03 +0200 Subject: [PATCH 07/11] net-misc/kristall: Make it respect *FLAGS. The project uses make which then calls qmake, so we can't use qmake-utils unless we want to make ourselves a lot of work. Instead we initialize the QMAKE_*FLAGS variables ourselves. Closes: https://bugs.gentoo.org/781692 Signed-off-by: Ronny (tastytea) Gutbrod --- .../files/kristall-0.3_add_flags.patch | 27 ++++++++++++++ net-misc/kristall/kristall-0.3-r1.ebuild | 35 +++++++++++++++++++ net-misc/kristall/kristall-9999.ebuild | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 net-misc/kristall/files/kristall-0.3_add_flags.patch create mode 100644 net-misc/kristall/kristall-0.3-r1.ebuild diff --git a/net-misc/kristall/files/kristall-0.3_add_flags.patch b/net-misc/kristall/files/kristall-0.3_add_flags.patch new file mode 100644 index 0000000000..2fa9d2ce80 --- /dev/null +++ b/net-misc/kristall/files/kristall-0.3_add_flags.patch @@ -0,0 +1,27 @@ +From 9cec33fdbd7c7bb983d4562ccbb08adf5d7194ec Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Fri, 9 Apr 2021 19:54:34 +0200 +Subject: [PATCH] Add *FLAGS. + +--- + src/kristall.pro | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/kristall.pro b/src/kristall.pro +index 2a8b21e..4193c57 100644 +--- a/src/kristall.pro ++++ b/src/kristall.pro +@@ -19,6 +19,10 @@ LIBS += -lcrypto + # We need iconv on non-linux platforms + !linux: LIBS += -liconv + ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) ++ + QMAKE_CFLAGS += -Wno-unused-parameter -Werror=return-type + QMAKE_CXXFLAGS += -Wno-unused-parameter -Werror=return-type + +-- +2.26.3 + diff --git a/net-misc/kristall/kristall-0.3-r1.ebuild b/net-misc/kristall/kristall-0.3-r1.ebuild new file mode 100644 index 0000000000..0d5efcd772 --- /dev/null +++ b/net-misc/kristall/kristall-0.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg + +DESCRIPTION="Visual cross-platform gemini browser" +HOMEPAGE="https://github.com/MasterQ32/kristall" +if [ "${PV}" == "9999" ]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/MasterQ32/kristall.git" +else + SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=" + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtsvg:5 + dev-qt/qtnetwork:5[ssl] +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qtcore" # qmake + +PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) + +src_install() { + emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install + einstalldocs +} diff --git a/net-misc/kristall/kristall-9999.ebuild b/net-misc/kristall/kristall-9999.ebuild index 2d6f83cf1b..3854bc55fa 100644 --- a/net-misc/kristall/kristall-9999.ebuild +++ b/net-misc/kristall/kristall-9999.ebuild @@ -27,6 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-qt/qtcore" # qmake +PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) + src_install() { emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install einstalldocs From e66671ff0cf0f2e1a01942af543a2ccdd52fb910 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 9 Apr 2021 20:47:42 +0200 Subject: [PATCH 08/11] net-misc/kristall: Remove old ebuilds. Signed-off-by: Ronny (tastytea) Gutbrod --- net-misc/kristall/Manifest | 1 - net-misc/kristall/kristall-0.2.ebuild | 38 --------------------------- net-misc/kristall/kristall-0.3.ebuild | 33 ----------------------- 3 files changed, 72 deletions(-) delete mode 100644 net-misc/kristall/kristall-0.2.ebuild delete mode 100644 net-misc/kristall/kristall-0.3.ebuild diff --git a/net-misc/kristall/Manifest b/net-misc/kristall/Manifest index fc1e582569..a597b1137c 100644 --- a/net-misc/kristall/Manifest +++ b/net-misc/kristall/Manifest @@ -1,2 +1 @@ -DIST kristall-0.2.tar.gz 7483452 BLAKE2B ab2cd662ce91d36310fcd0b643c18a673e2da504166936826e3642eff14fe80bd1d42a6c284317216069b67fff2f452b7d5d299d47bf19cd074f553ecf98eb33 SHA512 2f0492772b19cc7340e7690c2a5be199826bebddf02777a2a38de1607277bdcd8c7f1069499cc42e7070f1c978731a153bc1e79e1c17f022a8d7b78eca5e8bdb DIST kristall-0.3.tar.gz 7535712 BLAKE2B 3e00243cf455ad810e8d51333b63186e637de1c292a116dbb4273825c51b1c1bf1921bfd243acb97e13dc201b3dcce7240f3c66368b66b607e5c207a2d901934 SHA512 21c102e25235f3a7c1a4128d84215a2444603b4b9bc680e94100148d143dc50744bb86450c22b8848453c5e183ae4708a1594240486951614d4e4af2706cd2e8 diff --git a/net-misc/kristall/kristall-0.2.ebuild b/net-misc/kristall/kristall-0.2.ebuild deleted file mode 100644 index 0327c1b690..0000000000 --- a/net-misc/kristall/kristall-0.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils xdg - -DESCRIPTION="Visual cross-platform gemini browser" -HOMEPAGE="https://github.com/MasterQ32/kristall" -SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-qt/qtmultimedia[widgets] - dev-qt/qtsvg:5 - dev-qt/qtnetwork:5[ssl] -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -Ei 's|(target\.path) = .+|\1 = /usr/bin|' src/kristall.pro || die -} - -src_configure() { - eqmake5 src/kristall.pro -} - -src_install() { - emake install INSTALL_ROOT="${D}" - einstalldocs - - doicon src/icons/kristall.svg - domenu Kristall.desktop -} diff --git a/net-misc/kristall/kristall-0.3.ebuild b/net-misc/kristall/kristall-0.3.ebuild deleted file mode 100644 index 2d6f83cf1b..0000000000 --- a/net-misc/kristall/kristall-0.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg - -DESCRIPTION="Visual cross-platform gemini browser" -HOMEPAGE="https://github.com/MasterQ32/kristall" -if [ "${PV}" == "9999" ]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/MasterQ32/kristall.git" -else - SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND=" - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtsvg:5 - dev-qt/qtnetwork:5[ssl] -" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/qtcore" # qmake - -src_install() { - emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install - einstalldocs -} From 33b81c795ab53fe9bb9088599c5683b9c4b379ef Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 9 Apr 2021 19:53:02 -0400 Subject: [PATCH 09/11] acct-user/purritobin: fix description to correct package Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- acct-user/purritobin/purritobin-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acct-user/purritobin/purritobin-0.ebuild b/acct-user/purritobin/purritobin-0.ebuild index a5fc9ad657..5e930bd3a3 100644 --- a/acct-user/purritobin/purritobin-0.ebuild +++ b/acct-user/purritobin/purritobin-0.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit acct-user -DESCRIPTION="User for www-apps/jackett-bin" +DESCRIPTION="User for net-misc/purritobin" KEYWORDS="~amd64 ~arm64 ~x86" ACCT_USER_ID=-1 ACCT_USER_GROUPS=( purritobin ) From 603867b4f1332ee3b5993f334c6ecd9150afee37 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 10 Apr 2021 10:39:44 +0200 Subject: [PATCH 10/11] net-im/rocketchat-desktop-bin: add new package Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- net-im/rocketchat-desktop-bin/Manifest | 1 + net-im/rocketchat-desktop-bin/metadata.xml | 12 +++++ .../rocketchat-desktop-bin-3.1.1.ebuild | 51 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 net-im/rocketchat-desktop-bin/Manifest create mode 100644 net-im/rocketchat-desktop-bin/metadata.xml create mode 100644 net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest new file mode 100644 index 0000000000..39341e3f7e --- /dev/null +++ b/net-im/rocketchat-desktop-bin/Manifest @@ -0,0 +1 @@ +DIST rocketchat-3.1.1.x86_64.rpm 55360392 BLAKE2B 6384297c1707c549d9a8a26662a610b7fd9c168886b65ebe875eee15553c600be1f322716284011ccc8f6db70d489feea8ae3b7934651315968caccf4e871c1a SHA512 685e64b1c023baf69b1689aac83ebbfd990a0ae35b3c7b3447058595c04a7d845074d845f33dac698d59506069d05aead03b117039782c7703954b324be3cbf2 diff --git a/net-im/rocketchat-desktop-bin/metadata.xml b/net-im/rocketchat-desktop-bin/metadata.xml new file mode 100644 index 0000000000..49aa87d462 --- /dev/null +++ b/net-im/rocketchat-desktop-bin/metadata.xml @@ -0,0 +1,12 @@ + + + + + RocketChat/Rocket.Chat.Electron + https://github.com/RocketChat/Rocket.Chat.Electron/issues + + + andrewammerlaan@riseup.net + Andrew Ammerlaan + + diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild new file mode 100644 index 0000000000..ed80565945 --- /dev/null +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit rpm xdg + +DESCRIPTION="The Ultimate Open Source Web Chat Platform" +HOMEPAGE="https://rocket.chat" +SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm" + +KEYWORDS="-* ~amd64" +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + app-accessibility/at-spi2-atk:2 + dev-libs/atk + dev-libs/expat + dev-libs/libappindicator + dev-libs/nspr + dev-libs/nss + media-fonts/noto-emoji + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + x11-libs/libxcb + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + x11-libs/pango +" + +QA_PREBUILT="/opt/Rocket.Chat/*" + +S="${WORKDIR}" + +src_install() { + # remove files useless for Gentoo + rm -r usr/lib || die + cp -a "${S}"/* "${ED}" || die +} From 623ae723b83d0d450edf7e2eab845ec9f4e65d87 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 10 Apr 2021 11:49:07 +0200 Subject: [PATCH 11/11] net-im/ruqola: add new package Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- net-im/ruqola/Manifest | 1 + net-im/ruqola/metadata.xml | 15 +++++++++ net-im/ruqola/ruqola-1.3.1.ebuild | 53 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 net-im/ruqola/Manifest create mode 100644 net-im/ruqola/metadata.xml create mode 100644 net-im/ruqola/ruqola-1.3.1.ebuild diff --git a/net-im/ruqola/Manifest b/net-im/ruqola/Manifest new file mode 100644 index 0000000000..8974de1fa0 --- /dev/null +++ b/net-im/ruqola/Manifest @@ -0,0 +1 @@ +DIST ruqola-1.3.1.tar.gz 747083 BLAKE2B 2faa13bec72a57ce6caa9cc7e1e434de3cc171dc536de7fc6dbd0fc64e0d35737c7dbe597d2d10df9b3b14dc87be50a4489e61994c2a8bfedc1ff649f843879d SHA512 771e259039c1b83e0f39406409b165eba3162bd63edb3e02529e40aa8b4d3d992711a638b1718e0adfa69b88e7d0ca78b89595ba250d2649e6e282799da6cf88 diff --git a/net-im/ruqola/metadata.xml b/net-im/ruqola/metadata.xml new file mode 100644 index 0000000000..4ce2ed7add --- /dev/null +++ b/net-im/ruqola/metadata.xml @@ -0,0 +1,15 @@ + + + + + KDE/ruqola + https://bugs.kde.org + + + andrewammerlaan@riseup.net + Andrew Ammerlaan + + + Enable text-to-speech support + + diff --git a/net-im/ruqola/ruqola-1.3.1.ebuild b/net-im/ruqola/ruqola-1.3.1.ebuild new file mode 100644 index 0000000000..bfad83a4f0 --- /dev/null +++ b/net-im/ruqola/ruqola-1.3.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VIRTUALX_REQUIRED=test +ECM_TEST=forceoptional +ECM_HANDBOOK=forceoptional +KFMIN=5.80.0 +QTMIN=5.15.2 +inherit ecm + +DESCRIPTION="Rocket.Chat client for the KDE desktop" +HOMEPAGE="https://invent.kde.org/network/ruqola" +SRC_URI="https://invent.kde.org/network/ruqola/-/archive/${PV}/${P}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="GPL-2+" +SLOT="0" + +IUSE="speech telemetry" + +DEPEND=" + dev-libs/qtkeychain + >=dev-qt/qtmultimedia-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtnetworkauth-${QTMIN}:5 + >=dev-qt/qtwebsockets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" + +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package speech Qt5TextToSpeech) + $(cmake_use_find_package telemetry KUserFeedback) + ) + + ecm_src_configure +}