Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=145f23a634b533153e273231e3197810c8add2cf
commit 145f23a634b533153e273231e3197810c8add2cf
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Wed Jun 3 14:34:05 2009 +0200
inkscape-0.46-4-i686
- fix build with gcc-4.4
- fix build with glibc-2.10
diff --git a/source/xapps-extra/inkscape/FrugalBuild
b/source/xapps-extra/inkscape/FrugalBuild
index 32e4d05..152a76f 100644
--- a/source/xapps-extra/inkscape/FrugalBuild
+++ b/source/xapps-extra/inkscape/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=inkscape
pkgver=0.46
-pkgrel=3
+pkgrel=4
pkgdesc="A vector illustrator program"
depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm'
'freetype2' 'libxcb' \
'pango>=1.14.3' 'libgc>=7.0' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7'
'python>=2.6' 'perl' \
@@ -17,11 +17,16 @@ options=('scriptlet')
Finclude sourceforge
url="http://www.inkscape.org/";
source=($source perl5.10.patch inkscape-0.46-poppler-0.8.3.patch \
- gtk-2.13.patch)
+ gtk-2.13.patch inkscape-0.46-gcc44{,_p2}.patch \
+ inkscape-0.46-glibc2.10.patch inkscape-0.46-dupe.patch)
sha1sums=('b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27' \
'4c36b0e825771ffdfe3c548cb6037ac80c10a60c' \
'16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412' \
- 'd0257245079880c2aef0ffc609598924df999672')
+ 'd0257245079880c2aef0ffc609598924df999672' \
+ '927bd2e39d829e61ac990fc72a2fb2de3952c3ec' \
+ 'c20cb7caee6f9e27dac77ec3d0fea595e6ffec1c' \
+ 'b9078c7c7c8c6654ec646997436b3e78ffc0927e' \
+ 'c89bd6d6f4a1f3613fc67549614c58ec127799ea')
# TODO: java ?!
diff --git a/source/xapps-extra/inkscape/inkscape-0.46-dupe.patch
b/source/xapps-extra/inkscape/inkscape-0.46-dupe.patch
new file mode 100644
index 0000000..e3f97e1
--- /dev/null
+++ b/source/xapps-extra/inkscape/inkscape-0.46-dupe.patch
@@ -0,0 +1,22 @@
+ /bin/install -c -m 644 README default.svg A4_landscape.svg A4.svg
black_opaque.svg white_opaque.svg business_card_85x54mm.svg
business_card_90x50mm.svg CD_cover_300dpi.svg DVD_cover_regular_300dpi.svg
DVD_cover_slim_300dpi.svg DVD_cover_superslim_300dpi.svg
DVD_cover_ultraslim_300dpi.svg default.svg default.ca.svg default.cs.svg
default.de.svg default.eo.svg default.eu.svg default.es.svg default.fi.svg
default.fr.svg default.hu.svg default.it.svg default.lt.svg default.pl.svg
default.pt_BR.svg default.sk.svg default_mm.svg default_pt.svg
desktop_1024x768.svg desktop_1600x1200.svg desktop_640x480.svg
desktop_800x600.svg fontforge_glyph.svg icon_16x16.svg icon_32x32.svg
icon_48x48.svg icon_64x64.svg Letter_landscape.svg
'/var/tmp/fst/pkg/usr/share/inkscape/templates'
+/bin/install: will not overwrite just-created
`/var/tmp/fst/pkg/usr/share/inkscape/templates/default.svg' with `default.svg'
+make[3]: *** [install-templatesDATA] Error 1
+make[3]: Leaving directory `/var/tmp/fst/src/inkscape-0.46/share/templates'
+make[2]: *** [install-am] Error 2
+make[2]: Leaving directory `/var/tmp/fst/src/inkscape-0.46/share/templates'
+make[1]: *** [install-recursive] Error 1
+make[1]: Leaving directory `/var/tmp/fst/src/inkscape-0.46/share'
+make: *** [install-recursive] Error 1
+
+diff --git a/share/templates/Makefile.am b/share/templates/Makefile.am
+index 62ee5a1..bbd320c 100644
+--- a/share/templates/Makefile.am
++++ b/share/templates/Makefile.am
+@@ -15,7 +15,6 @@ templates_DATA = \
+ DVD_cover_slim_300dpi.svg \
+ DVD_cover_superslim_300dpi.svg \
+ DVD_cover_ultraslim_300dpi.svg \
+- default.svg \
+ default.ca.svg \
+ default.cs.svg \
+ default.de.svg \
diff --git a/source/xapps-extra/inkscape/inkscape-0.46-gcc44.patch
b/source/xapps-extra/inkscape/inkscape-0.46-gcc44.patch
new file mode 100644
index 0000000..5a7369c
--- /dev/null
+++ b/source/xapps-extra/inkscape/inkscape-0.46-gcc44.patch
@@ -0,0 +1,188 @@
+diff -Naur inkscape-0.46-orig/src/2geom/sbasis-math.cpp
inkscape-0.46/src/2geom/sbasis-math.cpp
+--- inkscape-0.46-orig/src/2geom/sbasis-math.cpp 2009-04-05
16:47:42.000000000 -0400
++++ inkscape-0.46/src/2geom/sbasis-math.cpp 2009-04-05 18:21:30.000000000
-0400
+@@ -38,11 +38,11 @@
+ //#define ZERO 1e-3
+
+
+-namespace Geom {
++#include <math.h>
++#include <cstdio>
+
++namespace Geom {
+
+-#include <stdio.h>
+-#include <math.h>
+
+ //-|x|-----------------------------------------------------------------------
+ Piecewise<SBasis> abs(SBasis const &f){
+diff -Naur inkscape-0.46-orig/src/2geom/svg-path-parser.h
inkscape-0.46/src/2geom/svg-path-parser.h
+--- inkscape-0.46-orig/src/2geom/svg-path-parser.h 2009-04-05
16:47:42.000000000 -0400
++++ inkscape-0.46/src/2geom/svg-path-parser.h 2009-04-05 18:21:30.000000000
-0400
+@@ -32,6 +32,7 @@
+ #ifndef SEEN_SVG_PATH_PARSER_H
+ #define SEEN_SVG_PATH_PARSER_H
+
++#include <cstdio>
+ #include <vector>
+ #include <iterator>
+ #include <stdexcept>
+diff -Naur inkscape-0.46-orig/src/dom/domimpl.cpp
inkscape-0.46/src/dom/domimpl.cpp
+--- inkscape-0.46-orig/src/dom/domimpl.cpp 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/dom/domimpl.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -30,6 +30,8 @@
+
+ #include "domimpl.h"
+
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+diff -Naur inkscape-0.46-orig/src/dom/io/domstream.h
inkscape-0.46/src/dom/io/domstream.h
+--- inkscape-0.46-orig/src/dom/io/domstream.h 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/dom/io/domstream.h 2009-04-05 18:21:30.000000000
-0400
+@@ -33,6 +33,8 @@
+
+ #include <dom/dom.h>
+
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+diff -Naur inkscape-0.46-orig/src/dom/io/socket.h
inkscape-0.46/src/dom/io/socket.h
+--- inkscape-0.46-orig/src/dom/io/socket.h 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/dom/io/socket.h 2009-04-05 18:34:14.000000000 -0400
+@@ -29,6 +29,7 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include <cstdio>
+ #include "dom/dom.h"
+
+ #ifdef HAVE_SSL
+diff -Naur inkscape-0.46-orig/src/dom/io/stringstream.h
inkscape-0.46/src/dom/io/stringstream.h
+--- inkscape-0.46-orig/src/dom/io/stringstream.h 2009-04-05
16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/stringstream.h 2009-04-05 18:22:50.000000000
-0400
+@@ -29,7 +29,7 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+-
++#include <cstdio>
+ #include "domstream.h"
+
+
+diff -Naur inkscape-0.46-orig/src/dom/svg/svgtypes.h
inkscape-0.46/src/dom/svg/svgtypes.h
+--- inkscape-0.46-orig/src/dom/svg/svgtypes.h 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/dom/svg/svgtypes.h 2009-04-05 18:21:30.000000000
-0400
+@@ -47,6 +47,7 @@
+ #include "dom/smil.h"
+
+
++#include <cstdio>
+ #include <math.h>
+
+
+diff -Naur inkscape-0.46-orig/src/dom/xpathtoken.h
inkscape-0.46/src/dom/xpathtoken.h
+--- inkscape-0.46-orig/src/dom/xpathtoken.h 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/dom/xpathtoken.h 2009-04-05 18:21:30.000000000 -0400
+@@ -35,6 +35,7 @@
+
+ #include <math.h>
+
++#include <cstdio>
+ #include <vector>
+
+ namespace org
+diff -Naur inkscape-0.46-orig/src/io/inkscapestream.h
inkscape-0.46/src/io/inkscapestream.h
+--- inkscape-0.46-orig/src/io/inkscapestream.h 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/io/inkscapestream.h 2009-04-05 18:21:30.000000000
-0400
+@@ -12,6 +12,7 @@
+ */
+
+
++#include <cstdio>
+ #include <glibmm.h>
+
+ namespace Inkscape
+diff -Naur inkscape-0.46-orig/src/io/sys.cpp inkscape-0.46/src/io/sys.cpp
+--- inkscape-0.46-orig/src/io/sys.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/io/sys.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -22,6 +22,8 @@
+ #include <glibmm/ustring.h>
+ #include <gtk/gtkmessagedialog.h>
+
++#include <cstdio>
++
+ #include "prefs-utils.h"
+ #include "sys.h"
+
+diff -Naur inkscape-0.46-orig/src/libavoid/vertices.h
inkscape-0.46/src/libavoid/vertices.h
+--- inkscape-0.46-orig/src/libavoid/vertices.h 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/libavoid/vertices.h 2009-04-05 18:21:30.000000000
-0400
+@@ -23,6 +23,7 @@
+ #ifndef AVOID_VERTICES_H
+ #define AVOID_VERTICES_H
+
++#include <cstdio>
+ #include <list>
+ #include <set>
+ #include <map>
+diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp
inkscape-0.46/src/libnr/nr-matrix-fns.cpp
+--- inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp 2009-04-05
16:47:42.000000000 -0400
++++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp 2009-04-05 18:21:30.000000000
-0400
+@@ -1,5 +1,7 @@
+ #include <libnr/nr-matrix-fns.h>
+
++#include <cstdio>
++
+ namespace NR {
+
+ Matrix elliptic_quadratic_form(Matrix const &m) {
+diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix.cpp
inkscape-0.46/src/libnr/nr-matrix.cpp
+--- inkscape-0.46-orig/src/libnr/nr-matrix.cpp 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/libnr/nr-matrix.cpp 2009-04-05 18:21:30.000000000
-0400
+@@ -11,6 +11,7 @@
+ * This code is in public domain
+ */
+
++#include <cstdio>
+ #include <cstdlib>
+ #include "nr-matrix.h"
+
+diff -Naur inkscape-0.46-orig/src/streams-handles.cpp
inkscape-0.46/src/streams-handles.cpp
+--- inkscape-0.46-orig/src/streams-handles.cpp 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/streams-handles.cpp 2009-04-05 18:21:30.000000000
-0400
+@@ -12,6 +12,7 @@
+ #include "streams-handles.h"
+ #include "uri.h"
+
++#include <cstdio>
+ #include <iostream>
+
+ namespace Inkscape {
+diff -Naur inkscape-0.46-orig/src/streams-zlib.cpp
inkscape-0.46/src/streams-zlib.cpp
+--- inkscape-0.46-orig/src/streams-zlib.cpp 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/streams-zlib.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -9,6 +9,7 @@
+ * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
+ */
+
++#include <cstdio>
+ #include <cstring>
+ #include <string>
+ #include <string.h>
+diff -Naur inkscape-0.46-orig/src/xml/event.cpp inkscape-0.46/src/xml/event.cpp
+--- inkscape-0.46-orig/src/xml/event.cpp 2009-04-05 16:47:42.000000000
-0400
++++ inkscape-0.46/src/xml/event.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -14,6 +14,7 @@
+ */
+
+ #include <glib.h> // g_assert()
++#include <cstdio>
+
+ #include "event.h"
+ #include "event-fns.h"
+
diff --git a/source/xapps-extra/inkscape/inkscape-0.46-gcc44_p2.patch
b/source/xapps-extra/inkscape/inkscape-0.46-gcc44_p2.patch
new file mode 100644
index 0000000..0d2fcd4
--- /dev/null
+++ b/source/xapps-extra/inkscape/inkscape-0.46-gcc44_p2.patch
@@ -0,0 +1,29 @@
+One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
+
+Lubomir Rintel <lkund...@v3.sk>
+
+diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44
inkscape/src/extension/internal/bitmap/imagemagick.cpp
+--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44
2009-01-28 22:12:57.000000000 +0100
++++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-03-02
17:05:57.000000000 +0100
+@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
+ char *search = (char *) g_strndup(xlink, 30);
+ if (strstr(search, "base64") != (char*)NULL) {
+ // 7 = strlen("base64") + strlen(",")
+- char* pureBase64 = strstr(xlink, "base64") + 7;
++ const char* pureBase64 = strstr(xlink, "base64") + 7;
+ Magick::Blob blob;
+ blob.base64(pureBase64);
+ image->read(blob);
+diff -up inkscape/src/libnr/nr-object.cpp.gcc44
inkscape/src/libnr/nr-object.cpp
+--- inkscape/src/libnr/nr-object.cpp.gcc44 2009-03-02 17:06:46.000000000
+0100
++++ inkscape/src/libnr/nr-object.cpp 2009-03-02 17:06:58.000000000 +0100
+@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
+ );
+ memset(object, 0xf0, c->isize);
+
+- object->klass = c;
+ c->cpp_ctor(object);
++ object->klass = c;
+ nr_class_tree_object_invoke_init (c, object);
+
+ return object;
diff --git a/source/xapps-extra/inkscape/inkscape-0.46-glibc2.10.patch
b/source/xapps-extra/inkscape/inkscape-0.46-glibc2.10.patch
new file mode 100644
index 0000000..376fe59
--- /dev/null
+++ b/source/xapps-extra/inkscape/inkscape-0.46-glibc2.10.patch
@@ -0,0 +1,177 @@
+diff -ru src/dialogs/export.cpp src/dialogs/export.cpp
+--- src/dialogs/export.cpp 2009-05-25 02:21:18.067302917 +0300
++++ src/dialogs/export.cpp 2009-05-25 02:21:17.804059091 +0300
+@@ -20,6 +20,9 @@
+ # include "config.h"
+ #endif
+
++// This has to be included prior to anything that includes setjmp.h, it
croaks otherwise
++#include <png.h>
++
+ #include <gtk/gtk.h>
+ #include <gtkmm/box.h>
+ #include <gtkmm/buttonbox.h>
+@@ -60,7 +63,6 @@
+ #include "io/sys.h"
+
+ #include "helper/png-write.h"
+-#include <png.h>
+
+
+ #define SP_EXPORT_MIN_SIZE 1.0
+@@ -1041,9 +1043,7 @@
+ static gchar *
+ filename_add_extension (const gchar *filename, const gchar *extension)
+ {
+- gchar *dot;
+-
+- dot = strrchr (filename, '.');
++ const gchar *dot = strrchr (filename, '.');
+ if ( !dot )
+ return g_strconcat (filename, ".", extension, NULL);
+ {
+diff -ru src/document.cpp src/document.cpp
+--- src/document.cpp 2009-05-25 02:21:18.052299751 +0300
++++ src/document.cpp 2009-05-25 02:21:17.797058619 +0300
+@@ -746,7 +746,7 @@
+ }
+
+ if ( NULL != document_language ) {
+- gchar *pos = strchr(document_language, '_');
++ const char *pos = strchr(document_language, '_');
+ if ( NULL != pos ) {
+ return Glib::ustring(document_language, pos -
document_language);
+ }
+diff -ru src/dom/io/domstream.cpp src/dom/io/domstream.cpp
+--- src/dom/io/domstream.cpp 2009-05-25 02:21:18.011048623 +0300
++++ src/dom/io/domstream.cpp 2009-05-25 02:21:17.755301212 +0300
+@@ -34,6 +34,7 @@
+ *
+ */
+
++#include <cstdio>
+ #include <math.h>
+ #include <stdarg.h>
+
+diff -ru src/dom/io/gzipstream.cpp src/dom/io/gzipstream.cpp
+--- src/dom/io/gzipstream.cpp 2009-05-25 02:21:18.012048750 +0300
++++ src/dom/io/gzipstream.cpp 2009-05-25 02:21:17.755301212 +0300
+@@ -29,6 +29,8 @@
+
+ #include "gzipstream.h"
+
++#include <cstdio>
++
+ #include "dom/util/ziptool.h"
+
+
+diff -ru src/dom/io/socket.cpp src/dom/io/socket.cpp
+--- src/dom/io/socket.cpp 2009-05-25 02:21:18.011048623 +0300
++++ src/dom/io/socket.cpp 2009-05-25 02:21:17.754336705 +0300
+@@ -35,6 +35,7 @@
+ #include <sys/filio.h> // needed on Solaris 8
+ #endif
+
++#include <cstdio>
+ #include "socket.h"
+ #include "dom/util/thread.h"
+
+diff -ru src/dom/io/uristream.cpp src/dom/io/uristream.cpp
+--- src/dom/io/uristream.cpp 2009-05-25 02:21:18.012048750 +0300
++++ src/dom/io/uristream.cpp 2009-05-25 02:21:17.755301212 +0300
+@@ -41,6 +41,7 @@
+
+
+ #include "uristream.h"
++#include <cstdio>
+
+
+
+diff -ru src/dom/lsimpl.cpp src/dom/lsimpl.cpp
+--- src/dom/lsimpl.cpp 2009-05-25 02:21:18.014048586 +0300
++++ src/dom/lsimpl.cpp 2009-05-25 02:21:17.760050211 +0300
+@@ -33,6 +33,7 @@
+ #include "lsimpl.h"
+
+ #include <stdarg.h>
++#include <cstdio>
+
+ namespace org
+ {
+diff -ru src/dom/svg/svgparser.cpp src/dom/svg/svgparser.cpp
+--- src/dom/svg/svgparser.cpp 2009-05-25 02:21:18.014048586 +0300
++++ src/dom/svg/svgparser.cpp 2009-05-25 02:21:17.759333709 +0300
+@@ -32,6 +32,7 @@
+ #include "dom/cssparser.h"
+ #include "dom/charclass.h"
+
++#include <cstdio>
+ #include <stdarg.h>
+
+ #define SVG_NAMESPACE "http://www.w3.org/2000/svg";
+diff -ru src/main.cpp src/main.cpp
+--- src/main.cpp 2009-05-25 02:21:18.069308689 +0300
++++ src/main.cpp 2009-05-25 02:21:17.810107556 +0300
+@@ -28,6 +28,9 @@
+ #endif
+ #include "path-prefix.h"
+
++// This has to be included prior to anything that includes setjmp.h, it
croaks otherwise
++#include <png.h>
++
+ #include <gtk/gtkmessagedialog.h>
+
+ #ifdef HAVE_IEEEFP_H
+@@ -111,7 +114,6 @@
+
+ #include "main-cmdlineact.h"
+
+-#include <png.h>
+ #include <errno.h>
+
+ enum {
+diff -ru src/prefix.cpp src/prefix.cpp
+--- src/prefix.cpp 2009-05-25 02:21:18.037083918 +0300
++++ src/prefix.cpp 2009-05-25 02:21:17.787058605 +0300
+@@ -355,7 +355,8 @@
+ char *
+ br_extract_dir (const char *path)
+ {
+- char *end, *result;
++ const char *end;
++ char *result;
+
+ br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
+
+@@ -390,7 +391,8 @@
+ char *
+ br_extract_prefix (const char *path)
+ {
+- char *end, *tmp, *result;
++ const char *end;
++ char *tmp, *result;
+
+ br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
+
+diff -ru src/sp-image.cpp src/sp-image.cpp
+--- src/sp-image.cpp 2009-05-25 02:21:18.023053851 +0300
++++ src/sp-image.cpp 2009-05-25 02:21:17.777050418 +0300
+@@ -17,6 +17,9 @@
+ # include "config.h"
+ #endif
+
++// This has to be included prior to anything that includes setjmp.h, it
croaks otherwise
++#include <png.h>
++
+ #include <cstring>
+ #include <string>
+ #include <libnr/nr-matrix-fns.h>
+@@ -41,7 +44,6 @@
+ #include "libnr/nr-matrix-fns.h"
+
+ #include "io/sys.h"
+-#include <png.h>
+ #if ENABLE_LCMS
+ #include "color-profile-fns.h"
+ #include "color-profile.h"
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
