diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2012-06-04 15:45:33 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2012-06-04 15:45:33 +0000 |
| commit | afae225d9f54675d8d153ce8c15949c5a5d31ff5 (patch) | |
| tree | 4e01adf07b16109e508b3601ca64a8843efe4019 /media-radio/tucnak2 | |
| parent | Commit the correct ebuild for the previous version bump. (diff) | |
| download | gentoo-2-afae225d9f54675d8d153ce8c15949c5a5d31ff5.tar.gz gentoo-2-afae225d9f54675d8d153ce8c15949c5a5d31ff5.tar.bz2 gentoo-2-afae225d9f54675d8d153ce8c15949c5a5d31ff5.zip | |
Fix error with USE=-hamlib (bug #419593). Thanks Ago
(Portage version: 2.1.10.64/cvs/Linux x86_64)
Diffstat (limited to 'media-radio/tucnak2')
| -rw-r--r-- | media-radio/tucnak2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff | 35 | ||||
| -rw-r--r-- | media-radio/tucnak2/tucnak2-2.48.ebuild | 5 |
3 files changed, 43 insertions, 3 deletions
diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog index 0794f1f45870..27063c943722 100644 --- a/media-radio/tucnak2/ChangeLog +++ b/media-radio/tucnak2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/tucnak2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.44 2012/05/03 03:48:56 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.45 2012/06/04 15:45:33 tomjbe Exp $ + + 04 Jun 2012; Thomas Beierlein <tomjbe@gentoo.org> tucnak2-2.48.ebuild, + +files/tucnak2-2.48-hamlib.diff: + Fix error with USE=-hamlib (bug #419593). Thanks Ago 03 May 2012; Jeff Horelick <jdhore@gentoo.org> tucnak2-2.44.ebuild, tucnak2-2.45.ebuild, tucnak2-2.46.ebuild, tucnak2-2.47.ebuild, diff --git a/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff b/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff new file mode 100644 index 000000000000..f0d573837a77 --- /dev/null +++ b/media-radio/tucnak2/files/tucnak2-2.48-hamlib.diff @@ -0,0 +1,35 @@ +# Fix forgotten #ifdef if hamlib not available +--- src/rotar.c.orig 2012-03-13 14:35:34.000000000 +0100 ++++ src/rotar.c 2012-06-04 17:26:54.000000000 +0200 +@@ -20,12 +20,13 @@ + + gpointer rot_hamlib_main(gpointer xxx); + ++#ifdef HAVE_HAMLIB + static int rot_print_model_list(const struct rot_caps *caps, void *data) + { + log_addf("%-6d %-14s %-20s %s\n", caps->rot_model, caps->mfg_name, caps->model_name, caps->version); + return 1; /* !=0, we want them all ! */ + } +- ++#endif + + struct rotar *init_rotar(struct config_rotar *crot, int rotchar){ + struct rotar *rot; +@@ -117,13 +118,15 @@ + } + + void free_rotar(struct rotar *rot){ +- if (rot->hl_thread){ ++#ifdef HAVE_HAMLIB ++ if (rot->hl_thread){ + rot->hl_thread_break = 1; + dbg("join hamlib rotar...\n"); + g_thread_join(rot->hl_thread); + dbg("done\n"); + rot->hl_thread=0; + } ++#endif + g_free(rot->desc); + g_free(rot->netid); + g_free(rot->rem_rotstr); diff --git a/media-radio/tucnak2/tucnak2-2.48.ebuild b/media-radio/tucnak2/tucnak2-2.48.ebuild index 19126892254f..25fafdfff7da 100644 --- a/media-radio/tucnak2/tucnak2-2.48.ebuild +++ b/media-radio/tucnak2/tucnak2-2.48.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.48.ebuild,v 1.2 2012/05/03 03:48:56 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.48.ebuild,v 1.3 2012/06/04 15:45:33 tomjbe Exp $ EAPI=4 inherit eutils autotools @@ -28,7 +28,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}/${P}-doc.diff" \ - "${FILESDIR}/${PN}-2.42-appname.diff" + "${FILESDIR}/${PN}-2.42-appname.diff" \ + "${FILESDIR}/${P}-hamlib.diff" eautoreconf } |