Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (a9018246719a9ffe64c950ae533c07f4776189a2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (a9018246719a9ffe64c950ae533c07f4776189a2)
  • Date: Mon, 19 Oct 2009 04:15:06 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

graphics/inkscape/HISTORY | 5 ++
graphics/inkscape/PRE_BUILD | 1
graphics/inkscape/libpng-setjmp.patch | 58
++++++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+)

New commits:
commit a9018246719a9ffe64c950ae533c07f4776189a2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

inkcape: fixing compile problem; added patch

diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 2a51cae..93c2b18 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,8 @@
+2009-10-19 Bor Kraljič <pyrobor AT ver.si>
+ * libpng-setjmp.patch: added, needed to compile
+ (see http://thread.gmane.org/gmane.linux.distributions.nixos/1501)
+ * PRE_BUILD: apply the patch
+
2008-10-11 Vlad Glagolev <stealth AT sourcemage.org>
* TRIGGERS: added, for poppler

diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD
index 24211c7..f723557 100755
--- a/graphics/inkscape/PRE_BUILD
+++ b/graphics/inkscape/PRE_BUILD
@@ -5,5 +5,6 @@ if is_depends_enabled $SPELL poppler; then
patch -p0 < "$SPELL_DIRECTORY/poppler.patch"
fi &&

+patch -p1 < "$SPELL_DIRECTORY/libpng-setjmp.patch" &&
patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
patch -p0 < "$SPELL_DIRECTORY/gtk-clist.patch"
diff --git a/graphics/inkscape/libpng-setjmp.patch
b/graphics/inkscape/libpng-setjmp.patch
new file mode 100644
index 0000000..c985f9f
--- /dev/null
+++ b/graphics/inkscape/libpng-setjmp.patch
@@ -0,0 +1,58 @@
+--- inkscape-0.46/src/sp-image.cpp 2008-03-11 05:19:56.000000000 +0100
++++ inkscape-0.46/src/sp-image.cpp 2009-01-26 15:34:33.000000000 +0100
+@@ -17,6 +17,8 @@
+ # include "config.h"
+ #endif
+
++#include <png.h>
++
+ #include <cstring>
+ #include <string>
+ #include <libnr/nr-matrix-fns.h>
+@@ -41,7 +43,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"
+
+--- inkscape-0.46/src/dialogs/export.cpp 2008-03-11
05:19:54.000000000 +0100
++++ inkscape-0.46/src/dialogs/export.cpp 2009-01-26
17:01:13.000000000 +0100
+@@ -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
+
+--- inkscape-0.46/src/main.cpp 2008-03-11 05:20:50.000000000 +0100
++++ inkscape-0.46/src/main.cpp 2009-01-26 17:57:12.000000000 +0100
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
++#include <png.h>
+ #include "path-prefix.h"
+
+ #include <gtk/gtkmessagedialog.h>
+@@ -111,7 +112,6 @@ using Inkscape::Extension::Internal::Pri
+
+ #include "main-cmdlineact.h"
+
+-#include <png.h>
+ #include <errno.h>
+
+ enum {
+



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (a9018246719a9ffe64c950ae533c07f4776189a2), Bor Kraljič, 10/19/2009

Archive powered by MHonArc 2.6.24.

Top of Page