Hello community, here is the log from the commit of package kcm-fcitx for openSUSE:12.3 checked in at 2013-02-05 11:07:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kcm-fcitx (Old) and /work/SRC/openSUSE:12.3/.kcm-fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcm-fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/kcm-fcitx/kcm-fcitx.changes 2013-01-31 01:21:04.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kcm-fcitx.new/kcm-fcitx.changes 2013-02-05 11:07:24.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 26 18:47:11 UTC 2013 - i@marguerite.su + +- update version 0.4.2 + * Add support for new custom configuration ui. +- kcm-fcitx-0.4.2-compat-qt474.patch + * fix build with qt 4.7.4 under 12.1 and below. + * remove next release + +------------------------------------------------------------------- Old: ---- kcm-fcitx-0.4.1.tar.bz2 New: ---- kcm-fcitx-0.4.2-compat-qt474.patch kcm-fcitx-0.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.nb945n/_old 2013-02-05 11:07:24.000000000 +0100 +++ /var/tmp/diff_new_pack.nb945n/_new 2013-02-05 11:07:24.000000000 +0100 @@ -19,7 +19,7 @@ %define pkgname fcitx-config-kde4 Name: kcm-fcitx -Version: 0.4.1 +Version: 0.4.2 Release: 0 Summary: KDE control module for Fcitx License: GPL-2.0+ @@ -28,6 +28,8 @@ #Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.bz2 Source1: input-keyboard.svg +# fix-for-opensuse wengxt@gmail.com - fix qt 4.7 builds +Patch1: kcm-fcitx-0.4.2-compat-qt474.patch Obsoletes: %{name} < 0.2.0 Provides: %{name} = %{version} BuildRequires: fcitx-devel @@ -81,6 +83,9 @@ %prep %setup -q -n %{name}-%{version} +%if 0%{?suse_version} <= 1210 +%patch1 -p1 +%endif %build %{__mkdir} -pv build ++++++ kcm-fcitx-0.4.2-compat-qt474.patch ++++++ diff --git a/src/fontbutton.cpp b/src/fontbutton.cpp index 5a20989..cd50e63 100644 --- a/src/fontbutton.cpp +++ b/src/fontbutton.cpp @@ -75,10 +75,13 @@ void FontButton::setFont(const QFont& font) { m_font = font; QString style; +#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) if (!font.styleName().isEmpty()) { style = font.styleName(); } - else { + else +#endif + { QStringList styles; if (font.bold()) styles << "Bold"; ++++++ kcm-fcitx-0.4.1.tar.bz2 -> kcm-fcitx-0.4.2.tar.bz2 ++++++ ++++ 4613 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org