[patch] diff against 4.4.3 in tree

qtjambi-4.4.3-4.5.0_rc1.diff (text/plain), 4.06 KB, created by Kyle Cavin on 2009-04-20 08:12:36 UTC

--- qtjambi-4.4.3.ebuild	2009-04-20 04:00:21.000000000 -0400
+++ qtjambi-4.5.0_rc1.ebuild	2009-04-20 04:05:39.000000000 -0400
@@ -4,18 +4,19 @@
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 versionator
 
-QTVERSION=4.4.2
+QTVERSION=4.5.0_rc1
 PATCHRELEASE=01
 
 DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit."
 HOMEPAGE="http://www.trolltech.com/"
 
-MY_PV=${PV}_${PATCHRELEASE}
+MY_PV=$(get_version_component_range 1-3 )_${PATCHRELEASE}
 
-SRC_URI="ftp://ftp.trolltech.no/qtjambi/source/qtjambi-src-gpl-${MY_PV}.tar.gz"
-S=${WORKDIR}/qtjambi-src-gpl-${MY_PV}
+SRC_URI="http://dist.trolltech.com/developer/download/qtjambi-src-preview-${MY_PV}.tar.gz"
+#S=${WORKDIR}/qtjambi-src-gpl-${MY_PV}
+S=${WORKDIR}/qtjambi-src-preview-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="4"
@@ -24,6 +25,7 @@
 IUSE="debug sqlite opengl phonon webkit xmlpatterns examples"
 
 DEPEND=">=x11-libs/qt-gui-${QTVERSION}
+	>=x11-libs/qt-svg-${QTVERSION}
 	>=virtual/jdk-1.5
 	dev-java/ant-trax
 	sqlite? ( dev-db/sqlite )
@@ -33,6 +35,7 @@
 	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVERSION} )"
 
 RDEPEND=">=x11-libs/qt-gui-${QTVERSION}
+	>=x11-libs/qt-svg-${QTVERSION}
 	>=virtual/jre-1.5
 	sqlite? ( dev-db/sqlite )
 	opengl? ( >=x11-libs/qt-opengl-${QTVERSION} )
@@ -45,6 +48,8 @@
 	cd "${S}"
 	epatch "${FILESDIR}/generator-${PV}.patch"
 	epatch "${FILESDIR}/configuration-${PV}.patch"
+	sed -i -e "/String arguments =/s#=.*#=\" ${MAKEOPTS}\";#" \
+		com/trolltech/tools/ant/MakeTask.java
 	java-ant_rewrite-classpath
 }
 
@@ -55,6 +60,8 @@
 	# Set build configuration
 	local extraArgs="-Dgentoo.qtdir=/usr/$(get_libdir)/qt4"
 
+	extraArgs="${extraArgs} -Dlibrary.designer=true"
+
 	use debug && extraArgs="${extraArgs} -Dqtjambi.config=debug"
 
 	if use sqlite ; then
@@ -99,16 +106,23 @@
 	einfo "Building the Java library"
 	eant ${extraArgs} library.java
 
-	# Step 4, Build the Examples
+	# Step 4, Build the Designer library
+	einfo "Building the Designer library"
+	eant ${extraArgs} library.designer library.designer.bundle
+
+	# Step 5, Build the Examples
 	use examples && einfo "Building Examples" && eant ${extraArgs} examples
 
-	# Step 5, Build API documentation
-	use doc && einfo "Generating Javadoc" && javadoc -J-Xmx128m -d javadoc -subpackages com
+	# Step 6, Build API documentation
+	use doc && einfo "Generating Javadoc" && javadoc -J-Xmx256m -d javadoc -subpackages com
 
-	# Step 6, generate start script for jambi-designer
+	# Step 7, generate start script for jambi-designer
 	cat > bin/jambi-designer <<-EOF
 		#! /bin/sh
-		LD_LIBRARY_PATH=/usr/lib/qt4 CLASSPATH=/usr/share/qtjambi-4/lib/qtjambi.jar:\${CLASSPATH} /usr/bin/designer
+		export LD_LIBRARY_PATH=/usr/lib/qt4:/usr/lib/${PN}-4
+		export CLASSPATH=/usr/share/${PN}-4/lib/${PN}.jar:/usr/share/${PN}-4/lib/${PN}-designer.jar:\${CLASSPATH}
+		export QT_PLUGIN_PATH=/usr/lib/qt4/plugins
+		exec /usr/bin/designer
 	EOF
 }
 
@@ -116,14 +130,20 @@
 
 	# Install built jar
 	java-pkg_newjar qtjambi-${MY_PV}.jar
+	java-pkg_newjar qtjambi-designer-${MY_PV}.jar ${PN}-designer.jar
 
 	# Install examples jar
 	use examples && java-pkg_newjar qtjambi-examples-${MY_PV}.jar ${PN}-examples.jar
 
 	# Install designer plugins
-	insinto "/usr/$(get_libdir)/qt4/plugins/designer"
+	insinto "/usr/$(get_libdir)/qt4/plugins/qtjambi"
 	insopts -m0755
 	doins plugins/designer/*.so
+	# Designer needs these libraries in both directories
+	dosym "/usr/$(get_libdir)/qt4/plugins/qtjambi/libJambiCustomWidget.so" \
+		"/usr/$(get_libdir)/qt4/plugins/designer/libJambiCustomWidget.so"
+	dosym "/usr/$(get_libdir)/qt4/plugins/qtjambi/libJambiLanguage.so" \
+		"/usr/$(get_libdir)/qt4/plugins/designer/libJambiLanguage.so"
 
 	# Install native library
 	#java-pkg_doso "${S}"/lib/* # does not work see #251500
@@ -141,6 +161,9 @@
 	# Install examples
 	use examples && java-pkg_doexamples "${S}"/com/trolltech/examples
 
+	# Install generator
+	dobin "${S}"/generator/generator
+
 	# Install launcher-scripts
 	dobin "${S}"/bin/*
 	use examples && java-pkg_dolauncher jambi --main com.trolltech.launcher.Launcher \