diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-01-03 06:31:16 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-03 06:31:16 +0000 |
commit | 5087ee3bf0055aae666159351774f2fb3610e571 (patch) | |
tree | 203f4d869518e7391a255055ca9a4b874e7b2d19 /sci-electronics | |
parent | ff733bfb4d0bd82175e03255004faef8721b53ea (diff) |
gentoo auto-resync : 03:01:2025 - 06:31:16
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/Manifest.gz | bin | 8714 -> 8712 bytes | |||
-rw-r--r-- | sci-electronics/fritzing/Manifest | 5 | ||||
-rw-r--r-- | sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch | 19 | ||||
-rw-r--r-- | sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch | 28 | ||||
-rw-r--r-- | sci-electronics/fritzing/fritzing-0.9.4-r3.ebuild | 81 | ||||
-rw-r--r-- | sci-electronics/pulseview/Manifest | 2 | ||||
-rw-r--r-- | sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild | 6 |
7 files changed, 6 insertions, 135 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 22c2e4f14431..8bb61fd8a17d 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz 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/pulseview/Manifest b/sci-electronics/pulseview/Manifest index 8213ff8e32b9..4d44529624a1 100644 --- a/sci-electronics/pulseview/Manifest +++ b/sci-electronics/pulseview/Manifest @@ -1,6 +1,6 @@ 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 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-0.4.2-r1.ebuild 1436 BLAKE2B fbf674213b9dffa1d52a0a7be55dbc978da0b1980a48e9ae5e3017cbbf04938a2a7bceb30d08001dac23d327584e21c97817fd1bff7c11dab934513c98ebbf98 SHA512 7a2c0fe07177f84d92881b93ee2dd7e4123afd9bd7bec8b832f53b7f52e0448e933244791c8e81a9b00494d6a8c01eee4a6be129f0b7ddf20d402085f4238463 EBUILD pulseview-9999.ebuild 1213 BLAKE2B 57b5be5abc95e6db85d5018172d80c5c0ab4e00435e45ffd492f94d6d8f7163a07fa40016b2523b942264aeb4ad354bdc983e8b25e771dcfeafc31756baf1418 SHA512 325cc00174c909e256c7820a79f71e9326ddbc44055627f0ebc313af8d94842bd5b7824763c3d54d2d25b916b72db3483728142cef8325f8fea089899797c359 MISC metadata.xml 334 BLAKE2B 4b5f18089903f6ea4eed965b12843da3d32a72646831ec5a56d6fcd0c0beef5e574a85e16204b8210c6e1bc0ed2571352a6f9f1831e967b15f2f3fe085fd87a8 SHA512 9f93f66a742a6cd8afebdce63a9a9edacec75381bc846d0e71c6fece1af1f16c490721eff8cb9cc34b4b7ae0b226f42b7a1e166f9dd05921dd9d7b08408ea241 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) |