rebase patch

epel9
Rex Dieter 5 years ago
parent 8df93347ca
commit 17fe05992e

1
.gitignore vendored

@ -1,3 +1,4 @@
/qwt-6.1.2.tar.bz2 /qwt-6.1.2.tar.bz2
/qwt-6.1.3.tar.bz2 /qwt-6.1.3.tar.bz2
/qwt-6.1.4.tar.bz2 /qwt-6.1.4.tar.bz2
/qwt-6.1.5.tar.bz2

@ -1,19 +1,18 @@
diff -rupN --no-dereference qwt-6.1.4/qwtbuild.pri qwt-6.1.4-new/qwtbuild.pri diff -up qwt-6.1.5/qwtbuild.pri.qt_install_paths qwt-6.1.5/qwtbuild.pri
--- qwt-6.1.4/qwtbuild.pri 2019-01-02 17:21:31.556467499 +0100 --- qwt-6.1.5/qwtbuild.pri.qt_install_paths 2020-07-13 13:22:57.829775189 -0500
+++ qwt-6.1.4-new/qwtbuild.pri 2020-01-06 17:17:19.790623764 +0100 +++ qwt-6.1.5/qwtbuild.pri 2020-07-13 13:23:39.719159410 -0500
@@ -14,8 +14,7 @@ @@ -14,7 +14,7 @@
CONFIG += qt CONFIG += qt
CONFIG += warn_on CONFIG += warn_on
CONFIG += no_keywords CONFIG += no_keywords
-CONFIG += silent -CONFIG += silent
-
+#CONFIG += silent +#CONFIG += silent
######################################################################
# release/debug mode DEFINES += QT_NO_DEPRECATED_WARNINGS # not fixing those before Qwt 6.2
######################################################################
diff -rupN --no-dereference qwt-6.1.4/qwtconfig.pri qwt-6.1.4-new/qwtconfig.pri diff -up qwt-6.1.5/qwtconfig.pri.qt_install_paths qwt-6.1.5/qwtconfig.pri
--- qwt-6.1.4/qwtconfig.pri 2019-01-02 17:21:31.556467499 +0100 --- qwt-6.1.5/qwtconfig.pri.qt_install_paths 2020-06-01 11:48:07.325112226 -0500
+++ qwt-6.1.4-new/qwtconfig.pri 2020-01-06 17:17:19.790623764 +0100 +++ qwt-6.1.5/qwtconfig.pri 2020-07-13 13:22:57.831775207 -0500
@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW @@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
Loading…
Cancel
Save