diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-17 17:17:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-17 17:17:41 +0100 |
| commit | 5b9522db2ae57aa61163fb9aff331742e9e22330 (patch) | |
| tree | 1697afb4225fb71399200099c3b68eaf5580ff81 /media-radio/fldigi | |
| parent | 0e6a8a6c51115943235f06224d9fd14b0eb41df3 (diff) | |
gentoo auto-resync : 17:09:2022 - 17:17:41
Diffstat (limited to 'media-radio/fldigi')
| -rw-r--r-- | media-radio/fldigi/Manifest | 5 | ||||
| -rw-r--r-- | media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch | 23 | ||||
| -rw-r--r-- | media-radio/fldigi/fldigi-4.1.22.ebuild | 3 | ||||
| -rw-r--r-- | media-radio/fldigi/fldigi-4.1.23.ebuild | 3 |
4 files changed, 30 insertions, 4 deletions
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest index 7460e40eeed3..cbbfcfec5f03 100644 --- a/media-radio/fldigi/Manifest +++ b/media-radio/fldigi/Manifest @@ -1,6 +1,7 @@ AUX fldigi-4.1.20-musl.patch 309 BLAKE2B 501ca7335497f0c8dcc4c6b40cab5ed437b084cdce42c4068d8a9ca5ef8a91e6d0a079f4e46ea9592836121075385b5103ed0e9bc6d405bd42d1263377be4386 SHA512 4a56a8bbc9eeeb94d31d3f27a870c68c8eca6646b46f68e71121939d3baa7fc1eb1a28aab637ba52794c0ac792da9684f7dbe4770d33ed6a66935a00dd3beb1b +AUX fldigi-drop-nullptr-definition.patch 596 BLAKE2B d258036b22f597d82b6a66ecadbf12f8dde20be21464910e6d205d4c24dbc19ae60e00cb089818f3504d88d8dbc56e9dc4894dc5cc2f2b3925b614c3cb231206 SHA512 71993594183394a6f8f9329e43c14cf08b759b35d462632bab8a02ec4540107fbc99e50c95b0239daa61e279cb10c442ccc0b4fabf419bea3b6841f0d89ba54d DIST fldigi-4.1.22.tar.gz 4934496 BLAKE2B 9db73c51acba4fe521c9acc90a7dcd5728aae8a0bf596c6d10831de2ba66bb1661bdff0be499585379db6951cc4312aae27491681b3325da41d36ae1dcae003a SHA512 e5b724afdd16b25d366ccfc549b4c39e7eed58c19fbf189d53bade0e27695d63124c5a1e02df7e256ce5ce145e85ba77e86da357faa6ccda8167c20698e70536 DIST fldigi-4.1.23.tar.gz 4933875 BLAKE2B 73c9598d73e3f8f4a4299edebf687254830196d81470b4563bc530b0434e7b8beb6d9d0cbbd97029fba2da3491ec354f3fc723045e4691b60db7d03666624a07 SHA512 c01d579fb23325f097969cbb93bd488c8e0c61ef552097166c902a56ce119d7c20694df5cd76ae9b2cb485d68570720745d961b1f1dd9918c6f466f0441005fb -EBUILD fldigi-4.1.22.ebuild 1479 BLAKE2B f8731fe72892e1a31cfc9ff903024d429fd75dd7d839b6313b73aaa6eef5dd0b9ac21f419a4616efd5a6cd4b02596ed4f43cb7ec17f45fc49797211e64fce374 SHA512 d7e227faa7e2d347846d2d589d0d334d3d85dc2eab7851e243ae651fbbaa851ef02132f07d739eb8f432f3d5eeeefa77e2a98565b678e227e6aca2f395825d3e -EBUILD fldigi-4.1.23.ebuild 1481 BLAKE2B 81d14bc8c4c66aa563b7c22ddac657f87d4cefeddbe4f749db6a9e2293a60c90ef3611f9c084f61aa2c11dfa52776e8bc3ea423285ebeb58058a09322c4ab9ca SHA512 ae661cbe620799e2c9326e784826334ea8adb645562e4141dab43504639f1085a172a7e894726e15f8a4ae9dc5917e33ddb3b2075c6de27f84648ab8e03b9db4 +EBUILD fldigi-4.1.22.ebuild 1531 BLAKE2B 938178cdec741635a08bac4d3a3fa4a2fd784c69f57f184c09738099762b0f79a668ce54c521064b0b0279f237458651fc8a66a8e9754a7261a9fc0e1266c069 SHA512 cb5bc9030ce0ecab467b5207663b3e34172025a8c53b6186589a0e10c08f36b1debdb8fe56b69f1b2a0c13093caf2169a0c15d3a7d980fd6c16b7fda213faa5e +EBUILD fldigi-4.1.23.ebuild 1533 BLAKE2B ca6d7c7be1585efa8dcc4c6b21b3ebbc90b3ba7861021abe22497aef3a576afd990c084951405478044d93df1d5255b8ccc8c1a4bbe419438db31a289b7a3dda SHA512 d6c74dc8fdf4154f620fffa9e143324621a24a3bc860d4e56dba00ab97baba3fd74ebc4abb2429b171d5722bb94a387006a361c94ca70515afa1fbb63afd103c MISC metadata.xml 548 BLAKE2B c527aea6c74ff1af56467b594775abdd47e6c57b0f1772013a38f941a5ca32eae9edebf2224c0f435a3f3ca6cbe076d1e33996f66d81e25504e2bd66e04cb9ad SHA512 200dba843700a8361c0f1367038a24c2d8d1389ad6bb36a609543272b44ae672118ab9c74ab7a63036b2bb130a1a288487a204b187e1780dc2bef132e6a1511d diff --git a/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch b/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch new file mode 100644 index 000000000000..8e14c6e0ca39 --- /dev/null +++ b/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch @@ -0,0 +1,23 @@ +# dropped code leeds to circular definition for >=sys-libs/musl-1.2.3 and +# is not needed as all our compilers support c++11 +diff --git a/src/logbook/table.cxx b/src/logbook/table.cxx +index 6deee6d..8011d02 100644 +--- a/src/logbook/table.cxx ++++ b/src/logbook/table.cxx +@@ -40,16 +40,6 @@ + #define DAMAGE_HEADER FL_DAMAGE_ALL + #define DAMAGE_ROWS FL_DAMAGE_ALL + +-/* +- * nullptr is not available in gcc < 4.6 +- * Redefine to NULL for CentOS 6 and OSX Darwin +- */ +-#ifndef __FreeBSD__ +- #ifndef nullptr +- #define nullptr NULL +- #endif +-#endif +- + + /* + * ====================================== diff --git a/media-radio/fldigi/fldigi-4.1.22.ebuild b/media-radio/fldigi/fldigi-4.1.22.ebuild index b6268dae8b30..13f0cf746f6b 100644 --- a/media-radio/fldigi/fldigi-4.1.22.ebuild +++ b/media-radio/fldigi/fldigi-4.1.22.ebuild @@ -35,7 +35,8 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog NEWS README ) -PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" + "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) src_prepare() { eapply ${PATCHES[@]} diff --git a/media-radio/fldigi/fldigi-4.1.23.ebuild b/media-radio/fldigi/fldigi-4.1.23.ebuild index 78512dcf4f0c..56b0232ac656 100644 --- a/media-radio/fldigi/fldigi-4.1.23.ebuild +++ b/media-radio/fldigi/fldigi-4.1.23.ebuild @@ -35,7 +35,8 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog NEWS README ) -PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" + "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) src_prepare() { eapply ${PATCHES[@]} |