diff --git a/.cvsignore b/.cvsignore index cd560e7..86c4361 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -inkscape-0.43.tar.bz2 +inkscape-0.44.tar.bz2 diff --git a/inkscape-0.42-GC-check.patch b/inkscape-0.42-GC-check.patch deleted file mode 100644 index aba9778..0000000 --- a/inkscape-0.42-GC-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure ---- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 -+++ inkscape-0.42/configure 2005-08-18 23:55:52.000000000 +0200 -@@ -23003,7 +23003,7 @@ - gc_ok=no - fi - -- gc_libs="-lpthread" -+ gc_libs="" - echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5 - echo $ECHO_N "checking for GC_malloc in -lgc... $ECHO_C" >&6 - if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then -@@ -23147,7 +23147,7 @@ - gc_ok=no - fi - -- gc_libs="-lpthread $lt_cv_dlopen_libs" -+ gc_libs="$lt_cv_dlopen_libs" - echo "$as_me:$LINENO: checking for GC_free in -lgc" >&5 - echo $ECHO_N "checking for GC_free in -lgc... $ECHO_C" >&6 - if test "${ac_cv_lib_gc_GC_free+set}" = set; then diff --git a/inkscape-0.43-null-conversion.patch b/inkscape-0.43-null-conversion.patch deleted file mode 100644 index 09a3900..0000000 --- a/inkscape-0.43-null-conversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ui/dialog/align-and-distribute.cpp -+++ src/ui/dialog/align-and-distribute.cpp -@@ -955,7 +955,7 @@ - break; - - } // end of switch statement -- return NULL; -+ return (std::list::iterator)NULL; - } - - AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const { diff --git a/inkscape-0.43-qualification.patch b/inkscape-0.43-qualification.patch deleted file mode 100644 index 9da731c..0000000 --- a/inkscape-0.43-qualification.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- src/dialogs/tiledialog.h -+++ src/dialogs/tiledialog.h -@@ -58,7 +58,7 @@ - /** - * Respond to selection change - */ -- void TileDialog::updateSelection(); -+ void updateSelection(); - - - /** ---- src/extension/internal/ps.h -+++ src/extension/internal/ps.h -@@ -36,10 +36,10 @@ - - void print_bpath (SVGOStringStream &os, const NArtBpath *bp); - -- void PrintPS::print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox); -- void PrintPS::print_stroke_style (SVGOStringStream &os, const SPStyle *style); -+ void print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox); -+ void print_stroke_style (SVGOStringStream &os, const SPStyle *style); - -- const char* PrintPS::PSFontName (const SPStyle *style); -+ const char* PSFontName (const SPStyle *style); - - unsigned int print_image (FILE *ofp, guchar *px, unsigned int width, unsigned int height, unsigned int rs, - const NRMatrix *transform); ---- src/jabber_whiteboard/pedroxmpp.cpp -+++ src/jabber_whiteboard/pedroxmpp.cpp -@@ -614,7 +614,7 @@ - static void hash(unsigned char *dataIn, - unsigned long len, unsigned char *digest); - -- static DOMString Md5::hashHex(unsigned char *dataIn, unsigned long len); -+ static DOMString hashHex(unsigned char *dataIn, unsigned long len); - - /** - * Initialize the context (also zeroizes contents) ---- src/jabber_whiteboard/pedroxmpp.h -+++ src/jabber_whiteboard/pedroxmpp.h -@@ -746,7 +746,7 @@ - * - */ - virtual std::vector -- XmppClient::groupChatGetUserList(const DOMString &groupJid); -+ groupChatGetUserList(const DOMString &groupJid); - - /** - * ---- src/libavoid/connector.h -+++ src/libavoid/connector.h -@@ -59,7 +59,7 @@ - bool isInitialised(void); - void unInitialise(void); - void setCallback(void (*cb)(void *), void *ptr); -- void ConnRef::handleInvalid(void); -+ void handleInvalid(void); - int generatePath(Point p0, Point p1); - void makePathInvalid(void); - ---- src/livarot/Path.h -+++ src/livarot/Path.h -@@ -198,7 +198,7 @@ - cut_position* CurvilignToPosition(int nbCv,double* cvAbs,int &nbCut); - cut_position PointToCurvilignPosition(NR::Point const &pos) const; - //Should this take a cut_position as a param? -- double Path::PositionToLength(int piece, double t); -+ double PositionToLength(int piece, double t); - - // caution: not tested on quadratic b-splines, most certainly buggy - void ConvertPositionsToMoveTo(int nbPos,cut_position* poss); ---- src/ui/dialog/aboutbox.h -+++ src/ui/dialog/aboutbox.h -@@ -28,7 +28,7 @@ - class AboutBoxChild: public Gtk::Dialog - { - public: -- AboutBoxChild::AboutBoxChild(Gtk::Window& parent, gchar * title) -+ AboutBoxChild(Gtk::Window& parent, gchar * title) - : Gtk::Dialog(title,parent) {}; - protected: - virtual void on_response(int response_id); diff --git a/inkscape.spec b/inkscape.spec index 24ae882..e1d87fc 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,35 +1,40 @@ Name: inkscape -Version: 0.43 -Release: 3%{?dist} +Version: 0.44 +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 -Patch0: inkscape-0.42-GC-check.patch -Patch1: inkscape-0.43-null-conversion.patch -Patch2: inkscape-0.43-qualification.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel BuildRequires: desktop-file-utils BuildRequires: freetype-devel -BuildRequires: gc-devel +BuildRequires: gc-devel >= 6.4 BuildRequires: gettext BuildRequires: gtkmm24-devel +BuildRequires: gtkspell-devel BuildRequires: libart_lgpl-devel >= 2.3.10 BuildRequires: libgnomeprintui22-devel >= 2.2.0 -BuildRequires: gnome-vfs2-devel +BuildRequires: gnome-vfs2-devel >= 2.0 BuildRequires: libpng-devel BuildRequires: libsigc++20-devel BuildRequires: libxml2-devel >= 2.4.24 BuildRequires: libxslt-devel BuildRequires: pango-devel -BuildRequires: perl-XML-Parser BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: loudmouth-devel +BuildRequires: lcms-devel >= 1.13 +BuildRequires: boost-devel +%{?_with_perl: BuildRequires: perl-XML-Parser, perl-libxml-enno} +%{?_with_python: BuildRequires: python-devel} +%{?_with_inkboard: BuildRequires: loudmouth-devel >= 1.0} +%{?_with_gnomeprint: BuildRequires: libgnomeprint22-devel >= 2.2.0} + +Requires: pstoedit +Requires: skencil + Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -53,19 +58,28 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. %prep %setup -q -%patch0 -p1 -b .GC-check -%patch1 -p0 -b .nullconv -%patch2 -p0 -b .qualif %build -%configure \ ---enable-static=no \ ---with-python \ ---with-perl \ ---with-inkjar \ ---with-gnome-vfs \ ---enable-inkboard +%configure \ +--disable-dependency-tracking \ +--with-xinerama \ +--enable-static=no \ +%if "%{?_with_python}" +--with-python \ +%endif +%if "%{?_with_perl}" +--with-perl \ +%endif +--with-gnome-vfs \ +--with-inkjar \ +%if "%{?_with_inkboard}" +--enable-inkboard \ +%endif +%if "%{?_with_gnomeprint}" +--with-gnome-print \ +%endif +--enable-lcms make %{?_smp_mflags} @@ -106,6 +120,13 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Wed Jun 28 2006 Denis Leroy - 0.44-2 +- Update to 0.44 +- Removed obsolete patches +- Disabled experimental perl and python extensions +- Added pstoedit, skencil, gtkspell and LittleCms support +- Inkboard feature disabled pending further security tests + * Tue Feb 28 2006 Denis Leroy - 0.43-3 - Rebuild diff --git a/sources b/sources index fefd223..d3dc79f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97c606182f5e177eef70c1e8a55efc1f inkscape-0.43.tar.bz2 +f0bf316e15ddc6009976d97388522f85 inkscape-0.44.tar.bz2