* [gentoo-commits] gentoo-x86 commit in dev-java/qtjambi: ChangeLog qtjambi-4.5.2_p1.ebuild
@ 2009-12-18 16:07 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-12-18 16:07 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/12/18 16:07:51
Modified: ChangeLog
Added: qtjambi-4.5.2_p1.ebuild
Log:
Version bump ( bug #282365 )
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Revision Changes Path
1.22 dev-java/qtjambi/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 9 Nov 2009 10:47:23 -0000 1.21
+++ ChangeLog 18 Dec 2009 16:07:51 -0000 1.22
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/qtjambi
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.21 2009/11/09 10:47:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.22 2009/12/18 16:07:51 hwoarang Exp $
+
+*qtjambi-4.5.2_p1 (18 Dec 2009)
+
+ 18 Dec 2009; Markos Chandras <hwoarang@gentoo.org>
+ +qtjambi-4.5.2_p1.ebuild:
+ Version bump ( bug #282365 )
09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
-files/generator-4.3.3.patch, -files/jambi.pri.diff,
1.1 dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?rev=1.1&content-type=text/plain
Index: qtjambi-4.5.2_p1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.1 2009/12/18 16:07:51 hwoarang Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source"
WANT_ANT_TASKS="ant-trax"
inherit eutils multilib qt4 java-pkg-2 java-ant-2
QTVER="${PV%%_p*}"
MY_PV="${PV/p/0}"
MY_P="${PN}-src-lgpl-${MY_PV}"
DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit."
HOMEPAGE="http://qt.nokia.com/"
SRC_URI="http://get.qt.nokia.com/${PN}/source/${MY_P}.tar.gz"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="debug examples opengl phonon webkit xmlpatterns"
COMMON_DEPS=">=x11-libs/qt-gui-${QTVER}:${SLOT}
>=x11-libs/qt-sql-${QTVER}:${SLOT}
>=x11-libs/qt-svg-${QTVER}:${SLOT}
opengl? ( >=x11-libs/qt-opengl-${QTVER}:${SLOT} )
phonon? ( >=x11-libs/qt-phonon-${QTVER}:${SLOT} )
webkit? (
>=x11-libs/qt-phonon-${QTVER}:${SLOT}
>=x11-libs/qt-webkit-${QTVER}:${SLOT}
)
xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
DEPEND="${COMMON_DEPS}
>=virtual/jdk-1.6"
RDEPEND="${COMMON_DEPS}
>=virtual/jre-1.6"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch \
"${FILESDIR}"/generator-4.5.0_p1.patch \
"${FILESDIR}"/configuration-4.5.0_p1.patch \
"${FILESDIR}"/gcc4.4-4.5.0_p1.patch
# Respect MAKEOPTS
sed -i -e "/String arguments =/s|=.*|=\" ${MAKEOPTS}\";|" \
com/trolltech/tools/ant/MakeTask.java || die
java-ant_rewrite-classpath
}
qtjambi_use() {
if [[ $1 == "phonon" ]] && use webkit; then
# USE=webkit requires phonon support
echo "-Dgentoo.phonon=true"
else
echo "-Dgentoo.$1=$(use $1 && echo true || echo false)"
fi
}
qt_config_use() {
if [[ $1 == "phonon" ]] && use webkit; then
# USE=webkit requires phonon support
echo "QT_CONFIG+=phonon"
else
echo "QT_CONFIG$(use $1 && echo '+' || echo '-')=$1"
fi
}
src_compile() {
local myconf="-Dqtjambi.config=$(use debug && echo debug || echo release)
-Dlibrary.designer=true
$(qtjambi_use opengl)
$(qtjambi_use phonon)
$(qtjambi_use webkit)
$(qtjambi_use xmlpatterns)"
export QTDIR="/usr/$(get_libdir)/qt4"
einfo "Initializing Qt Jambi build environment"
eant -Dgentoo.classpath="$(java-pkg_getjar --build-only ant-core ant.jar)" \
${myconf} init
einfo "Merging XML files used by the Qt Jambi generator"
eant ${myconf} generator.xmlmerge
# Use eqmake4 instead of generator.qmake ant target
eqmake4 generator/generator.pro -o generator/Makefile
einfo "Building and running the generator"
eant ${myconf} generator.run # implies generator.compile
# Use eqmake4 instead of library.native.qmake ant target
eqmake4 java.pro -recursive \
$(qt_config_use opengl) \
$(qt_config_use phonon) \
$(qt_config_use webkit) \
$(qt_config_use xmlpatterns)
einfo "Building the native library"
eant ${myconf} library.native.compile
einfo "Building the Java library"
eant ${myconf} library.java
einfo "Building the Designer library"
eant ${myconf} library.designer
if use examples; then
einfo "Building examples"
eant ${myconf} examples
fi
# Build API documentation
if use doc; then
einfo "Generating Javadoc"
javadoc -J-Xmx256m -d javadoc -subpackages com || die
fi
# Generate start script for jambi-designer
cat > bin/jambi-designer <<-EOF
#!/bin/sh
export LD_LIBRARY_PATH="/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/${PN}-${SLOT}:\${LD_LIBRARY_PATH}"
export CLASSPATH="/usr/share/${PN}-${SLOT}/lib/${PN}.jar:/usr/share/${PN}-${SLOT}/lib/${PN}-designer.jar:\${CLASSPATH}"
export QT_PLUGIN_PATH="/usr/$(get_libdir)/qt4/plugins"
exec /usr/bin/designer "\$@"
EOF
}
src_install() {
dobin "${S}"/bin/* || die
newbin "${S}"/generator/generator jambi-generator || die
einfo "Installing jars"
java-pkg_newjar qtjambi-${MY_PV}.jar
java-pkg_newjar qtjambi-designer-${MY_PV}.jar ${PN}-designer.jar
java-pkg_dojar ant-qtjambi.jar
einfo "Installing native libraries"
java-pkg_doso "${S}"/lib/*
einfo "Installing designer plugins"
exeinto /usr/$(get_libdir)/qt4/plugins/${PN}
doexe plugins/designer/*.so || die
# Designer needs these libraries in both directories
dosym /usr/$(get_libdir)/qt4/plugins/${PN}/libJambiCustomWidget.so \
/usr/$(get_libdir)/qt4/plugins/designer/libJambiCustomWidget.so
dosym /usr/$(get_libdir)/qt4/plugins/${PN}/libJambiLanguage.so \
/usr/$(get_libdir)/qt4/plugins/designer/libJambiLanguage.so
if use doc; then
einfo "Installing documentation"
dohtml "${S}"/readme.html
java-pkg_dojavadoc "${S}"/javadoc
fi
if use examples; then
einfo "Installing examples"
# Get rid of class files before installing
find "${S}"/com/trolltech/examples -name '*.class' -delete || die
java-pkg_newjar qtjambi-examples-${MY_PV}.jar ${PN}-examples.jar
java-pkg_doexamples "${S}"/com/trolltech/examples
java-pkg_dolauncher jambi-examples --main com.trolltech.launcher.Launcher \
--java_args "-Djava.library.path=/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/${PN}-${SLOT}"
fi
use source && java-pkg_dosrc "${S}"/com
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/qtjambi: ChangeLog qtjambi-4.5.2_p1.ebuild
@ 2010-05-19 14:27 Vlastimil Babka (caster)
0 siblings, 0 replies; 2+ messages in thread
From: Vlastimil Babka (caster) @ 2010-05-19 14:27 UTC (permalink / raw
To: gentoo-commits
caster 10/05/19 14:27:29
Modified: ChangeLog qtjambi-4.5.2_p1.ebuild
Log:
Fix building with ant 1.8, bug #319597.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.25 dev-java/qtjambi/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/qtjambi/ChangeLog?r1=1.24&r2=1.25
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 16 Feb 2010 06:46:27 -0000 1.24
+++ ChangeLog 19 May 2010 14:27:28 -0000 1.25
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/qtjambi
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.24 2010/02/16 06:46:27 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.25 2010/05/19 14:27:28 caster Exp $
+
+ 19 May 2010; Vlastimil Babka <caster@gentoo.org> qtjambi-4.5.2_p1.ebuild,
+ +files/ant180-4.5.2.patch:
+ Fix building with ant 1.8, bug #319597.
16 Feb 2010; Jonathan Callen <abcd@gentoo.org>
-files/configuration-4.4.3.patch, -files/generator-4.4.3.patch:
1.3 dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?r1=1.2&r2=1.3
Index: qtjambi-4.5.2_p1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtjambi-4.5.2_p1.ebuild 3 Jan 2010 01:29:04 -0000 1.2
+++ qtjambi-4.5.2_p1.ebuild 19 May 2010 14:27:29 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.2 2010/01/03 01:29:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.3 2010/05/19 14:27:29 caster Exp $
EAPI="2"
@@ -43,7 +43,8 @@
epatch \
"${FILESDIR}"/generator-4.5.0_p1.patch \
"${FILESDIR}"/configuration-4.5.0_p1.patch \
- "${FILESDIR}"/gcc4.4-4.5.0_p1.patch
+ "${FILESDIR}"/gcc4.4-4.5.0_p1.patch \
+ "${FILESDIR}"/ant180-4.5.2.patch
# Respect MAKEOPTS
sed -i -e "/String arguments =/s|=.*|=\" ${MAKEOPTS}\";|" \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-19 14:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-19 14:27 [gentoo-commits] gentoo-x86 commit in dev-java/qtjambi: ChangeLog qtjambi-4.5.2_p1.ebuild Vlastimil Babka (caster)
-- strict thread matches above, loose matches on Subject: below --
2009-12-18 16:07 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox