Created attachment 423462 [details, diff] 1.2.1-r2 -> 3.0 patch Here is a new version of piccolo2d, this is needed to make ScrollViewer work in tesseract (bug to be filed and linked here soon). I used piccolo2d-1.2.1-r2.ebuild as a base so the patch should apply cleanly if that file is copied over to piccolo2d-3.0-r1.ebuild and then applied to that.
Related to/supersedes #308237
Many thanks for the patch. It's good to know that it can be built directly with javac despite them using Maven now but using ejavac directly is discouraged. Please use the java-pkg-simple eclass as described in this link and contact us in #gentoo-java if you need help. https://wiki.gentoo.org/wiki/Java_Developer_Guide#java-pkg-simple
New patch using java-pkg-simple I also fixed the 'examples' and 'source' USE flags (meaning they now work) but removed the 'doc' flag because there doesn't seem to be javadoc at all (at least I couldn't find it).
Created attachment 423712 [details, diff] Patch 3.0-r1 (try 2)
Created attachment 423714 [details, diff] Patch 3.0-r1 (try 2)
Created attachment 423716 [details, diff] Patch 3.0-r1 (try 3) Ok, so my second patch actually still contained a diff of the Manifest so I removed it in this one. (As for the second "try 2", it is the same thing as this, except I mistakenly submitted the thing too fast)
Created attachment 423718 [details, diff] Patch 3.0-r1 (try 3) Obsoleting old patches
Sorry but your patch is messed up and I can't apply it cleanly against the repo. The first line of your patch starts with: diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild You're diffing from piccolo-3.0-r1.ebuild but this file does not exist in reality. I take it you created a copy of piccolo2d-1.2.1-r2.ebuild and then diff'd from it. piccolo-3.0 being the first revision, there's no need to add the prefix -r1 to the end: the name "piccolo-3.0.ebuild" suffices. BTW, if you can, send us a PR over on Github. It is MUCH easier to review changes from there than looking at diffs and patches on Bugzilla.
A mirror of the Gentoo repository is located here: https://github.com/gentoo/gentoo
Created attachment 423720 [details] piccolo-3.0.ebuild This is how I'd go about bumping piccolo.
(In reply to Patrice Clement from comment #8) > Sorry but your patch is messed up and I can't apply it cleanly against the > repo. The first line of your patch starts with: > > diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild > b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild > > You're diffing from piccolo-3.0-r1.ebuild but this file does not exist in > reality. I take it you created a copy of piccolo2d-1.2.1-r2.ebuild and then > diff'd from it. piccolo-3.0 being the first revision, there's no need to add > the prefix -r1 to the end: the name "piccolo-3.0.ebuild" suffices. > > BTW, if you can, send us a PR over on Github. It is MUCH easier to review > changes from there than looking at diffs and patches on Bugzilla. Yes, I have a previous patch that git mv 1.2.1 -> 3.0 which I mistakenly thought I shouldn't send (not that a mv was a good idea to begin with). Noted for revisions and PRs on Github. Now that you have fixed the patch, I suppose things are all done on my end, right?
Small nitpick: the package is dev-java/piccolo2d, not dev-java/piccolo, so I think the attachment is misnamed.
We don't want to take credit for it ;) How about sending us a PR to get familiar with contributing to the repo?
(In reply to Patrice Clement from comment #13) > We don't want to take credit for it ;) How about sending us a PR to get > familiar with contributing to the repo? Done, here is the link: https://github.com/gentoo/gentoo/pull/717
commit 9967127 (HEAD, master) Merge: 60ce8b9 7dffe7a Author: Patrice Clement <monsieurp@gentoo.org> Date: Sun Jan 24 22:11:50 2016 +0000 Merge remote-tracking branch 'github/pr/717'. Fixes bug 572486. Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Please make sure you also generate the Manifest file and commit it along with your ebuild. $ repoman manifest and Bob's your uncle.
