From d9061060f6007d240a20d4b152bcce4f8f4fe919 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sun, 21 May 2017 16:25:54 -0700 Subject: dom4j: unblacklist and fix build - Add SUMMARY and expand DESCRIPTION - Update HOMEPAGE - Update URI for jaxme - Add LIC_FILE_CHECKSUM - Fix path for 'find org ...' - Move SRC_URI checksums to recommended location in recipe - Add virtual/javac-native to DEPENDS for RSS Signed-off-by: Tim Orling Signed-off-by: Maxin B. John --- recipes-core/xml-commons/dom4j_1.6.1.bb | 29 ++++++++++++++--------------- recipes-core/xml-commons/jaxen_1.1.6.bb | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb b/recipes-core/xml-commons/dom4j_1.6.1.bb index 19dca74..97c9947 100644 --- a/recipes-core/xml-commons/dom4j_1.6.1.bb +++ b/recipes-core/xml-commons/dom4j_1.6.1.bb @@ -1,17 +1,22 @@ +SUMMARY = "A simple and flexible library for working with XML, XPath and XSLT" DESCRIPTION = "dom4j is a simple and flexible Java library for working with XML, XPath and XSLT" LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f752b663f2a821c3b32482fc6aece3c" -HOMEPAGE = "http://dom4j.org" +HOMEPAGE = "http://dom4j.github.io" -DEPENDS = "fastjar-native xerces-j xalan-j xpp2 xpp3 jaxen" +DEPENDS = "fastjar-native virtual/javac-native \ + xerces-j xalan-j xpp2 xpp3 jaxen" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \ - http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \ - file://debian.patch \ - " - -PNBLACKLIST[dom4j] ?= "BROKEN: indirectly depends on broken 'xom'" + ${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \ + http://archive.apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \ + file://debian.patch \ +" +SRC_URI[archive.md5sum] = "1e7ef6d20939315714de4a8502f27b2d" +SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f" +SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" +SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc" inherit java-library @@ -22,16 +27,10 @@ do_compile() { scp="src/java:${WORKDIR}/ws-jaxme-0.5.2/src/api" javac -sourcepath $scp -cp $cp -d build `find src/java -name "*.java" -and -not -wholename "*datatype*"` - (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;) + (cd src/java && find org -name "*.properties" -exec cp {} ../../build/{} \;) rm -rf build/org/w3c rm -rf build/javax fastjar -C build -c -f ${JARFILENAME} . } - - -SRC_URI[archive.md5sum] = "1e7ef6d20939315714de4a8502f27b2d" -SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f" -SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4" -SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc" diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb index 2e313fa..d75ce75 100644 --- a/recipes-core/xml-commons/jaxen_1.1.6.bb +++ b/recipes-core/xml-commons/jaxen_1.1.6.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2e66c2e2482aa23c11342f1469fa3b6" HOMEPAGE = "http://jaxen.org/" -DEPENDS = "fastjar-native xerces-j xom" +DEPENDS = "fastjar-native virtual/javac-native xerces-j xom" # upstream has moved to github, do not rely on ephemeral tarball, use git SRCREV = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6" -- cgit v1.2.3-54-g00ecf