Bug 228278 - [PATCH] graphics/leptonica: Update to 1.76.0, switch to github
Summary: [PATCH] graphics/leptonica: Update to 1.76.0, switch to github
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: Fernando Apesteguía
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-05-15 19:37 UTC by Peter Wullinger
Modified: 2018-06-01 15:32 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (hiroto.kagotani)


Attachments
patch to move to github and update to v1.76.0 (1.02 KB, patch)
2018-05-15 19:37 UTC, Peter Wullinger
no flags Details | Diff
Updated patch with patch file deletion (2.24 KB, patch)
2018-05-17 18:01 UTC, Peter Wullinger
no flags Details | Diff
patch to move to github and update to v1.76.0 (fixed patch #2) (2.79 KB, patch)
2018-05-17 19:08 UTC, Peter Wullinger
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Wullinger 2018-05-15 19:37:41 UTC
Created attachment 193437 [details]
patch to move to github and update to v1.76.0

1.74.1 does not fetch any more for me.

The source page (http://www.leptonica.com/download.html) indicates that releases are now on github, but current releases are still available from e.g. http://www.leptonica.com/source/leptonica-1.76.0.tar.gz

If there's no objection, I'd like to

- switch over MASTER_SITES to github (I'm not opinioned on MASTER_SITES staying where it was, either)
- update to v1.76.0

This drops the openjpeg-2.3 patch since it seems no longer needed (configure.ac has the appropriate changes)
Comment 1 Fernando Apesteguía freebsd_committer freebsd_triage 2018-05-15 20:34:03 UTC
Take.
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2018-05-17 16:07:56 UTC
Hi Peter,

I applied the patch, but the port fails in the patch target. Is the patch under files/ still relevant? It doesn't seem to be anymore. Can you update your patch so it deletes files/ entirely?

Also, the downloaded sources don't provide a configure script but a configure.ac. Could you try with USES=autoreconf?

Cheers.
Comment 3 Peter Wullinger 2018-05-17 18:01:07 UTC
Created attachment 193492 [details]
Updated patch with patch file deletion

Also remove files/patch-configure. Requires "patch -E"
Comment 4 Peter Wullinger 2018-05-17 19:07:39 UTC
Hi Fernando,

(In reply to Fernando Apesteguía from comment #2)

> I applied the patch but the port fails in the patch target. 

Yeah it would. Weird, I was sure that I did a successful poudriere build with this. Obviously not.

> Is the patch under files/ still relevant? It doesn't seem to be anymore.

No, the patch adds "openjpeg-2.3" include search path, which is now part of upstream's configure.ac

> Can you update your patch so it deletes files/ entirely?

I think "patch -E" can't do that, but I can get rid of files/patch-configure.

> Also, the downloaded sources don't provide a configure script but a
> configure.ac. Could you try with USES=autoreconf?

USES=pkgconfig is also needed.

Patched ports builds with in poudriere in 11.1-RELEASE-p10 jail.

Side note: The build also conflicts with installed openjpeg15 (includes the wrong openjpeg.h), side-by-side installation is fine, though.

There's also a bug that I could not yet track down wrt. installing bin/printimage, bin/printsplitimage, bin/printtiff, and bin/splitimage2pdf. These are built, but not installed. The trigger for this seems to be "--{en,dis}able-packages", but I cannot get those binaries to install.
Comment 5 Peter Wullinger 2018-05-17 19:08:31 UTC
Created attachment 193496 [details]
patch to move to github and update to v1.76.0 (fixed patch #2)

Correct the pkg-plist errors and add USES=pkgconfig as it is needed.
Comment 6 Fernando Apesteguía freebsd_committer freebsd_triage 2018-05-18 15:36:24 UTC
(In reply to Peter Wullinger from comment #4)

It seems it is deliberate. Those that you mention, along with other programs (like adaptmap_reg) are built but never installed since they are under the noinst_ prefix.
Comment 7 Fernando Apesteguía freebsd_committer freebsd_triage 2018-05-20 21:11:25 UTC
Revision accepted:

https://reviews.freebsd.org/D15478

Awaiting maintainer approval or timeout.
Comment 8 commit-hook freebsd_committer freebsd_triage 2018-06-01 15:31:06 UTC
A commit references this bug:

Author: fernape
Date: Fri Jun  1 15:30:58 UTC 2018
New revision: 471263
URL: https://svnweb.freebsd.org/changeset/ports/471263

Log:
  graphics/leptonica: update to 1.76.0

  * switch to github
  * remove unnecessary patch file

  Committing after maintainer timeout (2 weeks)

  PR:	228278
  Submitted by:	freebsd@dhke.de
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D15478

Changes:
  head/graphics/leptonica/Makefile
  head/graphics/leptonica/distinfo
  head/graphics/leptonica/files/
  head/graphics/leptonica/pkg-plist
Comment 9 Fernando Apesteguía freebsd_committer freebsd_triage 2018-06-01 15:32:47 UTC
Committed,

Thanks!