All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tim Orling <timothy.t.orling@linux.intel.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-java][master][pyro][PATCH 3/4] dom4j: unblacklist and fix build
Date: Sun, 21 May 2017 16:25:54 -0700	[thread overview]
Message-ID: <20170521232555.30221-4-timothy.t.orling@linux.intel.com> (raw)
In-Reply-To: <20170521232555.30221-1-timothy.t.orling@linux.intel.com>

- 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 <timothy.t.orling@linux.intel.com>
---
 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"
-- 
2.9.4



  parent reply	other threads:[~2017-05-21 23:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-21 23:25 [meta-java][master][pyro][PATCH 0/4] xml-commons: unblacklist Tim Orling
2017-05-21 23:25 ` [meta-java][master][pyro][PATCH 1/4] xom: unblacklist and update to v1.2.10 Tim Orling
2017-05-21 23:25 ` [meta-java][master][pyro][PATCH 2/4] jaxen: unblacklist and update to v1.1.6 Tim Orling
2017-05-21 23:25 ` Tim Orling [this message]
2017-05-21 23:25 ` [meta-java][master][pyro][PATCH 4/4] jdom: unblacklist and update to v1.1.3 Tim Orling

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170521232555.30221-4-timothy.t.orling@linux.intel.com \
    --to=timothy.t.orling@linux.intel.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.