packages: inkscape/inkscape-slider.patch (NEW), inkscape/inkscape-gcc44.pat...
pascalek
pascalek at pld-linux.org
Sat Jun 13 13:02:20 CEST 2009
Author: pascalek Date: Sat Jun 13 11:02:20 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
packages/inkscape:
inkscape-slider.patch (NONE -> 1.1) (NEW), inkscape-gcc44.patch (NONE -> 1.1) (NEW), inkscape-early-png-header.patch (NONE -> 1.1) (NEW), inkscape-gchar.patch (NONE -> 1.1) (NEW), inkscape-install.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/inkscape/inkscape-slider.patch
diff -u /dev/null packages/inkscape/inkscape-slider.patch:1.1
--- /dev/null Sat Jun 13 13:02:20 2009
+++ packages/inkscape/inkscape-slider.patch Sat Jun 13 13:02:14 2009
@@ -0,0 +1,22 @@
+## 11_gtk_adjustment_fix.dpatch by Marco Presi (Zufus) <zufus at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A patch allowing rgb and alhpa values tp 100%
+
+--- inkscape-0.46/src/widgets/sp-color-slider.cpp.orig 2009-04-24 09:56:45.000000000 +0200
++++ inkscape-0.46/src/widgets/sp-color-slider.cpp 2009-04-24 09:58:06.000000000 +0200
+@@ -334,6 +334,14 @@
+ adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1);
+ }
+
++#if GTK_CHECK_VERSION (2,14,0)
++ else {
++ gtk_adjustment_set_page_increment(adjustment, 0.0);
++ gtk_adjustment_set_page_size(adjustment, 0.0);
++ }
++#endif
++
++
+ if (slider->adjustment != adjustment) {
+ if (slider->adjustment) {
+ gtk_signal_disconnect_by_data (GTK_OBJECT (slider->adjustment), slider);
================================================================
Index: packages/inkscape/inkscape-gcc44.patch
diff -u /dev/null packages/inkscape/inkscape-gcc44.patch:1.1
--- /dev/null Sat Jun 13 13:02:20 2009
+++ packages/inkscape/inkscape-gcc44.patch Sat Jun 13 13:02:14 2009
@@ -0,0 +1,186 @@
+## 06_gcc-4.4.dpatch by Wolfram Quester <wolfi at sigxcpu.org>
+##
+## DP: Patch by Martin Michlmayr <tbm at cyrius.com> to make inkscape compile with
+## DP: gcc 4.4. His bug report and description:
+## DP: Your package fails to build with the upcoming GCC 4.4. Version 4.4
+## DP: has not been released yet but I'm building with a snapshot in order
+## DP: to find errors and give people an advance warning.
+## DP:
+## DP: GCC 4.4 cleaned up some more C++ headers. You always have to #include
+## DP: headers directly and cannot rely for things to be included indirectly.
+## DP:
+## DP: You can reproduce this problem with gcc-snapshot from unstable.
+## DP:
+## DP: > Automatic build of inkscape_0.46-3 on em64t by sbuild/amd64 0.53
+## DP: ...
+## DP: > x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include/freetype2 -pthread -DORBIT2=1 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DRELAYTOOL_CRYPTO='static const int libcrypto_is_present = 1; static int __attribute__((unused)) libcrypto_symbol_is_present(char *m) { return 1; }' -DRELAYTOOL_SSL='static const int libssl_is_present = 1; static int __attribute__((unused)) libssl_symbol_is_present(char *m) { return 1; }' -DHAVE_SSL -I/usr/include/libwpg-0.1 -I/usr/include/libwpd-0.8 -I/usr/include/freetype2 -I/usr/include/poppler -D_REENTRANT -I/usr/include/poppler/glib -I/usr/include/poppler -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1
-DPOTRACE=\"potrace\" -D_REENTRANT -pthread -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/atkmm-1.6 -I/usr/include/atk-1.0 -I/usr/include/libxml2 -I/usr/include/gtkspell-2.0 -I../cxxtest -Wall -g -O2 -MT conn-avoid-ref.o -MD -MP -MF $depbase.Tpo -c -o conn-avoid-ref.o conn-avoid-ref.cpp &&\
+## DP: > mv -f $depbase.Tpo $depbase.Po
+## DP: > In file included from ./libavoid/graph.h:30,
+## DP: > from libavoid/router.h:30,
+## DP: > from conn-avoid-ref.cpp:20:
+## DP: > ./libavoid/vertices.h:60: error: 'stdout' was not declared in this scope
+## DP: > ./libavoid/vertices.h: In member function 'void Avoid::VertInfList::stats()':
+## DP: > ./libavoid/vertices.h:103: error: 'printf' was not declared in this scope
+## DP: > make[3]: *** [conn-avoid-ref.o] Error 1
+## DP: > make[3]: Leaving directory `/build/tbm/inkscape-0.46/src'
+
+--- src/xml/event.cpp~ 2008-11-14 08:27:20.000000000 +0000
++++ inkscape-0.46/src/xml/event.cpp 2008-11-14 08:27:26.000000000 +0000
+@@ -14,6 +14,7 @@
+ */
+
+ #include <glib.h> // g_assert()
++#include <cstdio>
+
+ #include "event.h"
+ #include "event-fns.h"
+--- src/io/inkscapestream.h~ 2008-11-14 08:02:53.000000000 +0000
++++ inkscape-0.46/src/io/inkscapestream.h 2008-11-14 08:03:00.000000000 +0000
+@@ -12,6 +12,7 @@
+ */
+
+
++#include <cstdio>
+ #include <glibmm.h>
+
+ namespace Inkscape
+--- src/io/sys.cpp~ 2008-11-14 08:04:54.000000000 +0000
++++ inkscape-0.46/src/io/sys.cpp 2008-11-14 08:05:11.000000000 +0000
+@@ -22,6 +22,8 @@
+ #include <glibmm/ustring.h>
+ #include <gtk/gtkmessagedialog.h>
+
++#include <cstdio>
++
+ #include "prefs-utils.h"
+ #include "sys.h"
+
+--- src/dom/io/domstream.h~ 2008-11-14 07:51:18.000000000 +0000
++++ inkscape-0.46/src/dom/io/domstream.h 2008-11-14 07:51:28.000000000 +0000
+@@ -33,6 +33,8 @@
+
+ #include <dom/dom.h>
+
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+--- src/dom/svg/svgtypes.h~ 2008-11-14 07:53:23.000000000 +0000
++++ inkscape-0.46/src/dom/svg/svgtypes.h 2008-11-14 07:53:32.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include "dom/smil.h"
+
+
++#include <cstdio>
+ #include <math.h>
+
+
+--- src/dom/domimpl.cpp~ 2008-11-14 07:49:10.000000000 +0000
++++ inkscape-0.46/src/dom/domimpl.cpp 2008-11-14 07:49:18.000000000 +0000
+@@ -30,6 +30,8 @@
+
+ #include "domimpl.h"
+
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+--- src/dom/xpathtoken.h~ 2008-11-14 07:52:27.000000000 +0000
++++ inkscape-0.46/src/dom/xpathtoken.h 2008-11-14 07:52:36.000000000 +0000
+@@ -35,6 +35,7 @@
+
+ #include <math.h>
+
++#include <cstdio>
+ #include <vector>
+
+ namespace org
+--- src/libavoid/vertices.h~ 2008-11-14 07:14:36.000000000 +0000
++++ inkscape-0.46/src/libavoid/vertices.h 2008-11-14 07:14:41.000000000 +0000
+@@ -23,6 +23,7 @@
+ #ifndef AVOID_VERTICES_H
+ #define AVOID_VERTICES_H
+
++#include <cstdio>
+ #include <list>
+ #include <set>
+ #include <map>
+--- src/libnr/nr-matrix-fns.cpp~ 2008-11-14 08:16:43.000000000 +0000
++++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp 2008-11-14 08:16:48.000000000 +0000
+@@ -1,5 +1,7 @@
+ #include <libnr/nr-matrix-fns.h>
+
++#include <cstdio>
++
+ namespace NR {
+
+ Matrix elliptic_quadratic_form(Matrix const &m) {
+--- src/libnr/nr-matrix.cpp~ 2008-11-14 08:19:20.000000000 +0000
++++ inkscape-0.46/src/libnr/nr-matrix.cpp 2008-11-14 08:19:26.000000000 +0000
+@@ -11,6 +11,7 @@
+ * This code is in public domain
+ */
+
++#include <cstdio>
+ #include <cstdlib>
+ #include "nr-matrix.h"
+
+--- src/2geom/svg-path-parser.h~ 2008-11-14 08:06:45.000000000 +0000
++++ inkscape-0.46/src/2geom/svg-path-parser.h 2008-11-14 08:06:51.000000000 +0000
+@@ -32,6 +32,7 @@
+ #ifndef SEEN_SVG_PATH_PARSER_H
+ #define SEEN_SVG_PATH_PARSER_H
+
++#include <cstdio>
+ #include <vector>
+ #include <iterator>
+ #include <stdexcept>
+--- src/2geom/sbasis-math.cpp~ 2008-11-14 08:29:42.000000000 +0000
++++ inkscape-0.46/src/2geom/sbasis-math.cpp 2008-11-14 08:31:32.000000000 +0000
+@@ -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){
+--- src/streams-handles.cpp~ 2008-11-14 07:41:07.000000000 +0000
++++ inkscape-0.46/src/streams-handles.cpp 2008-11-14 07:41:14.000000000 +0000
+@@ -12,6 +12,7 @@
+ #include "streams-handles.h"
+ #include "uri.h"
+
++#include <cstdio>
+ #include <iostream>
+
+ namespace Inkscape {
+--- src/streams-zlib.cpp~ 2008-11-14 07:41:24.000000000 +0000
++++ inkscape-0.46/src/streams-zlib.cpp 2008-11-14 07:41:30.000000000 +0000
+@@ -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>
+--- src/dom/io/socket.cpp~ 2008-03-11 05:19:32.000000000 +0100
++++ inkscape-0.46/src/dom/io/socket.cpp 2009-05-26 12:09:45.000000000 +0200
+@@ -57,6 +57,7 @@
+ RELAYTOOL_SSL
+ #endif
+
++#include <cstdio>
+
+ namespace org
+ {
================================================================
Index: packages/inkscape/inkscape-early-png-header.patch
diff -u /dev/null packages/inkscape/inkscape-early-png-header.patch:1.1
--- /dev/null Sat Jun 13 13:02:20 2009
+++ packages/inkscape/inkscape-early-png-header.patch Sat Jun 13 13:02:14 2009
@@ -0,0 +1,63 @@
+## 11_early-png-header.dpatch by Daniel Schepler <dschepler at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+diff -urNad inkscape-0.46~/src/dialogs/export.cpp inkscape-0.46/src/dialogs/export.cpp
+--- inkscape-0.46~/src/dialogs/export.cpp 2009-04-21 22:26:34.000000000 +0000
++++ inkscape-0.46/src/dialogs/export.cpp 2009-04-21 22:26:44.000000000 +0000
+@@ -20,6 +20,7 @@
+ # include "config.h"
+ #endif
+
++#include <png.h>
+ #include <gtk/gtk.h>
+ #include <gtkmm/box.h>
+ #include <gtkmm/buttonbox.h>
+@@ -60,7 +61,6 @@
+ #include "io/sys.h"
+
+ #include "helper/png-write.h"
+-#include <png.h>
+
+
+ #define SP_EXPORT_MIN_SIZE 1.0
+diff -urNad inkscape-0.46~/src/main.cpp inkscape-0.46/src/main.cpp
+--- inkscape-0.46~/src/main.cpp 2009-04-21 22:18:48.000000000 +0000
++++ inkscape-0.46/src/main.cpp 2009-04-21 22:27:00.000000000 +0000
+@@ -28,6 +28,8 @@
+ #endif
+ #include "path-prefix.h"
+
++#include <png.h>
++
+ #include <gtk/gtkmessagedialog.h>
+
+ #ifdef HAVE_IEEEFP_H
+@@ -111,7 +113,6 @@
+
+ #include "main-cmdlineact.h"
+
+-#include <png.h>
+ #include <errno.h>
+
+ enum {
+diff -urNad inkscape-0.46~/src/sp-image.cpp inkscape-0.46/src/sp-image.cpp
+--- inkscape-0.46~/src/sp-image.cpp 2009-04-21 22:26:34.000000000 +0000
++++ inkscape-0.46/src/sp-image.cpp 2009-04-21 22:26:44.000000000 +0000
+@@ -17,6 +17,7 @@
+ # include "config.h"
+ #endif
+
++#include <png.h>
+ #include <cstring>
+ #include <string>
+ #include <libnr/nr-matrix-fns.h>
+@@ -41,7 +42,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"
================================================================
Index: packages/inkscape/inkscape-gchar.patch
diff -u /dev/null packages/inkscape/inkscape-gchar.patch:1.1
--- /dev/null Sat Jun 13 13:02:20 2009
+++ packages/inkscape/inkscape-gchar.patch Sat Jun 13 13:02:14 2009
@@ -0,0 +1,45 @@
+diff -Nur orig/src/dialogs/export.cpp chng/src/dialogs/export.cpp
+--- orig/src/dialogs/export.cpp 2008-03-11 05:19:54.000000000 +0100
++++ chng/src/dialogs/export.cpp 2009-05-26 11:58:15.000000000 +0200
+@@ -1043,7 +1043,7 @@
+ {
+ gchar *dot;
+
+- dot = strrchr (filename, '.');
++ dot = (gchar*)strrchr (filename, '.');
+ if ( !dot )
+ return g_strconcat (filename, ".", extension, NULL);
+ {
+diff -Nur orig/src/document.cpp chng/src/document.cpp
+--- orig/src/document.cpp 2008-03-11 05:20:34.000000000 +0100
++++ chng/src/document.cpp 2009-05-26 11:36:28.000000000 +0200
+@@ -746,7 +746,7 @@
+ }
+
+ if ( NULL != document_language ) {
+- gchar *pos = strchr(document_language, '_');
++ gchar *pos = (gchar*)strchr(document_language, '_');
+ if ( NULL != pos ) {
+ return Glib::ustring(document_language, pos - document_language);
+ }
+diff -Nur orig/src/prefix.cpp chng/src/prefix.cpp
+--- orig/src/prefix.cpp 2008-03-11 05:20:27.000000000 +0100
++++ chng/src/prefix.cpp 2009-05-26 11:37:09.000000000 +0200
+@@ -359,7 +359,7 @@
+
+ br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
+
+- end = strrchr (path, '/');
++ end = (gchar*)strrchr (path, '/');
+ if (!end) return strdup (".");
+
+ while (end > path && *end == '/')
+@@ -395,7 +395,7 @@
+ br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
+
+ if (!*path) return strdup ("/");
+- end = strrchr (path, '/');
++ end = (gchar*)strrchr (path, '/');
+ if (!end) return strdup (path);
+
+ tmp = br_strndup ((char *) path, end - path);
================================================================
Index: packages/inkscape/inkscape-install.patch
diff -u /dev/null packages/inkscape/inkscape-install.patch:1.1
--- /dev/null Sat Jun 13 13:02:21 2009
+++ packages/inkscape/inkscape-install.patch Sat Jun 13 13:02:14 2009
@@ -0,0 +1,11 @@
+diff -Nur orig/share/templates/Makefile.am chng/share/templates/Makefile.am
+--- orig/share/templates/Makefile.am 2008-03-11 05:21:04.000000000 +0100
++++ chng/share/templates/Makefile.am 2009-05-26 13:08:30.000000000 +0200
+@@ -3,7 +3,6 @@
+
+ templates_DATA = \
+ README \
+- default.svg \
+ A4_landscape.svg \
+ A4.svg \
+ black_opaque.svg \
================================================================
More information about the pld-cvs-commit
mailing list