commit: 49467ff7b50522b146de6b960406ecb23355050d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 18:41:53 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 21:47:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49467ff7
sci-libs/libsigrok: drop 0.5.2-r5, dropping stable keywords Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 6 + sci-libs/libsigrok/Manifest | 1 - .../files/libsigrok-0.5.2-check-0.15.patch | 26 --- .../libsigrok/files/libsigrok-0.5.2-py313.patch | 46 ----- .../files/libsigrok-0.5.2-ruby-swig-docs.patch | 63 ------- .../libsigrok/files/libsigrok-0.5.2-swig-4.1.patch | 11 -- .../libsigrok/files/libsigrok-0.5.2-swig-4.patch | 37 ---- sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild | 193 --------------------- 8 files changed, 6 insertions(+), 377 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 3b1e880955a5..2fc7fb910ef3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -36,6 +36,12 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner <[email protected]> (2025-06-02) +# Package destabilisation mask. There is simply no need for this without +# any stable consumers, and it is freeing up resources. +# 0.6.0_pre20241020 is available in ~arch. +~sci-libs/libsigrok-0.5.2 + # Andreas Sturmlechner <[email protected]> (2025-06-02) # Gui depends on Qt5 and is unmaintained for a very long time - its main # developers have moved to the InputLeap project (gui-apps/input-leap). diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 9bd82e0e200a..282f1287f250 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -1,2 +1 @@ -DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 DIST libsigrok-f06f788.zip 1881766 BLAKE2B 9477312c9365c4b35ef5fb5d0908946be6f1a7f681c0b42fe4a02595069b87697bf50ad5c11130abc15229b977c2432ed8407207b954f52078c471695c911908 SHA512 bfc3390cb1f6c54f137f8f75a3eb841451ceb0376c3ba9b020cfd106a815d59179d326bd6c00a59f44a9dd5b559cf422e012761ef16c6e7ec164f1eaef5a374e diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch deleted file mode 100644 index 8099dcc6c49d..000000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 505a55f7899ee2eb41418e753a1290252202ecd3 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <[email protected]> -Date: Tue, 15 Sep 2020 08:50:48 +0200 -Subject: [PATCH] tests: strutil, use ck_assert - -We pass no message, so use ck_assert instead of ck_assert_msg. This -results in an error with check 0.15: -tests/strutil.c:157:2: error: too few arguments to function '_ck_assert_failed' - 157 | ck_assert_msg(saved_locale != NULL); ---- - tests/strutil.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/strutil.c b/tests/strutil.c -index fca70eaae..ec2233329 100644 ---- a/tests/strutil.c -+++ b/tests/strutil.c -@@ -154,7 +154,7 @@ START_TEST(test_locale) - fprintf(stderr, "Old locale = %s\n", old_locale); - /* Copy the name so it won’t be clobbered by setlocale. */ - saved_locale = g_strdup(old_locale); -- ck_assert_msg(saved_locale != NULL); -+ ck_assert(saved_locale != NULL); - - #ifdef _WIN32 - /* diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch deleted file mode 100644 index a4c1be8de96a..000000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.5.2-py313.patch +++ /dev/null @@ -1,46 +0,0 @@ -http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=5bc8174531df86991ba8aa6d12942923925d9e72 - -From: Gerhard Sittig <redacted> -Date: Mon, 2 Oct 2023 16:33:08 +0000 (+0200) -Subject: bindings/python: rephrase for Python 3.9 deprecation (call API) -X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=5bc8174531df86991ba8aa6d12942923925d9e72;hp=1711287ee9e5e4d37cab1cf9fcda5c98f732a137 - -bindings/python: rephrase for Python 3.9 deprecation (call API) - -The PyEval_CallObject() routine was deprecated in Python 3.9, use -PyObject_CallObject() instead which has existed since at least 3.0. - -There are also PyEval_InitThreads() deprecation warnings, but these -originate from SWIG generated code and are outside of our control. -Requires SWIG version 4.1 to silence these. - -Tested-By: Sascha Silbe <redacted> ---- a/bindings/python/sigrok/core/classes.i -+++ b/bindings/python/sigrok/core/classes.i -@@ -134,7 +134,7 @@ typedef guint pyg_flags_type; - - auto arglist = Py_BuildValue("(OO)", log_obj, string_obj); - -- auto result = PyEval_CallObject($input, arglist); -+ auto result = PyObject_CallObject($input, arglist); - - Py_XDECREF(arglist); - Py_XDECREF(log_obj); -@@ -177,7 +177,7 @@ typedef guint pyg_flags_type; - $1 = [=] () { - const auto gstate = PyGILState_Ensure(); - -- const auto result = PyEval_CallObject($input, nullptr); -+ const auto result = PyObject_CallObject($input, nullptr); - const bool completed = !PyErr_Occurred(); - const bool valid_result = (completed && result == Py_None); - -@@ -221,7 +221,7 @@ typedef guint pyg_flags_type; - - auto arglist = Py_BuildValue("(OO)", device_obj, packet_obj); - -- auto result = PyEval_CallObject($input, arglist); -+ auto result = PyObject_CallObject($input, arglist); - - Py_XDECREF(arglist); - Py_XDECREF(device_obj); diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch deleted file mode 100644 index 808227a2fffb..000000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bae9308ec157378bd22ce4f4a0226f1e7ef23594 Mon Sep 17 00:00:00 2001 -From: Anatol Pomozov <[email protected]> -Date: Mon, 8 Jun 2020 20:46:44 -0700 -Subject: [PATCH] Fix ruby SWIG bindings generation - -bindings/swig/doc.py generates a swig interface file for ruby bindings -that includes docstrings with comments braces ( /* and */ ) like this: - - %feature("docstring") sigrok::Channel::type "/* Type of this channel. */\n"; - %feature("docstring") sigrok::Channel::enabled "/* Enabled status of this channel. */\n"; - -SWIG generates *.cxx and adds its own braces to the docstring: - -/*/* Document-class: Sigrok::Error -Exception thrown when an error code is returned by any libsigrok call. */ -*/ - -this causes compilation error for Ruby bindings. - -To fix the error we should not add extra braces to the docstring. -With this patch libsigrok compiles fine with with ruby 2.7 and swig 4.0.2. - -Fixes bug #1526 - -Signed-off-by: Anatol Pomozov <[email protected]> ---- - bindings/swig/doc.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bindings/swig/doc.py b/bindings/swig/doc.py -index e8767af8..182f5477 100644 ---- a/bindings/swig/doc.py -+++ b/bindings/swig/doc.py -@@ -46,7 +46,7 @@ for compound in index.findall('compound'): - if language == 'python': - print('%%feature("docstring") %s "%s";' % (class_name, brief)) - elif language == 'ruby': -- print('%%feature("docstring") %s "/* Document-class: %s\\n%s */\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief)) -+ print('%%feature("docstring") %s "Document-class: %s\\n%s\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief)) - elif language == 'java': - print('%%typemap(javaclassmodifiers) %s "/** %s */\npublic class"' % ( - class_name, brief)) -@@ -77,10 +77,10 @@ for compound in index.findall('compound'): - for name, desc in parameters.items()]) + '";') - if language == 'ruby' and kind == 'public-func': - print(str.join('\n', [ -- '%%feature("docstring") %s::%s "/* %s' % ( -+ '%%feature("docstring") %s::%s "%s' % ( - class_name, member_name, brief)] + [ - '@param %s %s' % (name, desc) -- for name, desc in parameters.items()]) + ' */\\n";') -+ for name, desc in parameters.items()]) + '\\n";') - elif language == 'java' and kind == 'public-func': - print(str.join('\n', [ - '%%javamethodmodifiers %s::%s "/** %s' % ( -@@ -111,4 +111,4 @@ for compound in index.findall('compound'): - print('%}') - elif language == 'ruby' and constants: - for member_name, brief in constants: -- print('%%feature("docstring") %s::%s "/* %s */\\n";' % (class_name, member_name, brief)) -+ print('%%feature("docstring") %s::%s "%s\\n";' % (class_name, member_name, brief)) --- -2.27.0 diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch deleted file mode 100644 index 6513491270cf..000000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/878395 ---- a/bindings/cxx/enums.py -+++ b/bindings/cxx/enums.py -@@ -73,6 +73,8 @@ - code = open(os.path.join(outdirname, 'cxx/enums.cpp'), 'w') - swig = open(os.path.join(outdirname, 'swig/enums.i'), 'w') - -+print('%include "attribute.i" \n', file=swig) -+ - for file in (header, code): - print("/* Generated file - edit enums.py instead! */", file=file) diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch deleted file mode 100644 index 3c5dd85a5100..000000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e803574173bdac8a7f33085a648c29eaf248a394 Mon Sep 17 00:00:00 2001 -From: Uwe Hermann <[email protected]> -Date: Sat, 4 Apr 2020 21:54:13 +0200 -Subject: [PATCH 1/1] bindings/java: Fix build issue with SWIG 4.x. - -Tested with SWIG 3.x and SWIG 4.x. - -This fixes bug #1527. ---- - bindings/java/org/sigrok/core/classes/classes.i | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i -index 75793b25..e953fe5d 100644 ---- a/bindings/java/org/sigrok/core/classes/classes.i -+++ b/bindings/java/org/sigrok/core/classes/classes.i -@@ -94,10 +94,18 @@ VECTOR(std::shared_ptr<sigrok::HardwareDevice>, HardwareDevice) - "java.util.Map<JKey, JValue>" - - %typemap(javain, -+/* SWIG 4.0.0 changed the std::map wrappers in an incompatible way. */ -+#if SWIG_VERSION >= 0x040000 -+ pre=" $javaclassname temp$javainput = new $javaclassname(); -+ for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet()) -+ temp$javainput.put(entry.getKey(), entry.getValue());", -+ pgcppname="temp$javainput") -+#else - pre=" $javaclassname temp$javainput = new $javaclassname(); - for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet()) - temp$javainput.set(entry.getKey(), entry.getValue());", - pgcppname="temp$javainput") -+#endif - std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)" - - %typemap(javaout) std::map< CKey, CValue > { --- -2.24.0.rc2 diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild deleted file mode 100644 index 29150532d1a4..000000000000 --- a/sci-libs/libsigrok/libsigrok-0.5.2-r5.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..13} ) - -USE_RUBY="ruby31 ruby32" -RUBY_OPTIONAL="yes" - -inherit autotools python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"; - KEYWORDS="amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" -HOMEPAGE="https://sigrok.org/wiki/Libsigrok"; - -LICENSE="GPL-3" -SLOT="0/4" -IUSE="bluetooth +cxx ftdi hidapi java parport python ruby serial static-libs test +udev usb" -REQUIRED_USE="java? ( cxx ) - python? ( cxx ${PYTHON_REQUIRED_USE} ) - ruby? ( cxx || ( $(ruby_get_use_targets) ) )" - -RESTRICT="!test? ( test )" - -# We also support librevisa, but that isn't in the tree ... -LIB_DEPEND=" - >=dev-libs/glib-2.32.0[static-libs(+)] - >=dev-libs/libzip-0.8:=[static-libs(+)] - bluetooth? ( >=net-wireless/bluez-4.0:= ) - cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) - ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) - hidapi? ( >=dev-libs/hidapi-0.8.0 ) - parport? ( sys-libs/libieee1284[static-libs(+)] ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] - ) - ruby? ( $(ruby_implementations_depend) ) - serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) - usb? ( virtual/libusb:1[static-libs(+)] ) -" -RDEPEND=" - java? ( >=virtual/jre-1.8:* ) - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( ${LIB_DEPEND} ) -" -DEPEND="${LIB_DEPEND//\[static-libs(+)]} - cxx? ( app-text/doxygen ) - java? ( - >=dev-lang/swig-3.0.6 - >=virtual/jdk-1.8:* - ) - python? ( - >=dev-lang/swig-3.0.6 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - ) - ruby? ( >=dev-lang/swig-3.0.8 ) - test? ( >=dev-libs/check-0.9.4 ) - virtual/pkgconfig -" - -S="${WORKDIR}"/${P} - -PATCHES=( - # https://sigrok.org/bugzilla/show_bug.cgi?id=1527 - "${FILESDIR}/${P}-swig-4.patch" - # https://sigrok.org/bugzilla/show_bug.cgi?id=1526 - "${FILESDIR}/${P}-ruby-swig-docs.patch" - "${FILESDIR}/${P}-check-0.15.patch" - # https://bugs.gentoo.org/878395 - "${FILESDIR}/${PN}-0.5.2-swig-4.1.patch" - - "${FILESDIR}/${P}-py313.patch" -) - -pkg_setup() { - use python && python_setup - use ruby && ruby-ng_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_unpack() { - [[ ${PV} == *9999* ]] && git-r3_src_unpack || default -} - -sigrok_src_prepare() { - eautoreconf -} - -each_ruby_prepare() { - sigrok_src_prepare -} - -src_prepare() { - if use ruby; then - # copy source to where ruby-ng_src_unpack puts it - cp -rl "${S}" "${WORKDIR}"/all || die - # ruby-ng_src_prepare calls default by itself - ruby-ng_src_prepare - fi - default - sigrok_src_prepare - use python && python_copy_sources -} - -sigrok_src_configure() { - econf \ - --disable-python \ - --disable-ruby \ - $(use_with bluetooth libbluez) \ - $(use_with ftdi libftdi) \ - $(use_with hidapi libhidapi) \ - $(use_with parport libieee1284) \ - $(use_with serial libserialport) \ - $(use_with usb libusb) \ - $(use_enable cxx) \ - $(use_enable java) \ - $(use_enable static-libs static) \ - "${@}" -} - -each_python_configure() { - cd "${BUILD_DIR}" - sigrok_src_configure --enable-python -} - -each_ruby_configure() { - RUBY="${RUBY}" sigrok_src_configure --enable-ruby -} - -src_configure() { - sigrok_src_configure - use python && python_foreach_impl each_python_configure - use ruby && ruby-ng_src_configure -} - -each_python_compile() { - cd "${BUILD_DIR}" - emake python-build -} - -each_ruby_compile() { - emake ruby-build -} - -src_compile() { - default - use python && python_foreach_impl each_python_compile - use ruby && ruby-ng_src_compile -} - -src_test() { - emake check -} - -each_python_install() { - cd "${BUILD_DIR}" - emake python-install DESTDIR="${D}" - python_optimize -} - -each_ruby_install() { - emake ruby-install DESTDIR="${D}" -} - -src_install() { - default - use python && python_foreach_impl each_python_install - use ruby && ruby-ng_src_install - use udev && udev_dorules contrib/*.rules - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - udev_reload -}
