use github https protocol as default and add a minor fix for qt 5.15.2 compilation...

diff --git a/products/compil_scripts/qt-5.15.2.sh b/products/compil_scripts/qt-5.15.2.sh
index 70d8bae784b18a69222ba055269396eb96dc571e..954446283f0298d14cc02e3950605cf4ac5d8f93 100755 (executable)
--- a/products/compil_scripts/qt-5.15.2.sh
+++ b/products/compil_scripts/qt-5.15.2.sh
@@ -25,10 +25,10 @@ rm -rf $BUILD_DIR && mkdir -p $BUILD_DIR && cd $BUILD_DIR
 
 # For -qt-harfbuzz option, see spns #9694
 echo
-echo "*** configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper"
+echo "*** configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper"
 
 $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath \
-    -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine \
+    -verbose -no-separate-debug-info -confirm-license -qt-libpng -xcb -no-eglfs -dbus-runtime -skip qtwebengine \
     -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz \
     -no-openssl -no-glib -no-jasper
 

diff --git a/salome-W10.pyconf b/salome-W10.pyconf
index 3159a3d11c4069e25827a368391164aed5581ea6..fda4a4185e7635b4de14ab74b4c73c5b468a9b4b 100644 (file)
--- a/salome-W10.pyconf
+++ b/salome-W10.pyconf
@@ -20,7 +20,8 @@ git_info :
   git_server :
   {
       tuleap : {url : "https://codev-tuleap.cea.fr/plugins/git/", opensource_only: 'no' }
-      github : {url : "git@github.com:SalomePlatform/",           opensource_only: 'yes'}
+      #github : {url : "git@github.com:SalomePlatform/",           opensource_only: 'yes'}
+      github : {url : "https://github.com/SalomePlatform/",       opensource_only: 'yes'}
       gitpub : {url : "https://git.salome-platform.org/gitpub/",  opensource_only: 'yes'}
   }
     # these two keys are deprecated - they are kept for backward compatibility only and

diff --git a/salome.pyconf b/salome.pyconf
index e5a467583b073a075280ad0a827092c7afdf5bed..4a228a79fcfb8d36b71217dc972c31b9661ec8ab 100644 (file)
--- a/salome.pyconf
+++ b/salome.pyconf
@@ -20,7 +20,8 @@ git_info :
   git_server :
   {
       tuleap : {url : "https://codev-tuleap.cea.fr/plugins/git/", opensource_only: 'no' }
-      github : {url : "git@github.com:SalomePlatform/",           opensource_only: 'yes'}
+      #github : {url : "git@github.com:SalomePlatform/",           opensource_only: 'yes'}
+      github : {url : "https://github.com/SalomePlatform/",       opensource_only: 'yes'}
       gitpub : {url : "https://git.salome-platform.org/gitpub/",  opensource_only: 'yes'}
   }
   # these two keys are deprecated - they are kept for backward compatibility only and