diff --git a/gc6.4.patch b/gc6.4.patch deleted file mode 100644 index 71147f7..0000000 --- a/gc6.4.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- acinclude.m4 -+++ acinclude.m4 -@@ -46,4 +46,3 @@ - ${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION) - ]) - --sinclude(libtool.m4) diff --git a/gc6.4.tar.bz2 b/gc6.4.tar.bz2 deleted file mode 100644 index 5819ec8..0000000 --- a/gc6.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d73a84ec25c90010836f027cee7a85f6a35295f600771daa99a47535762a4d3 -size 586767 diff --git a/inkscape-boehm-gc.patch b/inkscape-boehm-gc.patch deleted file mode 100644 index c8139f4..0000000 --- a/inkscape-boehm-gc.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -91,6 +91,13 @@ - ]) - ]) - -+AC_ARG_WITH(gc, "where is gc install located", [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build inkscape without gc])], -+ [with_gc="yes"]) -+test x"$with_gc" = xyes && with_gc="/usr" -+SAVE_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS -I$with_gc/include" -+SAVE_LDFLAGS="$LDFLAGS" -+LDFLAGS="$LDFLAGS -L$with_gc/lib" - AC_CHECK_HEADERS([gc.h gc/gc.h], - [ - # To test for the different required libs, I have to -@@ -98,12 +105,12 @@ - # desired function name. They're all in libgc. - # The "break" will exit from the top level - # AC_CHECK_HEADERS. -- gc_libs="" -+ gc_libs="-ldl" - AC_CHECK_LIB(gc, GC_init, - [gc_ok=yes; -- LIBS="-lgc $gc_libs $LIBS"; -+ LIBS="-lgc $gc_libs $LIBS -L$with_gc/lib"; - break], [gc_ok=no], [$gc_libs]) -- gc_libs="-lpthread" -+ gc_libs="-lpthread -ldl" - AC_CHECK_LIB(gc, GC_malloc, - [gc_ok=yes; - LIBS="-lgc $gc_libs $LIBS"; -@@ -120,31 +127,31 @@ - break], [gc_ok=no], [$gc_libs]) - break], - [gc_ok=no]) --if test "x$gc_ok" = "xyes"; then -- AC_MSG_CHECKING([libgc version 6.4+]) -- AC_RUN_IFELSE( -- [AC_LANG_SOURCE([[ -- #ifdef HAVE_GC_GC_H -- # include -- #else -- # include -- #endif -- #include -- extern unsigned GC_version; -- int main(void){ -- unsigned min = ((6 << 16) | (4 << 8) | 0); -- printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); -- if (GC_version>=min) return 0; -- return 1; -- }]])], -- [gc_ok=yes], -- [gc_ok=no] -- ) -- AC_MSG_RESULT([$gc_ok]) --fi --if test "x$gc_ok" != "xyes"; then -- AC_MSG_ERROR([libgc (the Boehm Conservative Collector) 6.4+, is needed to compile inkscape -- http://www.hpl.hp.com/personal/Hans_Boehm/gc]) --fi -+dnl if test "x$gc_ok" = "xyes"; then -+dnl AC_MSG_CHECKING([libgc version 6.4+]) -+dnl AC_RUN_IFELSE( -+dnl [AC_LANG_SOURCE([[ -+dnl #ifdef HAVE_GC_GC_H -+dnl # include -+dnl #else -+dnl # include -+dnl #endif -+dnl #include -+dnl extern unsigned GC_version; -+dnl int main(void){ -+dnl unsigned min = ((6 << 16) | (4 << 8) | 0); -+dnl printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); -+dnl if (GC_version>=min) return 0; -+dnl return 1; -+dnl }]])], -+dnl [gc_ok=yes], -+dnl [gc_ok=no] -+dnl ) -+dnl AC_MSG_RESULT([$gc_ok]) -+dnl fi -+dnl if test "x$gc_ok" != "xyes"; then -+dnl AC_MSG_ERROR([libgc (the Boehm Conservative Collector) 6.4+, is needed to compile inkscape -- http://www.hpl.hp.com/personal/Hans_Boehm/gc]) -+dnl fi - - AC_CHECK_HEADERS([malloc.h]) - AC_CHECK_FUNCS([mallinfo], [ diff --git a/inkscape-buffer-overrun.patch b/inkscape-buffer-overrun.patch deleted file mode 100644 index 3a4dc83..0000000 --- a/inkscape-buffer-overrun.patch +++ /dev/null @@ -1,84 +0,0 @@ -Index: inkscape-0.45.1/src/io/inkscapestream.h -=================================================================== ---- inkscape-0.45.1.orig/src/io/inkscapestream.h -+++ inkscape-0.45.1/src/io/inkscapestream.h -@@ -13,6 +13,7 @@ - - - #include -+#include - - namespace Inkscape - { -Index: inkscape-0.45.1/src/dom/cssparser.h -=================================================================== ---- inkscape-0.45.1.orig/src/dom/cssparser.h -+++ inkscape-0.45.1/src/dom/cssparser.h -@@ -71,6 +71,7 @@ public: - */ - virtual bool parseFile(const DOMString &str); - -+#include - - protected: - -Index: inkscape-0.45.1/src/dom/lsimpl.h -=================================================================== ---- inkscape-0.45.1.orig/src/dom/lsimpl.h -+++ inkscape-0.45.1/src/dom/lsimpl.h -@@ -35,6 +35,7 @@ - #include "events.h" - #include "traversal.h" - #include "ls.h" -+#include - - - #include "xmlreader.h" -Index: inkscape-0.45.1/src/dom/uri.h -=================================================================== ---- inkscape-0.45.1.orig/src/dom/uri.h -+++ inkscape-0.45.1/src/dom/uri.h -@@ -34,6 +34,7 @@ - - #include "dom.h" - -+#include - - namespace org - { -Index: inkscape-0.45.1/src/dom/xmlreader.h -=================================================================== ---- inkscape-0.45.1.orig/src/dom/xmlreader.h -+++ inkscape-0.45.1/src/dom/xmlreader.h -@@ -41,6 +41,7 @@ namespace w3c - namespace dom - { - -+#include - - - class XmlReader -Index: inkscape-0.45.1/src/dom/svg/svgparser.h -=================================================================== ---- inkscape-0.45.1.orig/src/dom/svg/svgparser.h -+++ inkscape-0.45.1/src/dom/svg/svgparser.h -@@ -43,6 +43,7 @@ namespace dom - namespace svg - { - -+#include - - class SvgParser - { -Index: inkscape-0.45.1/src/dom/util/ziptool.h -=================================================================== ---- inkscape-0.45.1.orig/src/dom/util/ziptool.h -+++ inkscape-0.45.1/src/dom/util/ziptool.h -@@ -37,6 +37,7 @@ - #include - #include - -+#include - - //######################################################################## - //# A D L E R 3 2 diff --git a/inkscape-bug-189159.patch b/inkscape-bug-189159.patch deleted file mode 100644 index 066b2bd..0000000 --- a/inkscape-bug-189159.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/desktop-style.cpp -=================================================================== ---- src/desktop-style.cpp.orig -+++ src/desktop-style.cpp -@@ -500,7 +500,7 @@ objects_query_fillstroke (GSList *object - // 2. Sum color, copy server from paint to paint_res - - if (paint_res->set && paint_effectively_set && paint->isColor()) { -- gfloat d[3]; -+ gfloat d[4]; - sp_color_get_rgb_floatv (&paint->value.color, d); - - // Check if this color is the same as previous diff --git a/inkscape-configure.patch b/inkscape-configure.patch deleted file mode 100644 index 5965c0e..0000000 --- a/inkscape-configure.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -33,7 +33,6 @@ - AC_LANG(C++) - AC_ISC_POSIX - AC_PROG_CXX --AM_PROG_CC_STDC - AM_PROG_AS - AC_HEADER_STDC - diff --git a/inkscape-swigfix.patch b/inkscape-swigfix.patch deleted file mode 100644 index 7407931..0000000 --- a/inkscape-swigfix.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/extension/script/inkscape_perl_wrap.cpp -+++ src/extension/script/inkscape_perl_wrap.cpp -@@ -776,14 +776,17 @@ - static void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, int (CPerlObj::*set)(SV *, MAGIC *), int (CPerlObj::*get)(SV *, MAGIC *)) { - #endif - MAGIC *mg; -+ MGVTBL *mgvtbl; - sv_magic(sv,sv,'U',(char *) name,strlen(name)); - mg = mg_find(sv,'U'); -- mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL)); -- mg->mg_virtual->svt_get = (SwigMagicFuncHack) get; -- mg->mg_virtual->svt_set = (SwigMagicFuncHack) set; -- mg->mg_virtual->svt_len = 0; -- mg->mg_virtual->svt_clear = 0; -- mg->mg_virtual->svt_free = 0; -+ mgvtbl = (MGVTBL *) malloc(sizeof(MGVTBL)); -+ memcpy((void*)mgvtbl, (const void*)mg, sizeof(MGVTBL)); -+ mgvtbl->svt_get = (SwigMagicFuncHack) get; -+ mgvtbl->svt_set = (SwigMagicFuncHack) set; -+ mgvtbl->svt_len = 0; -+ mgvtbl->svt_clear = 0; -+ mgvtbl->svt_free = 0; -+ mg->mg_virtual = mgvtbl; - } - - diff --git a/inkscape.changes b/inkscape.changes index d2b0657..351996e 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed May 13 02:53:30 CEST 2009 - vuntz@novell.com + +- Remove unneeded BuildRequires: libglade2-devel, + libgnomeprintui-devel, libgnomeui-devel, libwnck-devel, + loudmouth-devel +- Add BuildRequires: gc-devel, gnome-vfs2-devel +- Do not build gc inside this package and use the system-installed + one. Drop gc6.4.patch since we don't need to patch gc now :-) +- Drop inkscape-boehm-gc.patch: we just use the system-installed gc + now. +- Drop inkscape-swigfix.patch: I don't really see the point of + this. +- Drop inkscape-bug-189159.patch: the change is actually wrong, + looking at the code... +- Drop inkscape-configure.patch: not needed anymore. +- Drop inkscape-buffer-overrun.patch: doesn't appear to be needed + anymore. +- Tag inkscape-polyutil-newpoly.patch +- Remove non-existing --enable-db2html, --enable-gnome, + --with-gnome-print and --with-gc configure options. +- Use makeinstall. +- Do not package some files twice. + ------------------------------------------------------------------- Tue Apr 28 13:14:17 CEST 2009 - vuntz@novell.com diff --git a/inkscape.spec b/inkscape.spec index 9dab7d0..450e985 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -19,31 +19,25 @@ Name: inkscape -BuildRequires: boost-devel docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libMagick++-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libpoppler-glib-devel libwnck-devel libwpg-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files +BuildRequires: boost-devel docbook-toys fdupes gc-devel gcc-c++ gnome-vfs2-devel gtkmm24-devel intltool libMagick++-devel liblcms-devel libpoppler-glib-devel libwpg-devel libxslt-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files License: GPL v2 only; LGPL v2.1 only Group: Productivity/Graphics/Vector Editors Requires: ghostscript-fonts-std python-gtk pstoedit gzip /usr/bin/gs Summary: Inkscape Vector Illustration Program Version: 0.46 -Release: 66 +Release: 67 # package in <= NLD9 and SuSE Linux <= 9.1 Provides: sodipodi Obsoletes: sodipodi Source: %{name}-%{version}.tar.bz2 -Source1: gc6.4.tar.bz2 Source2: inkscape-split-extensions-extra.sh -Patch: %{name}-boehm-gc.patch #PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source. -Patch1: %{name}-packages.patch -Patch4: %{name}-swigfix.patch -Patch7: %{name}-bug-189159.patch -Patch8: %{name}-configure.patch -Patch10: gc6.4.patch -Patch13: %{name}-polyutil-newpoly.patch -Patch14: %{name}-buffer-overrun.patch +Patch1: inkscape-packages.patch +# PATCH-FIX-UPSTREAM inkscape-polyutil-newpoly.patch lp375771 +Patch13: inkscape-polyutil-newpoly.patch # PATCH-FIX-UPSTREAM inkscape-warnings.patch Patch15: inkscape-warnings.patch -# PATCH-FIX-UPSTREAM inkscape-gtk-clist.patch maw@novell.com -- https://bugs.launchpad.net/inkscape/+bug/238223 +# PATCH-FIX-UPSTREAM inkscape-gtk-clist.patch lp238223 maw@novell.com -- This is arguably a gtk+ bug (bgo536767) Patch16: inkscape-gtk-clist.patch # PATCH-FIX-UPSTREAM inkscape-lp237574-poppler.patch lp237574 vuntz@novell.com -- Fix compilation with latest poppler Patch17: inkscape-lp237574-poppler.patch @@ -424,22 +418,14 @@ Authors: %lang_package %prep -%setup -q -b 1 -%patch +%setup -q %patch1 -%patch4 -%patch7 -%patch8 %patch13 -%patch14 -p1 %patch15 -p0 %patch16 -p0 %patch17 -p1 %patch18 -p1 %patch19 -p0 -pushd ../gc* -%patch10 -popd patch <