[proaudio] [2179] working ebuild for canorus

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [2179] working ebuild for canorus
From: subversion@xxxxxxxxxxxxx
Date: Thu, 26 Jul 2012 22:11:19 +0200

Revision: 2179
Author:   dominique
Date:     2012-07-26 22:11:18 +0200 (Thu, 26 Jul 2012)
Log Message:
-----------
working ebuild for canorus

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

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/canorus/files/0001-Remove-extra-documentation.patch
    trunk/overlays/proaudio/media-sound/canorus/files/0003-Reduce-linked-libraries.patch
    trunk/overlays/proaudio/media-sound/canorus/files/0006-Add-lz-and-lpthread-to-linker-flags.patch
    trunk/overlays/proaudio/media-sound/canorus/files/0008-Do-not-install-examples.patch
    trunk/overlays/proaudio/media-sound/canorus/files/canorus-desktop_file.patch

Modified: trunk/overlays/proaudio/media-sound/canorus/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/ChangeLog	2012-07-21 12:51:15 UTC (rev 2178)
+++ trunk/overlays/proaudio/media-sound/canorus/ChangeLog	2012-07-26 20:11:18 UTC (rev 2179)
@@ -2,6 +2,18 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jul 2012; Dominique Michel <dominique@xxxxxxxxxxxxx>
+  canorus-8888.ebuild: Added doc and userdoc USE flags; added some debian patches.
+  +files/0001-Remove-extra-documentation.patch
+  +files/0003-Reduce-linked-libraries.patch
+  +files/0006-Add-lz-and-lpthread-to-linker-flags.patch
+  +files/0008-Do-not-install-examples.patch
+  The installation of the docs is handled via USE flaags and the ebuild.
+  The exemples are installed into the doc directory.
+  Remplaced outdated warning by a warning about python and ruby.
+  Install the desktop file.
+  °files/canorus-desktop_file.patch
+
   07 Sep 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> canorus-9999.ebuild,
   +files/canorus-9999-fix-MAKE_DIRECTORY.patch:
   cleanup; added patch fixing MAKE_DIRECTORY

Modified: trunk/overlays/proaudio/media-sound/canorus/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/Manifest	2012-07-21 12:51:15 UTC (rev 2178)
+++ trunk/overlays/proaudio/media-sound/canorus/Manifest	2012-07-26 20:11:18 UTC (rev 2179)
@@ -1,4 +1,9 @@
-AUX canorus-9999-fix-MAKE_DIRECTORY.patch 989 RMD160 57a27f87bbcca15f1204ea570b8dc2e2faaf8f57 SHA1 ea9fc3fa37df0e01429770ed6e0067c63e08e4d1 SHA256 ce53467edbfbbdb99992314e0186be27bc9915ea9580ed9e1816345bbd30851d
-EBUILD canorus-9999.ebuild 1043 RMD160 bcdb6e2c3da0ad49341f2532d9602445d6c7669e SHA1 1056efcbbc5e5c81e6a1ee524faf7ff9d44673f9 SHA256 c5cbdb5e2c929fbd58b3c4d033b266e06910a1ac68c13ed94b2c23f737f063a7
-MISC ChangeLog 375 RMD160 e6a60a009faee45362e91d171c70d66165177747 SHA1 95113eb392f11cdb1b21dea6d9e89b699daca269 SHA256 a355dc821e8c527018dcc4ba3ffb0ce4f89f1f384394a3843fbc352aaefc84c3
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+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 2763 SHA256 410c975d430c81d8477f49697d8651c00d5675ba1f482a0fb8ea121d69b96168 SHA512 2b3e6fd143668933d69e9333bd7aa5bd4d536b52d0469d36d76d77bd267751617fb630a9c2f7f69f5db40fe01a2fa6e5313c95bc200aa5f256d5485422621ba9 WHIRLPOOL dee3cba933d7df0c1fd38f05f3d27e58c311a498b48716e7750e349eb5b4c74c9b8f4144ae9a55b73b09f2b39ec1d76932ccb27408441ff60a9329d2c071086b
+MISC ChangeLog 964 SHA256 963e411b22e392fed4a965b1fd3e34760e73ed591d999e4e8980abdfe0b20a30 SHA512 fa8ea6224c4a8621f9c17927ff0f4efa84f0c3921255d1e71f5e1cef5695517576feaca71e9759289aabd71087d5e4ca1da2c125806080d62f53fa54381a24b0 WHIRLPOOL 9e947da335e6d08eefd033e7c45d4089940063f9b17a59db1eb3533afe62edbc4001a2bf0cdd95d7c8143f0511a11d88dc0fe4263768df453c5c7bffcc3f1f56
+MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a

