rpms/inkscape/F-8 inkscape-0.46pre1-gcc43.patch, NONE, 1.1 inkscape-0.46pre1-vectors.patch, NONE, 1.1 inkscape-16571-cxxinclude.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 inkscape.spec, 1.39, 1.40 sources, 1.12, 1.13 inkscape-0.44.1-psinput.patch, 1.1, NONE inkscape-0.45-python.patch, 1.2, NONE inkscape-0.45.1-gtkprint.patch, 1.2, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Thu Feb 14 02:34:09 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/inkscape/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4581/F-8
Modified Files:
.cvsignore inkscape.spec sources
Added Files:
inkscape-0.46pre1-gcc43.patch inkscape-0.46pre1-vectors.patch
inkscape-16571-cxxinclude.patch
Removed Files:
inkscape-0.44.1-psinput.patch inkscape-0.45-python.patch
inkscape-0.45.1-gtkprint.patch
Log Message:
Merge from devel
inkscape-0.46pre1-gcc43.patch:
--- NEW FILE inkscape-0.46pre1-gcc43.patch ---
The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in
unnecessary dependencies which aren't requested by the standard.
This fixes build for gcc-4.3
Lubomir Kundrak <lkundrak at redhat.com>
https://bugs.launchpad.net/inkscape/+bug/190017
diff -urp inkscape-0.45.1+0.46pre1.orig/src/display/nr-filter-slot.cpp inkscape-0.45.1+0.46pre1/src/display/nr-filter-slot.cpp
--- inkscape-0.45.1+0.46pre1.orig/src/display/nr-filter-slot.cpp 2008-01-15 00:24:31.000000000 +0100
+++ inkscape-0.45.1+0.46pre1/src/display/nr-filter-slot.cpp 2008-02-07 20:53:36.000000000 +0100
@@ -14,6 +14,7 @@
*/
#include <assert.h>
+#include <cstring>
#include "display/nr-arena-item.h"
#include "display/nr-filter-types.h"
diff -urp inkscape-0.45.1+0.46pre1.orig/src/live_effects/lpeobject-reference.cpp inkscape-0.45.1+0.46pre1/src/live_effects/lpeobject-reference.cpp
--- inkscape-0.45.1+0.46pre1.orig/src/live_effects/lpeobject-reference.cpp 2008-01-15 00:24:20.000000000 +0100
+++ inkscape-0.45.1+0.46pre1/src/live_effects/lpeobject-reference.cpp 2008-02-07 20:53:36.000000000 +0100
@@ -6,6 +6,8 @@
* Released under GNU GPL, read the file 'COPYING' for more information.
*/
+#include <cstring>
+
#include "enums.h"
#include "live_effects/lpeobject-reference.h"
#include "live_effects/lpeobject.h"
diff -urp inkscape-0.45.1+0.46pre1.orig/src/syseq.h inkscape-0.45.1+0.46pre1/src/syseq.h
--- inkscape-0.45.1+0.46pre1.orig/src/syseq.h 2008-01-15 00:24:28.000000000 +0100
+++ inkscape-0.45.1+0.46pre1/src/syseq.h 2008-02-07 20:53:36.000000000 +0100
@@ -15,6 +15,7 @@
#include <iostream>
#include <iomanip>
#include <vector>
+#include <algorithm>
#include "math.h"
namespace SysEq {
diff -urp inkscape-0.45.1+0.46pre1.orig/src/ui/dialog/filter-effects-dialog.h inkscape-0.45.1+0.46pre1/src/ui/dialog/filter-effects-dialog.h
--- inkscape-0.45.1+0.46pre1.orig/src/ui/dialog/filter-effects-dialog.h 2008-02-01 05:37:40.000000000 +0100
+++ inkscape-0.45.1+0.46pre1/src/ui/dialog/filter-effects-dialog.h 2008-02-07 20:53:36.000000000 +0100
@@ -12,6 +12,8 @@
#ifndef INKSCAPE_UI_DIALOG_FILTER_EFFECTS_H
#define INKSCAPE_UI_DIALOG_FILTER_EFFECTS_H
+#include <memory>
+
#include <gtkmm/adjustment.h>
#include <gtkmm/alignment.h>
#include <gtkmm/box.h>
diff -urp inkscape-0.45.1+0.46pre1.orig/src/widgets/ruler.h inkscape-0.45.1+0.46pre1/src/widgets/ruler.h
--- inkscape-0.45.1+0.46pre1.orig/src/widgets/ruler.h 2008-02-01 05:37:36.000000000 +0100
+++ inkscape-0.45.1+0.46pre1/src/widgets/ruler.h 2008-02-07 20:53:36.000000000 +0100
@@ -15,7 +15,7 @@
#include <gtk/gtkruler.h>
#include "sp-metric.h"
-#include <iostream.h>
+#include <iostream>
#include <glib.h>
inkscape-0.46pre1-vectors.patch:
--- NEW FILE inkscape-0.46pre1-vectors.patch ---
Avoid copying a vector when start offset is beyond the end.
This fixes a segfault when compiled with gcc-4.3 (#432220)
Lubomir Kundrak <lkundrak at redhat.com>
diff -urp inkscape-0.45.1+0.46pre1.orig/src/sp-text.cpp inkscape-0.45.1+0.46pre1/src/sp-text.cpp
--- inkscape-0.45.1+0.46pre1.orig/src/sp-text.cpp 2008-01-15 00:24:22.000000000 +0100
+++ inkscape-0.45.1+0.46pre1/src/sp-text.cpp 2008-02-13 20:44:34.000000000 +0100
@@ -749,8 +749,10 @@ void TextTagAttributes::mergeInto(Inksca
void TextTagAttributes::mergeSingleAttribute(std::vector<SVGLength> *output_list, std::vector<SVGLength> const &parent_list, unsigned parent_offset, std::vector<SVGLength> const *overlay_list)
{
if (overlay_list == NULL) {
- output_list->resize(std::max(0, (int)parent_list.size() - (int)parent_offset));
- std::copy(parent_list.begin() + parent_offset, parent_list.end(), output_list->begin());
+ if (parent_offset < parent_list.size()) {
+ output_list->resize((int)parent_list.size() - (int)parent_offset);
+ std::copy(parent_list.begin() + parent_offset, parent_list.end(), output_list->begin());
+ }
} else {
output_list->clear();
output_list->reserve(std::max((int)parent_list.size() - (int)parent_offset, (int)overlay_list->size()));
inkscape-16571-cxxinclude.patch:
--- NEW FILE inkscape-16571-cxxinclude.patch ---
--- inkscape-16571/src/Makefile.in.orig 2007-11-29 13:38:13.000000000 +0100
+++ inkscape-16571/src/Makefile.in 2007-11-29 13:38:29.000000000 +0100
@@ -317,7 +317,8 @@
$(POPPLER_GLIB_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
- -I$(top_srcdir)/cxxtest
+ -I$(top_srcdir)/cxxtest \
+ -I$(top_srcdir)/src/extension/script
@PLATFORM_WIN32_TRUE at win32_sources = winmain.cpp registrytool.cpp registrytool.h
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Mar 2007 09:29:43 -0000 1.12
+++ .cvsignore 14 Feb 2008 02:33:28 -0000 1.13
@@ -1 +1 @@
-inkscape-0.45.1.tar.gz
+inkscape-0.45.1+0.46pre1.tar.bz2
Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/inkscape.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- inkscape.spec 8 Jan 2008 13:37:10 -0000 1.39
+++ inkscape.spec 14 Feb 2008 02:33:28 -0000 1.40
@@ -1,18 +1,16 @@
-%define _with_inkboard 1
-
Name: inkscape
-Version: 0.45.1
-Release: 5%{?dist}
+Version: 0.45.1+0.46pre1
+Release: 3%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
URL: http://inkscape.sourceforge.net/
-Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.gz
-Patch0: inkscape-0.44.1-psinput.patch
-Patch1: inkscape-0.45-python.patch
-Patch2: inkscape-0.45.1-gtkprint.patch
-Patch3: inkscape-0.45.1-desktop.patch
+Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
+Patch0: inkscape-16571-cxxinclude.patch
+Patch1: inkscape-0.45.1-desktop.patch
+Patch2: inkscape-0.46pre1-gcc43.patch
+Patch3: inkscape-0.46pre1-vectors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: atk-devel
@@ -20,11 +18,10 @@
BuildRequires: freetype-devel
BuildRequires: gc-devel >= 6.4
BuildRequires: gettext
-BuildRequires: gtkmm24-devel
+BuildRequires: gtkmm24-devel >= 2.8.0
BuildRequires: gtkspell-devel
BuildRequires: gnome-vfs2-devel >= 2.0
BuildRequires: libpng-devel >= 1.2
-BuildRequires: libsigc++20-devel >= 2.0.12
BuildRequires: libxml2-devel >= 2.6.11
BuildRequires: libxslt-devel >= 1.0.15
BuildRequires: pango-devel
@@ -35,24 +32,20 @@
BuildRequires: dos2unix
BuildRequires: perl-XML-Parser
BuildRequires: python-devel
-%if %{fedora} > 7
+BuildRequires: poppler-devel >= 0.5.9
BuildRequires: popt-devel
-%else
-BuildRequires: popt
-%endif
-# The following are needed due to gtkprint patch changing configure.ac
-BuildRequires: autoconf automake17 intltool
-%{?_with_inkboard:BuildRequires: loudmouth-devel >= 1.0}
+BuildRequires: loudmouth-devel >= 1.0
+BuildRequires: boost-devel
Requires: pstoedit
Requires: perl(Image::Magick)
Requires: numpy
Requires: PyXML
+Requires: python-lxml
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
-
%description
Inkscape is a vector-based drawing program, like CorelDraw® or Adobe
Illustrator® from the proprietary software world, and Sketch or Karbon14 from
@@ -69,19 +62,16 @@
%prep
%setup -q
-%patch0 -p1 -b .psinput
-%patch1 -p1 -b .python
-%patch2 -p0 -b .gtkprint
-%patch3 -p1 -b .desktop
+%patch0 -p1 -b .cxxinclude
+%patch1 -p1 -b .desktop
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .vectors
find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
dos2unix share/extensions/*.py
%build
-intltoolize --force
-autoconf
-autoheader
%configure \
--disable-dependency-tracking \
--with-xinerama \
@@ -91,14 +81,15 @@
--with-gnome-vfs \
--with-inkjar \
--enable-inkboard \
---enable-lcms
+--enable-lcms \
+--enable-poppler-cairo
make %{?_smp_mflags}
%install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -106,12 +97,12 @@
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
desktop-file-install --vendor fedora --delete-original \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
%post
@@ -134,8 +125,24 @@
%changelog
-* Tue Jan 8 2008 Denis Leroy <denis at poolshark.org> - 0.45.1-5
-- Updated gtkprint patch to restore eps export
+* Wed Feb 13 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-3
+- Fix crash when adding text objects (#432220)
+
+* Thu Feb 07 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-2
+- Build with gcc-4.3
+
+* Wed Feb 06 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-1
+- 0.46 prerelease
+- Minor cosmetic changes to satisfy the QA script
+- Dependency on Boost
+- Inkboard is not optional
+- Merge from Denis Leroy's svn16571 snapshot:
+- Require specific gtkmm24-devel versions
+- enable-poppler-cairo
+- No longer BuildRequire libsigc++20-devel
+
+* Wed Dec 5 2007 Denis Leroy <denis at poolshark.org> - 0.45.1-5
+- Rebuild with new openssl
* Sun Dec 02 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-4
- Added missing dependencies for modules (#301881)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 21 Mar 2007 09:29:43 -0000 1.12
+++ sources 14 Feb 2008 02:33:28 -0000 1.13
@@ -1 +1 @@
-1ac63dfd5d78a676599bf5cf6d22e493 inkscape-0.45.1.tar.gz
+2b3b31cb92c558a68534f190d31b0d72 inkscape-0.45.1+0.46pre1.tar.bz2
--- inkscape-0.44.1-psinput.patch DELETED ---
--- inkscape-0.45-python.patch DELETED ---
--- inkscape-0.45.1-gtkprint.patch DELETED ---
More information about the fedora-extras-commits
mailing list