SF.net SVN: gar:[22453] csw/mgar/pkg/inkscape/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Fri Nov 8 16:38:23 CET 2013
Revision: 22453
http://gar.svn.sourceforge.net/gar/?rev=22453&view=rev
Author: guengel
Date: 2013-11-08 15:38:22 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
inkscape/trunk: Added more BUILD_DEP_PKGS. Added patches. Still work in progress, not guaranteed to build.
Modified Paths:
--------------
csw/mgar/pkg/inkscape/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/inkscape/trunk/files/0000-color-profile.cpp-Add-required-headers.patch
csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.h-Remove-stray-comma.patch
csw/mgar/pkg/inkscape/trunk/files/0000-fixed_point.h-Resolved-ambiguity.patch
csw/mgar/pkg/inkscape/trunk/files/0000-sp-ellipse.cpp-resolve-overload-ambiguity.patch
Modified: csw/mgar/pkg/inkscape/trunk/Makefile
===================================================================
--- csw/mgar/pkg/inkscape/trunk/Makefile 2013-11-08 15:36:17 UTC (rev 22452)
+++ csw/mgar/pkg/inkscape/trunk/Makefile 2013-11-08 15:38:22 UTC (rev 22453)
@@ -12,10 +12,29 @@
GARCOMPILER = GNU
+PATCHFILES += 0000-color-profile.cpp-Add-required-headers.patch
+PATCHFILES += 0000-desktop-widget.h-Remove-stray-comma.patch
+PATCHFILES += 0000-sp-ellipse.cpp-resolve-overload-ambiguity.patch
+PATCHFILES += 0000-fixed_point.h-Resolved-ambiguity.patch
+
+
BUILD_DEP_PKGS += CSWlibwpg-dev
+BUILD_DEP_PKGS += CSWpm-xml-parser
+BUILD_DEP_PKGS += CSWlibgc-dev
+BUILD_DEP_PKGS += CSWlibgtkmm-dev
+BUILD_DEP_PKGS += CSWliblcms2-dev
+BUILD_DEP_PKGS += CSWlibpangomm-dev
+BUILD_DEP_PKGS += CSWlibcairomm-dev
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibatk-dev
+BUILD_DEP_PKGS += CSWlibatkmm-dev
+BUILD_DEP_PKGS += CSWgsl-dev
+BUILD_DEP_PKGS += CSWimagemagick-dev
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-silent-rules
+
EXTRA_CONFIGURE_EXPORTS += XGETTEXT MSGMERGE MSGFMT
CONFIGURE_ENV_XGETTEXT = $(bindir)/gxgettext
CONFIGURE_ENV_MSGMERGE = $(bindir)/gmsgmerge
@@ -27,6 +46,8 @@
# Use this until GCC boost is moved to /opt/csw
EXTRA_INC += $(prefix)/gxx/include
EXTRA_LIB += $(prefix)/gxx/lib
+# Make gcc 4.8 stop yapping about stuff that was previously allowed
+EXTRA_CXXFLAGS += -fpermissive
include gar/category.mk
Added: csw/mgar/pkg/inkscape/trunk/files/0000-color-profile.cpp-Add-required-headers.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-color-profile.cpp-Add-required-headers.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-color-profile.cpp-Add-required-headers.patch 2013-11-08 15:38:22 UTC (rev 22453)
@@ -0,0 +1,26 @@
+From bb09effb1bad8c23e74e063ebf1d5cc323573e21 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 15:49:55 +0100
+Subject: [PATCH] color-profile.cpp: Add required headers
+
+---
+ src/color-profile.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/color-profile.cpp b/src/color-profile.cpp
+index 05328c0..6a4afd7 100644
+--- a/src/color-profile.cpp
++++ b/src/color-profile.cpp
+@@ -8,6 +8,9 @@
+ #include <sys/fcntl.h>
+ #include <gdkmm/color.h>
+ #include <glib/gi18n.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+
+ #ifdef DEBUG_LCMS
+ #include <gtk.h>
+--
+1.8.4.1
+
Added: csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.h-Remove-stray-comma.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.h-Remove-stray-comma.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-desktop-widget.h-Remove-stray-comma.patch 2013-11-08 15:38:22 UTC (rev 22453)
@@ -0,0 +1,25 @@
+From 8d463f8ae15db61f6f56697889cd47780fe319bb Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 15:54:45 +0100
+Subject: [PATCH] desktop-widget.h: Remove stray comma
+
+---
+ src/widgets/desktop-widget.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
+index d853e09..aab73c9 100644
+--- a/src/widgets/desktop-widget.h
++++ b/src/widgets/desktop-widget.h
+@@ -239,7 +239,7 @@ struct SPDesktopWidget {
+ private:
+ GtkWidget *tool_toolbox;
+ GtkWidget *aux_toolbox;
+- GtkWidget *commands_toolbox,;
++ GtkWidget *commands_toolbox;
+ GtkWidget *snap_toolbox;
+
+ static void init(SPDesktopWidget *widget);
+--
+1.8.4.1
+
Added: csw/mgar/pkg/inkscape/trunk/files/0000-fixed_point.h-Resolved-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-fixed_point.h-Resolved-ambiguity.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-fixed_point.h-Resolved-ambiguity.patch 2013-11-08 15:38:22 UTC (rev 22453)
@@ -0,0 +1,26 @@
+From da1e920058ce7e665768b87e6c5833324c0d531a Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 16:35:07 +0100
+Subject: [PATCH] fixed_point.h: Resolved ambiguity.
+
+Please note: no guarantee this cast is fool-proof.
+---
+ src/util/fixed_point.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/fixed_point.h b/src/util/fixed_point.h
+index 05a73da..31bc036 100644
+--- a/src/util/fixed_point.h
++++ b/src/util/fixed_point.h
+@@ -79,7 +79,7 @@ public:
+ operator unsigned int() const { return v>>precision; }
+
+ operator float() const { return ldexpf(v,-precision); }
+- operator double() const { return ldexp(v,-precision); }
++ operator double() const { return ldexp(static_cast<double>(v),-precision); }
+ private:
+ T v;
+ };
+--
+1.8.4.1
+
Added: csw/mgar/pkg/inkscape/trunk/files/0000-sp-ellipse.cpp-resolve-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-sp-ellipse.cpp-resolve-overload-ambiguity.patch (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-sp-ellipse.cpp-resolve-overload-ambiguity.patch 2013-11-08 15:38:22 UTC (rev 22453)
@@ -0,0 +1,25 @@
+From 81c50b04ead79d6ef33a5fa7184209869cc73575 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 16:08:15 +0100
+Subject: [PATCH] sp-ellipse.cpp: resolve overload ambiguity
+
+---
+ src/sp-ellipse.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sp-ellipse.cpp b/src/sp-ellipse.cpp
+index dbc5b14..c02a9a5 100644
+--- a/src/sp-ellipse.cpp
++++ b/src/sp-ellipse.cpp
+@@ -147,7 +147,7 @@ sp_genericellipse_update(SPObject *object, SPCtx *ctx, guint flags)
+ if (viewbox) {
+ double const dx = viewbox->width();
+ double const dy = viewbox->height();
+- double const dr = sqrt(dx*dx + dy*dy)/sqrt(2);
++ double const dr = sqrt(dx*dx + dy*dy)/sqrt(2.0);
+ double const em = style->font_size.computed;
+ double const ex = em * 0.5; // fixme: get from pango or libnrtype
+ ellipse->cx.update(em, ex, dx);
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list