diff options
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/Manifest.gz | bin | 8710 -> 8705 bytes | |||
| -rw-r--r-- | sci-electronics/pulseview/Manifest | 3 | ||||
| -rw-r--r-- | sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch | 18 | ||||
| -rw-r--r-- | sci-electronics/pulseview/pulseview-9999.ebuild | 23 |
4 files changed, 32 insertions, 12 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex ebb1244240b8..7550c2d816f2 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest index 4d44529624a1..c0bd93e2d0b7 100644 --- a/sci-electronics/pulseview/Manifest +++ b/sci-electronics/pulseview/Manifest @@ -1,6 +1,7 @@ AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403 AUX pulseview-0.4.2-qt-5.15.patch 5193 BLAKE2B ea81ba54ca1a8b9d76d2e7751940d7b4e509adb75f903e5e85be49976106eefe1745908fe55d2aa206402494cd636879c71fe811e7dde874ebc40174ea8727cd SHA512 66c1e00f9470d4384bfa5dda2db7ada9d1e86cee2b2cd2a8517b44c1d6ee310d2f9a930033a7c93a30e006675c738b7cf75d6ee22ee09c7b8b52e831ca6571d0 +AUX pulseview-0.5.0-glibmm-2.68-required.patch 488 BLAKE2B d2e4cf7e00b037da515cef0164b2b98c56480ad136a3b4a36e62da4bb6c5b433990afabe590b9c70b5e93618d517cc0397fbc6bdac10e019da8e8c07b38dad21 SHA512 f27b71279deb5db950730dac8908aee1d44f381b61f034bd43d7e4f67a408e8d8197a29f164aa274b59a90721cda05dd78ac5aaf3c7f0219ae55f4480b0d9a01 DIST pulseview-0.4.2.tar.gz 1399718 BLAKE2B ebbefefa55bb7ce9d1bbdfa8ea44d9536fa4f9ca9f6f13175a5bb6122dcb431ddad7c668e631128ca57fd2231021f8ce1c686fac9fa746ace24cf69ef3d71e71 SHA512 79f653c9faad021c03b59b4a519b594190d5558dfb9be60cabcc2a35e991e66b733b337fec58a9248699e7aef0df3be1472c81f93274b25cec1fc6b73f8f033b EBUILD pulseview-0.4.2-r1.ebuild 1436 BLAKE2B fbf674213b9dffa1d52a0a7be55dbc978da0b1980a48e9ae5e3017cbbf04938a2a7bceb30d08001dac23d327584e21c97817fd1bff7c11dab934513c98ebbf98 SHA512 7a2c0fe07177f84d92881b93ee2dd7e4123afd9bd7bec8b832f53b7f52e0448e933244791c8e81a9b00494d6a8c01eee4a6be129f0b7ddf20d402085f4238463 -EBUILD pulseview-9999.ebuild 1213 BLAKE2B 57b5be5abc95e6db85d5018172d80c5c0ab4e00435e45ffd492f94d6d8f7163a07fa40016b2523b942264aeb4ad354bdc983e8b25e771dcfeafc31756baf1418 SHA512 325cc00174c909e256c7820a79f71e9326ddbc44055627f0ebc313af8d94842bd5b7824763c3d54d2d25b916b72db3483728142cef8325f8fea089899797c359 +EBUILD pulseview-9999.ebuild 1298 BLAKE2B fa9600835574f7a9c9b40f0fff8591f43051cbf1495e3835296f62762c68d45ac258dab5fdde0ce2fd6c44a50144f814707a89abf2cc58ba79aa3160ab80b31d SHA512 cc6d193d0ebeacdb1506901026630d9ebe67c3645086e85fa980423210a68255800bbed6e261df98fedc67843b6a361cd4d3097046e0ec23086b32a5feb4af4f MISC metadata.xml 334 BLAKE2B 4b5f18089903f6ea4eed965b12843da3d32a72646831ec5a56d6fcd0c0beef5e574a85e16204b8210c6e1bc0ed2571352a6f9f1831e967b15f2f3fe085fd87a8 SHA512 9f93f66a742a6cd8afebdce63a9a9edacec75381bc846d0e71c6fece1af1f16c490721eff8cb9cc34b4b7ae0b226f42b7a1e166f9dd05921dd9d7b08408ea241 diff --git a/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch b/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch new file mode 100644 index 000000000000..46309724517a --- /dev/null +++ b/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,14 +120,7 @@ + + list(APPEND PKGDEPS glib-2.0>=2.28.0) + +-# Try to find the prefered glibmm-2.4. If not found then add glibmm-2.68 +-# to the dependency list. +-pkg_check_modules(GLIBMM_2_4 glibmm-2.4>=2.28.0) +-if(GLIBMM_2_4_FOUND) +- list(APPEND PKGDEPS glibmm-2.4>=2.28.0) +-else() +- list(APPEND PKGDEPS glibmm-2.68>=2.68.0) +-endif() ++list(APPEND PKGDEPS glibmm-2.68>=2.68.0) + + if(ENABLE_FLOW) + list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0) diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild index f6e44dc48a2f..80e69f8085ed 100644 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 inherit cmake xdg-utils @@ -20,25 +20,25 @@ LICENSE="GPL-3" SLOT="0" IUSE="+decode static" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" RDEPEND=" - >=dev-cpp/glibmm-2.28.0:2 + >=dev-cpp/glibmm-2.68.0:2.68 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.6.0:= ) " DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig +" DOCS=( HACKING NEWS README ) +PATCHES=( "${FILESDIR}/${PN}-0.5.0-glibmm-2.68-required.patch" ) + src_prepare() { cmake_src_prepare cmake_comment_add_subdirectory manual @@ -47,6 +47,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DDISABLE_WERROR=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON -DENABLE_DECODE=$(usex decode) -DSTATIC_PKGDEPS_LIBS=$(usex static) ) |