Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1c3344c17097e92c95718e17ad4c492e58600b3b
commit 1c3344c17097e92c95718e17ad4c492e58600b3b Author: Miklos Vajna <[email protected]> Date: Tue Feb 2 01:01:52 2010 +0100 soprano-2.3.70-2-i686 - add patch to build without blob java diff --git a/source/apps/soprano/FrugalBuild b/source/apps/soprano/FrugalBuild index 4b70b03..16c2ccb 100644 --- a/source/apps/soprano/FrugalBuild +++ b/source/apps/soprano/FrugalBuild @@ -3,23 +3,25 @@ pkgname=soprano pkgver=2.3.70 -pkgrel=1 +pkgrel=2 pkgdesc="RDF storage, parsing, and serialization framework" -depends=('libqtnetwork>=4.4.0' 'qt4-qdbus>=4.4.0' 'clucene' 'librdf' 'libqttest>=4.4.0') -if [ "$CARCH" != "ppc" ]; then - makedepends=('j2sdk') +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge cmake java +if [ "$CARCH" == "ppc" ]; then + unset depends makedepends fi +depends=('libqtnetwork>=4.4.0' 'qt4-qdbus>=4.4.0' 'clucene' 'librdf' 'libqttest>=4.4.0') groups=('apps') archs=('i686' 'x86_64' 'ppc') -_F_sourceforge_ext=".tar.bz2" options=('scriptlet') -Finclude sourceforge cmake -sha1sums=('2f730b384237ec9096e2dbc16073e085833f5db4') +source=($source gcj.patch) +sha1sums=('2f730b384237ec9096e2dbc16073e085833f5db4' \ + 'bee03fc02b4c6be0f6212c09f39786e99ae52205') ## TODO: Split subpkgs=("$pkgname-sesame2") subdescs=('Sesame2 storage backend (java-based)') -subdepends=('j2re') +subdepends=('libgcj-awt') subrodepends=("$pkgname=$pkgver") subgroups=('xapps-extra') subarchs=('i686 x86_64') diff --git a/source/apps/soprano/gcj.patch b/source/apps/soprano/gcj.patch new file mode 100644 index 0000000..b5ebd40 --- /dev/null +++ b/source/apps/soprano/gcj.patch @@ -0,0 +1,14 @@ +Yeah, hardwiring these versions is ugly. Let me know if you know a +better way. + +--- soprano-2.3.70/CMakeLists.txt.orig 2009-11-29 10:04:17.000000000 +0100 ++++ soprano-2.3.70/CMakeLists.txt 2010-02-02 00:40:19.000000000 +0100 +@@ -64,6 +64,8 @@ + endif(NOT SOPRANO_DISABLE_CLUCENE_INDEX) + + if(NOT SOPRANO_DISABLE_SESAME2_BACKEND) ++ set(JAVA_INCLUDE_PATH /usr/lib/gcc/i686-frugalware-linux/4.4.3/include/) ++ set(JAVA_JVM_LIBRARY /usr/lib/gcj-4.4.3-10/libjvm.so) + find_package(JNI) + if(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) + file(READ ${JAVA_INCLUDE_PATH}/jni.h jni_header_data) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
