Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (903608d846b3dd60d7610edbf7d95535f6719a22)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (903608d846b3dd60d7610edbf7d95535f6719a22)
  • Date: Fri, 6 Apr 2018 14:38:21 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-utils/kcalc/HISTORY | 3 +++
kde5-utils/kcalc/PRE_BUILD | 3 +++
kde5-utils/kcalc/patches/qt5.11.patch | 12 ++++++++++++
kde5-utils/print-manager/PRE_BUILD | 3 +++
kde5-utils/print-manager/patches/qt5.11.patch | 13 +++++++++++++
5 files changed, 34 insertions(+)

New commits:
commit 903608d846b3dd60d7610edbf7d95535f6719a22
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

print-manager - fix for qt5.11

commit f2f883aa2da8dad623a8670276ce4ede4d76749a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kcalc - fix for qt5.11

diff --git a/kde5-utils/kcalc/HISTORY b/kde5-utils/kcalc/HISTORY
index 8db800e..88cdfbe 100644
--- a/kde5-utils/kcalc/HISTORY
+++ b/kde5-utils/kcalc/HISTORY
@@ -1,3 +1,6 @@
+2018-04-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD qt5.11.patch: added
+
2018-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 17.12.3

diff --git a/kde5-utils/kcalc/PRE_BUILD b/kde5-utils/kcalc/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/kde5-utils/kcalc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde5-utils/kcalc/patches/qt5.11.patch
b/kde5-utils/kcalc/patches/qt5.11.patch
new file mode 100644
index 0000000..203897b
--- /dev/null
+++ b/kde5-utils/kcalc/patches/qt5.11.patch
@@ -0,0 +1,12 @@
+diff --git a/kcalc.cpp b/kcalc.cpp
+index a2e7148..f6ab135 100644
+--- a/kcalc.cpp
++++ b/kcalc.cpp
+@@ -34,6 +34,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
+ #include <QMenuBar>
+ #include <QShortcut>
+ #include <QStyle>
++#include <QButtonGroup>
+
+ #include <KAboutData>
+ #include <KAcceleratorManager>
diff --git a/kde5-utils/print-manager/PRE_BUILD
b/kde5-utils/print-manager/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/kde5-utils/print-manager/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde5-utils/print-manager/patches/qt5.11.patch
b/kde5-utils/print-manager/patches/qt5.11.patch
new file mode 100644
index 0000000..56e1a74
--- /dev/null
+++ b/kde5-utils/print-manager/patches/qt5.11.patch
@@ -0,0 +1,13 @@
+diff --git a/add-printer/PageAddPrinter.cpp b/add-printer/PageAddPrinter.cpp
+index c79c5a1..734dbeb 100644
+--- a/add-printer/PageAddPrinter.cpp
++++ b/add-printer/PageAddPrinter.cpp
+@@ -25,6 +25,7 @@
+
+ #include <QPainter>
+ #include <QPointer>
++#include <QRegExpValidator>
+ #include <QDebug>
+
+ #include <KIconLoader>
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (903608d846b3dd60d7610edbf7d95535f6719a22), Treeve Jelbert, 04/06/2018

Archive powered by MHonArc 2.6.24.

Top of Page