UPDATE: math/octave (Qt 5.13 fixes)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: math/octave (Qt 5.13 fixes)

Rafael Sadowski
This update fix my build issues with the upcoming Qt 5.13 update.

Not check shared libs or runtime and will not. Steven do you have time
to take a look?

Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.114
diff -u -p -u -p -r1.114 Makefile
--- Makefile 10 Aug 2019 19:41:08 -0000 1.114
+++ Makefile 27 Feb 2020 07:49:14 -0000
@@ -2,10 +2,9 @@
 
 COMMENT = high-level language for numerical computations
 
-VERSION = 5.1.0
+VERSION = 5.2.0
 DISTNAME = octave-${VERSION}
 CATEGORIES = math
-REVISION = 2
 
 SHARED_LIBS += octave 12.0
 SHARED_LIBS += octgui 6.0
@@ -19,20 +18,20 @@ MAINTAINER = Steven Mestdagh <steven@ope
 PERMIT_PACKAGE = Yes
 
 WANTLIB += ${MODFORTRAN_WANTLIB}
-WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
-WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
-WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5
-WANTLIB += SM X11 X11-xcb Xdamage
-WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
-WANTLIB += arpack blas btf bz2 c camd ccolamd cholmod colamd crypto curl
-WANTLIB += curses cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
-WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
-WANTLIB += fftw3f_threads fontconfig freetype gl2ps glapi glpk glut
-WANTLIB += gmp hdf5 iconv icui18n icuuc intl klu lapack lcms2 ltdl lzma
-WANTLIB += m nghttp2 ogg pcre pcre2-16 png portaudio pthread qhull
-WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
-WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
-WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z
+WANTLIB += ${COMPILER_LIBCXX} FLAC GL GLU GraphicsMagick GraphicsMagick++
+WANTLIB += ICE Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport
+WANTLIB += Qt5Sql Qt5Widgets Qt5Xml SM X11 X11-xcb Xdamage Xext
+WANTLIB += Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd arpack
+WANTLIB += blas bz2 c camd ccolamd cholmod colamd crypto curl
+WANTLIB += curses cxsparse drm ereadline execinfo expat fftw3
+WANTLIB += fftw3_threads fftw3f fftw3f_threads fontconfig freetype
+WANTLIB += gl2ps glapi glib-2.0 glpk glut gmp graphite2 gthread-2.0
+WANTLIB += harfbuzz hdf5 iconv icudata icui18n icuio icuuc intl
+WANTLIB += lapack lcms2 ltdl lzma m nghttp2 ogg pcre pcre2-16
+WANTLIB += png portaudio qhull qrupdate qscintilla2_qt5 sndfile
+WANTLIB += sndio ssl suitesparseconfig umfpack util vorbis vorbisenc
+WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
+WANTLIB += xcb-xfixes xshmfence z zstd
 
 MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 distinfo
--- distinfo 6 May 2019 21:09:52 -0000 1.22
+++ distinfo 27 Feb 2020 07:49:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
-SIZE (octave-5.1.0.tar.gz) = 32034788
+SHA256 (octave-5.2.0.tar.gz) = L+pis8eNbzjpRR2opNJgI4QHJZd9/+5SUNPRgPVlleE=
+SIZE (octave-5.2.0.tar.gz) = 33360285
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-configure
--- patches/patch-configure 6 May 2019 21:09:52 -0000 1.14
+++ patches/patch-configure 27 Feb 2020 07:49:14 -0000
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
 Index: configure
 --- configure.orig
 +++ configure
-@@ -67197,13 +67197,13 @@ fi
+@@ -67123,13 +67123,13 @@ fi
 
      ac_octave_save_LIBS="$LIBS"
      LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 
-@@ -67242,7 +67242,7 @@ fi
+@@ -67168,7 +67168,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
  $as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
  if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 PLIST
--- pkg/PLIST 6 May 2019 21:09:52 -0000 1.26
+++ pkg/PLIST 27 Feb 2020 07:49:15 -0000
@@ -776,13 +776,13 @@ lib/octave/${VERSION}/convhulln.a
 lib/octave/${VERSION}/dmperm.a
 lib/octave/${VERSION}/fftw.a
 lib/octave/${VERSION}/gzip.a
-lib/octave/${VERSION}/liboctave.a
+@static-lib lib/octave/${VERSION}/liboctave.a
 lib/octave/${VERSION}/liboctave.la
 @lib lib/octave/${VERSION}/liboctave.so.${LIBoctave_VERSION}
-lib/octave/${VERSION}/liboctgui.a
+@static-lib lib/octave/${VERSION}/liboctgui.a
 lib/octave/${VERSION}/liboctgui.la
 @lib lib/octave/${VERSION}/liboctgui.so.${LIBoctgui_VERSION}
