diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-12 02:35:26 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-12 02:35:26 +0200 |
| commit | 280afa1412da7b809e6fa7a646b2bc886be1effc (patch) | |
| tree | b8b0d90c86cafdc7ee9c540ddb206adf87f66cf3 /x11-libs/qtscriptgenerator | |
| parent | Update amarok deps a bit :] (diff) | |
| download | kde-280afa1412da7b809e6fa7a646b2bc886be1effc.tar.gz kde-280afa1412da7b809e6fa7a646b2bc886be1effc.tar.bz2 kde-280afa1412da7b809e6fa7a646b2bc886be1effc.zip | |
Few fixups for qtscriptgenerator
Diffstat (limited to 'x11-libs/qtscriptgenerator')
3 files changed, 24 insertions, 30 deletions
diff --git a/x11-libs/qtscriptgenerator/files/disable_phonon.patch b/x11-libs/qtscriptgenerator/files/disable_phonon.patch deleted file mode 100644 index 5caa106826..0000000000 --- a/x11-libs/qtscriptgenerator/files/disable_phonon.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- generator/generator.qrc.orig 2009-03-22 16:38:28.000000000 +0100 -+++ generator/generator.qrc 2009-03-22 16:38:40.000000000 +0100 -@@ -7,7 +7,6 @@ - <file alias="typesystem_svg.txt">typesystem_svg.xml</file> - <file alias="typesystem_network.txt">typesystem_network.xml</file> - <file alias="typesystem_xml.txt">typesystem_xml.xml</file> --<file alias="typesystem_phonon.txt">typesystem_phonon.xml</file> - <file alias="typesystem_webkit.txt">typesystem_webkit.xml</file> - <file alias="typesystem_xmlpatterns.txt">typesystem_xmlpatterns.xml</file> - <file>parser/rpp/pp-qt-configuration</file> ---- qtbindings/qtbindings.pro.orig 2009-03-22 17:03:05.000000000 +0100 -+++ qtbindings/qtbindings.pro 2009-03-22 17:03:15.000000000 +0100 -@@ -6,7 +6,6 @@ - qtscript_sql \ - qtscript_svg \ - qtscript_xml \ -- qtscript_phonon \ - qtscript_webkit \ - qtscript_xmlpatterns \ - qtscript_uitools \
\ No newline at end of file diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild index 2341874540..5649032301 100644 --- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild +++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild @@ -33,10 +33,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/disable_phonon.patch" -) - PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns" S="${WORKDIR}/${MY_P}" @@ -46,6 +42,17 @@ pkg_setup(){ QTLIBDIR="/usr/$(get_libdir)/qt4/" } +src_prepare() { + # remove phonon + sed -i \ + -e "s/typesystem_phonon.xml/d" \ + generator/generator.qrc || die "sed failed" + sed -i \ + -e "s/qtscript_phonon/d" \ + qtbindings/qtbindings.pro || die "sed failed" + qt4_src_prepare +} + src_configure() { cd "${S}"/generator eqmake4 generator.pro @@ -58,7 +65,7 @@ src_compile() { emake || die "emake generator failed" ./generator --include-paths="/usr/include/qt4/" || die "running generator failed" cd "${S}"/qtbindings - make || die "make qtbindings failed" # TODO: fix emake + emake -j1 || die "make qtbindings failed" } src_install() { diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild index de3a4a92b5..6a926d5ba4 100644 --- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild +++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild @@ -30,10 +30,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/disable_phonon.patch" -) - PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns" src_unpack() { @@ -44,6 +40,17 @@ pkg_setup(){ QTDIR="/usr/include/qt4" QTLIBDIR="/usr/$(get_libdir)/qt4/" } +src_prepare() { + # remove phonon + sed -i \ + -e "s/typesystem_phonon.xml/d" \ + generator/generator.qrc || die "sed failed" + sed -i \ + -e "s/qtscript_phonon/d" \ + qtbindings/qtbindings.pro || die "sed failed" + git_src_prepare + qt4_src_prepare +} src_configure() { cd "${S}"/generator @@ -57,7 +64,7 @@ src_compile() { emake || die "emake generator failed" ./generator --include-paths="/usr/include/qt4/" || die "running generator failed" cd "${S}"/qtbindings - make || die "make qtbindings failed" # TODO: fix emake + emake -j1 || die "make qtbindings failed" } src_install() { |