diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-20 11:59:43 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-20 11:59:43 +0200 |
| commit | 23fd9a7e7030c253cb0778da8702c44dc6288b46 (patch) | |
| tree | fef9822b6a030531e885f9af27e6366f58afa244 | |
| parent | c7debbe08c7830f26b7080b5f84381202983e5b6 (diff) | |
| download | tde-packaging-23fd9a7e7030c253cb0778da8702c44dc6288b46.tar.gz tde-packaging-23fd9a7e7030c253cb0778da8702c44dc6288b46.zip | |
RPM Packaging: fix kdbusnotification
| -rw-r--r-- | redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec | 3 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec index 4c4db932d..f4e8b815f 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec @@ -42,6 +42,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: kdbusnotification-14.0.0-fix_utf8.patch + BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -67,6 +69,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .utf8 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" diff --git a/redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch b/redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch new file mode 100644 index 000000000..46941f46f --- /dev/null +++ b/redhat/tdelibs/tdelibs-14.0.0-passivepopup_utf8.patch @@ -0,0 +1,13 @@ +--- trinity-tdelibs-14.0.0~pre599+bae79307/tdeui/kpassivepopup.cpp.ORI 2013-07-19 22:31:16.453073343 +0200 ++++ trinity-tdelibs-14.0.0~pre599+bae79307/tdeui/kpassivepopup.cpp 2013-07-19 22:31:55.288484612 +0200 +@@ -120,7 +120,9 @@ + const TQPixmap &icon ) + { + // kdDebug() << "KPassivePopup::setView " << caption << ", " << text << endl; +- setView( standardView( caption, text, icon, this ) ); ++ const TQString captionISO = TQString::fromLocal8Bit(caption.latin1()); ++ const TQString textISO = TQString::fromLocal8Bit(text.latin1()); ++ setView( standardView( captionISO, textISO, icon, this ) ); + } + + TQVBox * KPassivePopup::standardView( const TQString& caption, |