| 1 |
commit: d405376b1ffdb0d5666d1ea18c37ca3106b23512 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 1 21:07:10 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 1 21:21:29 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d405376b |
| 7 |
|
| 8 |
media-sound/musescore-9999: fixed |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/673342 |
| 11 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 13 |
|
| 14 |
media-sound/musescore/Manifest | 1 - |
| 15 |
.../musescore/files/musescore-3.0.1-man-pages.patch | 13 +++++++++++++ |
| 16 |
media-sound/musescore/musescore-9999.ebuild | 18 ++++++++---------- |
| 17 |
3 files changed, 21 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest |
| 20 |
index e3aa6440e5a..0b989b3ef61 100644 |
| 21 |
--- a/media-sound/musescore/Manifest |
| 22 |
+++ b/media-sound/musescore/Manifest |
| 23 |
@@ -1,4 +1,3 @@ |
| 24 |
DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc |
| 25 |
DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 |
| 26 |
DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d |
| 27 |
-DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89 |
| 28 |
|
| 29 |
diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..19d28c796c7 |
| 32 |
--- /dev/null |
| 33 |
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch |
| 34 |
@@ -0,0 +1,13 @@ |
| 35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 36 |
+index d337fbab5..bf334121a 100644 |
| 37 |
+--- a/CMakeLists.txt |
| 38 |
++++ b/CMakeLists.txt |
| 39 |
+@@ -667,7 +667,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE) |
| 40 |
+ # Compress man pages if gzip is installed (don't on OpenBSD) |
| 41 |
+ # Note: Compressing man pages is normal on Linux but not OpenBSD |
| 42 |
+ find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." ) |
| 43 |
+- if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") |
| 44 |
++ if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false) |
| 45 |
+ message(STATUS "Found 'gzip'. Man pages will be compressed.") |
| 46 |
+ set(MAN_TARGET ${MAN_BUILD}) |
| 47 |
+ set(MAN_EXTENSION ${MAN_EXTENSION}.gz) |
| 48 |
|
| 49 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild |
| 50 |
index 051ffdcc6ae..f06329ed93d 100644 |
| 51 |
--- a/media-sound/musescore/musescore-9999.ebuild |
| 52 |
+++ b/media-sound/musescore/musescore-9999.ebuild |
| 53 |
@@ -1,14 +1,13 @@ |
| 54 |
-# Copyright 1999-2018 Gentoo Foundation |
| 55 |
+# Copyright 1999-2019 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
|
| 60 |
-inherit cmake-utils git-r3 xdg-utils |
| 61 |
+inherit git-r3 cmake-utils xdg-utils gnome2-utils |
| 62 |
|
| 63 |
DESCRIPTION="WYSIWYG Music Score Typesetter" |
| 64 |
HOMEPAGE="https://musescore.org/" |
| 65 |
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" |
| 66 |
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2" |
| 67 |
|
| 68 |
LICENSE="GPL-2" |
| 69 |
SLOT="0" |
| 70 |
@@ -47,16 +46,13 @@ DEPEND="${RDEPEND} |
| 71 |
" |
| 72 |
|
| 73 |
PATCHES=( |
| 74 |
- "${WORKDIR}/${P}-fix-buildsystem.patch" |
| 75 |
+ "${FILESDIR}/${PN}-3.0.1-man-pages.patch" |
| 76 |
+ "${FILESDIR}/${PN}-3.0.1-porttime.patch" |
| 77 |
) |
| 78 |
|
| 79 |
-src_unpack() { |
| 80 |
- git-r3_src_unpack |
| 81 |
- default_src_unpack |
| 82 |
-} |
| 83 |
- |
| 84 |
src_configure() { |
| 85 |
local mycmakeargs=( |
| 86 |
+ -DCMAKE_SKIP_RPATH=ON |
| 87 |
-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON |
| 88 |
-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON |
| 89 |
-DUSE_SYSTEM_FREETYPE=ON |
| 90 |
@@ -67,7 +63,7 @@ src_configure() { |
| 91 |
-DBUILD_PORTMIDI="$(usex portmidi)" |
| 92 |
-DBUILD_PULSEAUDIO="$(usex pulseaudio)" |
| 93 |
-DSOUNDFONT3="$(usex vorbis)" |
| 94 |
- -DBUILD_WEBEBENGINE="$(usex webengine)" |
| 95 |
+ -DBUILD_WEBENGINE="$(usex webengine)" |
| 96 |
) |
| 97 |
cmake-utils_src_configure |
| 98 |
} |
| 99 |
@@ -81,9 +77,11 @@ src_compile() { |
| 100 |
pkg_postinst() { |
| 101 |
xdg_mimeinfo_database_update |
| 102 |
xdg_desktop_database_update |
| 103 |
+ gnome2_icon_cache_update |
| 104 |
} |
| 105 |
|
| 106 |
pkg_postrm() { |
| 107 |
xdg_mimeinfo_database_update |
| 108 |
xdg_desktop_database_update |
| 109 |
+ gnome2_icon_cache_update |
| 110 |
} |
Archives