From 6d0eecb2432d2ffca7b6344cf5aaf01b040396f5d1a9a5c593a3c740f77b546f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 8 Mar 2007 16:58:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=3 --- ...us-1.3.3.7_string-literal-comparsion.patch | 22 +++++++++++++++++++ scribus.changes | 6 +++++ scribus.spec | 9 ++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 scribus-1.3.3.7_string-literal-comparsion.patch diff --git a/scribus-1.3.3.7_string-literal-comparsion.patch b/scribus-1.3.3.7_string-literal-comparsion.patch new file mode 100644 index 0000000..ecaeee3 --- /dev/null +++ b/scribus-1.3.3.7_string-literal-comparsion.patch @@ -0,0 +1,22 @@ +--- scribus/colorm.cpp ++++ scribus/colorm.cpp +@@ -210,7 +210,7 @@ + ColorListBox::ColorListBox(QWidget * parent, const char * name, WFlags f) + : QListBox(parent, name, f) + { +- if (name == "") ++ if (name[0] == 0) + setName("ColorListBox"); + } + +--- scribus/plugins/scriptplugin/cmdcolor.cpp ++++ scribus/plugins/scriptplugin/cmdcolor.cpp +@@ -147,7 +147,7 @@ + char *Repl = const_cast(CommonStrings::None.latin1()); + if (!PyArg_ParseTuple(args, "es|es", "utf-8", &Name, "utf-8", &Repl)) + return NULL; +- if (Name == "") ++ if (Name[0] == 0) + { + PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot delete a color with an empty name.","python error")); + return NULL; diff --git a/scribus.changes b/scribus.changes index 90cb650..fa7af18 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 8 15:02:42 CET 2007 - pgajdos@suse.cz + +- fixed 'warning: comparsion with string literal' (#233016, #228963) +- string-literal-comparsion.patch + ------------------------------------------------------------------- Sun Jan 28 18:52:37 CET 2007 - stbinner@suse.de diff --git a/scribus.spec b/scribus.spec index 20a44c9..845ad58 100644 --- a/scribus.spec +++ b/scribus.spec @@ -28,8 +28,9 @@ Suggests: AdobeICCProfiles Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words Version: 1.3.3.7 -Release: 1 +Release: 7 Source: %{name}-%{version}.tar.bz2 +Patch: %{name}-%{version}_string-literal-comparsion.patch URL: http://www.scribus.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Open Source Page Layout and Desktop Publishing (DTP) @@ -100,6 +101,7 @@ Authors: %define prefix /usr %prep %setup -q +%patch %build . /etc/opt/kde3/common_options @@ -168,7 +170,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_prefix}/include/scribus -%changelog -n scribus +%changelog +* Thu Mar 08 2007 - pgajdos@suse.cz +- fixed 'warning: comparsion with string literal' (#233016, #228963) +- string-literal-comparsion.patch * Sun Jan 28 2007 - stbinner@suse.de - Updated to bugfix release 1.3.3.7 * Thu Nov 09 2006 - sbrabec@suse.cz