diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /sci-electronics/osqoop | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'sci-electronics/osqoop')
3 files changed, 22 insertions, 4 deletions
diff --git a/sci-electronics/osqoop/Manifest b/sci-electronics/osqoop/Manifest index 051b1ab5c8fc..bc4abf653546 100644 --- a/sci-electronics/osqoop/Manifest +++ b/sci-electronics/osqoop/Manifest @@ -1,3 +1,4 @@ +AUX osqoop-1.2.0_pre20170131-cmake-add_library-static.patch 491 BLAKE2B c424cd0a4061b7d7461f6aebfd87fcec888d8d1447d9e9b5418bcfdafebfeea1747ebc49c3026be43835c7edeb30d7cf06c8a1c881ef2696f7221e0e4a76dba4 SHA512 21b0906555d558872fa0128d16a3c4b1d81b3565b19afd9b2f4cddcf867eb25b8c2095b8943953fbe3042aad4fb89122fb58685851b4efe4ea74aa65b9c577c1 DIST osqoop-1.2.0_pre20170131.tar.gz 426915 BLAKE2B 18b1e6df5b76f7a9691c991a431cc1147c67c771cd7a44757bfd6f458f8c8edc6ce707a9adb1c5ed8d674b289c9d228745045929b09771fcf14d440f0431c79f SHA512 e2ced1195c2dda0164761b5f4a928db2bcdff566d3cc05a11460ff570dbd2b7696a30545dd1252930b9544794879d9c89cf7ddf784ddfdbd5e2a0754478f7d60 -EBUILD osqoop-1.2.0_pre20170131.ebuild 761 BLAKE2B e9f666808f3749d3c447a417018f553435a8b0f71c6a24e17065bb14e376cbef880a6723d4715d9336c8ab7e1319acce526ef6bed21495b07fdb0a5d0a2678f9 SHA512 aff1f50d6db85796c6c43d9b0cd54261df4e1fc785c34aef85dbf5112a360cf976365b95841170ff10880b75ba6a3bf681308b095b8de3fc38cf9c8e42e54609 +EBUILD osqoop-1.2.0_pre20170131.ebuild 884 BLAKE2B fc3e69000e168f09678c9837afd8482394edd2ec08d9d171619d4650ceb08b257e8eedb309c09b6ea03283e3225dc45ab6f7a9ae296f50fb0f93b7e348bc5f03 SHA512 1447a630db190119c47ab5c3ef235f143356d04cb34556f9f75b8ef93d54319f4058f1526afee03b66b4c0e685f3afa214a79450b371f15f53a034f032199492 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch b/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch new file mode 100644 index 000000000000..8b315cf0c0f1 --- /dev/null +++ b/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch @@ -0,0 +1,11 @@ +--- a/processing/lib/CMakeLists.txt 2017-02-12 19:13:31.000000000 +0100 ++++ b/processing/lib/CMakeLists.txt 2021-02-28 11:30:50.812028355 +0100 +@@ -4,7 +4,7 @@ + FeedForwardNeuralNetwork.cpp + ) + include_directories (${CMAKE_BINARY_DIR}/processing/lib) +-add_library(processing ${processing_SRCS}) ++add_library(processing STATIC ${processing_SRCS}) + target_link_libraries(processing Qt5::Core) + if (CMAKE_COMPILER_IS_GNUCC) + set_target_properties(processing PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild index 9bac71de0ad4..9e14ed9013bb 100644 --- a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild +++ b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 COMMIT=b5bd459dd5c2a180a9a3e5a706ed5039159d7286 -inherit cmake-utils vcs-snapshot +inherit cmake DESCRIPTION="Multi-platform open source software oscilloscope based on Qt" HOMEPAGE="https://github.com/stephanemagnenat/osqoop https://github.com/sandsmark/osqoop" # sandsmark/osqoop: PR-branch on top of last commit in stephanemagnenat/osqoop (17-01-31) SRC_URI="https://github.com/sandsmark/osqoop/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2" SLOT="0" @@ -25,3 +26,8 @@ RDEPEND=" virtual/libusb:0 x11-libs/libXtst" DEPEND="${RDEPEND}" + +# downstream fix for BUILD_SHARED_LIBS=ON default +PATCHES=( + "${FILESDIR}"/${P}-cmake-add_library-static.patch +) |