From nobody Fri Apr 11 16:39:38 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZZ2TR0hlVz5sJYs; Fri, 11 Apr 2025 16:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZ2TQ36P7z3Ngg; Fri, 11 Apr 2025 16:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744389578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSN/b9hyaVWmPvwTtM+tHdEVXHuh1tZ8mFV9gcCLA0E=; b=Q7nP+ZCx7yM2t1ZvMx6HrA2H9/zel/5G3HcJ9+2Bs8+2dKk4Ae19AE5fvVnLgz0mEQmBj6 jUPYXnytHkY9oEe/Hnlbej9CzWFLPojyzahkdBYx4Qq+to+dz9cljHIdihCSNB9ZyuZHjS rOq6sA72y66E13oGS1avFoHIGTxrKYJ2kIN7BAm7DAFuhyKUoXXLBLyD+C5P7bfMVQTA9X i9E52UoYL8aGXagGHPO4y8CZruHNEypXhJpsPhJmePvZx0QHZthBa0cke0mlVajRNW2oiv /IORQzguy79SlhXLLO5RVSeI71Anllc34fRrkjTAXscX02bWn6/oFAZ9fdrTmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744389578; a=rsa-sha256; cv=none; b=LL/Luv4Oq7CUIPVolu8gUb9hckOSkwE9r2Il5eAYRM+cdKkMSCidRJj6dU96W6gruzUH+9 6GwXrAY84s9mkzxH9X55sa6LlQvWUsLjFMOpnJIhP8MKbRdg688otnO/BYvS/vx0IAkpay cy02dF3IrR9qXZjiQAHm2Xx4XhNQwZiT9w5L1WQUjGu1ITZXgHXI5+9qkOTbmqAFWbZLdt qW/US/OaCGtG8YdcxPvBeeeuf0ejnY0q4kgJI8hUHhCvFlstxPz1IWe0ODTbx8SevGElmf zYBvra19PybgoTCViTqGotxP1FCzvYwFGlX3r+qRMDR3+a0KcHKzVm8kq+L7PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744389578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSN/b9hyaVWmPvwTtM+tHdEVXHuh1tZ8mFV9gcCLA0E=; b=uPReGVA/16tIKiK7rnusosf4X6B0QShFszFOpcdE2Al1Xgaa+PuAO0G8/rx7AdV/uH0Q4W Nx1yT4JJTRBkF6EK+udtIoEzYirJo8EeBokvFfgMH1GLeJ5uT0Bxxj3DTey99A68jX26bf 1ubaHHGiDLvsAlx1oNenJe/VN8Qb9fGoHNtbT5jSMLTaYTK8bTBMqNk0mVhgoAEq/oWWU1 PlxGW6A6sPmlzD7YdTWayyhD6Khk5rpybCG4llpmgRHqp3uDur+5jV2lYMaavwivZLanGB fnfQRzOxBcjslwh+bMF+oBXKsEV41JdAEhIbP4w3zR1PTGMM2WckruD34hr2LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZZ2TQ2jyPzhBQ; Fri, 11 Apr 2025 16:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53BGdcrd037308; Fri, 11 Apr 2025 16:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BGdcC5037305; Fri, 11 Apr 2025 16:39:38 GMT (envelope-from git) Date: Fri, 11 Apr 2025 16:39:38 GMT Message-Id: <202504111639.53BGdcC5037305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9e6ed91b5750 - main - devel/libsigrok: Fix runtime with newer pythons List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e6ed91b57507d53af8a27eaa73cfef383b3cf48 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e6ed91b57507d53af8a27eaa73cfef383b3cf48 commit 9e6ed91b57507d53af8a27eaa73cfef383b3cf48 Author: Muhammad Moinur Rahman AuthorDate: 2025-04-10 19:52:11 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-04-11 16:39:13 +0000 devel/libsigrok: Fix runtime with newer pythons --- devel/libsigrok/Makefile | 10 +--- devel/libsigrok/files/patch-Makefile.in | 90 +-------------------------------- devel/libsigrok/files/patch-configure | 23 +++++++++ 3 files changed, 26 insertions(+), 97 deletions(-) diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile index d635d2134e31..6735023b795f 100644 --- a/devel/libsigrok/Makefile +++ b/devel/libsigrok/Makefile @@ -1,6 +1,6 @@ PORTNAME= libsigrok PORTVERSION= 0.5.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://sigrok.org/download/source/libsigrok/ @@ -19,7 +19,7 @@ LIB_DEPENDS= libcheck.so:devel/check \ libvisa.so:devel/librevisa \ libzip.so:archivers/libzip -USES= compiler:c11 gnome libtool pathfix pkgconfig python:-3.9,build \ +USES= compiler:c11 gnome libtool pathfix pkgconfig python:build \ shared-mime-info USE_GNOME= glibmm USE_LDCONFIG= yes @@ -30,10 +30,4 @@ MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip -post-patch: -# libusb can be disabled via src.conf(5), so detect via pkg-config - @${REINPLACE_CMD} -e 's/\(libusb-1\.0\) >= 1\.0\.[0-9]*/\1/' \ - -e '/\*freebsd\*/,/;;/d' \ - ${WRKSRC}/configure - .include diff --git a/devel/libsigrok/files/patch-Makefile.in b/devel/libsigrok/files/patch-Makefile.in index acb879d7942b..21bd2aa2accd 100644 --- a/devel/libsigrok/files/patch-Makefile.in +++ b/devel/libsigrok/files/patch-Makefile.in @@ -1,93 +1,5 @@ ---- Makefile.in.orig 2023-02-26 13:49:58 UTC +--- Makefile.in.orig 2025-04-10 19:22:13 UTC +++ Makefile.in -@@ -579,7 +579,7 @@ am__v_lt_0 = --silent - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent --am__v_lt_1 = -+am__v_lt_1 = - bindings_cxx_libsigrokcxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(AM_CXXFLAGS) $(CXXFLAGS) \ -@@ -1095,12 +1095,12 @@ am__v_GEN_0 = @echo " GEN " $@; - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --am__v_GEN_1 = -+am__v_GEN_1 = - AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ --am__v_at_1 = --DEFAULT_INCLUDES = -+am__v_at_1 = -+DEFAULT_INCLUDES = - depcomp = $(SHELL) $(top_srcdir)/autostuff/depcomp - am__maybe_remake_depfiles = depfiles - am__depfiles_remade = bindings/cxx/$(DEPDIR)/classes.Plo \ -@@ -1327,7 +1327,7 @@ am__v_CC_0 = @echo " CC " $@; - AM_V_CC = $(am__v_CC_@AM_V@) - am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) - am__v_CC_0 = @echo " CC " $@; --am__v_CC_1 = -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -1335,7 +1335,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; --am__v_CCLD_1 = -+am__v_CCLD_1 = - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -1345,7 +1345,7 @@ am__v_CXX_0 = @echo " CXX " $@; - AM_V_CXX = $(am__v_CXX_@AM_V@) - am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) - am__v_CXX_0 = @echo " CXX " $@; --am__v_CXX_1 = -+am__v_CXX_1 = - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -@@ -1353,7 +1353,7 @@ am__v_CXXLD_0 = @echo " CXXLD " $@; - AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) - am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) - am__v_CXXLD_0 = @echo " CXXLD " $@; --am__v_CXXLD_1 = -+am__v_CXXLD_1 = - SOURCES = $(bindings_cxx_libsigrokcxx_la_SOURCES) \ - $(libsigrok_la_SOURCES) $(src_libdrivers_la_SOURCES) \ - $(src_libdrivers_head_la_SOURCES) \ -@@ -1780,7 +1780,7 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(src - $(am__append_1) - @WIN32_FALSE@global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' - # Do not hard-code the firmware location on Windows. --@WIN32_TRUE@global_defs = -+@WIN32_TRUE@global_defs = - # Ensure that local include directories are always searched first. - AM_CPPFLAGS = $(local_includes) $(global_defs) - -@@ -2020,7 +2020,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h --$(srcdir)/config.h.in: $(am__configure_deps) -+$(srcdir)/config.h.in: $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ -@@ -2319,7 +2319,7 @@ src/scale/kern.lo: src/scale/$(am__dirstamp) \ - src/scale/kern.lo: src/scale/$(am__dirstamp) \ - src/scale/$(DEPDIR)/$(am__dirstamp) - --libsigrok.la: $(libsigrok_la_OBJECTS) $(libsigrok_la_DEPENDENCIES) $(EXTRA_libsigrok_la_DEPENDENCIES) -+libsigrok.la: $(libsigrok_la_OBJECTS) $(libsigrok_la_DEPENDENCIES) $(EXTRA_libsigrok_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsigrok_la_LINK) -rpath $(libdir) $(libsigrok_la_OBJECTS) $(libsigrok_la_LIBADD) $(LIBS) - src/drivers.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) - src/hardware/agilent-dmm/$(am__dirstamp): @@ -5262,6 +5262,7 @@ $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsig @BINDINGS_RUBY_TRUE@$(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC) @BINDINGS_RUBY_TRUE@ $(AM_V_at)test -d $(RDIR) || $(MKDIR_P) $(RDIR) diff --git a/devel/libsigrok/files/patch-configure b/devel/libsigrok/files/patch-configure new file mode 100644 index 000000000000..a5f3d089ae27 --- /dev/null +++ b/devel/libsigrok/files/patch-configure @@ -0,0 +1,23 @@ +--- configure.orig 2025-04-10 19:24:26 UTC ++++ configure +@@ -17892,9 +17892,9 @@ case $host_os in #( + freebsd*) : + sr_libusb_req='libusb-1.0' sr_have_libusb=yes ;; #( + mingw*) : +- sr_libusb_req='libusb-1.0 >= 1.0.20' ;; #( ++ sr_libusb_req='libusb-1.0' ;; #( + *) : +- sr_libusb_req='libusb-1.0 >= 1.0.16' ;; ++ sr_libusb_req='libusb-1.0' ;; + esac + + +@@ -22346,7 +22346,7 @@ else + $as_echo_n "(cached) " >&6 + else + +- for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do ++ for am_cv_pathless_PYTHON in python python3 python3.9 python3.10 python3.11 python3.12 python3.13 python3.14 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros