Hello community,

here is the log from the commit of package fcitx-qt5 for openSUSE:Factory 
checked in at 2018-04-29 19:37:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx-qt5 (Old)
 and      /work/SRC/openSUSE:Factory/.fcitx-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fcitx-qt5"

Sun Apr 29 19:37:37 2018 rev:15 rq:602233 version:1.2.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx-qt5/fcitx-qt5.changes      2018-02-13 
10:29:48.308225137 +0100
+++ /work/SRC/openSUSE:Factory/.fcitx-qt5.new/fcitx-qt5.changes 2018-04-29 
19:37:38.937751398 +0200
@@ -1,0 +2,6 @@
+Sat Apr 28 06:50:53 UTC 2018 - [email protected]
+
+- Add upstream patch fix-compilation-with-qt-5.11.patch:
+  * Fix compilation with Qt 5.11 (missing include)
+
+-------------------------------------------------------------------

New:
----
  fix-compilation-with-qt-5.11.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fcitx-qt5.spec ++++++
--- /var/tmp/diff_new_pack.htUxjb/_old  2018-04-29 19:37:39.677724262 +0200
+++ /var/tmp/diff_new_pack.htUxjb/_new  2018-04-29 19:37:39.681724115 +0200
@@ -20,11 +20,13 @@
 Version:        1.2.2
 Release:        0
 Summary:        Fcitx QT5 Input Context
-License:        GPL-2.0+ AND GPL-3.0+ AND BSD-3-Clause
+License:        GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause
 Group:          System/I18n/Chinese
 Url:            https://github.com/fcitx/fcitx-qt5
 Source:         https://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM: fix compilation with Qt 5.11 (missing include)
+Patch0:         fix-compilation-with-qt-5.11.patch
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fcitx-devel >= 4.2.9.1
@@ -53,6 +55,7 @@
 
 %prep
 %setup -q
+%autopatch -p1
 
 %build
 %cmake ..

++++++ fix-compilation-with-qt-5.11.patch ++++++
>From af033e3d5305108eecc568adff7f8b2da5831ed6 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <[email protected]>
Date: Sun, 25 Mar 2018 10:16:16 -0700
Subject: [PATCH] Fix #34

Add include <QIcon>
---
 quickphrase-editor/batchdialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickphrase-editor/batchdialog.cpp 
b/quickphrase-editor/batchdialog.cpp
index 5b4c72c..4038db5 100644
--- a/quickphrase-editor/batchdialog.cpp
+++ b/quickphrase-editor/batchdialog.cpp
@@ -17,6 +17,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QIcon>
 #include "batchdialog.h"
 #include "common.h"
 #include "ui_batchdialog.h"

Reply via email to