summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-04-27 23:39:16 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-04-28 17:26:43 +0200
commit89430661217c0394fa0a7c26c38d6984ee22d5e1 (patch)
tree088afce9907fa77237b185b3d875f77b506253a1 /sci-geosciences/qgis
parentsci-geosciences/qgis: EAPI-7 bump (diff)
downloadgentoo-89430661217c0394fa0a7c26c38d6984ee22d5e1.tar.gz
gentoo-89430661217c0394fa0a7c26c38d6984ee22d5e1.tar.bz2
gentoo-89430661217c0394fa0a7c26c38d6984ee22d5e1.zip
sci-geosciences/qgis: Drop obsolete cmake hacks, fix icons install
Upstream commit 618c3ce368a93aa614b534af7b1f867c25d7aabe Package-Manager: Portage-2.3.65, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-geosciences/qgis')
-rw-r--r--sci-geosciences/qgis/qgis-9999.ebuild18
1 files changed, 4 insertions, 14 deletions
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 9a7788163270..a1d962905d67 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -110,16 +110,6 @@ pkg_setup() {
src_prepare() {
cmake-utils_src_prepare
-
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
- -i CMakeLists.txt || die "Failed to fix lrelease path"
-
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
- cd src/plugins || die
}
src_configure() {
@@ -165,14 +155,14 @@ src_configure() {
src_install() {
cmake-utils_src_install
- domenu debian/qgis.desktop
+ newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
local size type
for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
done
done
newicon -s scalable images/icons/qgis_icon.svg qgis.svg