From 7e2acbcc52ddf4fa86a13e4f855cedd0fa2eb0e2 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 4 Jun 2024 10:11:51 +0200 Subject: [PATCH] use github https protocol as default and add a minor fix for qt 5.15.2 compilation script --- products/compil_scripts/qt-5.15.2.sh | 4 ++-- salome-W10.pyconf | 3 ++- salome.pyconf | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/products/compil_scripts/qt-5.15.2.sh b/products/compil_scripts/qt-5.15.2.sh index 70d8bae..9544462 100755 --- 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 3159a3d..fda4a41 100644 --- 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 e5a4675..4a228a7 100644 --- 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 -- 2.39.2