Bug 193397 - [MAINTAINER] deskutils/calibre: Update to to 1.48.0
Summary: [MAINTAINER] deskutils/calibre: Update to to 1.48.0
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: Guido Falsi
URL:
Keywords: needs-qa, patch
Depends on:
Blocks:
 
Reported: 2014-09-06 17:52 UTC by rnejdl
Modified: 2014-09-28 21:57 UTC (History)
2 users (show)

See Also:


Attachments
Diff File (2.79 KB, patch)
2014-09-06 17:52 UTC, rnejdl
no flags Details | Diff
calibre.diff (2.20 KB, patch)
2014-09-08 17:23 UTC, Guido Falsi
no flags Details | Diff
calibre.diff (4.25 KB, patch)
2014-09-28 15:59 UTC, Guido Falsi
madpilot: maintainer-approval? (rnejdl)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description rnejdl 2014-09-06 17:52:04 UTC
Created attachment 146955 [details]
Diff File

This is the last update for a while.  Calibre has migrated to QT-5 with the latest 2.0 branch and that is not yet ready for primetime on FreeBSD.  While here, move from imaging as a dependency to pillow.
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2014-09-07 11:44:40 UTC
If possible please also include the following to promote quick 
resolution:

 * Attach successful poudriere testport, or redports.org build logs
 * portlint -AC output (after addressing any outstanding issues)
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2014-09-08 17:21:24 UTC
Hi!

I have performed some testing. You forgot to add a file to the plist, I fixed that.

Your patch also changes the dependency on py-imaging to py-pillow. This causes the automatic update with portmaster/pkg to fail, since those two ports install the same files(they look interchangeable in fact). Manual intervention would be needed, removing py-imaging manually.

Why did you change the dependency? is this strictly needed? If committing this to the ports tree an UPDATING entry is needed to explain the change and with instructions on how to perform the update.

I run tested the port with py-imaging as a dependency and it works fine.

I'm attaching a patch with the plist fix and py-imaging as a dependency. I've also UPDATED the port structure, now USES=python is available.

Thanks in advance for your feedback!
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2014-09-08 17:23:27 UTC
Created attachment 147071 [details]
calibre.diff
Comment 4 rnejdl 2014-09-08 18:19:04 UTC
Guido,

A user had emailed me asking me about the py-imaging use as it was a not updated port and last updated in 2009.  For that user, every other app they use requires py-pillow which is a fork and newer.  Py-pillow is being updated now so I changed dependencies over even though the old port is not deprecated.  The app will run with either though, so the other option I suppose would be for a dialog to choose which one you want.  Your thoughts?

As for the missing file, I'm sorry, I thought I got everything covered.

Rusty
Comment 5 Guido Falsi freebsd_committer freebsd_triage 2014-09-08 19:53:27 UTC
(In reply to rnejdl from comment #4)
> Guido,
> 
> A user had emailed me asking me about the py-imaging use as it was a not
> updated port and last updated in 2009.  For that user, every other app they
> use requires py-pillow which is a fork and newer.  Py-pillow is being
> updated now so I changed dependencies over even though the old port is not
> deprecated.  The app will run with either though, so the other option I
> suppose would be for a dialog to choose which one you want.  Your thoughts?
> 

The change itself isn't a big problem. The problem is, since py-imaging and py-pillow  are conflicting ports, that automatic updating will fail, since py-imaging will be already installed on the system and will have to be removed by hand.

Adding an option to choose which one to allow choosing which one to use would be anyway a good thing. But if you want to change the default to py-pillow it is needed to add instructions in UPDATING on how to manually intervene to update this port.

One will need to remove by hand calibre and py-imaging and then reinstall python (which will pull in py-pillow). If you add an option you would also have to specify that one can choose which one to use.

Can you cook up such an entry?

> As for the missing file, I'm sorry, I thought I got everything covered.
> 

I forgot, you also have to reset PORTREVISION on updates.
Comment 6 rnejdl 2014-09-08 20:47:21 UTC
Yes, but it may not be until the weekend before I can do that.

Rusty
Comment 7 Guido Falsi freebsd_committer freebsd_triage 2014-09-09 20:15:24 UTC
(In reply to rnejdl from comment #6)
> Yes, but it may not be until the weekend before I can do that.
> 

Don't worry, there no hurry.

Thanks for your work!
Comment 8 Guido Falsi freebsd_committer freebsd_triage 2014-09-28 15:59:43 UTC
Created attachment 147755 [details]
calibre.diff

Hi again,

I found time to make a new entry in UPDATING.

I'm attaching a new patch with the port modified to depend on py-pillow AND the new UPDATING entry.

Can you review it and eventually approve it?

Thanks.
Comment 9 rnejdl 2014-09-28 16:38:19 UTC
Well this works too!  I have been trying to build out the options framework but haven't gotten it to work yet (ignorance on my part).

Thank you and approved!

Rusty
Comment 10 commit-hook freebsd_committer freebsd_triage 2014-09-28 21:55:21 UTC
A commit references this bug:

Author: madpilot
Date: Sun Sep 28 21:54:58 UTC 2014
New revision: 369501
URL: https://svnweb.freebsd.org/changeset/ports/369501

Log:
  - Update to 1.48.0
  - Remove deprecated @dirrms from plist
  - Switch dependency on py-imaging with py-pilllow
  - Convert to USES=python

  PR:		193397
  Submitted by:	rnejdl@ringofsaturn.com (maintainer)

Changes:
  head/UPDATING
  head/deskutils/calibre/Makefile
  head/deskutils/calibre/distinfo
  head/deskutils/calibre/pkg-plist
Comment 11 Guido Falsi freebsd_committer freebsd_triage 2014-09-28 21:57:26 UTC
Committed. I also updated the plist removing @dirrms, since those are now deprecated.

Thanks!