-lib/octave/${VERSION}/liboctinterp.a
+@static-lib lib/octave/${VERSION}/liboctinterp.a
 lib/octave/${VERSION}/liboctinterp.la
 @lib lib/octave/${VERSION}/liboctinterp.so.${LIBoctinterp_VERSION}
 lib/octave/${VERSION}/oct/
@@ -844,6 +844,9 @@ libexec/octave/site/exec/${GNU_ARCH}/
 @man man/man1/octave-config.1
 @man man/man1/octave.1
 share/applications/org.octave.Octave.desktop
+share/icons/hicolor/1024x1024/
+share/icons/hicolor/1024x1024/apps/
+share/icons/hicolor/1024x1024/apps/octave.png
 share/icons/hicolor/128x128/apps/octave.png
 share/icons/hicolor/16x16/apps/octave.png
 share/icons/hicolor/22x22/apps/octave.png
@@ -1107,6 +1110,7 @@ share/octave/${VERSION}/etc/tests/fixed/
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/Snork.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/cack.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/ctranspose.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/display.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/double.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/end.m
@@ -1139,6 +1143,7 @@ share/octave/${VERSION}/etc/tests/fixed/
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/subsref.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/tattack.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/times.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/transpose.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/uminus.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/uplus.m
 share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/vertcat.m
@@ -1386,6 +1391,7 @@ share/octave/${VERSION}/etc/tests/libint
 share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov.cc-tst
 share/octave/${VERSION}/etc/tests/libinterp/octave.cc-tst
 share/octave/${VERSION}/etc/tests/libinterp/parse-tree/
+share/octave/${VERSION}/etc/tests/libinterp/parse-tree/bp-table.cc-tst
 share/octave/${VERSION}/etc/tests/libinterp/parse-tree/lex.ll-tst
 share/octave/${VERSION}/etc/tests/libinterp/parse-tree/oct-parse.yy-tst
 share/octave/${VERSION}/etc/tests/libinterp/parse-tree/pt-assign.cc-tst

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: math/octave (Qt 5.13 fixes)

Rafael Sadowski
On Thu Feb 27, 2020 at 08:53:15AM +0100, Rafael Sadowski wrote:
> This update fix my build issues with the upcoming Qt 5.13 update.
>
> Not check shared libs or runtime and will not. Steven do you have time
> to take a look?
>
> Rafael
>

Please forget the previous diff. This one fixes our current version
without trouble.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.114
diff -u -p -u -p -r1.114 Makefile
--- Makefile 10 Aug 2019 19:41:08 -0000 1.114
+++ Makefile 27 Feb 2020 12:00:01 -0000
@@ -5,7 +5,7 @@ COMMENT = high-level language for numeri
 VERSION = 5.1.0
 DISTNAME = octave-${VERSION}
 CATEGORIES = math
-REVISION = 2
+REVISION = 3
 
 SHARED_LIBS += octave 12.0
 SHARED_LIBS += octgui 6.0
@@ -83,7 +83,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
  LRELEASE="${MODQT_LRELEASE}" \
  CFLAGS="${CFLAGS} -std=gnu11" \
  CXXFLAGS="${CXXFLAGS} -std=gnu++11" \
- QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator
+ QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator \
+ COLLECTIONGENERATOR=${LOCALBASE}/lib/qt5/bin/qcollectiongenerator
 
 # needed to build on amd64
 GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: math/octave (Qt 5.13 fixes)

Paul Irofti-4
On Thu, Feb 27, 2020 at 09:43:20PM +0100, Rafael Sadowski wrote:

> On Thu Feb 27, 2020 at 08:53:15AM +0100, Rafael Sadowski wrote:
> > This update fix my build issues with the upcoming Qt 5.13 update.
> >
> > Not check shared libs or runtime and will not. Steven do you have time
> > to take a look?
> >
> > Rafael
> >
>
> Please forget the previous diff. This one fixes our current version
> without trouble.
>
> OK?

OK.

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.114
> diff -u -p -u -p -r1.114 Makefile
> --- Makefile 10 Aug 2019 19:41:08 -0000 1.114
> +++ Makefile 27 Feb 2020 12:00:01 -0000
> @@ -5,7 +5,7 @@ COMMENT = high-level language for numeri
>  VERSION = 5.1.0
>  DISTNAME = octave-${VERSION}
>  CATEGORIES = math
> -REVISION = 2
> +REVISION = 3
>  
>  SHARED_LIBS += octave 12.0
>  SHARED_LIBS += octgui 6.0
> @@ -83,7 +83,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
>   LRELEASE="${MODQT_LRELEASE}" \
>   CFLAGS="${CFLAGS} -std=gnu11" \
>   CXXFLAGS="${CXXFLAGS} -std=gnu++11" \
> - QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator
> + QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator \
> + COLLECTIONGENERATOR=${LOCALBASE}/lib/qt5/bin/qcollectiongenerator
>  
>  # needed to build on amd64
>  GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}