rpms/twinkle/F-10 twinkle-1.3.2-command-line-segfault.patch, NONE, 1.1 twinkle.spec, 1.15, 1.16
Kevin Fenzi
kevin at fedoraproject.org
Wed Dec 10 20:59:06 UTC 2008
Author: kevin
Update of /cvs/extras/rpms/twinkle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29852
Modified Files:
twinkle.spec
Added Files:
twinkle-1.3.2-command-line-segfault.patch
Log Message:
Add patch to fix command line segfault (fixes #473677)
twinkle-1.3.2-command-line-segfault.patch:
--- NEW FILE twinkle-1.3.2-command-line-segfault.patch ---
diff -Nur twinkle-1.3.2.orig/src/gui/main.cpp twinkle-1.3.2/src/gui/main.cpp
--- twinkle-1.3.2.orig/src/gui/main.cpp 2008-08-02 09:05:34.000000000 -0600
+++ twinkle-1.3.2/src/gui/main.cpp 2008-12-09 21:06:52.000000000 -0700
@@ -710,7 +710,7 @@
// Check if the previous Twinkle session was stopped by a system
// shutdow and now gets restored.
- if (qa->isSessionRestored()) {
+ if (qa && qa->isSessionRestored()) {
QString msg = "Restore session: " + qa->sessionId();
log_file->write_report(msg.ascii(), "::main");
Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/F-10/twinkle.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- twinkle.spec 3 Sep 2008 20:08:39 -0000 1.15
+++ twinkle.spec 10 Dec 2008 20:58:34 -0000 1.16
@@ -1,6 +1,6 @@
Name: twinkle
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A SIP Soft Phone
Group: Applications/Internet
@@ -8,6 +8,7 @@
URL: http://www.twinklephone.com
Source0: http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
Patch0: twinkle-1.1-msg.patch
+Patch1: twinkle-1.3.2-command-line-segfault.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: commoncpp2-devel
@@ -28,6 +29,7 @@
%prep
%setup -q
%patch0 -p1 -b .msg
+%patch1 -p1 -b .segfault
%build
%configure
@@ -60,6 +62,9 @@
%{_datadir}/applications/fedora-twinkle.desktop
%changelog
+* Tue Dec 09 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-2
+- Add patch to fix command line segfault (fixes #473677)
+
* Tue Sep 02 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-1
- Update to 1.3.2
More information about the fedora-extras-commits
mailing list