| [proaudio] proaudio/proaudio: [3059] Udpdated to eapi 5 and qt5; various fixes |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3059
Author: dominique
Date: 2017-07-22 20:37:28 +0200 (Sat, 22 Jul 2017)
Log Message:
-----------
Udpdated to eapi 5 and qt5; various fixes
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/canorus/ChangeLog
trunk/overlays/proaudio/media-sound/canorus/Manifest
trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild
trunk/overlays/proaudio/media-sound/canorus/metadata.xml
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/canorus/files/0006-Add-lz-and-lpthread-to-linker-flags.patch
Modified: trunk/overlays/proaudio/media-sound/canorus/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/ChangeLog 2017-07-20 10:09:43 UTC (rev 3058)
+++ trunk/overlays/proaudio/media-sound/canorus/ChangeLog 2017-07-22 18:37:28 UTC (rev 3059)
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/canorus
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Jul 2017; Dominique Michel <dominique@xxxxxxxxxxxxx>
+ canorus-9999.ebuild: moved to eapi and qt5;
+ verious fixes
+
09 Mar 2013; Dominique Michel <dominique@xxxxxxxxxxxxx>
canorus-9999.ebuild: moved qt depends to dev-qt/*
Modified: trunk/overlays/proaudio/media-sound/canorus/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/Manifest 2017-07-20 10:09:43 UTC (rev 3058)
+++ trunk/overlays/proaudio/media-sound/canorus/Manifest 2017-07-22 18:37:28 UTC (rev 3059)
@@ -1,9 +1,8 @@
AUX 0001-Remove-extra-documentation.patch 771 SHA256 75a512d1cb1bb9370a5e815d5ce8e0c899f52162d56d313e10c96350c2f1ec0b SHA512 89e777721800e2a8a9d15ffd8f7f73d7fcb7de84d65b0fcfcf2e7b88b446570badc0e3445b7990fd39e8d3db8a00ba32ecbb956d313efc110b2cb76b0e2c7008 WHIRLPOOL 2004dd0cbb9b6e091cad29a4e1af82a5b805f59f1de6f4a180004224107eaa975617a3f7e17f7124c28d831d43f3eff0149d3da17af8c5317489e46b24c9fae6
AUX 0003-Reduce-linked-libraries.patch 763 SHA256 667fd7e17b18e2f1351b23a4727025c72b02a952ac44014b22ad3e1912597990 SHA512 a1abfc9c3149b55866271938414a704c21fd35b61b6967660e1daefccbde2b08bf7955474f8da07f582126aea573a8416a126ff4268aea58125d4cae5ed1f748 WHIRLPOOL 28ef2aec23f62596040e3f88b06c6b3aa4610e59fca040d20f02fdfd57af91c9bae809bc6b4c093ef77657c4f40e8d3b51dc80ffc09bc1a51f8c589de63bde51
-AUX 0006-Add-lz-and-lpthread-to-linker-flags.patch 967 SHA256 b2519558701380fc52e11a9bb04651ab642cdd395a65afcf2902019f2f553f26 SHA512 4dbe4893f44d7c5afcbb31a7ec81ac9bc9986665a9c399fe6bc0ebed8873c4dca46411f5e3121a63693278ebecfae45d3cd8ed8cb5802e0fd114295469c05920 WHIRLPOOL 0d0f8434819442f1d750aa276f683f47a1530ed2f561bed5f7515018cfad7e0e5de04ecd01fcfc1bf0c0ddbae618520def8e39353e34f0b0549fbd1ffbf257f3
AUX 0008-Do-not-install-examples.patch 978 SHA256 29539b39e15aa0f1e30c011067b4e226229a2e7a68e5db8548c421ac5d3fe985 SHA512 7a8cdf0f21bfadf4d9bc379653a49fba65d919ec4f9c65414d6f7176f5fe5ee107bf1bb3e5d4545456d771381b0ddc3c3025b45a55cf7e68e0ed93e09dbb5100 WHIRLPOOL 2d10fec147b2a1578756f54d0a97cb86eeea0a1c4bb00d31784f72319328b88e046da4c8119eafa1ae702b7b7f535d4b49e0bd555e402af375c7f4733e469d06
AUX canorus-9999-fix-MAKE_DIRECTORY.patch 989 SHA256 ce53467edbfbbdb99992314e0186be27bc9915ea9580ed9e1816345bbd30851d SHA512 71bc48259cf1d58e0cd611ecabb4433587bce40cbc2f2a327039920398df2b205b82841713926d4dc2772b92141090b9f5c8100ebbc5061ac331558cb6f60ce0 WHIRLPOOL 6e0ffc3d1a1dcee73190720c2b409415b9716cd118301948332623354454bd9868a845272f250cf911fe7f907d406f8ff49a8f8f0f278ea493c6f4fff9dc1369
AUX canorus-desktop_file.patch 499 SHA256 546db12b8fb8ae4b43e06d8f4871dd2310c8311653ca023fe047c100d16cef30 SHA512 e4150a31d0b3a96726fdef92b3cc49408b3ee29c4d9d5dcc600fcc0677a9799fc13e0ff2f3e38812d6582ba60fa2838cd91f47d4bcdfab5fe209838c9514908a WHIRLPOOL 6f5fb9c7fb4f24d8e91d57d7c6cd3933556eb9bc7ddc72a9f114bae370efee59fdc6c87653161c60019449af57c06c2e595250534530f150cdac1d4338701a19
-EBUILD canorus-9999.ebuild 2851 SHA256 f0aebac6c18e8080bf8be480626f91ef8074de559dd3ac15035da7119488c289 SHA512 883e148786f4f875f4c275a502358764e32645ba06a8f7585eeb3f883d128f6eb4da00988828b4574c914e07c382746a97e8007aba31b94302d0788d51c0deef WHIRLPOOL 7990089e49c96991073449056f44689588a9e81d11e787e8a007ba816452058202b8164dd6d12c4c85df3a95f6daa2c27bde9ca225ae4e7bc27b5a12223957aa
-MISC ChangeLog 1116 SHA256 b359d4e4d6c1c9d5ec0e17824c5570e0cdc30a1a374ea655633109ac43046a44 SHA512 37b29bc1ca1d7c7447bacd688f9665852b6115f903ade1c02b735aeafb1ef2fb2af47c11c5e73c1467a05b446c1f0e06e6f5fd8e598310905ba6f5594b72e76c WHIRLPOOL 3db802e01a27fd5519026303eedc91d26f57005e83911afca45fa7272e615426535f934fc01d5826feafdce0f6e105a99273fc31d5c8cb46be33f3e1a21d05e6
-MISC metadata.xml 319 SHA256 d1bf2273c231c6de357d9ca7cda0760c8aa61a8d71d1e2a243b7a326c2700614 SHA512 25818ef01379eaeb749e9e6cf5f7782b0aad29c7bd7a2be4c9a0b7024a7c0fb182927f67564da302a72e5d9f83ff132493487b646189fc5e18fd8bebbbfbc63b WHIRLPOOL 1418119a4cee051f430b6da374bc8447bca6e091705280282f7e7137def0e5bed65d0419f6762f17a82e3238503c4e9e26e95e6f8148232b640ea5c6c94ad255
+EBUILD canorus-9999.ebuild 3117 SHA256 86a7fa052176be1a81b68ab43f561e27af03cd8bddf5ee2ab816ab8cc752e954 SHA512 f86f0d85549b527f448e60fbc640901cd4329b37ab809ccd01da4ef5f2c63ff4ad1ae4cbe9c0b5c2f0700b416090b7c1d9c78a72217d585bb62cfba419167c00 WHIRLPOOL 6b70dc3d0957ebb1e1f58f4b17e240862c463e71a4e310d62b7a646a2561a9bdc1bd8adb46f115f4aa2fcc3da2d7bb994242b7220428a8929a6388d892152d08
+MISC ChangeLog 1237 SHA256 227500a9af120e9c5a24c85932477db48acc425782891f8dbf2dbe1618dd935f SHA512 326d1d279737957ee60abb32dfb97ff403ed68710bd849dc4916bce0e720c0778bc17b2bd50275a769b39b8c667905fd40216cd71314797cb164304463d3addf WHIRLPOOL f450c01c27a86b1873a1462c7c3faf3da31ce3d0cd963acc4e291d72dfd43a9ea5eef48cbf4224a2cf17dd733a01767fb9d05a02819d07a95d88a266a232a888
+MISC metadata.xml 334 SHA256 c2b1f7069a388815d627537717c237e7182932f0f352ec0e883e038714316392 SHA512 9f7157aa0122f87df0ec6d0af488c5826ba8887b40565378fcc49b0a69c9eaa2fa4825e7409f0799aa40c573b0c5ed4431fbaa26ab794b24d5fb55e0fb0e9d6f WHIRLPOOL 080eea08a428342bb249a804dd6c32516e59dc423e112ee11838c83bf9ce9060be65622f3e9f65cb4a8109be219f9f742c4bf4a463af1a5407863917222d6b77
Modified: trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild 2017-07-20 10:09:43 UTC (rev 3058)
+++ trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild 2017-07-22 18:37:28 UTC (rev 3059)
@@ -1,17 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="2"
+EAPI=5
CMAKE_IN_SOURCE_BUILD="1"
-inherit eutils qt4-r2 subversion cmake-utils
+inherit eutils subversion cmake-utils
-ESVN_REPO_URI="svn://svn.berlios.de/canorus/trunk"
-ESVN_PROJECT="canorus"
+ESVN_REPO_URI="svn://svn.code.sf.net/p/canorus/code/trunk"
+ESVN_PROJECT="canorus-code"
DESCRIPTION="a free extensible music score editor"
-HOMEPAGE="http://canorus.berlios.de";
+HOMEPAGE="http://sourceforge.net/projects/canorus";
SRC_URI=""
LICENSE="GPL-2"
@@ -23,17 +22,17 @@
RDEPEND="python? ( >=dev-lang/python-2.5 )
sys-libs/zlib
media-libs/alsa-lib
- >=dev-qt/qtsvg-4.4:4
- >=dev-qt/qtcore-4.4:4
+ >=dev-qt/qtsvg-5.3:5
+ >=dev-qt/qtcore-5.3:5
+ >=dev-qt/qtwebengine-5.3:5[widgets]
ruby? ( dev-lang/ruby )
sys-libs/libunwind
media-sound/lilypond
- dev-qt/qthelp:4"
+ dev-qt/qthelp:5"
DEPEND="${REDEND}
- dev-lang/swig
- userdoc? ( app-office/lyx
- dev-tex/tex4ht )
+ >=dev-lang/swig-2.0.12
+ userdoc? ( dev-python/sphinx[latex] )
doc? ( app-doc/doxygen )"
pkg_setup() {
@@ -54,20 +53,21 @@
epatch "${FILESDIR}/${P}-fix-MAKE_DIRECTORY.patch"
epatch "${FILESDIR}/0001-Remove-extra-documentation.patch"
epatch "${FILESDIR}/0003-Reduce-linked-libraries.patch"
- epatch "${FILESDIR}/0006-Add-lz-and-lpthread-to-linker-flags.patch"
epatch "${FILESDIR}/0008-Do-not-install-examples.patch"
epatch "${FILESDIR}/${PN}-desktop_file.patch"
- if use userdoc ; then
- sed -i -e "s/htlatex/mk4ht htlatex/g" "${S}"/doc/usersguide/Makefile \
- || die "sed userdoc Makefile failed"
- fi
}
src_compile() {
cmake-utils_src_compile || die "make failed"
if use userdoc ; then
- cd doc/usersguide
- make qthelp || die "make users documentation failed"
+ cd doc/usersguide2
+ # the sl language fail
+ sed -i -e "s/en sl nb/en nb/" Makefile || die "patch languages in Makefile failed"
+ # the other language generate no html file
+ sed -i -e "s/copyright = /copyright = u/" source/en/conf.py || die "patch en language config failed"
+ sed -i -e "s/copyright = /copyright = u/" source/nb/conf.py || die "patch nb language config failed"
+
+ make || die "make users documentation failed"
fi
if use doc ; then
cd "${S}"/doc/developersguide
@@ -77,6 +77,7 @@
src_install() {
dodoc AUTHORS DEVELOPERS NEWS README TODO VERSION
+ doman debian/canorus.6
# install the examples
insinto /usr/share/doc/"${P}"/examples
doins examples/* || die "install examples failed"
@@ -85,14 +86,15 @@
insinto /usr/share/doc/"${P}"/examples/musicxml
doins examples/musicxml/* || die "install examples/musicxml failed"
# install a desktop file with its icon
+ # non standard categories must start with X-
domenu canorus.desktop
insinto /usr/share/icons
- newins doc/usersguide/images/canorushelpicon.png canorus.png
+ newins src/ui/images/clogosm.png canorus.png
# install the user documentation
if use userdoc ; then
- insinto "/usr/share/${PN}/doc/usersguide"
- doins doc/usersguide/*.qhc
- doins doc/usersguide/*.qch
+ insinto "/usr/share/${PN}/doc/usersguide2"
+ doins doc/usersguide2/build/en/*
+ doins doc/usersguide2/build/nb/*
fi
# install the debeloppers documentation
if use doc ; then
@@ -99,5 +101,5 @@
dohtml doc/developersguide/html/* || die "install developpers doc failed"
fi
- qt4-r2_src_install || die "install failed"
+ cmake-utils_src_install || die "install failed"
}
Deleted: trunk/overlays/proaudio/media-sound/canorus/files/0006-Add-lz-and-lpthread-to-linker-flags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/files/0006-Add-lz-and-lpthread-to-linker-flags.patch 2017-07-20 10:09:43 UTC (rev 3058)
+++ trunk/overlays/proaudio/media-sound/canorus/files/0006-Add-lz-and-lpthread-to-linker-flags.patch 2017-07-22 18:37:28 UTC (rev 3059)
@@ -1,27 +0,0 @@
-From: Tobias Quathamer <toddy@xxxxxxxxxx>
-Date: Wed, 2 Mar 2011 06:00:59 +0100
-Subject: Add -lz and -lpthread to linker flags
-
-When using binutils-gold, the linker uses --no-add-needed by default,
-resulting in an FTBFS.
-
-Closes: #554082
-Thanks: Ilya Barygin <barygin@xxxxxxxxx>
----
- src/CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d0eaa66..8e766ae 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -620,7 +620,7 @@ ENDIF(USE_PYTHON)
- # command. Never remove that line :-)
- # Add ${QT_QTTEST_LIBRARY} below to add the Qt Test library as well
- # Add ${POPPLERQT4_LIBRARY} ${POPPLER_LIBRARY} to reactivate poppler libraries
--TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} )
-+TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} -lz -lpthread)
-
- ############################
- # RtMIDI Library additions #
---
Modified: trunk/overlays/proaudio/media-sound/canorus/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/metadata.xml 2017-07-20 10:09:43 UTC (rev 3058)
+++ trunk/overlays/proaudio/media-sound/canorus/metadata.xml 2017-07-22 18:37:28 UTC (rev 3059)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>