From: Gilles DAVID Date: Mon, 19 Jun 2017 06:52:39 +0000 (+0200) Subject: Fix patch qt.001 to work with 'patch -p1' command X-Git-Tag: V9_0_0~14^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fgdd%2Ffix_qt_patches;p=tools%2Fconfiguration.git Fix patch qt.001 to work with 'patch -p1' command --- diff --git a/config/patches/qt.001_proxy_factory.patch b/config/patches/qt.001_proxy_factory.patch index c31936f..b39fa98 100644 --- a/config/patches/qt.001_proxy_factory.patch +++ b/config/patches/qt.001_proxy_factory.patch @@ -1,6 +1,6 @@ diff -NaurwB /tmp/qt/qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp /tmp/qt/qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp ---- /tmp/qt/qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp 2016-05-25 18:46:17.000000000 +0300 -+++ /tmp/qt/qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp 2017-03-15 17:51:11.051090499 +0300 +--- qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp 2016-05-25 18:46:17.000000000 +0300 ++++ qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp 2017-03-15 17:51:11.051090499 +0300 @@ -74,7 +74,7 @@ QList ret; diff --git a/config/patches/qt.004_blender_scene.patch b/config/patches/qt.004_blender_scene.patch index 11b5c6f..7dd045c 100644 --- a/config/patches/qt.004_blender_scene.patch +++ b/config/patches/qt.004_blender_scene.patch @@ -1,6 +1,6 @@ diff -NaurwB /tmp/qt/qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp /tmp/qt/qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp ---- /tmp/qt/qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 17:56:09.572756601 +0300 -+++ /tmp/qt/qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 18:00:35.950259586 +0300 +--- qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 17:56:09.572756601 +0300 ++++ qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp 2017-03-15 18:00:35.950259586 +0300 @@ -677,39 +677,39 @@ //-------------------------------------------------------------------------------- void DNA::RegisterConverters() {