From 17fe05992e199de070d91b98710105470d59e72d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 Jul 2020 13:24:29 -0500 Subject: [PATCH] rebase patch --- .gitignore | 1 + ....patch => qwt-6.1.5-qt_install_paths.patch | 21 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) rename qwt-6.1.2-qt_install_paths.patch => qwt-6.1.5-qt_install_paths.patch (78%) diff --git a/.gitignore b/.gitignore index 7055920..789b8e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qwt-6.1.2.tar.bz2 /qwt-6.1.3.tar.bz2 /qwt-6.1.4.tar.bz2 +/qwt-6.1.5.tar.bz2 diff --git a/qwt-6.1.2-qt_install_paths.patch b/qwt-6.1.5-qt_install_paths.patch similarity index 78% rename from qwt-6.1.2-qt_install_paths.patch rename to qwt-6.1.5-qt_install_paths.patch index bd80822..120c546 100644 --- a/qwt-6.1.2-qt_install_paths.patch +++ b/qwt-6.1.5-qt_install_paths.patch @@ -1,19 +1,18 @@ -diff -rupN --no-dereference qwt-6.1.4/qwtbuild.pri qwt-6.1.4-new/qwtbuild.pri ---- qwt-6.1.4/qwtbuild.pri 2019-01-02 17:21:31.556467499 +0100 -+++ qwt-6.1.4-new/qwtbuild.pri 2020-01-06 17:17:19.790623764 +0100 -@@ -14,8 +14,7 @@ +diff -up qwt-6.1.5/qwtbuild.pri.qt_install_paths qwt-6.1.5/qwtbuild.pri +--- qwt-6.1.5/qwtbuild.pri.qt_install_paths 2020-07-13 13:22:57.829775189 -0500 ++++ qwt-6.1.5/qwtbuild.pri 2020-07-13 13:23:39.719159410 -0500 +@@ -14,7 +14,7 @@ CONFIG += qt CONFIG += warn_on CONFIG += no_keywords -CONFIG += silent -- +#CONFIG += silent - ###################################################################### - # release/debug mode - ###################################################################### -diff -rupN --no-dereference qwt-6.1.4/qwtconfig.pri qwt-6.1.4-new/qwtconfig.pri ---- qwt-6.1.4/qwtconfig.pri 2019-01-02 17:21:31.556467499 +0100 -+++ qwt-6.1.4-new/qwtconfig.pri 2020-01-06 17:17:19.790623764 +0100 + + DEFINES += QT_NO_DEPRECATED_WARNINGS # not fixing those before Qwt 6.2 + +diff -up qwt-6.1.5/qwtconfig.pri.qt_install_paths qwt-6.1.5/qwtconfig.pri +--- qwt-6.1.5/qwtconfig.pri.qt_install_paths 2020-06-01 11:48:07.325112226 -0500 ++++ qwt-6.1.5/qwtconfig.pri 2020-07-13 13:22:57.831775207 -0500 @@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]