RPM Packaging: fix kdbusnotification

pull/3/head
François Andriot 11 years ago
parent c7debbe08c
commit 23fd9a7e70

@ -42,6 +42,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: kdbusnotification-14.0.0-fix_utf8.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -67,6 +69,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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/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" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"

@ -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,
Loading…
Cancel
Save