diff options
Diffstat (limited to 'sci-electronics')
19 files changed, 475 insertions, 195 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 474369a314d2..7550c2d816f2 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest index 36a41bd46804..89b32a5af2d6 100644 --- a/sci-electronics/Stage/Manifest +++ b/sci-electronics/Stage/Manifest @@ -1,4 +1,4 @@ AUX libdir.patch 2638 BLAKE2B bcc1cce443ffde27cb8fe93e83c7242913fcb2efd2b2d0c9fadf1098565a4670a3fa34df4d03711f3546d8f99c71ea8f7ad15b76f1d5a3761edc9a969f817ecb SHA512 78cf1bfbc15cb5f1ba7c091a39cf3f356aba1dd8c90c319ae30d8655691a0d449e28fbcf0ec59bcb5a457ec59ebe061edd6fa30f11fd0e5f99748ee6f6abcc02 DIST Stage-4.3.0.tar.gz 1039133 BLAKE2B 30a6083750b05f83884764ed5c56489df6e534af1ef4722212f3bd129180954321a111081e22916ec676d9e76e3f28cb6f5beb79d2290add76acef529d28d731 SHA512 37abf63c3a187dc2521c80d504aaef4b7eeef861cbbdce488a7d1c14e7e6eb6f84e010e014b1a3cb81f4ca9ccbebc564a32ffa7ba7b50458c50436216bd8250f -EBUILD Stage-4.3.0-r1.ebuild 561 BLAKE2B ba048455b241e1b275a706465d20784184b9dce8eaafe2343a1ff36d268aa5a29819d21354e87e4fe8c4beeb266957f27d5f61421f8b6e8100c9cfc70bb2447d SHA512 ebdefd9306a9f47e5c15105b4931ca4c47b029a6586d9e1d60a3cb1c857c8b7cfd75dbbb75932cfc506304931903c7d317695c8be47986a1154e2c02672e0488 +EBUILD Stage-4.3.0-r2.ebuild 564 BLAKE2B 7c45aead3ad7da2b5c989fc1202632cf99a7cfb07a9072b0f22fb22a6f2a4a6727990aca791907ee7fea1ce920860d4f0c212296c04ebf6eca02098560f0fa09 SHA512 63a4f80bc1980ceecb568e2d9ab9ae9f9f0cd5816a0f53be3555c7494131bfea414589f3eb4e7ce05e7deaa44cc260a7de82842dda0bb4ff7ce82700ab422f88 MISC metadata.xml 324 BLAKE2B 42b5f359c2fe27832c48137676be95fdce985fed2d94d66f88372381730591861608b1004edcf6872ae11d328c5e169451dfa14509e5dfc4d48891e3d831b9e3 SHA512 1aef94496f65317310077956198628e09d45df8f8f787ea116cca00a4b63fb5a37fcb02d4b84393c9c7c6673d3205c7f53aeb5a396c5994fcf3e7a4b0140c806 diff --git a/sci-electronics/Stage/Stage-4.3.0-r1.ebuild b/sci-electronics/Stage/Stage-4.3.0-r2.ebuild index 9012058a44da..eb173c8f8685 100644 --- a/sci-electronics/Stage/Stage-4.3.0-r1.ebuild +++ b/sci-electronics/Stage/Stage-4.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ RDEPEND=" dev-libs/libltdl:0 media-libs/libpng:0= sys-libs/zlib:0= - x11-libs/fltk[opengl] + x11-libs/fltk:1=[opengl] virtual/glu virtual/jpeg:0 virtual/opengl diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest index bf1977a368d7..aea39c2536ab 100644 --- a/sci-electronics/fritzing/Manifest +++ b/sci-electronics/fritzing/Manifest @@ -1,12 +1,7 @@ -AUX fritzing-0.9.4-fix-libgit2-version.patch 818 BLAKE2B 559efc56933460e541850e73eec1f872e3c83757e6e5e6edb8a9adf120f9e1988024d32af92d80eeedad9bce9f8f954caa5bd2c08da6c5fb7a3b6fd8a2110c01 SHA512 344597d2a1d95909bffabd852a199219d1112ec020c5f1b4bc7a46c3ed522ce931f5abef54b68dcd53dbbb52eb890262fcd67dea1947b56ef9b9d7eaebedd6e3 AUX fritzing-0.9.4-move-parts-db-path.patch 2345 BLAKE2B c95d68d115614152817bd3905a2d0b9efdd5a358bfa242455b626d670c2382affe5ef42bcef71446c567dba28be1fed7b66102d6d82db66d86154e8374f3283d SHA512 851f4e049564a488502a93d2730484a258b042147a6645ce40195a31c97cb92b7d79e7c03751cf6337b4d9558c263f5149e7e969ecedd97abcd0e8824adb551b -AUX fritzing-0.9.4-quazip1.patch 645 BLAKE2B 2f0fe077ab6c880479be0d9682a9812e93cccf71e4c5879bd3a3270799cc1db82ad3836d6714c79e6e553cc31463c30dc4a93c2f86d4c98057db019579fed5dc SHA512 af588ea11e1bb8695ff37166a4ac5972c4e6302e44f09db24645d8b34005c14773293d4899f2b3d9ddba713a5ff6d3fcfab0c122d6016c43e5c3c1e3439ab853 AUX fritzing-0.9.6-dropping-register-keyword.patch 952 BLAKE2B e27664d226060d1cf34c56d99daf49b7160af0e8f3eeba50ae1c0ddbdcd96b95bd5677332594831356f34e6ab4f3a8c315571969171357f1445ea4cadcad79e5 SHA512 692bb9485c91a8da654aec8b05da2d01ff86131ce47a596119ca99e25c2b212776c11bf2a0ccdcc5f2ff2a1b265e4e1eadb74d969bb46d00ede13461e9d12ad0 AUX fritzing-0.9.6-quazip-qt5.patch 662 BLAKE2B aa027d5bfcd6fccbd0a07949bf505b42d07e50f7a36b4b0bbd86bbdb929baa3cd2314a071118f753a6f8d721e72a4522d5e80177f2c2558e0a9094eea0f5e556 SHA512 fa130813e293dc72395333b8037e37ab10f783c310879fa0b4e0ae10abb01082f9c3fe66403f2afc559d50b7b4f3385d4acb0e68cde347b2f54bac6ae1884748 -DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0 DIST fritzing-0.9.6.tar.gz 11521767 BLAKE2B 01c6ea87108b70161350b79c4878c288935c3f0a37464cf3c4e276a746edb2bbcb2c3b7bcf0b3a879232f5f79fd15b573f930b8cea96924b04b1e5b3ddade542 SHA512 d91fcf79760b9570513e8315bcb29fcd1d53684920e8563539669a0dedd164e35031e53da7ea2c12e95e564b3f95a05ce953082ffdfa54f4e4f99c50a4991a52 -DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f DIST fritzing-parts-0.9.6.tar.gz 14982269 BLAKE2B 0f017a2a3eb654ed26d647faa463024c52aab58df7a487c75e1636efb288dc9fad9aa8499404f381012287e6e3312a569ed2f171d20b2d5df85440d97673fe9c SHA512 d39096bcb89e2aa04c285aaddd575a54a08d016d859399133eab89d69ed37d5e5e5a5a9e838cad5879835bcdcdd9c3b484179104e04d8f96d4eef1004047162b -EBUILD fritzing-0.9.4-r3.ebuild 2002 BLAKE2B aa702c9514e25478631ff42d2fd1e2e15231c29cd7e25726b64feb67c5d8750e63aa770ac12785071d49922009dba5bc786dc3a7f3617e0b214fcbda2582553c SHA512 dfa8e64efc4095bfaa06a7b171eeb38ea99853b1d76f2ef2d1dd4eaabc5dffbe7b4f80b6d25699b705dac09c204ea8f92a872e9f7e8e3b2a96221f2efa7b6bb4 EBUILD fritzing-0.9.6.ebuild 1785 BLAKE2B ae865d1b7266c854c58ad4fe472886d03d7727a8f5b0739b34b8e6cfd7c5447a0ced161d67a767f6e4c254647bba187d26f104a113d1b2e8aa7e4ca1ec9ef4ee SHA512 6096457c4eb08ed62b2a1eea542d6866335972c8c25068d7929c2efce2d08fbad20c129eb8a89f742b04b97b8b5c8122af18f337f571f8b89f7cbfefbf526584 MISC metadata.xml 254 BLAKE2B 9edd3c3a62e897c3ca28044d6104110726e1d92b0f7e9c0409ac5800eaa638e3d6d46acd09c8ee196fd932a4d1cfcdccdc5a127976f448121954fd9d7dd793b8 SHA512 7bef4d8bb64ab101097fb37465de7cdcd4c14d94d5a9e8ee8fd8f45514d91e8195555b096c8aec70431f65bc2a95dcf360cf3f670ddf03821fe585557ddfd0c6 diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch deleted file mode 100644 index 47aea61ae76e..000000000000 --- a/sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 472951243d70eeb40a53b1f7e16e6eab0588d079 -Author: PsikoBlock <rramsch@googlemail.com> -Date: Fri Apr 10 21:41:52 2020 +0200 - - Fix libgit2 version check to allow building with versions >= 1.0 - -diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp -index 65daf76e..36300fe0 100644 ---- a/src/version/partschecker.cpp -+++ b/src/version/partschecker.cpp -@@ -115,7 +115,7 @@ bool PartsChecker::newPartsAvailable(const QString &repoPath, const QString & sh - /** - * Connect to the remote. - */ --#if LIBGIT2_VER_MINOR > 24 -+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24) - error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL); - #elif LIBGIT2_VER_MINOR == 24 - error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL); diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch deleted file mode 100644 index d218c10d90a0..000000000000 --- a/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix build with QuaZip-1.0. - ---- a/phoenix.pro -+++ b/phoenix.pro -@@ -194,8 +194,8 @@ - include(pri/qtsysteminfo.pri) - - contains(DEFINES, QUAZIP_INSTALLED) { -- INCLUDEPATH += /usr/include/quazip -- LIBS += -lquazip -+ CONFIG += link_pkgconfig -+ PKGCONFIG += quazip1-qt5 - } else { - include(pri/quazip.pri) - } ---- a/src/utils/folderutils.cpp -+++ b/src/utils/folderutils.cpp -@@ -35,8 +35,8 @@ - - #include "../debugdialog.h" - #ifdef QUAZIP_INSTALLED --#include <quazip/quazip.h> --#include <quazip/quazipfile.h> -+#include <quazip.h> -+#include <quazipfile.h> - #else - #include "../lib/quazip/quazip.h" - #include "../lib/quazip/quazipfile.h" diff --git a/sci-electronics/fritzing/fritzing-0.9.4-r3.ebuild b/sci-electronics/fritzing/fritzing-0.9.4-r3.ebuild deleted file mode 100644 index da0b0ccbba53..000000000000 --- a/sci-electronics/fritzing/fritzing-0.9.4-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -MY_PV="CD-498" -PARTS_P="${PN}-parts-${PV}" -PARTS_COMMIT="e79a69765026f3fda8aab1b3e7a4952c28047a62" - -DESCRIPTION="Electronic Design Automation" -HOMEPAGE="https://fritzing.org/ - https://github.com/fritzing/fritzing-app/" -SRC_URI="https://github.com/fritzing/fritzing-app/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz" - -LICENSE="CC-BY-SA-3.0 GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/quazip:0=[qt5(+)] - dev-libs/libgit2:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 -" -DEPEND="${RDEPEND} - dev-libs/boost -" - -S="${WORKDIR}/${PN}-app-${MY_PV}" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}/${P}-fix-libgit2-version.patch" - "${FILESDIR}/${P}-move-parts-db-path.patch" - "${FILESDIR}/${P}-quazip1.patch" -) - -src_prepare() { - xdg_src_prepare - - if has_version "<dev-libs/quazip-1.0"; then - sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i phoenix.pro || die - fi - - # Get a rid of the bundled libs - # Bug 412555 and - # https://code.google.com/p/fritzing/issues/detail?id=1898 - rm -r src/lib/quazip/ pri/quazip.pri || die - - # Fritzing doesn't need zlib - sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die - - # Use system libgit - sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die - - # Add correct git version - sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${MY_PV}:" pri/gitversion.pri || die -} - -src_configure() { - eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro -} - -src_install() { - PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}" - INSTALL_ROOT="${D}" default - insinto /usr/share/fritzing/fritzing-parts - doins -r ${PARTS_DIR}/* -} diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 231cc0cc0825..c3afb598e4ec 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,11 +1,14 @@ AUX boost.patch 1851 BLAKE2B b05a0397ec6cd16d910c3edfa636d31959daea0992c56cfe67030ffe49a8462ddf20ce4a0d205c711ec0eedfe591381e342d3aacf5ddedb81ed49058a8436f93 SHA512 d1c4a4359e0f1719f8793bd65388cf2ac77494685e12dca6872c145dbea9abc1866375b171720937f9290d3c435c47254c37d6b26210a388069c55ef59007f8d AUX boost186.patch 794 BLAKE2B 341d0636232511ae5d437a9806823a09bc107f2c89c04ac159871584c7eb773d638b43dd681b597712786935e9f95d5f8658dd58b2917e4fdd6dfbad8fdb53f0 SHA512 821ba11dfafed69d3f964e393cc829230594ab5be04d756ff834ac43b02734cc2105fbdb4ae8bc3e7207c72ee3d63a699a6d7d9af9c5f0e897e506de5d4b8206 +AUX boost187.patch 7727 BLAKE2B 861d4efb46f766d4f3fd3f844bfd65a86518187aaa8375900775e6296b5179774cc619f817b18d5e257cceb2703b97ba7e294dcca96b34e5c078df59c077692b SHA512 58b1aa3e1414f077798f1ec9d7dcc76c9fb3b21cc345bee393a0b7b755c7120190cdca9708c23e7d1d18fec0c8023e2f85348c416e725be83de9e98ffb00ebfb AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f AUX gv10.patch 1617 BLAKE2B 2fee9681e2f2f67e6a52bef75fc7c56217a4c57c8136e4b27ace7ba49c520161c2f15a1a73035822244b321b0f6b15c0af9c67254076e6168b4cc8624334e81d SHA512 3c3b8a08d212c5f93e85577ea043107e6008ebd85631951cd7ed6767a22be2b807b87b1cfce3f13f66d936ea53cf1eb14a4c067d1f444d2cd7e35462bb1f27bc AUX protobuf.patch 8899 BLAKE2B c8d181250926a7b22aa67e17b1e38b9713c50578458452d02b9af89400d4194f31808563709cbfc81fdb4709ee57032fbb77d26ff413bc069a5dc0407a57146b SHA512 eb36f0000204788ad9fa40d8fcdc0fcb6fc8d27489c5bae3cc12e910a7046936ed1d6adc23b3498060ee6da380df5f238bde17b699b3c3b0eec9f1c75a6c07e9 AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792 DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390 DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34 +DIST gazebo-11.15.1.tar.bz2 111639491 BLAKE2B 1a97fd04980310ed8e775c5ba8aa36af6d60ea0235c467ade763a4d7cb2ca72008bae2299c73018f89b0d5b12c23f3663948fd0a5c91b58a3cf235b49ffaa975 SHA512 085bd71f2495d86752274c02578d4e30d49f4e35dc91226ad11242f0cc5129f98686dfbae83120d228036d2034beb21b9cd1be91505a48d4ccc757d19cecb111 EBUILD gazebo-11.13.0.ebuild 1893 BLAKE2B 01d3b523ca6342fea4be572679cbee959da6dbe89084680786ef5e0edb655f6fa3051e69aedfbfd0f929f41211447029b59021d31c22fe3ead1a07e803d57467 SHA512 e2f5973099b478942089d2863d2751ee7b47bf46db4ae0730cd3a765af3e484ef63c5c5df5d41c99eb32b47acf7775f6818cb70befad0e7a65c54bd27e6b75de EBUILD gazebo-11.14.0.ebuild 1946 BLAKE2B 4835978994e711666ca4fd40d9046ec8458cee3a07ea9967224c91807658cd9fdc4d0f0ff9635c01739a34d9d951863cfef0a05859b02098ab257ec06a1a7821 SHA512 41d1fd8291bc7eaee1961b3608ad6dbe52eafb40ed9b7237885b5e3b15d9cdc170f3eee446a3447ba8aa01322cd6bbb2ca71b6dc45320197764ea5a1fcf9ffdf -MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af +EBUILD gazebo-11.15.1.ebuild 1893 BLAKE2B 7e1e238bac3fd139cce1615e746fa26d2f7d3b7076f9f2165362f6c5badf92cbe59b75fb9e99182b0fe3ec2718c5ce8456072bf49b46c140140bfbb1e79645b0 SHA512 a6918b5c12f842c6e43a32e15d661edfb6443e9352a11c9d2230b6a24d8b5c41277b063771f48f807eb29fb5168700023169c97c1f309363883d18bcc0443012 +MISC metadata.xml 339 BLAKE2B 2e86aa36f341e7c650a7af81354fdbd8fffc63558877ea4a226e8d4bf6a9b4eceb14339ed2e2131fde619fef2f655c75a847bc2a671c71430b6aa19051dec34a SHA512 d19331593693ad389d6956bdbc5e3129f67d9bd417e0fc98cbb00130d6e2d1f0674d77387151830ecf2168bb1c09da56e5ffad05fadba3b6b16769ce3c96ddad diff --git a/sci-electronics/gazebo/files/boost187.patch b/sci-electronics/gazebo/files/boost187.patch new file mode 100644 index 000000000000..30fe4a82fa4d --- /dev/null +++ b/sci-electronics/gazebo/files/boost187.patch @@ -0,0 +1,198 @@ +Index: gazebo-11.15.1/gazebo/transport/Connection.cc +=================================================================== +--- gazebo-11.15.1.orig/gazebo/transport/Connection.cc ++++ gazebo-11.15.1/gazebo/transport/Connection.cc +@@ -73,7 +73,7 @@ IOManager *Connection::iomanager = NULL; + // is stolen from adress::is_unspecified function in boost v1.52. + static bool addressIsUnspecified(const boost::asio::ip::address_v4 &_addr) + { +- return _addr.to_ulong() == 0; ++ return _addr.to_uint() == 0; + } + + // Version 1.52 of boost has an address::is_loopback function, but +@@ -81,7 +81,7 @@ static bool addressIsUnspecified(const b + // is stolen from adress::is_loopback function in boost v1.52. + static bool addressIsLoopback(const boost::asio::ip::address_v4 &_addr) + { +- return (_addr.to_ulong() & 0xFF000000) == 0x7F000000; ++ return (_addr.to_uint() & 0xFF000000) == 0x7F000000; + } + + ////////////////////////////////////////////////// +@@ -151,15 +151,15 @@ bool Connection::Connect(const std::stri + host = _host.substr(7, _host.size() - 7); + + // Resolve the host name into an IP address +- boost::asio::ip::tcp::resolver::iterator end; + boost::asio::ip::tcp::resolver resolver(iomanager->GetIO()); +- boost::asio::ip::tcp::resolver::query query(host, service, ++ ++ auto res = resolver.resolve(host, service, + boost::asio::ip::resolver_query_base::numeric_service); +- boost::asio::ip::tcp::resolver::iterator endpointIter; ++ auto endpointIter = res.begin(); ++ auto end = res.end(); + + try + { +- endpointIter = resolver.resolve(query); + + // Find the first valid IPv4 address + for (; endpointIter != end && +@@ -690,9 +690,9 @@ boost::asio::ip::tcp::endpoint Connectio + if (hostname && !std::string(hostname).empty()) + { + boost::asio::ip::tcp::resolver resolver(iomanager->GetIO()); +- boost::asio::ip::tcp::resolver::query query(hostname, ""); +- boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query); +- boost::asio::ip::tcp::resolver::iterator end; ++ auto res = resolver.resolve(hostname, ""); ++ auto iter = res.begin(); ++ auto end = res.end(); + + // Loop through the results, and stop at the first valid address. + while (iter != end) +@@ -724,7 +724,7 @@ boost::asio::ip::tcp::endpoint Connectio + << "] is invalid. We will still try to use it, be warned.\n"; + } + +- address = boost::asio::ip::address_v4::from_string(ip); ++ address = boost::asio::ip::make_address_v4(ip); + } + + // Try to automatically find a valid address if GAZEBO_IP and +@@ -774,7 +774,7 @@ boost::asio::ip::tcp::endpoint Connectio + if (!ValidateIP(host)) + continue; + +- address = boost::asio::ip::address_v4::from_string(host); ++ address = boost::asio::ip::make_address_v4(host); + + // Also make sure that the IP address is not a loopback interface. + if (!addressIsLoopback(address)) +@@ -868,7 +868,7 @@ boost::asio::ip::tcp::endpoint Connectio + "but will almost certainly not work if you have remote processes." + "Report to the disc-zmq development team to seek a fix." << std::endl; + } +- address = boost::asio::ip::address_v4::from_string(retAddr); ++ address = boost::asio::ip::make_address_v4(retAddr); + #endif + } + +@@ -923,8 +923,9 @@ std::string Connection::GetHostname(boos + else + { + boost::asio::ip::tcp::resolver resolver(iomanager->GetIO()); +- boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(_ep); +- boost::asio::ip::tcp::resolver::iterator end; ++ auto res = resolver.resolve(_ep); ++ auto iter = res.begin(); ++ auto end = res.end(); + + while (iter != end) + { +@@ -950,7 +951,7 @@ std::string Connection::GetLocalHostname + + ////////////////////////////////////////////////// + void Connection::OnConnect(const boost::system::error_code &_error, +- boost::asio::ip::tcp::resolver::iterator /*_endPointIter*/) ++ boost::asio::ip::tcp::resolver::results_type::iterator /*_endPointIter*/) + { + // This function is called when a connection is successfully (or + // unsuccessfully) established. +Index: gazebo-11.15.1/gazebo/transport/Connection.hh +=================================================================== +--- gazebo-11.15.1.orig/gazebo/transport/Connection.hh ++++ gazebo-11.15.1/gazebo/transport/Connection.hh +@@ -409,7 +409,7 @@ namespace gazebo + /// \param[in] _error Error code thrown during connection + /// \param[in] _endPointIter Pointer to resolver iterator + private: void OnConnect(const boost::system::error_code &_error, +- boost::asio::ip::tcp::resolver::iterator _endPointIter); ++ boost::asio::ip::tcp::resolver::results_type::iterator _endPointIter); + + /// \brief Socket pointer + private: boost::asio::ip::tcp::socket *socket; +Index: gazebo-11.15.1/gazebo/transport/IOManager.cc +=================================================================== +--- gazebo-11.15.1.orig/gazebo/transport/IOManager.cc ++++ gazebo-11.15.1/gazebo/transport/IOManager.cc +@@ -17,6 +17,7 @@ + #include <atomic> + #include <boost/bind/bind.hpp> + #include <boost/thread/thread.hpp> ++#include <boost/asio/executor_work_guard.hpp> + #include <iostream> + #include "gazebo/transport/IOManager.hh" + +@@ -28,10 +29,10 @@ namespace transport + class IOManagerPrivate + { + /// \brief IO service. +- public: boost::asio::io_service *io_service = nullptr; ++ public: boost::asio::io_context *io_service = nullptr; + + /// \brief Use io_service::work to keep the io_service running in thread. +- public: boost::asio::io_service::work *work = nullptr; ++ //public: boost::asio::executor_work_guard<boost::asio::io_context> work; + + /// \brief Reference count of connections using this IOManager. + public: std::atomic_int count; +@@ -44,12 +45,11 @@ class IOManagerPrivate + IOManager::IOManager() + : dataPtr(new IOManagerPrivate) + { +- this->dataPtr->io_service = new boost::asio::io_service; +- this->dataPtr->work = new boost::asio::io_service::work( +- *this->dataPtr->io_service); ++ this->dataPtr->io_service = new boost::asio::io_context; ++ //this->dataPtr->work = boost::asio::make_work_guard(*this->dataPtr->io_service); + this->dataPtr->count = 0; + this->dataPtr->thread = new boost::thread(boost::bind( +- &boost::asio::io_service::run, this->dataPtr->io_service)); ++ &boost::asio::io_context::run, this->dataPtr->io_service)); + } + + ///////////////////////////////////////////////// +@@ -57,9 +57,6 @@ IOManager::~IOManager() + { + this->Stop(); + +- delete this->dataPtr->work; +- this->dataPtr->work = nullptr; +- + delete this->dataPtr->io_service; + this->dataPtr->io_service = nullptr; + +@@ -70,7 +67,7 @@ IOManager::~IOManager() + ///////////////////////////////////////////////// + void IOManager::Stop() + { +- this->dataPtr->io_service->reset(); ++ this->dataPtr->io_service->restart(); + this->dataPtr->io_service->stop(); + if (this->dataPtr->thread) + { +@@ -81,7 +78,7 @@ void IOManager::Stop() + } + + ///////////////////////////////////////////////// +-boost::asio::io_service &IOManager::GetIO() ++boost::asio::io_context &IOManager::GetIO() + { + return *this->dataPtr->io_service; + } +Index: gazebo-11.15.1/gazebo/transport/IOManager.hh +=================================================================== +--- gazebo-11.15.1.orig/gazebo/transport/IOManager.hh ++++ gazebo-11.15.1/gazebo/transport/IOManager.hh +@@ -42,7 +42,7 @@ namespace gazebo + + /// \brief Get handle to boost::asio IO service + /// \return Handle to boost::asio IO service +- public: boost::asio::io_service &GetIO(); ++ public: boost::asio::io_context &GetIO(); + + /// \brief Increment the event count by 1 + public: void IncCount(); diff --git a/sci-electronics/gazebo/gazebo-11.15.1.ebuild b/sci-electronics/gazebo/gazebo-11.15.1.ebuild new file mode 100644 index 000000000000..d5dea1bebd8b --- /dev/null +++ b/sci-electronics/gazebo/gazebo-11.15.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A 3D multiple robot simulator with dynamics" +HOMEPAGE="https://gazebosim.org/home" +SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" + +LICENSE="Apache-2.0" +# Subslot = major version = soname of libs +SLOT="0/11" +KEYWORDS="~amd64" +IUSE="cpu_flags_x86_sse2 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/protobuf-2:= + virtual/opengl + media-libs/openal + net-misc/curl + dev-libs/tinyxml + >=dev-libs/tinyxml2-6:= + dev-libs/libtar + dev-cpp/tbb:= + >=dev-games/ogre-1.7.4:=[freeimage] + <dev-games/ogre-1.10 + >=media-libs/freeimage-3.15.4[png] + sci-libs/libccd + >=media-video/ffmpeg-2.6:0= + sci-libs/gts + >=sci-physics/bullet-2.82:= + >=dev-libs/sdformat-9.8:= + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-libs/boost:= + sci-libs/gdal:= + virtual/libusb:1 + dev-libs/libspnav + media-libs/freeimage + sci-libs/hdf5:=[cxx] + sys-apps/util-linux + >=media-gfx/graphviz-4 + net-libs/ignition-msgs:5= + sci-libs/ignition-math:6= + net-libs/ignition-transport:8= + sci-libs/ignition-common:3= + sci-libs/ignition-fuel-tools:4= + x11-libs/qwt:6=[qt5(+)] +" +DEPEND="${RDEPEND} + dev-qt/qttest:5 + x11-apps/mesa-progs + test? ( dev-libs/libxslt ) +" +BDEPEND=" + app-text/ronn-ng + app-arch/gzip + virtual/pkgconfig +" +CMAKE_BUILD_TYPE=RelWithDebInfo +PATCHES=( + "${FILESDIR}/qwt2.patch" + "${FILESDIR}/cmake.patch" + "${FILESDIR}/boost187.patch" +) + +src_configure() { + # find OGRE properly + sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die + + local mycmakeargs=( + "-DUSE_UPSTREAM_CFLAGS=OFF" + "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" + "-DUSE_HOST_CFLAGS=FALSE" + "-DBUILD_TESTING=$(usex test TRUE FALSE)" + "-DENABLE_SCREEN_TESTS=FALSE" + "-DUSE_EXTERNAL_TINYXML2=TRUE" + ) + cmake_src_configure +} diff --git a/sci-electronics/gazebo/metadata.xml b/sci-electronics/gazebo/metadata.xml index f06b5fca3cdf..1218503b5c0a 100644 --- a/sci-electronics/gazebo/metadata.xml +++ b/sci-electronics/gazebo/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>aballier@gentoo.org</email> -<name>Alexis Ballier</name> -</maintainer> + <maintainer type="person"> + <email>aballier@gentoo.org</email> + <name>Alexis Ballier</name> + </maintainer> + <upstream> + <remote-id type="github">gazebosim/gazebo-classic</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest index f205bb3a94eb..2c98efd8edf0 100644 --- a/sci-electronics/librepcb/Manifest +++ b/sci-electronics/librepcb/Manifest @@ -1,3 +1,3 @@ -DIST librepcb-1.1.0-source.zip 15373750 BLAKE2B 6f8ba8d66b95373e4760aae617b423e71fcb89ceb39703ce4547a390e4ad0630866632d9bad01f93780fdb8c3452ec0424e753ef891402e440686c64eba56495 SHA512 2ca02095d89547e17813fcfeadedd48fb9345d177885c9d21a8d313d864c6f02243eb13a33341c474bc0671a66ef6b00b6329760aeb3439fdb10123f2db9d38b -EBUILD librepcb-1.1.0-r1.ebuild 2067 BLAKE2B 219827c805ec9a68e50c10020233661319e7ddd502ba45100e14aff5ee2bb5ed2151124cd0b4db4e6914516a9106516cb1733135f6ba0fd5ba36cbd8e00c9adc SHA512 f893d6a797daa1e41939347f8f97234df0c657312393905962389baa414de89ff48b7462f52b064783ab9c2643c1b97c455fc2d0177c42e09f714d6c2e9b866e +DIST librepcb-1.2.0-source.zip 15923398 BLAKE2B b7ec8dc5ff4b9531e4614defe8e95ec4bf3da796f5aece8d849aed6dfa3d352149fbdb928cf5b24510266977dd9648634ab89a7e675f29d990849bb314a252e8 SHA512 a7e7a0e4e433000db39501874240652d85fe3a2be08f442c72138b70ec3faa0e8117399a997f2083e31d54a5f9276c02fa5a101d3855fad8d1c5cd78f1d80a8f +EBUILD librepcb-1.2.0.ebuild 1687 BLAKE2B 6b5259acbd9270f529536a611cea6ce2f8aef4a702264fd600e45a1c9d180cbbbd75f0afd798e7ead3d6b8935ed8ed1b38262411b49a6b31a5cea133a5140bdb SHA512 c848bef3d7c1aa8b0247e8bd9286b12aa4ecb63e6afec7989efd9094fb6941ec2fd9a7a5f4709050d36e1974068b123d4b0aec630de8d7ce4a9488427b03ef1b MISC metadata.xml 1316 BLAKE2B 0e2933c46eed63177cc16902e0c9235cd77640af852a5b2242db98b4dda997a3d9ede5e79b95d860b162ab6055a67935c828309ea32e81e4e2551e2f37d0e3bd SHA512 e5dc0108675528726309169119d7c09fcc7da55d68981314bf61fed0a14109bf69363eabf9360164f55b6912a7d1d451aabfc21d73e209c638561a37e74fa61d diff --git a/sci-electronics/librepcb/librepcb-1.1.0-r1.ebuild b/sci-electronics/librepcb/librepcb-1.2.0.ebuild index 26ffe3cc6261..9ac74c9d417e 100644 --- a/sci-electronics/librepcb/librepcb-1.1.0-r1.ebuild +++ b/sci-electronics/librepcb/librepcb-1.2.0.ebuild @@ -1,73 +1,56 @@ -# Copyright 2009-2024 Gentoo Authors +# Copyright 2009-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake virtualx xdg +inherit cmake xdg DESCRIPTION="Free EDA software to develop printed circuit boards" HOMEPAGE="https://librepcb.org/" SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip" - S="${WORKDIR}/${PN}-${PV/_/-}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" - -IUSE="opencascade qt6" - -BDEPEND=" - app-arch/unzip - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] )" +IUSE="opencascade test" +RESTRICT="!test? ( test )" RDEPEND=" dev-cpp/muParser:= - !qt6? ( - dev-libs/quazip:=[qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-libs/quazip:=[qt6(-)] - dev-qt/qtbase[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets] - dev-qt/qtdeclarative:6 - dev-qt/qtsvg:6 - ) - opencascade? ( sci-libs/opencascade:= ) + >=dev-libs/quazip-1.3-r2:=[qt6(+)] + dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 media-libs/libglvnd[X] sys-libs/zlib - virtual/glu" + virtual/glu + opencascade? ( sci-libs/opencascade:= )" DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) - !qt6? ( dev-qt/qttest:5 )" + test? ( dev-cpp/gtest )" + +BDEPEND=" + app-arch/unzip + dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( - -DBUILD_TESTS=$(usex test ON OFF) - -DQT_MAJOR_VERSION=$(usex qt6 6 5) + -DQT_MAJOR_VERSION=6 -DUNBUNDLE_GTEST=ON -DUNBUNDLE_MUPARSER=ON -DUNBUNDLE_QUAZIP=ON - -DUSE_OPENCASCADE=$(usex opencascade 1 0) ) + -DUSE_OPENCASCADE=$(usex opencascade 1 0) + -DBUILD_TESTS=$(usex test ON OFF) + ) cmake_src_configure } src_test() { + local -x QT_QPA_PLATFORM=offscreen cd "${BUILD_DIR}"/tests/unittests || die # https://github.com/LibrePCB/LibrePCB/issues/516 - # virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername - virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername:CategoryTreeModelTest.testSort:BoardPlaneFragmentsBuilderTest.testFragments:BoardGerberExportTest.test + ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername:CategoryTreeModelTest.testSort:BoardPlaneFragmentsBuilderTest.testFragments:BoardGerberExportTest.test } pkg_postinst() { diff --git a/sci-electronics/nvc/Manifest b/sci-electronics/nvc/Manifest index 537fe7c17ebe..f29963e58ac7 100644 --- a/sci-electronics/nvc/Manifest +++ b/sci-electronics/nvc/Manifest @@ -1,6 +1,8 @@ AUX nvc-1.9.2-jit-code-capstone.patch 200 BLAKE2B f819ef52f6f47b5c2c04d7c938c82a439dc111daffad1ec92506b3d15daa6eb2182fb5384edff8ca76b3120a62085af8ddd01cf7092bea66eb37213985fd90b5 SHA512 11b9be76fb07893fa95b17006fc694faea30c522454f16183b18aa43c772d38098ba5c558ed331203530fd1eb44a37a0c85cff5f3f89d9410164cad29b635375 DIST nvc-1.14.1.tar.gz 2033076 BLAKE2B 8c17d08aaf01d8dec293530b9e28e37261396e846433a574532e7d1c68bd13424879e25a00e186e46523fa73b9e731a624088312c8133b3fa0d5626f42681d8b SHA512 13648a8c9b952a64c0ec053f733f359ee138a0a3f02ac160ed8d7ac2ace0db658a9092695229a0fe6d1bebf7bae4386969b6b2883e720ae6f4e8ab8098960cc2 DIST nvc-1.14.2.tar.gz 2035337 BLAKE2B 999540938a31ea0d622eeaeca93a0910bcd7af1d36470b9ecbee37dfc53dba6c1a56d543665c7b8ada18a81d0755818d6b570d06610e139436a1c53d57d0241c SHA512 90b9be206628784f39eac721e92e70a5b9b2b6043973f51b18f45df8c50e642bddcc149c02a8bea6d433b91d5fac1678107581832ca24f433f63e1450162fb2d +DIST nvc-1.15.0.tar.gz 2110906 BLAKE2B 0b451e35c535af09660567f176b217eeeeb17203ef9ab6f6f16796e981bf92da4b27c9251642bf5abd8ff63c292154013c739d3c7fa131368f4b5d865e234c9a SHA512 965bd7ff8bd1c59317f8d2c7c2e466f41e009765ea18dd09212c844a8142cd1aa5d5e20db4628285f3d3998345e2a0ccf2a89081fcdf3baa6abe777163c46ac5 EBUILD nvc-1.14.1.ebuild 1989 BLAKE2B 3738add0c0f4328ad5dc93a0f8e3469379b88457eb34d68c2c2672bf3a6f6f43675c58165a81c842d1690248ce16ffe2b5c9ca6ad4dc0e005cb2e616111c20a9 SHA512 e2987af74b15e25472b69052e2087f8dddcbc1f1647bdc820cceeb1f8cba10dad0fec6e5a6f02df926fb5e5798217219763beebc4630ed5f5f50320b1a247e7a EBUILD nvc-1.14.2.ebuild 1989 BLAKE2B 3738add0c0f4328ad5dc93a0f8e3469379b88457eb34d68c2c2672bf3a6f6f43675c58165a81c842d1690248ce16ffe2b5c9ca6ad4dc0e005cb2e616111c20a9 SHA512 e2987af74b15e25472b69052e2087f8dddcbc1f1647bdc820cceeb1f8cba10dad0fec6e5a6f02df926fb5e5798217219763beebc4630ed5f5f50320b1a247e7a +EBUILD nvc-1.15.0.ebuild 1989 BLAKE2B 1177254ece8d33e5b830a650c63d9c2b761f31987ad6e8f216268d16b5d115b00bcfdbd93cd81c8403e93b2f3946d1a3869395480e3571f692b5d188e5b349ff SHA512 ad7c49c27eb3b5ea35212fc89aa81218774a6fe7f1c42e32957601863515602f19cbd3bd608fd7497cc3ea74f6b8b1ebd3e1634ac48615cf9d92b70740cc37b3 MISC metadata.xml 1226 BLAKE2B 128540883638e57fd16a3e1620a49cc6dae4db49fcb5b6863007f9cda3af8801a2f47d0c2bf400727fde7e88b22c9c06b5c8cc8c073e150ad3046f8b37b098a2 SHA512 20ac4aa36dd420487eefa409de17ea2351f4225bf864d82817e201fc452dd9efc4ced9e6e7bae35eaf4901eb66d25da6463c82f7802a698336c5e8be6a053286 diff --git a/sci-electronics/nvc/nvc-1.15.0.ebuild b/sci-electronics/nvc/nvc-1.15.0.ebuild new file mode 100644 index 000000000000..5770424e35be --- /dev/null +++ b/sci-electronics/nvc/nvc-1.15.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {18..19} ) + +inherit autotools bash-completion-r1 llvm-r1 + +DESCRIPTION="NVC is a VHDL compiler and simulator" +HOMEPAGE="https://www.nickg.me.uk/nvc/ + https://github.com/nickg/nvc/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nickg/nvc.git" + + NVC_SOURCEDIR="${WORKDIR}/${PN}-${PV}" +else + SRC_URI="https://github.com/nickg/nvc/archive/r${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + + NVC_SOURCEDIR="${WORKDIR}/${PN}-r${PV}" +fi + +NVC_BUILDDIR="${NVC_SOURCEDIR}_BuildDir" +S="${NVC_BUILDDIR}" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="debug llvm" +RESTRICT="test" # Some tests fail. + +RDEPEND=" + app-arch/bzip2:= + app-arch/zstd:= + dev-libs/capstone:= + dev-libs/elfutils + dev-libs/icu:= + dev-libs/libffi:= + dev-libs/libxml2:= + sys-libs/ncurses:= + sys-libs/zlib:= + llvm? ( + $(llvm_gen_dep ' + llvm-core/llvm:${LLVM_SLOT}= + ') + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-libs/check + sys-apps/which + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${FILESDIR}/nvc-1.9.2-jit-code-capstone.patch" ) + +# Special libraries for NVC. +QA_FLAGS_IGNORED="usr/lib[0-9]*/nvc/preload[0-9]*.so" + +pkg_setup() { + use llvm && llvm-r1_pkg_setup +} + +src_unpack() { + default + + mkdir -p "${S}" || die +} + +src_prepare() { + pushd "${NVC_SOURCEDIR}" >/dev/null || die + + default + eautoreconf + + popd >/dev/null || die +} + +src_configure() { + # Needs "bison" and "flex" exactly. + unset LEX + unset YACC + + local ECONF_SOURCE="${NVC_SOURCEDIR}" + local -a myconf=( + --enable-vital + --with-bash-completion="$(get_bashcompdir)" + $(use_enable debug) + $(use_enable llvm) + ) + econf "${myconf[@]}" + + export V=1 # Verbose compilation and install. +} + +src_compile() { + emake -j1 +} + +src_test() { + PATH="${S}/bin:${PATH}" emake check-TESTS +} + +src_install() { + default + + mv "${D}/$(get_bashcompdir)"/nvc{.bash,} || die + dostrip -x "/usr/$(get_libdir)/nvc" +} diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest index 8213ff8e32b9..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 1303 BLAKE2B 4d63f1add1118967373d083bcd7053cb0475251e2174e2aa1d160fd4a146162ba7109ee00843378a78c93cc9dbdf68c9e720b4d5b81ad82704c169f67b196898 SHA512 4e3a372e49221bc89680471f1677a97454ca48a6b4a9fca530e8d4f52cfdcc1541a4bb5c9ab054a787baa4568c53881ac144a066788efa85d4dd32bb6df339af -EBUILD pulseview-9999.ebuild 1213 BLAKE2B 57b5be5abc95e6db85d5018172d80c5c0ab4e00435e45ffd492f94d6d8f7163a07fa40016b2523b942264aeb4ad354bdc983e8b25e771dcfeafc31756baf1418 SHA512 325cc00174c909e256c7820a79f71e9326ddbc44055627f0ebc313af8d94842bd5b7824763c3d54d2d25b916b72db3483728142cef8325f8fea089899797c359 +EBUILD pulseview-0.4.2-r1.ebuild 1436 BLAKE2B fbf674213b9dffa1d52a0a7be55dbc978da0b1980a48e9ae5e3017cbbf04938a2a7bceb30d08001dac23d327584e21c97817fd1bff7c11dab934513c98ebbf98 SHA512 7a2c0fe07177f84d92881b93ee2dd7e4123afd9bd7bec8b832f53b7f52e0448e933244791c8e81a9b00494d6a8c01eee4a6be129f0b7ddf20d402085f4238463 +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-0.4.2-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild index 0b5446455b34..97332060d41f 100644 --- a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild +++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -50,6 +50,10 @@ src_prepare() { } src_configure() { + # Needed for modern Boost (bug #946610). + # Drop this on bump > 0.4.2. + sed -i -e 's:-std=c++11:-std=c++17:' CMakeLists.txt || die + local mycmakeargs=( -DDISABLE_WERROR=TRUE -DENABLE_DECODE=$(usex decode) 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) ) |