diff options
| -rw-r--r-- | media-radio/flrig/ChangeLog | 9 | ||||
| -rw-r--r-- | media-radio/flrig/Manifest | 26 | ||||
| -rw-r--r-- | media-radio/flrig/files/fix-bashism.patch | 11 | ||||
| -rw-r--r-- | media-radio/flrig/files/vfprintf_bug.diff | 112 | ||||
| -rw-r--r-- | media-radio/flrig/flrig-1.3.16.ebuild | 8 | ||||
| -rw-r--r-- | media-radio/flrig/flrig-1.3.18.ebuild (renamed from media-radio/flrig/flrig-1.3.15.ebuild) | 8 |
6 files changed, 41 insertions, 133 deletions
diff --git a/media-radio/flrig/ChangeLog b/media-radio/flrig/ChangeLog index 7331b1a1f51e..11e496e4b118 100644 --- a/media-radio/flrig/ChangeLog +++ b/media-radio/flrig/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-radio/flrig # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/ChangeLog,v 1.36 2014/10/10 11:07:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/ChangeLog,v 1.37 2014/12/13 13:19:46 tomjbe Exp $ + +*flrig-1.3.18 (13 Dec 2014) + + 13 Dec 2014; Thomas Beierlein <tomjbe@gentoo.org> -flrig-1.3.15.ebuild, + flrig-1.3.16.ebuild, +flrig-1.3.18.ebuild, +files/fix-bashism.patch, + -files/vfprintf_bug.diff: + Builds with dash (bug #526554). Drop old. Version bump 10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> flrig-1.3.16.ebuild: Stable for x86, wrt bug #519468 diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest index 079e657b2a9d..348bfd5ff9fa 100644 --- a/media-radio/flrig/Manifest +++ b/media-radio/flrig/Manifest @@ -1,29 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX vfprintf_bug.diff 3016 SHA256 0f3cc1735cb467364b243492866960c156e9c5c1282492ec98d9d5d7a9e00c50 SHA512 a7191afdb5a6e373b720b4c802fd0b4646e8b77d5f6b971a2ebac40a64e55af9e0e2bfc6c74a87a27d9f28c30f36543a4e42f5bcf88a325b9831487145a53dd1 WHIRLPOOL 2153b83931905377ac6ea413e9708f469cf82a77a59bd6772b532b97e0ac4dfdde57d4c98881551ca1f91645816179b50ac5a96a7df221f4a2aa1753126f7c6b +AUX fix-bashism.patch 547 SHA256 88fbb0007e6c291d75abf2187a5de9933409e5e5630f4fd707d9f89c192efaa8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9 WHIRLPOOL f0973dba412907da25a31499334a710e92fcc1cfa02299245b9fea66d1fecec228ad74c2a844fd8b8c79ba8ffcbac52f4520bc668ed25ffc7f98d627d7ead3af DIST flrig-1.3.14.tar.gz 578452 SHA256 d4f5d5028800de2caf678621ab3a0c917197a0365220a21a1a54610033001a3c SHA512 0b4dfc4c7f9a410114ee31937306610408fd8e75ebd6674c2cbe60c4a78b6397f034a44da0087ccec7c0e27445ac17fe54385c8a3e84e20cb7155ed28827fdb1 WHIRLPOOL dfda9a885f97dd47121a5586074185d69fb2ec98ecadeb6edb5094a92ef023192c945c87cfceaf414d06ca165b46af8d0b0a0865dfe788b2fb7195f0b4a8db62 -DIST flrig-1.3.15.tar.gz 596888 SHA256 1c6163b3b1a410829a2ac4bd68f857d7c25419041bd30eb003bd0aff22348818 SHA512 a503ac3fcca72cc2dc587b4b1bf3c2d7a4a6c82cacbd85729e17dc42227fb9d5ead653a9303b0ec4c4749de1a0e3695763f04c296dd52cddc633648e7ca44039 WHIRLPOOL c9517781bfb75cf4dd44711fb2dff8691f7a9d775a61ebaefc3df2c980ee474838ed1010982c9591fcbb1e2cd8eed62029fd51a8c2c007e24d8e2a33891e7d1d DIST flrig-1.3.16.tar.gz 604998 SHA256 c39f951ab20e195819e6962b9038c3097b7c1a466afd76d71c234b7ac766276c SHA512 50c9cbeba4632b820375332a004a5573259604be8e1a455cf683325925d8bf6afdb475e18b14e3e2cd8c489ca3acab949430339feb3e432d7bb3b3aef0d5df9c WHIRLPOOL 36b597fe1549a35392a87692c07829b1a801bb82285cf06553117b45d34a8a293a639a6bdc0390c51a9b460b5d888fb2b35b5d21cd41a3395648ffd246ad2d16 +DIST flrig-1.3.18.tar.gz 616711 SHA256 50f0a3eb1110a50a838fdd8f1393d2eafe1b6ea605deaf437e0e61a5a7d34370 SHA512 94f3a783d171003323130bccbb762f676de9b3d629f898715ab713ccc03f5198bc25ca39c913bedc6d28a2d0272dc6e584566a9e09389222dcffa22b1bab3f8e WHIRLPOOL 46ef6f66a7c59bbbc1f3f45010b8da576bbe1cb9148274059a54bceab28a9f775f5c8cb41f030b435cd2e850814b12caab0d780e18829d5819169102f28ab2bf EBUILD flrig-1.3.14.ebuild 654 SHA256 e4ff5ace022d1e1ff792d5bc4b8234306e6c84d46acf1b93a7153c0a18fab3fb SHA512 81a915c4802a8b949fd55637706f02b010b8f6cf9fd18eab8466ea52248e76d7ce61268c6331826fe7627c222b1da2757128027eca494fc9c9987fb3398c0bc0 WHIRLPOOL 2288a5fd1b4445baf0c2282637bd4d1247096c3360dcf757fb986f144940e4c8e973b5257d83b4ad2557917052602e1f6b45a83eecaaa4998e0ae03c3e890635 -EBUILD flrig-1.3.15.ebuild 659 SHA256 3ca28b630d31f33bc52d1a09eb3ebf00c0e733c7ae85b8a1d68fee5bab1baf7d SHA512 cc3bbdecca0895f848a2ca03ea6b045d643cec8e116bd0d2c38a41c9398f3419eaf8cf1b7edebada7ed6e190411670376e17351ecbe9f4579b8267ba92c3f4b5 WHIRLPOOL f0f79b0d5f4d6a87cddb40786303fc026ff47fabbb1ae5c00cdbf4b20f9bc77cec7799e6f8ecba41eecd41cd8874707c2a3518cad2bd7af18fbbb2ff3644aa95 -EBUILD flrig-1.3.16.ebuild 654 SHA256 01522602d7370c0ab2c437be8b9e306cef0707e4e26028eb88b99bdb2af48a1f SHA512 e61013705576f9d3ea30f2ebfd95dae1ed9dd92641aa64d10728cbe9bb11fe4bb77e035f06f04feb8b403aca48e39e417a2e4a039dbf29b8cb119aa43734d093 WHIRLPOOL 92884cdaadbeae88a27ce72319d41a2b859d06d720ac9b070dd322ab32c7e97f8a355d62d8165054be723c25961c39ebba0b750ffae4e56a75628199b7d57ccb -MISC ChangeLog 4631 SHA256 bd5b285316dfa998800b1823a915ef9f66d2763a6380cc3be1d35d3b7a29530d SHA512 2b1c558edde63f3b5832504d836cc038d5946bde827335ade4a456aac9b575da09b7b374be708fcd6957463ab4867a4787098aa63eed5b26b76314f43834727f WHIRLPOOL 9e33bcbd2ea31f517dd952e39322a81a676a0180a3817b471f9a2a902acaa4e40e6198e60740cbcd01e01e7bba2aa24c7a6764fc0be8cd77b91d096f41685580 +EBUILD flrig-1.3.16.ebuild 754 SHA256 0b85873327745f1ed81faaae2b872386b8d1a3cdec2943d1476f4ae83cba8052 SHA512 7c967e2d34f8a89cffa78d04127ef8ff855076947c11eb6240cb5d64ba46f2453cf9344d15338cb8f385626a45d045f10d26f2d906144b26bee9327680c64bf4 WHIRLPOOL 51fe88370a7c451288738dbc64cf36817650471bab8ddb5c7fee8ebe020686042ce6b001378599f6af274d57d9690ba4c5f1456629ffe791262e7349fba745f8 +EBUILD flrig-1.3.18.ebuild 756 SHA256 eeaac4a4f770b21640e9f8cb9a615a8499e65ee6134ec6cefb9afae180a55da3 SHA512 1e6acd652313d20916aaef2cd2893257a32c80d92aad93d87cdfb5bdd949aa7029477f09c6cd23043dabc0830c676eb94c7ce0ac34534a0fdc765d34c036966b WHIRLPOOL e8831c502087ceb6412e06a80b2ad9effca9eaf3c6dd89cc490b98780309ee4ce449fd91de9e84f6922d0a22b13941ff0dcd090bb1c35b997c9bfe453fb4699d +MISC ChangeLog 4894 SHA256 82b31510227d7aebce25ec95011bc3ad77c5584a427351c00579365219783f4f SHA512 8a39c82151100f272077f62044cfbdd083f07725999623098269ec245b86b8673668e30fdaa648819043b526864ab20119b40c199f8ad46f67a72ae10dc00994 WHIRLPOOL f64c3aa18b4c6bdc886a4021cb36f4692d4a78d4a34910a3b6f0c81eac8557278eb61ae29ae9e4888f5def91a3c525798da8d853588502d3294353ee7c657233 MISC metadata.xml 236 SHA256 c19d776cfd72a8a5833ea6d4c6a59f906f624aa5fd758527c2171d806a9f9096 SHA512 f95348dda4493774aa5123c211b9f7d2b2f8a7d18feea8e31d5b72e73afcc6617a5f4a7648698b0e3726f31ddaddec9545239d27f39c13a149906033c06827b1 WHIRLPOOL ad9eb3edb0f6cf0d91c23ac3d18489aa427468c6bb577f4bf3ce7be1ee87379ad154cbb8f370637f8105bfc02380de2063b6b4d0a5a61e1f5c9b2faf7303b0d6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUN733AAoJELp701BxlEWfhoMQAKxW8eSByHJXJPePAI37RDTG -vvp587H9nLQo32HV74rda1EBGDamZkH/ZX0S3zq7UdRSz45uQC1UBEz+XFsYZ71L -VcqE97K33PLPafGwxhBh1j1e7cguv8EcYFZql8dXFHIjPqi0lDxGy2L2YqBrb5VT -QbZ6inQGyWSSp9vqXm8FVghzAAs5fBwSXwPYprk9nB613oukFcSFdBDyEETJonNr -tGRbw6v/U/c61rH3c5d0R6JsH70UZXElFOTaicmamw5RfMD2ugPEssBhd7vOMcj4 -JuuNEcvjwqgYJTrZODcV5mrR+mF6Rysb2YGR5j+bQXW/ggMj9ANNiCfuKAzwRwC7 -uiIwcoEhK99LtD4X2F4hFIqmap6qYdMXnDLIOBU7P2n/2njv+tYmwNTuQQeHhc4E -X5yelnkovvPAWwgocBGVH5FAp6yFCdEnxQLqIfnxTL3/hz/5zc8xhAXDY3/ncpEE -GEWU/zw92cBi/1PXYKvCWxHQd/HQ1JI2gddSCB8m652R54sD5o6jejx5fLoWWNmu -c+Ol0akX2dSPJfckXCYGVmQTXP9LI1FNc4vAujdX12y9iPOsq3VqKSlEmWYGBT7a -vSXDkkXrn3EuY6ejPQ6+6JN6ZrPlx0Nxtri5HC8DxWIO2O6gwFdyL1+/FO7//qu6 -7Nq1IqbkAJXZoW9ahw2p -=ea8J +iEYEAREIAAYFAlSMPPkACgkQQe4uqXYgU9XHjACgpoAO+dNshAAVwVNldYTVnCa3 +48AAn3usOaeZgJfbJVXtpybACxaxuFvU +=kU7M -----END PGP SIGNATURE----- diff --git a/media-radio/flrig/files/fix-bashism.patch b/media-radio/flrig/files/fix-bashism.patch new file mode 100644 index 000000000000..53dac6b27d6c --- /dev/null +++ b/media-radio/flrig/files/fix-bashism.patch @@ -0,0 +1,11 @@ +--- m4/fltk.m4.orig 2014-12-13 13:46:29.000000000 +0100 ++++ m4/fltk.m4 2014-12-13 14:03:44.000000000 +0100 +@@ -38,7 +38,7 @@ + FLTK_LIBS=`$FLTK_CONFIG --ldflags --use-images` + if test "x$target_mingw32" != "xyes"; then + if test "x$target_darwin" != "xyes"; then +- if grep -q "lX11" <<< "$FLTK_LIBS"; then ++ if echo "$FLTK_LIBS" | grep -q "lX11" ; then + FLTK_LIBS="$FLTK_LIBS"; + else + FLTK_LIBS="$FLTK_LIBS -lm -lX11"; diff --git a/media-radio/flrig/files/vfprintf_bug.diff b/media-radio/flrig/files/vfprintf_bug.diff deleted file mode 100644 index 168a8af859b2..000000000000 --- a/media-radio/flrig/files/vfprintf_bug.diff +++ /dev/null @@ -1,112 +0,0 @@ -commit 224cde7b724f847f5f3018e22828308bf9355a7f -Author: David Freese <w1hkj@w1hkj.com> -Date: Thu Aug 29 13:18:06 2013 -0500 - - vfprintf bug on 64 bit Linux systems - - * removed use of vfprintf in debug.cxx - -diff --git a/src/debug.cxx b/src/debug.cxx -index d4dc4ac..1e64677 100644 ---- a/src/debug.cxx -+++ b/src/debug.cxx -@@ -125,8 +125,9 @@ void debug::log(level_e level, const char* func, const char* srcf, int line, con - va_start(args, format); - - vsnprintf(sztemp, sizeof(sztemp), fmt, args); -+ - estr.append(sztemp); -- vfprintf(wfile, fmt, args); -+ fprintf(wfile, "%s", sztemp); - - va_end(args); - -@@ -149,7 +150,7 @@ void debug::slog(level_e level, const char* func, const char* srcf, int line, co - - vsnprintf(sztemp, sizeof(sztemp), fmt, args); - estr.append(sztemp); -- vfprintf(wfile, fmt, args); -+ fprintf(wfile, "%s", sztemp); - va_end(args); - - fflush(wfile); -@@ -157,7 +158,8 @@ void debug::slog(level_e level, const char* func, const char* srcf, int line, co - if (tty) { - if (level <= DEBUG_LEVEL && level >= QUIET_LEVEL) { - va_start(args, format); -- vfprintf(stderr, fmt, args); -+ vsnprintf(sztemp, sizeof(sztemp), fmt, args); -+ fprintf(wfile, "%s", sztemp); - va_end(args); - } - } -diff --git a/src/dialogs.cxx b/src/dialogs.cxx -index 106fd40..aeeed3c 100644 ---- a/src/dialogs.cxx -+++ b/src/dialogs.cxx -@@ -138,7 +138,7 @@ void init_port_combos() - ssize_t len; - struct dirent* dp; - -- LOG_WARN("%s", "Searching /sys/class/tty/"); -+ LOG_INFO("%s", "Searching /sys/class/tty/"); - - while ((dp = readdir(sys))) { - # ifdef _DIRENT_HAVE_D_TYPE -@@ -152,7 +152,7 @@ void init_port_combos() - snprintf(ttyname, sizeof(ttyname), "/dev/%s", dp->d_name); - if (stat(ttyname, &st) == -1 || !S_ISCHR(st.st_mode)) - continue; -- LOG_WARN("Found serial port %s", ttyname); -+ LOG_INFO("Found serial port %s", ttyname); - add_combos(ttyname); - ret = true; - } -diff --git a/src/rig.cxx b/src/rig.cxx -index cd29649..c537719 100644 ---- a/src/rig.cxx -+++ b/src/rig.cxx -@@ -286,21 +286,6 @@ int main (int argc, char *argv[]) - RigHomeDir = dirbuf; - checkdirectories(); - -- progStatus.loadLastState(); -- -- if (progStatus.UIsize == small_ui) -- mainwindow = Small_rig_window(); -- else -- mainwindow = Wide_rig_window(); -- -- mainwindow->callback(exit_main); -- -- progStatus.UI_laststate(); -- -- fntbrowser = new Font_Browser; -- dlgMemoryDialog = Memory_Dialog(); -- dlgDisplayConfig = DisplayDialog(); -- - try { - debug::start(string(RigHomeDir).append("debug_log.txt").c_str()); - time_t t = time(NULL); -@@ -316,6 +301,21 @@ int main (int argc, char *argv[]) - exit(1); - } - -+ progStatus.loadLastState(); -+ -+ if (progStatus.UIsize == small_ui) -+ mainwindow = Small_rig_window(); -+ else -+ mainwindow = Wide_rig_window(); -+ -+ mainwindow->callback(exit_main); -+ -+ progStatus.UI_laststate(); -+ -+ fntbrowser = new Font_Browser; -+ dlgMemoryDialog = Memory_Dialog(); -+ dlgDisplayConfig = DisplayDialog(); -+ - Fl::lock(); - - #if defined(__WIN32__) && defined(PTW32_STATIC_LIB) diff --git a/media-radio/flrig/flrig-1.3.16.ebuild b/media-radio/flrig/flrig-1.3.16.ebuild index 6e8b3b8e863d..2602aa252d25 100644 --- a/media-radio/flrig/flrig-1.3.16.ebuild +++ b/media-radio/flrig/flrig-1.3.16.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.16.ebuild,v 1.3 2014/10/10 11:07:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.16.ebuild,v 1.4 2014/12/13 13:19:46 tomjbe Exp $ EAPI=5 +inherit autotools eutils DESCRIPTION="Transceiver control program for Amateur Radio use" HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html" @@ -20,6 +21,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} sys-devel/gettext" +src_prepare() { + epatch "${FILESDIR}"/fix-bashism.patch + eautoreconf +} + src_install() { emake DESTDIR="${D}" install nonfatal dodoc AUTHORS ChangeLog README diff --git a/media-radio/flrig/flrig-1.3.15.ebuild b/media-radio/flrig/flrig-1.3.18.ebuild index d6f4c8ec9d0c..c5b38884e0cb 100644 --- a/media-radio/flrig/flrig-1.3.15.ebuild +++ b/media-radio/flrig/flrig-1.3.18.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.15.ebuild,v 1.1 2014/02/06 17:39:20 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/flrig/flrig-1.3.18.ebuild,v 1.1 2014/12/13 13:19:46 tomjbe Exp $ EAPI=5 +inherit autotools eutils DESCRIPTION="Transceiver control program for Amateur Radio use" HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html" @@ -20,6 +21,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} sys-devel/gettext" +src_prepare() { + epatch "${FILESDIR}"/fix-bashism.patch + eautoreconf +} + src_install() { emake DESTDIR="${D}" install nonfatal dodoc AUTHORS ChangeLog README |