Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 727332 - net-wireless/gnuradio-3.8.1.0-r1 unnecessary icons installed into pixmaps
Summary: net-wireless/gnuradio-3.8.1.0-r1 unnecessary icons installed into pixmaps
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Radio project
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-06-06 16:35 UTC by Chris Mayo
Modified: 2020-12-17 16:46 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Mayo 2020-06-06 16:35:22 UTC
/usr/share/pixmaps/grc-icon-128.png
/usr/share/pixmaps/grc-icon-16.png
/usr/share/pixmaps/grc-icon-24.png
/usr/share/pixmaps/grc-icon-256.png
/usr/share/pixmaps/grc-icon-32.png
/usr/share/pixmaps/grc-icon-48.png
/usr/share/pixmaps/grc-icon-64.png

Caused by the doicon "${fd_path}/"*.png in src_install(). Indeed the inherit desktop and that entire "if use grc ; then" block is not needed with GNU Radio 3.8.


Also:
-- Checking for module 'mpir >= 3.0'
--   No package 'mpir' found

unsure of the significance but appears it can be fixed in src_prepare:

sed -i '/pkg_check_modules(PC_MPIR "mpir >= 3.0")/d' cmake/Modules/FindMPIR.cmake || die


Total patch:

N.B. also fix for Python 3.6 installed into lib64 too (my mistake), t here was a bug about this.

--- gnuradio-3.8.1.0-r1.ebuild
+++ gnuradio-3.8.1.0-r2.ebuild
@@ -5,7 +5,7 @@
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils desktop
+inherit cmake python-single-r1 virtualx xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -116,6 +116,8 @@
 
 src_prepare() {
 	xdg_environment_reset #534582
+	
+	sed -i '/pkg_check_modules(PC_MPIR "mpir >= 3.0")/d' cmake/Modules/FindMPIR.cmake || die
 
 	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
 	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
@@ -183,19 +185,9 @@
 	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
 	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
 
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
 	python_fix_shebang "${ED}"
 	# Remove incorrectly byte-compiled Python files and replace
-	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
 	python_optimize
 }
Comment 1 Rick Farina (Zero_Chaos) gentoo-dev 2020-09-21 19:17:56 UTC
do the icons not belong in pixmaps or what?  seems fine to leave them there?
Comment 2 Chris Mayo 2020-09-22 18:40:05 UTC
I think only /usr/share/pixmaps/gnuradio-grc.png would be used - and preferably you want the sized icons in the matching directory of the hicolor theme so that the desktop can pick the appropriate one.

I guess the main point is that all the desktop stuff is installed now with cmake:
https://github.com/gnuradio/gnuradio/blob/master/grc/scripts/freedesktop/CMakeLists.txt
so there is no need to maintain this in the ebuild.
Comment 3 Rick Farina (Zero_Chaos) gentoo-dev 2020-12-17 16:46:07 UTC
agreed, installing the icons twice does seem redundant.  I've adjusted in place as it's pretty minor and I don't want to force everyone to rebuild to save a few K

Thanks!