Modified: trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild	2012-07-21 12:51:15 UTC (rev 2178)
+++ trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild	2012-07-26 20:11:18 UTC (rev 2179)
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,33 +18,84 @@
 SLOT="0"
 KEYWORDS=""
 
-IUSE="ruby"
+IUSE="doc -python -ruby userdoc"
 
-RDEPEND=">=dev-lang/python-2.5
+RDEPEND="python? ( >=dev-lang/python-2.5 )
 	sys-libs/zlib
 	media-libs/alsa-lib
 	>=x11-libs/qt-svg-4.4:4
 	>=x11-libs/qt-core-4.4:4
-	ruby? ( dev-lang/ruby )"
-	#>=x11-libs/qt-assistant-4.4:4
+	ruby? ( dev-lang/ruby )
+	sys-libs/libunwind
+	media-sound/lilypond
+	x11-libs/qt-assistant:4"
 
 DEPEND="${REDEND}
-	dev-lang/swig"
+	dev-lang/swig
+	userdoc? ( app-office/lyx
+		dev-tex/tex4ht )
+	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
-	ewarn "if this ebuild fails have a look at"
-	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=157501";
-	ewarn "hav no time to fix the ebuild"
+	ewarn "USE=python will fail to compile with recent versions of swig."
+	ewarn "USE=ruby work but do nothing. If you know how to fix it,"
+	ewarn "please considere to contribute."
 
 	mycmakeargs+=" -DCANORUS_INSTALL_LIB_DIR=$(get_libdir) \
-		-DNO_RUBY=$( use ruby && echo false || echo true ) \
-		-DNO_PYTHON=false"
+		-DNO_PYTHON=$( use python && echo false || echo true ) \
+		-DNO_RUBY=$( use ruby && echo false || echo true )"
 }
 
