- fixed a crash when closing a hyphenator object (#537677)
This commit is contained in:
parent
3ab5071688
commit
2c4b28ee72
26
scribus-1.3.5-check-hdict.patch
Normal file
26
scribus-1.3.5-check-hdict.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From dedea3f94802f0f9d9adef4c48f8061282baf776 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
|
Date: Mon, 23 Nov 2009 10:13:48 +0100
|
||||||
|
Subject: [PATCH] check hdict value before freeing the hyphenator
|
||||||
|
|
||||||
|
---
|
||||||
|
Scribus/scribus/hyphenator.cpp | 3 ++-
|
||||||
|
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Scribus/scribus/hyphenator.cpp b/Scribus/scribus/hyphenator.cpp
|
||||||
|
index 614db47..4da4467 100644
|
||||||
|
--- a/Scribus/scribus/hyphenator.cpp
|
||||||
|
+++ b/Scribus/scribus/hyphenator.cpp
|
||||||
|
@@ -90,7 +90,8 @@ Hyphenator::Hyphenator(QWidget* parent, ScribusDoc *dok) : QObject( parent ),
|
||||||
|
|
||||||
|
Hyphenator::~Hyphenator()
|
||||||
|
{
|
||||||
|
- hnj_hyphen_free(hdict);
|
||||||
|
+ if (hdict)
|
||||||
|
+ hnj_hyphen_free(hdict);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Hyphenator::NewDict(const QString& name)
|
||||||
|
--
|
||||||
|
1.6.3.3
|
||||||
|
|
11
scribus.spec
11
scribus.spec
@ -1,6 +1,6 @@
|
|||||||
Name: scribus
|
Name: scribus
|
||||||
Version: 1.3.5.1
|
Version: 1.3.5.1
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Summary: DeskTop Publishing application written in Qt
|
Summary: DeskTop Publishing application written in Qt
|
||||||
|
|
||||||
@ -8,7 +8,12 @@ Group: Applications/Productivity
|
|||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.scribus.net/
|
URL: http://www.scribus.net/
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=506074
|
||||||
|
# http://bugs.scribus.net/view.php?id=8232
|
||||||
Patch0: %{name}-1.3.5-system-hyphen.patch
|
Patch0: %{name}-1.3.5-system-hyphen.patch
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=537677
|
||||||
|
# http://bugs.scribus.net/view.php?id=8595
|
||||||
|
Patch1: %{name}-1.3.5-check-hdict.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
@ -76,6 +81,7 @@ Obsoletes: %{name}-doc < 1.3.5-0.12.beta
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1 -b .system-hyphen
|
%patch0 -p1 -b .system-hyphen
|
||||||
|
%patch1 -p2 -b .check-hdict
|
||||||
|
|
||||||
# recode man page to UTF-8
|
# recode man page to UTF-8
|
||||||
pushd scribus/manpages
|
pushd scribus/manpages
|
||||||
@ -183,6 +189,9 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 25 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-5
|
||||||
|
- fixed a crash when closing a hyphenator object (#537677)
|
||||||
|
|
||||||
* Thu Aug 27 2009 Tomas Mraz <tmraz@redhat.com> - 1.3.5.1-4
|
* Thu Aug 27 2009 Tomas Mraz <tmraz@redhat.com> - 1.3.5.1-4
|
||||||
- rebuilt with new openssl
|
- rebuilt with new openssl
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user