Bug 213329 - math/cadabra2: Update to 2.0.930, unbreak GUI
Summary: math/cadabra2: Update to 2.0.930, unbreak GUI
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: Kurt Jaeger
URL:
Keywords: patch-ready
Depends on:
Blocks:
 
Reported: 2016-10-09 01:27 UTC by Yuri Victorovich
Modified: 2016-10-21 09:01 UTC (History)
2 users (show)

See Also:
pi: maintainer-feedback+
pi: merge-quarterly-


Attachments
patch (12.01 KB, patch)
2016-10-09 01:27 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (12.53 KB, patch)
2016-10-09 17:30 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (12.58 KB, patch)
2016-10-09 17:32 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (12.77 KB, patch)
2016-10-09 20:49 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (13.26 KB, patch)
2016-10-10 06:19 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
shar archive (13.53 KB, text/plain)
2016-10-20 15:28 UTC, Yuri Victorovich
no flags Details
patch-v2 (12.94 KB, patch)
2016-10-21 07:35 UTC, Kurt Jaeger
pi: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yuri Victorovich freebsd_committer freebsd_triage 2016-10-09 01:27:28 UTC
Created attachment 175552 [details]
patch

This patch:
* Updates to the currently latest revision
* Unbreaks GUI by applying two patches:
** Patch in boost headers to prevent EINPROGRESS mishandling (https://github.com/zaphoyd/websocketpp/issues/563)
** Patch in websocketpp fixing IPv4 vs. IPv6 mismatch (https://github.com/zaphoyd/websocketpp/issues/587)
* GUI option is made default
* Clones icons for the GUI app cadabra2-gui
* Adds "USE_TEX=texmf texhash" to allow for unincluded latex macros, and to make tex hash local packages installed by cadabra2

Verified that cadabra2 GUI now works fine - it is able to run many examples from their website.
Comment 1 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-09 17:30:10 UTC
Created attachment 175581 [details]
patch

Upstream accepted some patches, and fixed compiler warnings.
Comment 2 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-09 17:32:14 UTC
Created attachment 175582 [details]
patch
Comment 3 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-09 20:49:46 UTC
Created attachment 175588 [details]
patch
Comment 4 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-10 06:19:13 UTC
Created attachment 175595 [details]
patch

Unbundled devel/websocketpp.
Comment 5 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-20 11:01:46 UTC
somehow, some files are missing:
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: %%DATADIR%%/manual/algorithms/asym.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/canonicalise.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/collect_factors.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/collect_terms.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/combine.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/complete.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/decompose_product.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/drop_weight.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/eliminate_kronecker.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/eliminate_metric.cnb
Error: Missing: %%DATADIR%%/manual/algorithms/epsilon_to_delta.cnb
[...]
Comment 6 Kubilay Kocak freebsd_committer freebsd_triage 2016-10-20 11:34:41 UTC
If the quarterly version is also affected (broken GUI), it would be great for this (and all bug reports in general) to separate version updates from other changes, so that they can be merged for quarterly users to benefit from improvements & fixes
Comment 7 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-20 15:28:20 UTC
Created attachment 175981 [details]
shar archive

Hi Kurt,

I reverted and updated from subversion, reapplied the patch, and it still builds and passes stage-qa for me on 10.3 amd64. I am attaching the shar of the directory that builds.

Yuri
Comment 8 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-20 15:31:15 UTC
GUI isn't technically required to run cadabra2, so we probably shouldn't worry about GUI fix only update on quarterly. Just don't merge into quarterly imo.
Comment 9 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-20 16:00:32 UTC
Do you build in poudriere or on a host loaded with other ports ?
Comment 10 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-20 16:34:55 UTC
build-failure, e.g. on 11a:

http://people.freebsd.org/~pi/logs/math__cadabra2-11a-1476955893.txt
Comment 11 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-20 20:02:02 UTC
It builds fin on 10.3 in both poudriere and full of installed ports machine.

There is some cmake or pkgconf issue on 11 causing it to not detect tex/boost. I am investigating.
Comment 12 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-20 20:51:11 UTC
I had it fail on 10.3i, too:

http://people.freebsd.org/~pi/logs/math__cadabra2-10i-1476955893.txt
Comment 13 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-20 21:02:49 UTC
Here is one additional thing I don't understand: why in your builds GUI=off when the default is "on"?

> ---Begin OPTIONS List---
> ===> The following configuration options are available for cadabra2-2.0.930:
>      GUI=off: GUI (Graphical User Interface) support
> ===> Use 'make config' to modify these settings
> ---End OPTIONS List---

On my system it comes up as "on" when not set by 'make config', and same in poudriere.

Port says:
> OPTIONS_DEFINE= GUI
> OPTIONS_DEFAULT=GUI
so it should be "on".
Comment 14 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-21 07:09:30 UTC
Testbuilds with GUI=on are OK.

The build fails if GUI is OFF because the pkg-plist is wrong.

Adding some %%GUI%% to the pkg-plist does not solve the root-cause, but it's worth a try.
Comment 15 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-21 07:35:18 UTC
Created attachment 176007 [details]
patch-v2

With this, the pkg-plist is modified for the GUI-off case, and builds fine.

Please approve.
Comment 16 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-21 07:55:09 UTC
It passed for me with both GUI=on and GUI=off. I will update once I find the reason.
Comment 17 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-21 08:33:49 UTC
Comment on attachment 176007 [details]
patch-v2

Kurt, you are right, these should be prefixed with %%GUI%%, but stage-qa doesn't fail for me for some reason.
Comment 18 Yuri Victorovich freebsd_committer freebsd_triage 2016-10-21 08:34:28 UTC
Approved.
Comment 19 Kurt Jaeger freebsd_committer freebsd_triage 2016-10-21 09:01:20 UTC
Committed, thanks!
Comment 20 commit-hook freebsd_committer freebsd_triage 2016-10-21 09:01:25 UTC
A commit references this bug:

Author: pi
Date: Fri Oct 21 09:01:11 UTC 2016
New revision: 424395
URL: https://svnweb.freebsd.org/changeset/ports/424395

Log:
  math/cadabra2: update 2.0.816 -> 2.0.930

  - Unbreaks GUI by applying two patches:
  - Patch in boost headers to prevent EINPROGRESS mishandling
    https://github.com/zaphoyd/websocketpp/issues/563
  - Patch in websocketpp fixing IPv4 vs. IPv6 mismatch
    https://github.com/zaphoyd/websocketpp/issues/587
  - GUI option is made default
  - Clones icons for the GUI app cadabra2-gui
  - Adds "USE_TEX=texmf texhash" to allow for unincluded latex macros,
    and to make tex hash local packages installed by cadabra2
  - Verified that cadabra2 GUI now works fine - it is able to run
    many examples from their website.

  PR:		213329
  Submitted by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)

Changes:
  head/math/cadabra2/Makefile
  head/math/cadabra2/distinfo
  head/math/cadabra2/files/patch-CMakeLists.txt
  head/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp
  head/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp
  head/math/cadabra2/pkg-plist