- Update to 0.43
- Added 2 patches to fix g++ 4.1 compilation issues - Enabled new jabber/loudmouth-based inkboard feature
This commit is contained in:
Denis Leroy
parent
8cae0ee98f
commit
2ea9654edd
@ -1,2 +1 @@
|
||||
inkscape-0.42.2.tar.bz2
|
||||
inkscape-0.42.2.tar.bz2.sig
|
||||
inkscape-0.43.tar.bz2
|
||||
|
||||
@ -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-07-29 12:34:14.000000000 +0200
|
||||
@@ -21344,7 +21344,7 @@
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-return (int) ngettext ("","", 1)
|
||||
+return (int)(long) ngettext ("","", 1)
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@@ -21402,7 +21402,7 @@
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-return (int) dgettext ("","")
|
||||
+return (int)(long) dgettext ("","")
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
11
inkscape-0.43-null-conversion.patch
Normal file
11
inkscape-0.43-null-conversion.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- 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<SPItem *>::iterator)NULL;
|
||||
}
|
||||
|
||||
AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const {
|
||||
82
inkscape-0.43-qualification.patch
Normal file
82
inkscape-0.43-qualification.patch
Normal file
@ -0,0 +1,82 @@
|
||||
--- 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<XmppUser>
|
||||
- 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);
|
||||
@ -1,14 +1,15 @@
|
||||
Name: inkscape
|
||||
Version: 0.42.2
|
||||
Release: 2%{?dist}
|
||||
Version: 0.43
|
||||
Release: 1%{?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-gettext-x86_64.patch
|
||||
Patch1: inkscape-0.42-GC-check.patch
|
||||
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
|
||||
@ -28,6 +29,7 @@ BuildRequires: pango-devel
|
||||
BuildRequires: perl-XML-Parser
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: loudmouth-devel
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
|
||||
@ -51,19 +53,19 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .dgettext
|
||||
%patch1 -p1 -b .GC-check
|
||||
%patch0 -p1 -b .GC-check
|
||||
%patch1 -p0 -b .nullconv
|
||||
%patch2 -p0 -b .qualif
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-dependency-tracking \
|
||||
--with-xinerama \
|
||||
--enable-static=no \
|
||||
--with-python \
|
||||
--with-inkjar
|
||||
#temporarily disabled until I can look into it further
|
||||
#--with-gnome-print \
|
||||
%configure \
|
||||
--enable-static=no \
|
||||
--with-python \
|
||||
--with-perl \
|
||||
--with-inkjar \
|
||||
--with-gnome-vfs \
|
||||
--enable-inkboard
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -94,7 +96,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README HACKING
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%doc %{_mandir}/man1/*
|
||||
%{_bindir}/*
|
||||
%{_datadir}/%{name}/
|
||||
@ -104,6 +106,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 17 2005 Denis Leroy <denis@poolshark.org> - 0.43-1
|
||||
- Update to 0.43
|
||||
- Added 2 patches to fix g++ 4.1 compilation issues
|
||||
- Enabled new jabber/loudmouth-based inkboard feature
|
||||
|
||||
* Mon Sep 26 2005 Denis Leroy <denis@poolshark.org> - 0.42.2-2
|
||||
- rebuilt with newer glibmm
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user