| 1 |
commit: 89430661217c0394fa0a7c26c38d6984ee22d5e1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 27 21:39:16 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 28 15:26:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89430661 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Drop obsolete cmake hacks, fix icons install |
| 9 |
|
| 10 |
Upstream commit 618c3ce368a93aa614b534af7b1f867c25d7aabe |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-geosciences/qgis/qgis-9999.ebuild | 18 ++++-------------- |
| 16 |
1 file changed, 4 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
| 19 |
index 9a778816327..a1d962905d6 100644 |
| 20 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
| 21 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
| 22 |
@@ -110,16 +110,6 @@ pkg_setup() { |
| 23 |
|
| 24 |
src_prepare() { |
| 25 |
cmake-utils_src_prepare |
| 26 |
- |
| 27 |
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ |
| 28 |
- -i CMakeLists.txt || die "Failed to fix lrelease path" |
| 29 |
- |
| 30 |
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \ |
| 31 |
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ |
| 32 |
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ |
| 33 |
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" |
| 34 |
- |
| 35 |
- cd src/plugins || die |
| 36 |
} |
| 37 |
|
| 38 |
src_configure() { |
| 39 |
@@ -165,14 +155,14 @@ src_configure() { |
| 40 |
src_install() { |
| 41 |
cmake-utils_src_install |
| 42 |
|
| 43 |
- domenu debian/qgis.desktop |
| 44 |
+ newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop |
| 45 |
|
| 46 |
local size type |
| 47 |
for size in 16 22 24 32 48 64 96 128 256; do |
| 48 |
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png |
| 49 |
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png |
| 50 |
+ newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png |
| 51 |
+ newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png |
| 52 |
for type in qgs qml qlr qpt; do |
| 53 |
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png |
| 54 |
+ newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png |
| 55 |
done |
| 56 |
done |
| 57 |
newicon -s scalable images/icons/qgis_icon.svg qgis.svg |
Archives