Bug 206834 - graphics/qgis: Add (CUSTOMWIDGETS ASTYLE) options for QGis (developer)
Summary: graphics/qgis: Add (CUSTOMWIDGETS ASTYLE) options for QGis (developer)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Lars Engels
URL:
Keywords: patch, patch-ready
Depends on:
Blocks:
 
Reported: 2016-02-02 05:08 UTC by Loïc Bartoletti
Modified: 2016-02-16 07:06 UTC (History)
2 users (show)

See Also:
koobs: maintainer-feedback+


Attachments
QGis 2.12.2 with QT CustomWidgets and AStyle options (2.78 KB, patch)
2016-02-02 05:08 UTC, Loïc Bartoletti
no flags Details | Diff
QGis 2.12.2 with QT CustomWidgets and AStyle options, reworked (12.31 KB, patch)
2016-02-03 05:56 UTC, Rainer Hurling
rhurlin: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Loïc Bartoletti freebsd_committer freebsd_triage 2016-02-02 05:08:00 UTC
Created attachment 166417 [details]
QGis 2.12.2 with QT CustomWidgets and AStyle options

Add QGis AStyle and QGis QT CustomWidgets.

Logs:
http://download.tuxfamily.org/bartcoding/ports/qgis/
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2016-02-02 08:25:41 UTC
Thanks for your submission!

For future issues, please:

* Use the standard "Summary" field format: category/port: Summary (without [])
* Include confirmation of QA passing, rather than providing attachments or remote URLS of logs
Comment 2 Rainer Hurling freebsd_committer freebsd_triage 2016-02-02 09:26:38 UTC
Hi coder@, thanks for your interesting suggestion. I did not consider it in the past, but I think, we should integrate these developer items now.

There is a patch on Bugzilla (bug #206412) for the QGIS update from 2.12.2 to 2.12.3. I think, it would be nice to integrate your patch into that one.

I will take the opportunity and rework the structure of the options window (make config).
Comment 3 Kubilay Kocak freebsd_committer freebsd_triage 2016-02-02 09:33:46 UTC
@Rainer, may I suggest that we keep the changes isolated, as there's much less manual work rejigging the separate issues details to account for the combining.

If you want this however to wait for bug 206412, please set "Depends on" in this issue accordingly :)
Comment 4 Rainer Hurling freebsd_committer freebsd_triage 2016-02-02 09:54:53 UTC
(In reply to Kubilay Kocak from comment #3)

@Kubilay, I am not sure, if this is the way, I would prefer.
Even if we keep changes isolated, I have to rework the patch for version 2.12.3 in bug #206412, because then version 2.12.2 would have been changed before this commit ...

Of course, we could commit the changes, suggested by @Coder, before going to 2.12.3. But also in this case, I would like to integrate some additions into the options, to show it a bit more clearly, which of them are developer options and which are options for normal users.

@Coder, what do you think. Would it be ok for you, if we integrate your patch (a bit modified) into bug #206412? Or should we instead, go with only your functionality in a precedent commit for 2.12.2?
Comment 5 Kubilay Kocak freebsd_committer freebsd_triage 2016-02-02 10:12:29 UTC
(In reply to Rainer Hurling from comment #4)

Rainer, you're free to provide an updated patch here that makes any modifications you see fit, in order to land this change first

Separate issues (and changesets) are preferable for a number of reason in order isolate certain changes from others, but in particular, feature and bugfix changes separate from version updates (as it relates to merges to quarterly)
Comment 6 Rainer Hurling freebsd_committer freebsd_triage 2016-02-02 10:19:49 UTC
(In reply to Kubilay Kocak from comment #5)

Kubilay, thanks for your statement. As I said before, I can live with a seperate commit before 2.12.3.

Of course, I fully understand the advantages of a different changeset with isolated feature and bugfix changes.

I will prepare a slightly modified patch from the one, @coder submitted, and test in Poudriere, before I submit it here.
Comment 7 Rainer Hurling freebsd_committer freebsd_triage 2016-02-03 05:56:34 UTC
Created attachment 166482 [details]
QGis 2.12.2 with QT CustomWidgets and AStyle options, reworked

This is a slightly rework of the patch, offered by @Coder.

What this patch should do

- Add two new options CUSTOMWIDGETS and ASTYLE
- Divide options menu into a general and a developers section
- Move the DEBUG option to the developers section
- Add some options descriptions
- Reorder the handling of the options
- Update pkg-plist

Many thanks to @Coder for his initial patch and to @Kubilay for his advices.
Comment 8 Kubilay Kocak freebsd_committer freebsd_triage 2016-02-03 06:03:55 UTC
@Rainer, please confirm QA passes with the latest patch, thank you :)
Comment 9 Rainer Hurling freebsd_committer freebsd_triage 2016-02-03 06:14:21 UTC
Sorry, forgot to mention, that the second patch (attachment 166482 [details]) passes 'portlint -AC' and several runs of Poudriere (HEADa, 10.2a and 9.3a/i, with options all enabled, all disabled, and default options) without problems.
Comment 10 Lars Engels freebsd_committer freebsd_triage 2016-02-16 07:06:06 UTC
Committed, thanks!