Bug 219109 - textproc/fop: Update to 2.2
Summary: textproc/fop: Update to 2.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Danilo G. Baio
URL: https://reviews.freebsd.org/D10977
Keywords: patch
: 218798 (view as bug list)
Depends on:
Blocks:
 
Reported: 2017-05-06 21:01 UTC by mail_of_sergey
Modified: 2017-05-31 00:36 UTC (History)
2 users (show)

See Also:
gspeicher: maintainer-feedback+


Attachments
Diff for Makefile and patch for build.xml (1.07 KB, application/x-7z-compressed)
2017-05-06 21:01 UTC, mail_of_sergey
no flags Details
Updated distinfo file (289 bytes, text/plain)
2017-05-16 05:54 UTC, mail_of_sergey
no flags Details
Without #219109 bug (517 bytes, patch)
2017-05-16 06:42 UTC, mail_of_sergey
no flags Details | Diff
SVN diff for update to 2.2 version (4.17 KB, patch)
2017-05-17 02:54 UTC, mail_of_sergey
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description mail_of_sergey 2017-05-06 21:01:14 UTC
Created attachment 182349 [details]
Diff for Makefile and patch for build.xml
Comment 1 Geoff Speicher 2017-05-15 14:36:15 UTC
A couple issues/questions:

1. you'll need to run "make makesum" to update distinfo and add it to this patch

2. what revision is this patch against? it contains files/patch-build.xml but there is no files directory in head. see here:

     https://svnweb.freebsd.org/ports/head/textproc/fop/

One part of it also seems to duplicate the effects of bug #218798 so may be redundant anyway. Can you clarify what's going on here?
Comment 2 mail_of_sergey 2017-05-16 05:54:37 UTC
Created attachment 182616 [details]
Updated distinfo file
Comment 3 mail_of_sergey 2017-05-16 06:42:55 UTC
Created attachment 182617 [details]
Without #219109 bug
Comment 4 mail_of_sergey 2017-05-16 07:20:27 UTC
(In reply to geoff from comment #1)
1. Done. I'm sorry.

2. The 'files/patch-build.xml' against 'fop/build.xml' from distfile. (http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-2_2/fop/build.xml)

The reason creating 'files/patch-build.xml' is non-ANSII name Boris Poudérous:
    [javac] /home/acc107_3/test/fop/work/fop-2.2/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java:212: error: unmappable character for encoding ASCII
    [javac]      * The 'public' modifier has been added by Boris Poud??rous for

I got 68 errors like this.


Realy, first part of 'files/patch-build.xml' contains patch for bug #219109.

'make makepatch' command also add patch for bug #219109 from my modified Makefile. I think this is more convient way then patching Makefile and try to kill two birds with one stone.

I add 'files/patch-build.xml' without solving hyphen problem.
Comment 5 Geoff Speicher 2017-05-16 11:55:22 UTC
Thank you for the update and the explanation. Rather than patching the same build.xml file using two different methods, it would be better to handle both changes in the same place via the external patch file. If you can add that stack size modification back to this changeset then I will cancel bug #218798. I just realized that I forgot to approve that attachment anyway.

One final request to expedite processing: rather than forcing a committer to sort through multiple attachments on this ticket, can you generate one diff file using svn as described in the link below?

https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/port-upgrading.html

Then attach the diff to this ticket as plaintext without using 7z or any other compression. This will help ensure that it gets committed quickly. Thanks!
Comment 6 mail_of_sergey 2017-05-17 02:54:52 UTC
Created attachment 182650 [details]
SVN diff for update to 2.2 version

Error "unmappable character for encoding ASCII:The 'public' modifier has been added by Boris Poud??rous" is solved.

"StackOverflowError" when building hyphenation is solved.
Comment 7 Geoff Speicher 2017-05-17 12:04:50 UTC
Looks good to me. Thanks!
Comment 8 Geoff Speicher 2017-05-17 12:05:57 UTC
Comment on attachment 182650 [details]
SVN diff for update to 2.2 version

LGTM
Comment 9 Geoff Speicher 2017-05-17 12:07:08 UTC
Comment on attachment 182650 [details]
SVN diff for update to 2.2 version

I can't seem to change the maintainer-approval flag on this patch.
Comment 10 mail_of_sergey 2017-05-17 17:42:25 UTC
*** Bug 218798 has been marked as a duplicate of this bug. ***
Comment 11 Danilo G. Baio freebsd_committer freebsd_triage 2017-05-28 04:13:40 UTC
I'll take it.
Comment 12 commit-hook freebsd_committer freebsd_triage 2017-05-31 00:18:27 UTC
A commit references this bug:

Author: dbaio
Date: Wed May 31 00:17:52 UTC 2017
New revision: 442129
URL: https://svnweb.freebsd.org/changeset/ports/442129

Log:
  textproc/fop: Update to 2.2

  - Set LICENSE

  Changes: https://xmlgraphics.apache.org/fop/changes.html

  PR:		219109
  Submitted by:	mail_of_sergey@mail.ru
  Approved by:	garga (mentor), geoff@sea-incorporated.com (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D10977

Changes:
  head/textproc/fop/Makefile
  head/textproc/fop/distinfo
  head/textproc/fop/files/
  head/textproc/fop/files/patch-build.xml
  head/textproc/fop/pkg-plist
Comment 13 Danilo G. Baio freebsd_committer freebsd_triage 2017-05-31 00:36:08 UTC
Committed with small adjustments: license and pkg-plist

Thanks for your work.

Regards.