Merge branch 'RB-2.3' into #439

.travis.yml

@@ -127,8 +127,8 @@ matrix:
   exclude:
     - os: osx
       compiler: gcc
-#  allow_failures:
-#    - os: osx # if we exceed the time limit
+  allow_failures:
+    - os: osx # if we exceed the time limit, if if qt4 is still using openssl 1.0
   fast_finish: true
 
 

Gui/GuiPrivate.cpp

@@ -643,6 +643,12 @@ GuiPrivate::restoreGuiGeometry()
         QRect screen = desktop->screenGeometry();
         _gui->resize( (int)( 0.93 * screen.width() ), (int)( 0.93 * screen.height() ) ); // leave some space
     }
+    if ( settings.contains( QString::fromUtf8("maximized")) ) {
+        bool maximized = settings.value( QString::fromUtf8("maximized") ).toBool();
+        if (maximized) {
+            _gui->showMaximized();
+        }
+    }
     if ( settings.contains( QString::fromUtf8("fullScreen") ) ) {
         bool fs = settings.value( QString::fromUtf8("fullScreen") ).toBool();
         if (fs) {
@@ -707,6 +713,7 @@ GuiPrivate::saveGuiGeometry()
     settings.setValue( QString::fromUtf8("pos"), _gui->pos() );
     settings.setValue( QString::fromUtf8("size"), _gui->size() );
     settings.setValue( QString::fromUtf8("fullScreen"), _gui->isFullScreen() );
+    settings.setValue( QString::fromUtf8("maximized"), _gui->isMaximized() );
     settings.setValue( QString::fromUtf8("ToolbarHidden"), leftToolBarDisplayedOnHoverOnly);
     settings.endGroup();
 

README.md

@@ -54,14 +54,13 @@ Features
 - OpenFX: Currently almost all features of OpenFX v1.4 are supported
 
 - Intuitive user interface: Natron aims not to break habits by providing an intuitive and familiar user
-interface.  It is possible to customize and separate on any number of screens the graphical user interface.
-You can re-use your layouts and share your layout files (.nl)
+interface.  It is possible to customize and separate the graphical user interface on any number of screens.
+You can re-use your layouts and share your layout files (.nl).
 
-- Performances:  Never wait for anything to be rendered, in Natron anything you do produces
-real-time feedback thanks to its optimised multi-threaded rendering pipeline and its support for proxy rendering (i.e:
-the render pipeline can be computed at lower res to speed-up rendering).
+- Performance:  Never wait for anything to be rendered. In Natron, anything you do produces
+real-time feedback thanks to its optimised multi-threaded rendering pipeline and its support for proxy rendering (i.e the render pipeline can be computed at lower res to speed-up rendering).
 
-- Multi-task: Natron can render multiple graphs at the same time, it can also be used
+- Multi-task: Natron can render multiple graphs at the same time. It can also be used
 as a background process in command-line mode without any display support (e.g. for render farm purpose).
 
 - Recover easily from bugs: Natron sometimes crashes. Fear not, an  auto-save system

tools/MacPorts/aqua/qt4-mac/Portfile

@@ -11,7 +11,7 @@ PortGroup           compiler_blacklist_versions 1.0
 
 name                qt4-mac
 version             4.8.7
-revision            9
+revision            10
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories          aqua
@@ -30,8 +30,12 @@ distname            qt-everywhere-opensource-src-${version}
 master_sites        http://download.qt.io/official_releases/qt/${branch}/${version}/
 
 checksums           rmd160 afb5e5a99388e6429faca59cb5000054feffd166 \
-                    sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+                    sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 \
+                    size   241075567
 
+if {[info exists use_xcode]} {
+    use_xcode           yes
+}
 minimum_xcodeversions   {8 2.5}
 
 depends_lib-append  port:zlib \
@@ -40,7 +44,7 @@ depends_lib-append  port:zlib \
                     port:tiff \
                     port:libpng \
                     port:libmng \
-                    path:lib/libjpeg.dylib:jpeg 
+                    path:lib/libjpeg.dylib:jpeg
 
 # find a way to specify the OS MINOR version.  For OSX 10.X, this
 # value will be X.  The type is this variable is integer, so we can
@@ -354,6 +358,24 @@ patchfiles-append patch-src_gui_text_qfontengine_coretext.mm.diff
 # see https://trac.macports.org/ticket/58205
 patchfiles-append patch-qt4-openssl111.diff
 
+# newer versions of MacPorts Clang default to newer C++ standards
+# see https://trac.macports.org/ticket/57751
+if {![variant_isset cxx11]} {
+    patchfiles-append patch-compiler_standard.diff
+}
+
+# the configure script uses the compiler version to determine if QtXmlPatterns and QtWebKit can be built
+# the logic does not work for newer versions of GCC or Clang (masquerading as GCC)
+patchfiles-append patch-test_compiler_version.diff
+
+# the version header file is part of C++20
+# newer versions of Clang find VERSION instead
+post-extract {
+    move \
+        ${worksrcpath}/src/3rdparty/javascriptcore/VERSION \
+        ${worksrcpath}/src/3rdparty/javascriptcore/VERSION.txt
+}
+
 # fix building with clang > 5.0
 # see https://trac.macports.org/ticket/57751
 patchfiles-append \
@@ -552,7 +574,7 @@ post-patch {
 
 compiler.blacklist-append { clang <= 503 } \
     gcc-3.3 *gcc-4.0 macports-gcc* \
-    {macports-clang-[6-9].0}
+    {macports-clang-[6-8].0}
 
 # --prefix is not recognized
 
@@ -650,6 +672,12 @@ foreach driver {mysql odbc psql sqlite sqlite2} {
     configure.args-append -no-sql-${driver}
 }
 
+# on older systems, /usr/include/rpcsvc/yp_prot.h redefines bool unless BOOL_DEFINED is defined
+if {${os.major} < 11} {
+    configure.args-append {-D BOOL_DEFINED}
+    patchfiles-append     patch-nis.diff
+}
+
 pre-configure {
 
     # use the corrected CPATH and LIBRARY_PATH for build
@@ -1117,6 +1145,17 @@ post-destroot {
     ln -s ${qt_frameworks_dir}/QtGui.framework/Resources \
         ${dr_qt_libs_dir}
 
+    # link pkg-config files to where they will be found automatically
+    if {${qt_libs_dir} ne "${prefix}/lib"} {
+
+        set qt_pc_dir ${qt_libs_dir}/pkgconfig
+        set dr_lib_pc_dir ${destroot}${prefix}/lib/pkgconfig
+        xinstall -d -m 0755 ${destroot}${qt_pc_dir}
+        foreach pcfile [glob -nocomplain -tails -directory ${destroot}${qt_pc_dir} *.pc] {
+            ln -s ${qt_pc_dir}/${pcfile} ${dr_lib_pc_dir}
+        }
+
+    }
 }
 
 variant odbc description {Enable iODBC SQL Driver} {

tools/MacPorts/aqua/qt4-mac/Portfile.orig

@@ -11,7 +11,7 @@ PortGroup           compiler_blacklist_versions 1.0
 
 name                qt4-mac
 version             4.8.7
-revision            9
+revision            10
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories          aqua
@@ -30,8 +30,12 @@ distname            qt-everywhere-opensource-src-${version}
 master_sites        http://download.qt.io/official_releases/qt/${branch}/${version}/
 
 checksums           rmd160 afb5e5a99388e6429faca59cb5000054feffd166 \
-                    sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
+                    sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 \
+                    size   241075567
 
+if {[info exists use_xcode]} {
+    use_xcode           yes
+}
 minimum_xcodeversions   {8 2.5}
 
 depends_lib-append  port:zlib \
@@ -40,7 +44,7 @@ depends_lib-append  port:zlib \
                     port:tiff \
                     port:libpng \
                     port:libmng \
-                    path:lib/libjpeg.dylib:jpeg 
+                    path:lib/libjpeg.dylib:jpeg
 
 # find a way to specify the OS MINOR version.  For OSX 10.X, this
 # value will be X.  The type is this variable is integer, so we can
@@ -354,6 +358,24 @@ patchfiles-append patch-src_gui_text_qfontengine_coretext.mm.diff
 # see https://trac.macports.org/ticket/58205
 patchfiles-append patch-qt4-openssl111.diff
 
+# newer versions of MacPorts Clang default to newer C++ standards
+# see https://trac.macports.org/ticket/57751
+if {![variant_isset cxx11]} {
+    patchfiles-append patch-compiler_standard.diff
+}
+
+# the configure script uses the compiler version to determine if QtXmlPatterns and QtWebKit can be built
+# the logic does not work for newer versions of GCC or Clang (masquerading as GCC)
+patchfiles-append patch-test_compiler_version.diff
+
+# the version header file is part of C++20
+# newer versions of Clang find VERSION instead
+post-extract {
+    move \
+        ${worksrcpath}/src/3rdparty/javascriptcore/VERSION \
+        ${worksrcpath}/src/3rdparty/javascriptcore/VERSION.txt
+}
+
 # error out if trying to build on a new OSX version (> 10.15).
 
 platform darwin {
@@ -528,7 +550,7 @@ post-patch {
 
 compiler.blacklist-append { clang <= 503 } \
     gcc-3.3 *gcc-4.0 macports-gcc* \
-    {macports-clang-[6-9].0}
+    {macports-clang-[6-8].0}
 
 # --prefix is not recognized
 
@@ -626,6 +648,12 @@ foreach driver {mysql odbc psql sqlite sqlite2} {
     configure.args-append -no-sql-${driver}
 }
 
+# on older systems, /usr/include/rpcsvc/yp_prot.h redefines bool unless BOOL_DEFINED is defined
+if {${os.major} < 11} {
+    configure.args-append {-D BOOL_DEFINED}
+    patchfiles-append     patch-nis.diff
+}
+
 pre-configure {
 
     # use the corrected CPATH and LIBRARY_PATH for build
@@ -1093,6 +1121,17 @@ post-destroot {
     ln -s ${qt_frameworks_dir}/QtGui.framework/Resources \
         ${dr_qt_libs_dir}
 
+    # link pkg-config files to where they will be found automatically
+    if {${qt_libs_dir} ne "${prefix}/lib"} {
+
+        set qt_pc_dir ${qt_libs_dir}/pkgconfig
+        set dr_lib_pc_dir ${destroot}${prefix}/lib/pkgconfig
+        xinstall -d -m 0755 ${destroot}${qt_pc_dir}
+        foreach pcfile [glob -nocomplain -tails -directory ${destroot}${qt_pc_dir} *.pc] {
+            ln -s ${qt_pc_dir}/${pcfile} ${dr_lib_pc_dir}
+        }
+
+    }
 }
 
 variant odbc description {Enable iODBC SQL Driver} {

tools/MacPorts/aqua/qt4-mac/files/patch-compiler_standard.diff

@@ -0,0 +1,16 @@
+--- configure.orig	2019-11-03 08:14:10.000000000 -0700
++++ configure	2019-11-03 08:21:30.000000000 -0700
+@@ -8030,6 +8030,13 @@
+     QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off"
+ fi
+
++if [ "$PLATFORM_MAC" = "yes" ]; then
++    QMakeVar add QMAKE_CFLAGS "-std=c99"
++    QMakeVar add QMAKE_CXXFLAGS "-std=c++98"
++    QMakeVar add QMAKE_OBJECTIVE_CFLAGS "-std=c99"
++    QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS "-std=c++98"
++fi
++
+ # On Mac, set the minimum deployment target for the different architechtures 
+ # using the Xarch compiler option when supported (10.5 and up).  On 10.4 the
+ # deployment version is set to 10.4 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET

tools/MacPorts/aqua/qt4-mac/files/patch-nis.diff

@@ -0,0 +1,10 @@
+--- config.tests/unix/nis/nis.cpp.orig	2015-05-07 07:14:42.000000000 -0700
++++ config.tests/unix/nis/nis.cpp	2019-11-04 10:14:47.000000000 -0700
+@@ -41,6 +41,7 @@
+
+ #include <sys/types.h>
+ #include <rpc/rpc.h>
++#define BOOL_DEFINED
+ #include <rpcsvc/ypclnt.h>
+ #include <rpcsvc/yp_prot.h>
+

tools/MacPorts/aqua/qt4-mac/files/patch-test_compiler_version.diff

@@ -0,0 +1,11 @@
+--- configure.orig	2019-11-04 10:17:41.000000000 -0700
++++ configure	2019-11-04 11:13:15.000000000 -0700
+@@ -7795,8 +7795,6 @@
+                 canBuildWebKit="no"
+                 ;;
+ 	    *)
+-		canBuildWebKit="no"
+-		canBuildQtXmlPatterns="no"
+ 		;;
+ 	esac
+ 	;;