From a3b862075dfb95d407dba59baf28212a7faac0e2 Mon Sep 17 00:00:00 2001 From: François Andriot Date: Wed, 31 Jul 2013 10:52:13 +0200 Subject: RPM Packaging: update kdbusnotification --- .../kdbusnotification-14.0.0-fix_utf8.patch | 15 --------------- .../kdbusnotification/kdbusnotification-14.0.0.spec | 19 +++++++++++++------ .../kdbusnotification-3.5.13.2-fix_utf8.patch | 15 +++++++++++++++ .../kdbusnotification/kdbusnotification-3.5.13.2.spec | 2 +- 4 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch create mode 100644 redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch deleted file mode 100644 index 4ed8c1c52..000000000 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200 -+++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200 -@@ -231,9 +231,10 @@ - } - - // Send a notification request to KDE here... -- TQString messageText = TQString(body); -+ TQString messageCaption = TQString::fromLocal8Bit(summary); -+ TQString messageText = TQString::fromLocal8Bit(body); - -- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y); -+ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y); - - return_id = 0; - diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec index f4e8b815f..7836a2311 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec @@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg} Summary: a DBUS notification service [Trinity] Version: 0.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -42,8 +42,6 @@ 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} @@ -69,7 +67,6 @@ 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" @@ -88,8 +85,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ --disable-rpath \ - --enable-closure + \ + --with-extra-includes=%{tde_includedir}/tqt %__make %{?_smp_mflags} @@ -114,9 +118,12 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 0.1-5 +* Mon Jul 29 2013 Francois Andriot - 0.1-6 - Initial release for TDE 14.0.0 +* Sun Jul 28 2013 Francois Andriot - 0.1-5 +- Fix UTF8 messages + * Mon Jun 03 2013 Francois Andriot - 0.1-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch new file mode 100644 index 000000000..4ed8c1c52 --- /dev/null +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch @@ -0,0 +1,15 @@ +--- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200 ++++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200 +@@ -231,9 +231,10 @@ + } + + // Send a notification request to KDE here... +- TQString messageText = TQString(body); ++ TQString messageCaption = TQString::fromLocal8Bit(summary); ++ TQString messageText = TQString::fromLocal8Bit(body); + +- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y); ++ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y); + + return_id = 0; + diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec index c76b84f2b..d371d5669 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec @@ -42,7 +42,7 @@ 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 +Patch1: kdbusnotification-3.5.13.2-fix_utf8.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= %{tde_version} -- cgit v1.2.3