From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CDE2138335 for ; Fri, 1 Feb 2019 21:21:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F820E0833; Fri, 1 Feb 2019 21:21:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAA60E0833 for ; Fri, 1 Feb 2019 21:21:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42113335D04 for ; Fri, 1 Feb 2019 21:21:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90F7A4FF for ; Fri, 1 Feb 2019 21:21:46 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1549056089.d405376b1ffdb0d5666d1ea18c37ca3106b23512.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/Manifest media-sound/musescore/files/musescore-3.0.1-man-pages.patch media-sound/musescore/musescore-9999.ebuild X-VCS-Directories: media-sound/musescore/files/ media-sound/musescore/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d405376b1ffdb0d5666d1ea18c37ca3106b23512 X-VCS-Branch: master Date: Fri, 1 Feb 2019 21:21:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 751a09df-32d6-41f1-a492-ff609e105cea X-Archives-Hash: dceb77a06ac71ba37329a940a8c1d9f3 commit: d405376b1ffdb0d5666d1ea18c37ca3106b23512 Author: Miroslav Šulc gentoo org> AuthorDate: Fri Feb 1 21:07:10 2019 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Feb 1 21:21:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d405376b media-sound/musescore-9999: fixed Closes: https://bugs.gentoo.org/673342 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/musescore/Manifest | 1 - .../musescore/files/musescore-3.0.1-man-pages.patch | 13 +++++++++++++ media-sound/musescore/musescore-9999.ebuild | 18 ++++++++---------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index e3aa6440e5a..0b989b3ef61 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,4 +1,3 @@ DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d -DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89 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 new file mode 100644 index 00000000000..19d28c796c7 --- /dev/null +++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d337fbab5..bf334121a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -667,7 +667,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE) + # Compress man pages if gzip is installed (don't on OpenBSD) + # Note: Compressing man pages is normal on Linux but not OpenBSD + find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." ) +- if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") ++ if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false) + message(STATUS "Found 'gzip'. Man pages will be compressed.") + set(MAN_TARGET ${MAN_BUILD}) + set(MAN_EXTENSION ${MAN_EXTENSION}.gz) diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 051ffdcc6ae..f06329ed93d 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils git-r3 xdg-utils +inherit git-r3 cmake-utils xdg-utils gnome2-utils DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/" EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2" LICENSE="GPL-2" SLOT="0" @@ -47,16 +46,13 @@ DEPEND="${RDEPEND} " PATCHES=( - "${WORKDIR}/${P}-fix-buildsystem.patch" + "${FILESDIR}/${PN}-3.0.1-man-pages.patch" + "${FILESDIR}/${PN}-3.0.1-porttime.patch" ) -src_unpack() { - git-r3_src_unpack - default_src_unpack -} - src_configure() { local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON -DUSE_SYSTEM_FREETYPE=ON @@ -67,7 +63,7 @@ src_configure() { -DBUILD_PORTMIDI="$(usex portmidi)" -DBUILD_PULSEAUDIO="$(usex pulseaudio)" -DSOUNDFONT3="$(usex vorbis)" - -DBUILD_WEBEBENGINE="$(usex webengine)" + -DBUILD_WEBENGINE="$(usex webengine)" ) cmake-utils_src_configure } @@ -81,9 +77,11 @@ src_compile() { pkg_postinst() { xdg_mimeinfo_database_update xdg_desktop_database_update + gnome2_icon_cache_update } pkg_postrm() { xdg_mimeinfo_database_update xdg_desktop_database_update + gnome2_icon_cache_update }