+src_unpack() {
+	subversion_src_unpack
+}
+
 src_prepare() {
 	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_unpack() {
-	subversion_src_unpack
+src_compile() {
+	cmake-utils_src_compile || die "make failed"
+	if use userdoc ; then
+		cd doc/usersguide
+		make qthelp || die "make users documentation failed"
+	fi
+	if use doc ; then
+		cd "${S}"/doc/developersguide
+		make || die "make developpers guide failed"
+	fi
 }
+
+src_install() {
+	dodoc AUTHORS DEVELOPERS NEWS README TODO VERSION
+	# install the examples
+	insinto /usr/share/doc/"${P}"/examples
+	doins examples/* || die "install examples failed"
+	insinto /usr/share/doc/"${P}"/examples/midi
+	doins examples/midi/* || die "install examples/midi failed"
+	insinto /usr/share/doc/"${P}"/examples/musicxml
+	doins examples/musicxml/* || die "install examples/musicxml failed"
+	# install a desktop file
+	domenu canorus.desktop
+	# install the user documentation
+	if use userdoc ; then
+		insinto "/usr/share/${PN}/doc/usersguide"
+		doins doc/usersguide/*.qhc
+		doins doc/usersguide/*.qch
+	fi
+	# install the debeloppers documentation
+	if use doc ; then
+		dohtml doc/developersguide/html/* || die "install developpers doc failed"
+	fi
+
+	qt4-r2_src_install || die "install failed"
+}

Added: trunk/overlays/proaudio/media-sound/canorus/files/0001-Remove-extra-documentation.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/files/0001-Remove-extra-documentation.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/canorus/files/0001-Remove-extra-documentation.patch	2012-07-26 20:11:18 UTC (rev 2179)
@@ -0,0 +1,21 @@
+From: Tobias Quathamer <toddy@xxxxxxxxxx>
+Date: Wed, 2 Mar 2011 05:47:43 +0100
+Subject: Remove extra documentation
+
+Do not install documentation, it's handled by debhelper commands.
+---
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b682492..1cd0f29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,5 +90,5 @@ ADD_SUBDIRECTORY(src)
+ ADD_SUBDIRECTORY(doc)
+ 
+ # Install README, VERSION, COPYING and other raw txt files
+-INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
++# INSTALL(FILES AUTHORS DEVELOPERS COPYING NEWS README VERSION DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}")
+ 
+-- 

Added: trunk/overlays/proaudio/media-sound/canorus/files/0003-Reduce-linked-libraries.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/files/0003-Reduce-linked-libraries.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/canorus/files/0003-Reduce-linked-libraries.patch	2012-07-26 20:11:18 UTC (rev 2179)
@@ -0,0 +1,24 @@
+From: Tobias Quathamer <toddy@xxxxxxxxxx>
+Date: Wed, 7 Mar 2012 21:39:40 +0100
+Subject: Reduce linked libraries
+
+Reduce linking with unneeded libraries
+---
+ src/CMakeLists.txt |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index de452ae..2a58c7f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -19,6 +19,9 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2")
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+ 
++# Do not link with unneeded libraries
++SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
++
+ # Build universal binaries on Mac
+ IF(APPLE)
+ 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch ppc -arch i386")
+-- 

Added: 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	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/canorus/files/0006-Add-lz-and-lpthread-to-linker-flags.patch	2012-07-26 20:11:18 UTC (rev 2179)
@@ -0,0 +1,27 @@
+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 #
+-- 

Added: trunk/overlays/proaudio/media-sound/canorus/files/0008-Do-not-install-examples.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/files/0008-Do-not-install-examples.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/canorus/files/0008-Do-not-install-examples.patch	2012-07-26 20:11:18 UTC (rev 2179)
@@ -0,0 +1,23 @@
+From: Tobias Quathamer <toddy@xxxxxxxxxx>
+Date: Wed, 14 Mar 2012 15:10:17 +0100
+Subject: Do not install examples
+
+Examples are covered by debhelper
+---
+ src/CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c789d45..0a01238 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -710,7 +710,7 @@ INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_IN
+ #FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+ #INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+ # Install examples
+-INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
++#INSTALL( DIRECTORY ${Canorus_Examples} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}" )
+ 
+ IF(MINGW)
+ 	# Install Qt libs
+-- 

Added: trunk/overlays/proaudio/media-sound/canorus/files/canorus-desktop_file.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/files/canorus-desktop_file.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/canorus/files/canorus-desktop_file.patch	2012-07-26 20:11:18 UTC (rev 2179)
@@ -0,0 +1,18 @@
+--- canorus.desktop.orig	2012-07-26 22:47:56.000000000 +0200
++++ canorus.desktop	2012-07-26 22:53:36.000000000 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Encoding=UTF-8
++Version=1.0
+ Name=Canorus
+ GenericName=Music score editor
+ GenericName[sl]=Program za pisanje not
+@@ -9,6 +9,6 @@
+ Icon=canorus
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;Audio;AudioVideoEditing;MIDI;
+ StartupNotify=true
+-MimeType=application/x-notes
++MimeType=application/x-notes;

Messages sorted by: [ date | thread ]
Prev by Date: Re: [proaudio] a2jmidid-9999: ./waf invalid syntax
Next by Date: [proaudio] [2180] canorus: desktop icon
Previous by thread: Re: [proaudio] a2jmidid-9999: ./waf invalid syntax
Next by thread: [proaudio] [2180] canorus: desktop icon

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/