[147651] trunk/dports/math/octave-devel
mcalhoun at macports.org
mcalhoun at macports.org
Mon Apr 11 10:59:26 PDT 2016
Revision: 147651
https://trac.macports.org/changeset/147651
Author: mcalhoun at macports.org
Date: 2016-04-11 10:59:26 -0700 (Mon, 11 Apr 2016)
Log Message:
-----------
octave-devel-release: update version 4.0.0->4.0.1; fixes #51100
Modified Paths:
--------------
trunk/dports/math/octave-devel/Portfile
trunk/dports/math/octave-devel/files/octave-devel-release
Removed Paths:
-------------
trunk/dports/math/octave-devel/files/octave-clang-classdef.patch
trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch
trunk/dports/math/octave-devel/files/patch-append_version_cli.diff
Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/Portfile 2016-04-11 17:59:26 UTC (rev 147651)
@@ -23,7 +23,7 @@
#fetch.type hg
#hg.url http://hg.savannah.gnu.org/hgweb/octave/
-set version_release 4.0.0
+set version_release 4.0.1
set version_rc 4.0.1-rc4
set version_tip 4.1.0+
@@ -71,37 +71,25 @@
subport octave-devel-release {
version ${version_release}
- revision 7
- hg.tag 3ccc2d02e64b
+ #revision 0
+ hg.tag 5162cdfb56d8
if {${version_release} eq ${version_rc}} {
conflicts-append octave-devel-release
}
- # see http://savannah.gnu.org/bugs/?41178
- patchfiles-append \
- octave-clang-classdef.patch
-
# see http://savannah.gnu.org/bugs/?func=detailitem&item_id=46592
patchfiles-append \
patch-e870a68742a6.diff
- # allow osmesa support to at least compile
- patchfiles-append \
- osmesa_mac_fix.patch
-
- # force "${prefix}/bin/octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli
- patchfiles-append \
- patch-append_version_cli.diff
-
# see http://savannah.gnu.org/bugs/?41027
patchfiles-append \
octave-bug_41027.patch
checksums-append \
${hg.tag}${extract.suffix} \
- rmd160 4bbcc004ffdde859b0735e602aac2d01388d0b2c \
- sha256 2a4017a03ca80c280b5d39cf88af8954c7bfdbf1b3b40b9f09d3bd4bd1dd6040
+ rmd160 64c48708d456e8efb48877af6443a2c637f3d3a6 \
+ sha256 8b6b93d2fe830f7aa5b446856105436c51547e1ff8fe47a4184ea535bdd370d1
livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\nrelease-"
}
Deleted: trunk/dports/math/octave-devel/files/octave-clang-classdef.patch
===================================================================
--- trunk/dports/math/octave-devel/files/octave-clang-classdef.patch 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/octave-clang-classdef.patch 2016-04-11 17:59:26 UTC (rev 147651)
@@ -1,40 +0,0 @@
-# HG changeset patch
-# User akira noda <you.akira.noda at gmail.com>
-# Date 1440176752 14400
-# Fri Aug 21 13:05:52 2015 -0400
-# Node ID 03a20edfe1c7f147e7adcface83025351b8f31c9
-# Parent 0fe7133da8ceb02744b3288841927f586b9a514c
-Fix compilation of classdef with the clang compiler (bug #41178)
-
-* ov-classdef.cc, ov-classdef.h (cdef_object_scalar::mark_as_constructed):
-Move function definition out of header file to avoid dependency on incomplete
-type, compilation error with clang.
-
-diff --git a/libinterp/octave-value/ov-classdef.cc b/libinterp/octave-value/ov-classdef.cc
---- a/libinterp/octave-value/ov-classdef.cc
-+++ libinterp/octave-value/ov-classdef.cc
-@@ -1946,6 +1946,12 @@ cdef_object_scalar::is_partially_constru
- return true;
- }
-
-+void
-+cdef_object_scalar::mark_as_constructed (const cdef_class& cls)
-+{
-+ ctor_list.erase (cls);
-+}
-+
- handle_cdef_object::~handle_cdef_object (void)
- {
- #if DEBUG_TRACE
-diff --git a/libinterp/octave-value/ov-classdef.h b/libinterp/octave-value/ov-classdef.h
---- a/libinterp/octave-value/ov-classdef.h
-+++ libinterp/octave-value/ov-classdef.h
-@@ -438,7 +438,7 @@ public:
-
- void mark_as_constructed (void) { ctor_list.clear (); }
-
-- void mark_as_constructed (const cdef_class& cls) { ctor_list.erase (cls); }
-+ void mark_as_constructed (const cdef_class& cls);
-
- bool is_constructed (void) const { return ctor_list.empty (); }
-
Modified: trunk/dports/math/octave-devel/files/octave-devel-release
===================================================================
--- trunk/dports/math/octave-devel/files/octave-devel-release 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/octave-devel-release 2016-04-11 17:59:26 UTC (rev 147651)
@@ -1,30 +1,30 @@
-bin/mkoctfile-4.0.0
-bin/octave-4.0.0
-bin/octave-cli-4.0.0
-bin/octave-config-4.0.0
-share/man/man1/mkoctfile-4.0.0.1.gz
-share/man/man1/octave-cli-4.0.0.1.gz
-share/man/man1/octave-config-4.0.0.1.gz
-share/man/man1/octave-4.0.0.1.gz
-share/info/octave_4.0.0/liboctave.info
-share/info/octave_4.0.0/octave.info
-share/info/octave_4.0.0/octave.info-1
-share/info/octave_4.0.0/octave.info-2
-share/info/octave_4.0.0/octave.info-3
-share/info/octave_4.0.0/octave.info-4
-share/info/octave_4.0.0/octave.info-5
-share/info/octave_4.0.0/octave.info-6
-share/info/octave_4.0.0/octave.info-7
-share/info/octave_4.0.0/octave.info-8
-share/info/octave_4.0.0/octave.info-9
-share/octave/4.0.0/appdata/www.octave.org-octave.appdata.xml
-share/octave/4.0.0/icons/hicolor/16x16/apps/octave.png
-share/octave/4.0.0/icons/hicolor/22x22/apps/octave.png
-share/octave/4.0.0/icons/hicolor/24x24/apps/octave.png
-share/octave/4.0.0/icons/hicolor/32x32/apps/octave.png
-share/octave/4.0.0/icons/hicolor/48x48/apps/octave.png
-share/octave/4.0.0/icons/hicolor/64x64/apps/octave.png
-share/octave/4.0.0/icons/hicolor/128x128/apps/octave.png
-share/octave/4.0.0/icons/hicolor/256x256/apps/octave.png
-share/octave/4.0.0/icons/hicolor/512x512/apps/octave.png
-share/octave/4.0.0/icons/hicolor/scalable/apps/octave.svg
+bin/mkoctfile-4.0.1
+bin/octave-4.0.1
+bin/octave-cli-4.0.1
+bin/octave-config-4.0.1
+share/man/man1/mkoctfile-4.0.1.1.gz
+share/man/man1/octave-cli-4.0.1.1.gz
+share/man/man1/octave-config-4.0.1.1.gz
+share/man/man1/octave-4.0.1.1.gz
+share/info/octave_4.0.1/liboctave.info
+share/info/octave_4.0.1/octave.info
+share/info/octave_4.0.1/octave.info-1
+share/info/octave_4.0.1/octave.info-2
+share/info/octave_4.0.1/octave.info-3
+share/info/octave_4.0.1/octave.info-4
+share/info/octave_4.0.1/octave.info-5
+share/info/octave_4.0.1/octave.info-6
+share/info/octave_4.0.1/octave.info-7
+share/info/octave_4.0.1/octave.info-8
+share/info/octave_4.0.1/octave.info-9
+share/octave/4.0.1/appdata/www.octave.org-octave.appdata.xml
+share/octave/4.0.1/icons/hicolor/16x16/apps/octave.png
+share/octave/4.0.1/icons/hicolor/22x22/apps/octave.png
+share/octave/4.0.1/icons/hicolor/24x24/apps/octave.png
+share/octave/4.0.1/icons/hicolor/32x32/apps/octave.png
+share/octave/4.0.1/icons/hicolor/48x48/apps/octave.png
+share/octave/4.0.1/icons/hicolor/64x64/apps/octave.png
+share/octave/4.0.1/icons/hicolor/128x128/apps/octave.png
+share/octave/4.0.1/icons/hicolor/256x256/apps/octave.png
+share/octave/4.0.1/icons/hicolor/512x512/apps/octave.png
+share/octave/4.0.1/icons/hicolor/scalable/apps/octave.svg
Deleted: trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch
===================================================================
--- trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch 2016-04-11 17:59:26 UTC (rev 147651)
@@ -1,29 +0,0 @@
-diff -Naur a/libinterp/dldfcn/__osmesa_print__.cc b/libinterp/dldfcn/__osmesa_print__.cc
---- libinterp/dldfcn/__osmesa_print__.cc 2015-05-23 16:21:53.000000000 +0200
-+++ libinterp/dldfcn/__osmesa_print__.cc 2015-10-05 21:08:50.000000000 +0200
-@@ -27,6 +27,12 @@
- #include <config.h>
- #endif
-
-+#if defined (HAVE_OSMESA_H)
-+#include "osmesa.h"
-+#elif defined (HAVE_GL_OSMESA_H)
-+#include "GL/osmesa.h"
-+#endif
-+
- #include "oct-locbuf.h"
- #include "unwind-prot.h"
-
-@@ -36,12 +42,6 @@
- #include "graphics.h"
- #include "gripes.h"
-
--#if defined (HAVE_OSMESA_H)
--#include "osmesa.h"
--#elif defined (HAVE_GL_OSMESA_H)
--#include "GL/osmesa.h"
--#endif
--
- #if defined (HAVE_OSMESA) && defined (HAVE_OPENGL)
- static void
- close_fcn (FILE *f)
Deleted: trunk/dports/math/octave-devel/files/patch-append_version_cli.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-append_version_cli.diff 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/patch-append_version_cli.diff 2016-04-11 17:59:26 UTC (rev 147651)
@@ -1,11 +0,0 @@
---- src/main.in.cc.orig 2016-01-09 14:14:07.000000000 -0700
-+++ src/main.in.cc 2016-01-09 14:16:05.000000000 -0700
-@@ -462,7 +462,7 @@
-
- start_gui = false;
- gui_libs = false;
-- file = octave_bindir + dir_sep_char + "octave-cli";
-+ file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
- }
- else if (! strcmp (argv[i], "--no-gui"))
- {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160411/1a975a43/attachment.html>
More information about the macports-changes
mailing list