* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/
@ 2022-02-07 18:47 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2022-02-07 18:47 UTC (permalink / raw
To: gentoo-commits
commit: b60e3a9c208702a304c4578851a121b544d4a07c
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 7 18:47:10 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Feb 7 18:47:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60e3a9c
media-radio/flrig: Fixes musl build error
Closes: https://bugs.gentoo.org/832232
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/flrig/files/flrig-1.4.4-musl.patch | 28 ++++++++++++++++++++++++++
media-radio/flrig/flrig-1.4.4.ebuild | 9 ++++++++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/media-radio/flrig/files/flrig-1.4.4-musl.patch b/media-radio/flrig/files/flrig-1.4.4-musl.patch
new file mode 100644
index 000000000000..44c85a711828
--- /dev/null
+++ b/media-radio/flrig/files/flrig-1.4.4-musl.patch
@@ -0,0 +1,28 @@
+diff --git a/src/cmedia/cmedia.cxx b/src/cmedia/cmedia.cxx
+index c65400f..efe83c5 100644
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
+diff --git a/src/cmedia/tmate2.cxx b/src/cmedia/tmate2.cxx
+index b209469..6408179 100644
+--- a/src/cmedia/tmate2.cxx
++++ b/src/cmedia/tmate2.cxx
+@@ -44,9 +44,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/media-radio/flrig/flrig-1.4.4.ebuild b/media-radio/flrig/flrig-1.4.4.ebuild
index a98ec86ead1f..fa8591685185 100644
--- a/media-radio/flrig/flrig-1.4.4.ebuild
+++ b/media-radio/flrig/flrig-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,3 +20,10 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
+
+src_prepare() {
+ eapply ${PATCHES[@]}
+ eapply_user
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/
@ 2023-04-29 18:44 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2023-04-29 18:44 UTC (permalink / raw
To: gentoo-commits
commit: 45a01aef6883db7c788124d6ddc759ac15724c18
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 18:40:18 2023 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 18:43:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a01aef
media-radio/flrig: Add missing include
Closes: https://bugs.gentoo.org/895566
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/flrig/files/flrig-1.4.7-uint8.patch | 11 +++++++++++
media-radio/flrig/flrig-1.4.7.ebuild | 5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/media-radio/flrig/files/flrig-1.4.7-uint8.patch b/media-radio/flrig/files/flrig-1.4.7-uint8.patch
new file mode 100644
index 000000000000..554ac137eca3
--- /dev/null
+++ b/media-radio/flrig/files/flrig-1.4.7-uint8.patch
@@ -0,0 +1,11 @@
+--- a/src/include/WSclient.h 2023-04-29 20:25:55.322076690 +0200
++++ b/src/include/WSclient.h 2023-04-29 20:26:20.686925674 +0200
+@@ -35,6 +35,8 @@
+
+ #ifdef __WIN32__
+ typedef unsigned char uint8_t;
++#else
++ #include <stdint.h>
+ #endif
+
+ namespace WSclient {
diff --git a/media-radio/flrig/flrig-1.4.7.ebuild b/media-radio/flrig/flrig-1.4.7.ebuild
index 81a737736eac..6ae84171b383 100644
--- a/media-radio/flrig/flrig-1.4.7.ebuild
+++ b/media-radio/flrig/flrig-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,8 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/gettext"
-PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch"
+ "${FILESDIR}/${P}-uint8.patch" )
src_prepare() {
eapply ${PATCHES[@]}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/
@ 2023-11-09 20:44 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2023-11-09 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 237984bc2f871a79fa98f54d9d3f4bfd3a675e24
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 9 20:40:38 2023 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 20:43:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237984bc
media-radio/flrig: drop 1.4.7
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/flrig/Manifest | 1 -
media-radio/flrig/files/flrig-1.4.7-uint8.patch | 11 -------
media-radio/flrig/flrig-1.4.7.ebuild | 39 -------------------------
3 files changed, 51 deletions(-)
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index ff6c1ccfe8e5..dbbcd7abe794 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,3 +1,2 @@
-DIST flrig-1.4.7.tar.gz 1042848 BLAKE2B a1cb9ccd57466dc1d2b387dd8a4e9784f937a2f0227a0e394b10a25b40d06c4c9566dff2b4e5f7b09b5564b13b8fa604a0618f7909b992053f8d7ec6f0aa4c7c SHA512 6d213e15e0a81808491509e10c84e6f90b5f22483a9a327a4a1a56fdd1b773f2ddfa615470e5e5458747bf4d7a2087f2753951b25e6d2169dcf26aed7f50d87d
DIST flrig-1.4.8.tar.gz 1072241 BLAKE2B 002d2346a797af8abb04f029fa343846c307273a26af0b74063c3ce5e6c6de08c133630b34994d7ca550c70983fbca170f3215662d46dc404f835493d61d7bb6 SHA512 1075a48ad98375be2c901c693767eef0150b7548440f13a22664c02d7453ad1736b448846af0f38b6eeeb1777fe2f0147742bb83f3647e07fdeadbe2f5d51ae3
DIST flrig-2.0.03.tar.gz 1107842 BLAKE2B 9421fb6b3e996119772de44cc5e4e8d308ab33cb03ab1d07faaf23db14a396df93dac137c8dc6c5c49ddf939f73530d6f2c0d1396c7bd8749ff7cbb951da277f SHA512 90543effff3e290f8a36c37ec1daecb1871fde857824b31366544f2526bd25e3db287058452acda99781274614e00eefb9d5f8d628c992e5cc9d71f4c36dca9b
diff --git a/media-radio/flrig/files/flrig-1.4.7-uint8.patch b/media-radio/flrig/files/flrig-1.4.7-uint8.patch
deleted file mode 100644
index 554ac137eca3..000000000000
--- a/media-radio/flrig/files/flrig-1.4.7-uint8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/include/WSclient.h 2023-04-29 20:25:55.322076690 +0200
-+++ b/src/include/WSclient.h 2023-04-29 20:26:20.686925674 +0200
-@@ -35,6 +35,8 @@
-
- #ifdef __WIN32__
- typedef unsigned char uint8_t;
-+#else
-+ #include <stdint.h>
- #endif
-
- namespace WSclient {
diff --git a/media-radio/flrig/flrig-1.4.7.ebuild b/media-radio/flrig/flrig-1.4.7.ebuild
deleted file mode 100644
index 6ae84171b383..000000000000
--- a/media-radio/flrig/flrig-1.4.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch"
- "${FILESDIR}/${P}-uint8.patch" )
-
-src_prepare() {
- eapply ${PATCHES[@]}
- eapply_user
-}
-
-src_configure() {
- #fails to compile with -flto (bug #860408)
- filter-lto
-
- econf
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/
@ 2024-01-05 15:28 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2024-01-05 15:28 UTC (permalink / raw
To: gentoo-commits
commit: e2c01f8459ab6ab4b6cc1a11226417675577448b
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 15:27:36 2024 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 15:27:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c01f84
media-radio/flrig: add 2.0.05
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/flrig/Manifest | 1 +
media-radio/flrig/files/flrig-2.0.05-musl.patch | 32 +++++++++++++++++++++
media-radio/flrig/flrig-2.0.05.ebuild | 38 +++++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 44e4a36c65b1..e0119d3249f2 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1 +1,2 @@
DIST flrig-2.0.04.tar.gz 1108760 BLAKE2B 9ca60d182c5b94f17e8baefebc822792111954b3c11f03e5cabd570e60769804c9ec1153afd36a074f16e9880792d6b51b5545e59b988adffee912e7b6d2a8e5 SHA512 db1a4bb148900fb9e1a6feb44fd5a017d8aac1a2f81e577e78176c241adc39cf05378057bc97ad997581ed0d3d8a79f3ec726d1d194322b46d709df6e913c84f
+DIST flrig-2.0.05.tar.gz 1112204 BLAKE2B 58cda5069546aee790bb819f9ac2713896281de283345fa6a84c466c67b5cce236c63dec41ad3a226849195fba982c4b69b4d5d386ffb0f4d8b14767ca9cc6bf SHA512 a06df0f8810212a1f614899be162e1d0373f29492bca26718b4385b8fba3be4293b95e366cb391fb938d40228bb5d091049414c7ae2104dbd7a0ddd2011dc88b
diff --git a/media-radio/flrig/files/flrig-2.0.05-musl.patch b/media-radio/flrig/files/flrig-2.0.05-musl.patch
new file mode 100644
index 000000000000..737c893cf7a8
--- /dev/null
+++ b/media-radio/flrig/files/flrig-2.0.05-musl.patch
@@ -0,0 +1,32 @@
+diff --git a/src/cmedia/cmedia.cxx b/src/cmedia/cmedia.cxx
+index ba01f5d..0bd3c1c 100644
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,11 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# ifndef __FreeBSD__
+-# include <error.h>
+-# endif
+-# endif
+ #endif
+
+ #include "config.h"
+diff --git a/src/cmedia/tmate2.cxx b/src/cmedia/tmate2.cxx
+index 8a3e37a..cde0c76 100644
+--- a/src/cmedia/tmate2.cxx
++++ b/src/cmedia/tmate2.cxx
+@@ -44,11 +44,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# ifndef __FreeBSD__
+-# include <error.h>
+-# endif
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/media-radio/flrig/flrig-2.0.05.ebuild b/media-radio/flrig/flrig-2.0.05.ebuild
new file mode 100644
index 000000000000..a5bc7dbf08a2
--- /dev/null
+++ b/media-radio/flrig/flrig-2.0.05.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+ x11-libs/fltk:1
+ x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.05-musl.patch" )
+
+src_prepare() {
+ eapply ${PATCHES[@]}
+ eapply_user
+}
+
+src_configure() {
+ #fails to compile with -flto (bug #860408)
+ filter-lto
+
+ econf
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/
@ 2024-03-10 8:14 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2024-03-10 8:14 UTC (permalink / raw
To: gentoo-commits
commit: b34e86e16b99134dfaeda009522e490ac03d5770
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 08:09:51 2024 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 08:10:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34e86e1
media-radio/flrig: drop 2.0.04
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/flrig/Manifest | 1 -
media-radio/flrig/files/flrig-1.4.4-musl.patch | 28 ------------------
media-radio/flrig/flrig-2.0.04.ebuild | 41 --------------------------
3 files changed, 70 deletions(-)
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index e0119d3249f2..56cc242c9d44 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,2 +1 @@
-DIST flrig-2.0.04.tar.gz 1108760 BLAKE2B 9ca60d182c5b94f17e8baefebc822792111954b3c11f03e5cabd570e60769804c9ec1153afd36a074f16e9880792d6b51b5545e59b988adffee912e7b6d2a8e5 SHA512 db1a4bb148900fb9e1a6feb44fd5a017d8aac1a2f81e577e78176c241adc39cf05378057bc97ad997581ed0d3d8a79f3ec726d1d194322b46d709df6e913c84f
DIST flrig-2.0.05.tar.gz 1112204 BLAKE2B 58cda5069546aee790bb819f9ac2713896281de283345fa6a84c466c67b5cce236c63dec41ad3a226849195fba982c4b69b4d5d386ffb0f4d8b14767ca9cc6bf SHA512 a06df0f8810212a1f614899be162e1d0373f29492bca26718b4385b8fba3be4293b95e366cb391fb938d40228bb5d091049414c7ae2104dbd7a0ddd2011dc88b
diff --git a/media-radio/flrig/files/flrig-1.4.4-musl.patch b/media-radio/flrig/files/flrig-1.4.4-musl.patch
deleted file mode 100644
index 44c85a711828..000000000000
--- a/media-radio/flrig/files/flrig-1.4.4-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/cmedia/cmedia.cxx b/src/cmedia/cmedia.cxx
-index c65400f..efe83c5 100644
---- a/src/cmedia/cmedia.cxx
-+++ b/src/cmedia/cmedia.cxx
-@@ -41,9 +41,6 @@
- #ifndef __WIN32__
- #include <termios.h>
- #include <glob.h>
--# ifndef __APPLE__
--# include <error.h>
--# endif
- #endif
-
- #include "config.h"
-diff --git a/src/cmedia/tmate2.cxx b/src/cmedia/tmate2.cxx
-index b209469..6408179 100644
---- a/src/cmedia/tmate2.cxx
-+++ b/src/cmedia/tmate2.cxx
-@@ -44,9 +44,6 @@
- #ifndef __WIN32__
- #include <termios.h>
- #include <glob.h>
--# ifndef __APPLE__
--# include <error.h>
--# endif
- #endif
-
- #include "config.h"
diff --git a/media-radio/flrig/flrig-2.0.04.ebuild b/media-radio/flrig/flrig-2.0.04.ebuild
deleted file mode 100644
index 0a9e7a5c39ab..000000000000
--- a/media-radio/flrig/flrig-2.0.04.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.4-musl.patch"
- "${FILESDIR}/${PN}-2.0.04-stdint.patch"
- )
-
-src_prepare() {
- eapply ${PATCHES[@]}
- eapply_user
-}
-
-src_configure() {
- #fails to compile with -flto (bug #860408)
- filter-lto
-
- econf
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-10 8:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-07 18:47 [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2023-04-29 18:44 Thomas Beierlein
2023-11-09 20:44 Thomas Beierlein
2024-01-05 15:28 Thomas Beierlein
2024-03-10 8:14 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox