Bug 218772 - security/qtkeychain-qt{4,5}: Update to 0.8.0
Summary: security/qtkeychain-qt{4,5}: Update to 0.8.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: Raphael Kubo da Costa
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-04-20 09:22 UTC by Gleb Popov
Modified: 2017-08-01 18:10 UTC (History)
2 users (show)

See Also:
linimon: maintainer-feedback+

Attachments
The patch (2.12 KB, patch)
2017-04-20 09:22 UTC, Gleb Popov 		arrowd: maintainer-approval+
Details | Diff
Patch (3.20 KB, patch)
2017-07-26 15:21 UTC, Gleb Popov 		arrowd: maintainer-approval+
Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Gleb Popov freebsd_committer freebsd_triage 2017-04-20 09:22:00 UTC 
Created attachment 181932 [details]
The patch
Comment 1 Raphael Kubo da Costa freebsd_committer freebsd_triage 2017-04-30 10:53:45 UTC 
The plist for the Qt4 version seems to need a fix:

===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: mkspecs/modules/qt_QtKeychain.pri
Comment 2 Gleb Popov freebsd_committer freebsd_triage 2017-04-30 18:05:19 UTC 
(In reply to Raphael Kubo da Costa from comment #1)
Can't reproduce this on my side. How do you get this?
Comment 3 Raphael Kubo da Costa freebsd_committer freebsd_triage 2017-04-30 20:30:19 UTC 
This is a regular 'poudriere testbuild' run on a 12-amd64 jail. It just looks like you need to make the same change you did to pkg-plist.qt5 to pkg-plist.qt4 too.
Comment 4 Gleb Popov freebsd_committer freebsd_triage 2017-05-01 18:54:41 UTC 
(In reply to Raphael Kubo da Costa from comment #3)
Hum. It is "lib/qt5/mkspecs/modules/qt_QtKeychain.pri" for me, and I intentionally left it, so it wouldn't installed. What's the correct way to do this?
Comment 5 Tobias C. Berner freebsd_committer freebsd_triage 2017-06-04 21:20:20 UTC 
Btw, I think you could unify the two plists into one by defining a PLIST_SUB 
VERSION_SUFFIX="" for -qt4 respectievly VERSION_SUFFIX=5 for -qt5.

Also, is the install conflict still necessary?
Comment 6 Gleb Popov freebsd_committer freebsd_triage 2017-07-26 15:21:01 UTC 
Created attachment 184734 [details]
Patch
Comment 7 commit-hook freebsd_committer freebsd_triage 2017-08-01 18:08:32 UTC 
A commit references this bug:

Author: rakuco
Date: Tue Aug  1 18:07:46 UTC 2017
New revision: 447066
URL: https://svnweb.freebsd.org/changeset/ports/447066

Log:
  Update to 0.8.0.

  PR:		218772
  Submitted by:	arrowd <6yearold@gmail.com> (maintainer)

Changes:
  head/security/qtkeychain-qt5/Makefile
  head/security/qtkeychain-qt5/distinfo
  head/security/qtkeychain-qt5/files/
  head/security/qtkeychain-qt5/files/patch-CMakeLists.txt
  head/security/qtkeychain-qt5/pkg-plist.qt5
Comment 8 Raphael Kubo da Costa freebsd_committer freebsd_triage 2017-08-01 18:10:23 UTC 
Committed, thanks!