<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ff9caeaf003f936fc7f28bc6224ddccfb42b912">https://github.com/macports/macports-ports/commit/6ff9caeaf003f936fc7f28bc6224ddccfb42b912</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6ff9cae octave-devel*: update to latest versions
</span>6ff9cae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ff9caeaf003f936fc7f28bc6224ddccfb42b912
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 13 17:22:44 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave-devel*: update to latest versions
</span>---
math/octave-devel/Portfile | 176 ++++++++++----------
math/octave-devel/files/clang-libcxx-fix.patch | 4 +-
.../octave-devel/files/octave-bug_41027-half.patch | 13 --
math/octave-devel/files/octave-devel | 60 +++----
math/octave-devel/files/octave-devel-rc | 60 +++----
math/octave-devel/files/octave-devel-release | 60 +++----
math/octave-devel/files/patch-configure.diff | 180 ---------------------
math/octave-devel/files/patch-iconsize.diff | 18 +++
.../files/patch-libinterp-Makefile.in.diff | 12 ++
math/octave-devel/files/patch-qscintilla2.diff | 16 ++
10 files changed, 227 insertions(+), 372 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/Portfile b/math/octave-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50c4f24..6e2df18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup compilers 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup linear_algebra 1.0
</span> PortGroup select 1.0
name octave-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,60 +23,52 @@ homepage http://www.gnu.org/software/octave
</span> #fetch.type hg
#hg.url http://hg.savannah.gnu.org/hgweb/octave/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_release 4.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_rc 4.0.1-rc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_tip 4.1.0+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_release 4.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_rc 4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_tip 4.2.0-rc4
</span>
if { ${name} eq ${subport} } {
version ${version_tip}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.tag 19e8eddd4773
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.tag e078f5607762
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://savannah.gnu.org/bugs/?41027
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave-bug_41027-half.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://savannah.gnu.org/bugs/index.php?47886
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://savannah.gnu.org/bugs/?48773
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qscintilla2.diff
</span>
checksums-append \
${hg.tag}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bf6d26b12fa1f0e2a8434a54ffa395c2b4e7f31e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 934b7f116018e3f8d97c7bbd2d213a77c823d934a4865155e24eac5cb42a636b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e5d7103a820d9cd6362fb7e2f3c70a678f30c622 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2d079ab1f89c90559ef94e6f7025501963f030b3ccc16f0b52607867105cd93b
</span>
livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\ntip"
}
subport octave-devel-rc {
version ${version_rc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.tag 2b66f30a0de7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.tag 69ac19073ae6
</span>
if {${version_rc} eq ${version_release}} {
conflicts-append octave-devel-release
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://savannah.gnu.org/bugs/?func=detailitem&item_id=46592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://savannah.gnu.org/bugs/?48773
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-e870a68742a6.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://savannah.gnu.org/bugs/?41027
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave-bug_41027.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qscintilla2.diff
</span>
checksums-append \
${hg.tag}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4bf919790f28f21752381e127cf55b3a5f4d7344 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4785967cff091dddd7d82dbbd094658a39ad26d4a7219abc1f1bbc4fe696d43a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d5c405d684ea3d3a8114db1bf8a03a214112e77e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f29857e2c642361ffc26519784468fda330c1c4dcc7eeb54e53ba0aa00412d8d
</span>
livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\nrc-"
}
subport octave-devel-release {
version ${version_release}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.tag acaf1e137c5e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.tag 00f7b278defd
</span>
if {${version_release} eq ${version_rc}} {
conflicts-append octave-devel-release
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,8 +84,8 @@ subport octave-devel-release {
</span>
checksums-append \
${hg.tag}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 454f0f6ef1657a49f9a41ff5bae03c09a332d77f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3aafb5568bd46c1c6e6bae494cf8fdf457e8a84fea402b14a454e992c0885a8c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3506df6b7c142448bddd50bdf4d47a8f593f7603 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2409aca13faeff3afa0f25d8d39dad200fc49fdf69bec4fa004becefcf71f25a
</span>
livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\nrelease-"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,25 +102,33 @@ compiler.blacklist-append { clang <= 318.0.61 }
</span> select.group octave
select.file ${filespath}/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see ${worksrcpath}/.hgsubstate to find revision of gnulib-hg subrepository that should be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set hg_gnu_tag 7f19e7f2afa2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see ${worksrcpath}/.hgsubstate to find revision of gnulib or gnulib-hg subrepository that should be used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hg_gnu_tag c2b547926f34
</span>
checksums-append \
${hg_gnu_tag}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9d906212fdb4201f8592da10524606dadb3f50e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 85add8ce0c53e8868d903c28c407d864ca54bd42e8d472e09b1a1bb4b105b741
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a1b1f6326862b2a4905de42a42ab85b21fe17499 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4f1dc6ecc7e27891f317e064f789f305dd4d9ab2b4ca7a762c3ec8a8ec9777dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif { ${subport} eq "octave-devel-rc" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hg_gnu_tag a05c0ede6620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${hg_gnu_tag}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 07d7528f0cc77e0d5ab3dd4497fabebf7882295c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ecb78b45c9b6c72d4c3b36d120491b58e22dc3e44095255aec306c1a80db2c9
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # check http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg/rev for latest version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set hg_gnu_tag 4a3a7c6111c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check http://hg.octave.org/gnulib for latest version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hg_gnu_tag a05c0ede6620
</span>
checksums-append \
${hg_gnu_tag}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 367b2811b5d4e3bab5ed22382c4ecfed808335e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 39f09d2000654d0d75a95b756fdd0724f869dfe65ef08f47814fbad230e8b25c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 07d7528f0cc77e0d5ab3dd4497fabebf7882295c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ecb78b45c9b6c72d4c3b36d120491b58e22dc3e44095255aec306c1a80db2c9
</span> }
master_sites http://hg.savannah.gnu.org/hgweb/octave/archive:octave \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://hg.octave.org/gnulib/archive:gnulib \
</span> http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg/archive:gnulib
distfiles \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +139,11 @@ worksrcdir octave-${hg.tag}
</span>
post-extract {
# mimic presence of mercurial subrepository
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/../gnulib-${hg_gnu_tag} ${worksrcpath}/gnulib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
pre-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +170,7 @@ pre-patch {
</span> } elseif { [variant_exists clang33] && [variant_isset clang33] } {
set gl2psbug yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${gl2psbug} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gl2psbug} && ${subport} eq "octave-devel-release" } {
</span> patchfiles-append patch-gl2ps_renderer.diff
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +183,11 @@ depends_build-append \
</span>
use_autoconf yes
autoconf.cmd ./bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-autoconf.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoconf.args --gnulib-srcdir=gnulib-hg --no-git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoconf.args --gnulib-srcdir=gnulib --no-git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# avoid depends_build-append port:coreutils
configure.env-append MKDIR_P="/bin/mkdir -p"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,7 +301,7 @@ configure.args-append \
</span> --without-magick \
--disable-docs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "octave-devel-release" } {
</span> configure.args-append \
--disable-gui
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,6 +346,9 @@ depends_lib-append port:qhull
</span>
#--without-z
depends_lib-append port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libinterp-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
#--without-hdf5
if { ${name} eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,42 +401,8 @@ depends_run-append \
</span>
depends_run-append port:octave_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas openblas {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:vecLibFort
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas=-lvecLibFort \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lapack=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openblas description {use BLAS from MacPorts' openblas port} conflicts atlas accelerate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LAPACK required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replicate default values if configure script finds openblas on its own
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas=-lopenblas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lapack=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant atlas description {use BLAS from MacPorts' atlas port} conflicts accelerate openblas {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replicate default values if configure script finds atlas on its own
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas="-lcblas -lf77blas -latlas" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lapack=-llapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-blas="-L${prefix}/lib ${linalglib}" --with-lapack=""
</span> }
variant java description {enable Java interface} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,17 +414,43 @@ variant java description {enable Java interface} {
</span> # #51480
#default_variants-append +java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4gui description {build the GUI using Qt4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 conflicts qt5 description {build the GUI using Qt4} {
</span> PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:qscintilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${subport} eq "octave-devel-release" } {
</span> configure.args-replace --disable-gui --enable-gui
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-qt --with-qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-qt --with-qt=4
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +qt4gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt5 conflicts qt4 description {build the GUI using Qt5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://savannah.gnu.org/bugs/?41027
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-iconsize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # location of libqscintilla2.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${qt_libs_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-qt --with-qt=5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${qt_dir}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${qt_dir}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_isset qt4] && ![variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant fltk description {enable fltk as a graphics toolkit for plotting} {
depends_lib-append path:lib/libfltk.dylib:fltk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -457,7 +459,7 @@ variant fltk description {enable fltk as a graphics toolkit for plotting} {
</span> }
default_variants-append +fltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset fltk] || [variant_isset qt4gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
</span>
# native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -468,7 +470,7 @@ if {[variant_isset fltk] || [variant_isset qt4gui]} {
</span> configure.args-replace --without-opengl --with-framework-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset fltk] && [variant_isset qt4gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [variant_isset qt5]) } {
</span> notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,7 +519,7 @@ variant app description "build application bundle to launch ${subport}" {
</span> xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents/MacOS
set script [open "${worksrcpath}/${appName}/Contents/MacOS/Octave" w 0755]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset qt4gui] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset qt4] || [variant_isset qt5] } {
</span> puts ${script} "#!/bin/sh"
puts ${script} ""
puts ${script} "${prefix}/bin/octave-${version} --force-gui"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,7 +643,7 @@ if {${magickDefault}} {
</span> default_variants-append +graphicsmagick
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "octave-devel-release" } {
</span> # remove architecture flags from header file
if { [variant_exists universal] && [variant_isset universal] } {
merger-post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/clang-libcxx-fix.patch b/math/octave-devel/files/clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 19b8b04..c464ba1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/files/clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/libcxx-fix.h
</span> diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/mx-inlines.cc
--- a/liboctave/operators/mx-inlines.cc Thu Oct 09 20:38:04 2014 -0700
+++ liboctave/operators/mx-inlines.cc Sun Oct 12 00:00:55 2014 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -307,7 +307,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -398,7 +398,13 @@
</span>
// Let the compiler decide which pow to use, whichever best matches the
// arguments provided.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,4 +102,4 @@ diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/mx-inlines.cc
</span> +#endif
DEFMXMAPPER2X (mx_inline_pow, pow)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Arbitrary function appliers. The function is a template parameter to enable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Arbitrary function appliers.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/octave-bug_41027-half.patch b/math/octave-devel/files/octave-bug_41027-half.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 40c86b2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/files/octave-bug_41027-half.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r 900b524d9072 libinterp/corefcn/comment-list.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libinterp/corefcn/comment-list.h Sat Apr 19 09:28:20 2014 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/comment-list.h Sun May 18 18:09:05 2014 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <base-list.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "base-list.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern std::string get_comment_text (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r 900b524d9072 libinterp/corefcn/oct.h
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/octave-devel b/math/octave-devel/files/octave-devel
</span><span style='display:block; white-space:pre;color:#808080;'>index e665ecd..c4ef001 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/files/octave-devel
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/octave-devel
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/mkoctfile-4.1.0+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-4.1.0+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-cli-4.1.0+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-config-4.1.0+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/mkoctfile-4.1.0+.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-cli-4.1.0+.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-config-4.1.0+.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-4.1.0+.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/liboctave.info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.1.0+/octave.info-9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/appdata/www.octave.org-octave.appdata.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/16x16/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/22x22/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/24x24/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/32x32/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/48x48/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/64x64/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/128x128/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/256x256/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/512x512/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.1.0+/icons/hicolor/scalable/apps/octave.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mkoctfile-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-cli-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-config-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/mkoctfile-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-cli-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-config-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/liboctave.info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/appdata/www.octave.org-octave.appdata.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/16x16/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/22x22/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/24x24/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/32x32/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/48x48/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/64x64/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/128x128/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/256x256/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/512x512/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/scalable/apps/octave.svg
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/octave-devel-rc b/math/octave-devel/files/octave-devel-rc
</span><span style='display:block; white-space:pre;color:#808080;'>index a4f5ec2..c4ef001 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/files/octave-devel-rc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/octave-devel-rc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/mkoctfile-4.0.1-rc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-4.0.1-rc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-cli-4.0.1-rc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-config-4.0.1-rc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/mkoctfile-4.0.1-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-cli-4.0.1-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-config-4.0.1-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-4.0.1-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/liboctave.info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.1-rc4/octave.info-9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/appdata/www.octave.org-octave.appdata.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/16x16/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/22x22/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/24x24/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/32x32/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/48x48/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/64x64/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/128x128/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/256x256/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/512x512/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.1-rc4/icons/hicolor/scalable/apps/octave.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mkoctfile-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-cli-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-config-4.2.0-rc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/mkoctfile-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-cli-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-config-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-4.2.0-rc4.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/liboctave.info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.2.0-rc4/octave.info-9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/appdata/www.octave.org-octave.appdata.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/16x16/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/22x22/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/24x24/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/32x32/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/48x48/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/64x64/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/128x128/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/256x256/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/512x512/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.2.0-rc4/icons/hicolor/scalable/apps/octave.svg
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/octave-devel-release b/math/octave-devel/files/octave-devel-release
</span><span style='display:block; white-space:pre;color:#808080;'>index 645237a..80067cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/files/octave-devel-release
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/octave-devel-release
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/mkoctfile-4.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-4.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-cli-4.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/octave-config-4.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/mkoctfile-4.0.2.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-cli-4.0.2.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-config-4.0.2.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/octave-4.0.2.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/liboctave.info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/info/octave_4.0.2/octave.info-9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/appdata/www.octave.org-octave.appdata.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/16x16/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/22x22/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/24x24/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/32x32/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/48x48/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/64x64/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/128x128/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/256x256/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/512x512/apps/octave.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/octave/4.0.2/icons/hicolor/scalable/apps/octave.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mkoctfile-4.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-4.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-cli-4.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/octave-config-4.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/mkoctfile-4.0.3.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-cli-4.0.3.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-config-4.0.3.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/octave-4.0.3.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/liboctave.info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/info/octave_4.0.3/octave.info-9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/appdata/www.octave.org-octave.appdata.xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/16x16/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/22x22/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/24x24/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/32x32/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/48x48/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/64x64/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/128x128/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/256x256/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/512x512/apps/octave.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/octave/4.0.3/icons/hicolor/scalable/apps/octave.svg
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/patch-configure.diff b/math/octave-devel/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c60d714..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,180 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-05-08 13:35:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-05-10 06:04:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1266,84 +1266,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--## Check for FreeType 2 library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--warn_freetype=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES([FT2], [freetype2], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- min_ft2_version=9.03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$ac_status" = 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- save_LIBS="$LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="$FT2_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_FUNCS([FT_Reference_Face])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="$save_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- warn_freetype="FreeType library >= 9.03 not found. OpenGL graphics will not be fully functional."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$warn_freetype"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OCTAVE_CONFIGURE_WARNING([warn_freetype])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FT2_CPPFLAGS="$FT2_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ## of `pkg-config --cflags` output.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FT2_CPPFLAGS="$FT2_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_SUBST(FT2_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--## Check for Xft library (when using X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--warn_xft=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$have_x" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(XFT, [xft],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_DEFINE(HAVE_XFT, 1, [Define to 1 if Xft is present.])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [warn_xft="Xft library not found. OpenGL graphics will not be fully functional."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$warn_xft"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OCTAVE_CONFIGURE_WARNING([warn_xft])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--## Check for fontconfig library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--warn_fontconfig=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [warn_fontconfig="Fontconfig library not found. OpenGL graphics will not be fully functional."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$warn_fontconfig"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OCTAVE_CONFIGURE_WARNING([warn_fontconfig])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ## of `pkg-config --cflags` output.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_SUBST(FONTCONFIG_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--## Check for OSMesa which is needed for offscreen rendering with OpenGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--## FIXME: Check for version >= 9.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OCTAVE_CHECK_LIB(OSMesa, OSMesa,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [OSMesa library not found. Offscreen rendering with OpenGL will be disabled.],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [osmesa.h GL/osmesa.h], [OSMesaCreateContext])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--## Check for gl2ps which is required for printing with OpenGL graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CHECK_HEADERS([gl2ps.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [GL2PS_LIBS="-lgl2ps"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$warn_gl2ps"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_SUBST(GL2PS_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### GUI/Qt related tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_CPPFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1652,6 +1574,92 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opengl_graphics=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Check for FreeType 2 library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+warn_freetype=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$opengl_graphics" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES([FT2], [freetype2], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ min_ft2_version=9.03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_status" = 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ save_LIBS="$LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="$FT2_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_FUNCS([FT_Reference_Face])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="$save_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ warn_freetype="FreeType library >= 9.03 not found. OpenGL graphics will not be fully functional."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test -n "$warn_freetype"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OCTAVE_CONFIGURE_WARNING([warn_freetype])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FT2_CPPFLAGS="$FT2_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## of `pkg-config --cflags` output.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FT2_CPPFLAGS="$FT2_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_SUBST(FT2_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Check for Xft library (when using X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+warn_xft=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$opengl_graphics" = yes && "$have_x" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(XFT, [xft],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE(HAVE_XFT, 1, [Define to 1 if Xft is present.])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [warn_xft="Xft library not found. OpenGL graphics will not be fully functional."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test -n "$warn_xft"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OCTAVE_CONFIGURE_WARNING([warn_xft])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Check for fontconfig library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+warn_fontconfig=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$opengl_graphics" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [warn_fontconfig="Fontconfig library not found. OpenGL graphics will not be fully functional."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test -n "$warn_fontconfig"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OCTAVE_CONFIGURE_WARNING([warn_fontconfig])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## of `pkg-config --cflags` output.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_SUBST(FONTCONFIG_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Check for OSMesa which is needed for offscreen rendering with OpenGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## FIXME: Check for version >= 9.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$opengl_graphics" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OCTAVE_CHECK_LIB(OSMesa, OSMesa,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [OSMesa library not found. Offscreen rendering with OpenGL will be disabled.],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [osmesa.h GL/osmesa.h], [OSMesaCreateContext])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## Check for gl2ps which is required for printing with OpenGL graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$opengl_graphics" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([gl2ps.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [GL2PS_LIBS="-lgl2ps"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test -n "$warn_gl2ps"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST(GL2PS_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### Start determination of shared vs. static libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Use -static if compiling on Alpha OSF/1 1.3 systems.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/patch-iconsize.diff b/math/octave-devel/files/patch-iconsize.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ec68286
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/patch-iconsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/src/octave-dock-widget.cc.orig 2016-10-27 11:48:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/octave-dock-widget.cc 2016-11-10 04:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,8 +55,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this, SLOT (handle_active_dock_changed (octave_dock_widget*,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_dock_widget*)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QStyle *st = style ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QStyle *st = p->style ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // fix retina scaling for Mac (bug #46723)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _icon_size = 2*st->pixelMetric (QStyle::PM_SmallIconSize) / p->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined (Q_OS_WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // windows: add an extra title bar that persists when floating
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/patch-libinterp-Makefile.in.diff b/math/octave-devel/files/patch-libinterp-Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..618b4ee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/patch-libinterp-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/link-deps.mk.orig 2016-07-01 11:47:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/link-deps.mk 2016-11-11 19:52:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GL2PS_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LLVM_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JAVA_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(LAPACK_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LAPACK_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(Z_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBOCTINTERP_LINK_OPTS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(FT2_LDFLAGS) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-devel/files/patch-qscintilla2.diff b/math/octave-devel/files/patch-qscintilla2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dcedb2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-devel/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/acinclude.m4.orig 2016-11-08 13:21:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/acinclude.m4 2016-11-11 09:31:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1351,7 +1351,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([Unrecognized Qt version $qt_version])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2738,4 +2738,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl End of macros written by Octave developers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span></pre><pre style='margin:0'>
</pre>