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 5F00F1395E9 for ; Mon, 30 Jan 2017 13:20:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BACF8E0E24; Mon, 30 Jan 2017 13:20:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87DE9E0E24 for ; Mon, 30 Jan 2017 13:20:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A5A934165A for ; Mon, 30 Jan 2017 13:20:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE7413AF7 for ; Mon, 30 Jan 2017 13:20:33 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1485782426.afb483297962f98d38ff20f01c3f7ee679c9fbf6.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/musescore/Manifest media-sound/musescore/files/musescore-1.3-cflags.patch media-sound/musescore/files/musescore-1.3-freetype251.patch media-sound/musescore/musescore-1.3.ebuild X-VCS-Directories: media-sound/musescore/files/ media-sound/musescore/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: afb483297962f98d38ff20f01c3f7ee679c9fbf6 X-VCS-Branch: master Date: Mon, 30 Jan 2017 13:20:33 +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-Archives-Salt: a17bfbb7-0c2b-40ca-adaa-491d44d1d464 X-Archives-Hash: 9a5a06374233a29cd20dc20c00490cf5 commit: afb483297962f98d38ff20f01c3f7ee679c9fbf6 Author: Johannes Huber gentoo org> AuthorDate: Mon Jan 30 13:17:51 2017 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Jan 30 13:20:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb48329 media-sound/musescore: Remove 1.3 Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-sound/musescore/Manifest | 1 - .../musescore/files/musescore-1.3-cflags.patch | 113 --------------------- .../files/musescore-1.3-freetype251.patch | 19 ---- media-sound/musescore/musescore-1.3.ebuild | 60 ----------- 4 files changed, 193 deletions(-) diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index 65bc3e1..7ca5ad2 100644 --- a/media-sound/musescore/Manifest +++ b/media-sound/musescore/Manifest @@ -1,3 +1,2 @@ -DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1 DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6 DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2 diff --git a/media-sound/musescore/files/musescore-1.3-cflags.patch b/media-sound/musescore/files/musescore-1.3-cflags.patch deleted file mode 100644 index 44af885..00000000 --- a/media-sound/musescore/files/musescore-1.3-cflags.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- mscore-1.3/mscore/al/CMakeLists.txt -+++ mscore-1.3/mscore/al/CMakeLists.txt -@@ -42,7 +42,7 @@ - - set_source_files_properties( - dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - set_source_files_properties(dspSSE.cpp ---- mscore-1.3/mscore/awl/CMakeLists.txt -+++ mscore-1.3/mscore/awl/CMakeLists.txt -@@ -61,7 +61,7 @@ - - set_target_properties( awl - PROPERTIES COMPILE_FLAGS -- "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - ADD_DEPENDENCIES(awl mops1) ---- mscore-1.3/mscore/CMakeLists.txt -+++ mscore-1.3/mscore/CMakeLists.txt -@@ -257,9 +257,6 @@ - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - ) - --set(CMAKE_CXX_FLAGS_DEBUG "-g") --set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") -- - if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") - if (MINGW) - set(FLAGS -DQT_DEBUG -DQT_DLL) -@@ -272,9 +269,9 @@ - endif (MINGW) - else (CMAKE_BUILD_TYPE STREQUAL "DEBUG") - if (MINGW) -- set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG) -+ set(FLAGS -DNDEBUG -DQT_DLL -DQT_NO_DEBUG) - else (MINGW) -- set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG) -+ set(FLAGS -DNDEBUG -DQT_NO_DEBUG) - endif (MINGW) - endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG") - -@@ -284,7 +281,7 @@ - add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch - COMMAND ${CMAKE_CXX_COMPILER} -- -x c++-header -g ${FLAGS} -+ -x c++-header ${FLAGS} - -I${QT_HEADERS_DIR} - -o all.h.gch all.h - DEPENDS ${PROJECT_BINARY_DIR}/all.h ---- mscore-1.3/mscore/fluid/CMakeLists.txt -+++ mscore-1.3/mscore/fluid/CMakeLists.txt -@@ -28,7 +28,7 @@ - ) - - set_target_properties( fluid -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - ADD_DEPENDENCIES(fluid mops1) ---- mscore-1.3/mscore/mscore/CMakeLists.txt -+++ mscore-1.3/mscore/mscore/CMakeLists.txt -@@ -199,7 +199,7 @@ - if(CMAKE_BUILD_TYPE MATCHES "DEBUG") - set_target_properties( mscore - PROPERTIES -- COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_LIB" - LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib" - ) - else(CMAKE_BUILD_TYPE MATCHES "DEBUG") ---- mscore-1.3/mscore/ofqf/CMakeLists.txt -+++ mscore-1.3/mscore/ofqf/CMakeLists.txt -@@ -34,8 +34,8 @@ - ) - - set_target_properties( ofqf -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - ADD_DEPENDENCIES(ofqf mops1) --ADD_DEPENDENCIES(ofqf mops2) -\ No newline at end of file -+ADD_DEPENDENCIES(ofqf mops2) ---- mscore-1.3/mscore/osdabzip/CMakeLists.txt -+++ mscore-1.3/mscore/osdabzip/CMakeLists.txt -@@ -29,7 +29,7 @@ - ) - - set_target_properties( osdabzip -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - ADD_DEPENDENCIES(osdabzip mops1) ---- mscore-1.3/mscore/singleapp/src/CMakeLists.txt -+++ mscore-1.3/mscore/singleapp/src/CMakeLists.txt -@@ -35,7 +35,7 @@ - ) - - set_target_properties( qtsingleapp -- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - ADD_DEPENDENCIES(qtsingleapp mops1) diff --git a/media-sound/musescore/files/musescore-1.3-freetype251.patch b/media-sound/musescore/files/musescore-1.3-freetype251.patch deleted file mode 100644 index 0fbad40..00000000 --- a/media-sound/musescore/files/musescore-1.3-freetype251.patch +++ /dev/null @@ -1,19 +0,0 @@ -Date: Tue, 15 Apr 2014 16:36:51 +0200 -Subject: [PATCH] Fix compilation with >=freetype-2.5.1 while remaining - compatible with older freetype versions. - -This fixes Gentoo bug #507712 (https://bugs.gentoo.org/507712) - -Signed-off-by: Lars Wendler - ---- mscore-1.3/mscore/mscore/genft.cpp -+++ mscore-1.3/mscore/mscore/genft.cpp -@@ -27,7 +27,7 @@ - - #include - #include FT_FREETYPE_H --#include -+#include FT_TRUETYPE_TABLES_H - #include "al/xml.h" - - QMap codemap; diff --git a/media-sound/musescore/musescore-1.3.ebuild b/media-sound/musescore/musescore-1.3.ebuild deleted file mode 100644 index fc1ae34..00000000 --- a/media-sound/musescore/musescore-1.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils eutils font - -MY_P="mscore-${PV}" - -DESCRIPTION="WYSIWYG Music Score Typesetter" -HOMEPAGE="http://mscore.sourceforge.net" -SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/alsa-lib - >=media-libs/libsndfile-1.0.19 - media-libs/portaudio - media-sound/fluidsynth - media-sound/jack-audio-connection-kit - sys-libs/zlib - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qt3support:4 - dev-qt/qtscript:4 - dev-qt/qtsvg:4 - x11-libs/qtscriptgenerator" -DEPEND="${RDEPEND} - dev-texlive/texlive-context - app-doc/doxygen - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}/mscore" -VARTEXFONTS="${T}/fonts" -FONT_SUFFIX="ttf" -FONT_S="${S}/mscore/fonts" - -src_prepare() { - # don't build redundant qtscriptgenerator libs - sed -i '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die - - epatch "${FILESDIR}"/${P}-cflags.patch \ - "${FILESDIR}"/${P}-freetype251.patch -} - -src_compile() { - cmake-utils_src_make lupdate - cmake-utils_src_make lrelease - cmake-utils_src_make -} - -src_install() { - cmake-utils_src_install - font_src_install - dodoc ChangeLog NEWS README - doman packaging/mscore.1 -}