From 48a64126b392e8fd7b3423e371476b8123f0c2fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 12 Apr 2015 15:42:52 +0200 Subject: [PATCH] - removed obsolete patches --- inkscape-build.patch | 225 ------------------------------------ inkscape-poppler-0.26.patch | 89 -------------- 2 files changed, 314 deletions(-) delete mode 100644 inkscape-build.patch delete mode 100644 inkscape-poppler-0.26.patch diff --git a/inkscape-build.patch b/inkscape-build.patch deleted file mode 100644 index 9769691..0000000 --- a/inkscape-build.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff -urN inkscape-0.48.4.org/configure.ac inkscape-0.48.4/configure.ac ---- inkscape-0.48.4.org/configure.ac 2012-12-15 17:50:19.000000000 +0100 -+++ inkscape-0.48.4/configure.ac 2013-04-18 08:23:52.486037399 +0200 -@@ -21,12 +21,12 @@ - export CC CXX - ]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_LANG(C++) - AC_ISC_POSIX -+AC_PROG_CC - AC_PROG_CXX --AM_PROG_CC_STDC - AM_PROG_AS - AC_PROG_RANLIB - AC_PROG_INTLTOOL(0.22) -@@ -37,7 +37,6 @@ - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - - dnl These next few lines are needed only while libcroco is in our source tree. --AC_PROG_CC - AM_PROG_CC_C_O - if test "$GCC" = "yes"; then - # Enable some warnings from gcc. -diff -urN inkscape-0.48.4.org/src/application/application.cpp inkscape-0.48.4/src/application/application.cpp ---- inkscape-0.48.4.org/src/application/application.cpp 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.4/src/application/application.cpp 2013-04-18 18:46:57.986074834 +0200 -@@ -14,6 +14,7 @@ - # include - #endif - -+#include - #include - - #include "preferences.h" -diff -urN inkscape-0.48.4.org/src/color-profile.cpp inkscape-0.48.4/src/color-profile.cpp ---- inkscape-0.48.4.org/src/color-profile.cpp 2012-02-19 02:41:36.000000000 +0100 -+++ inkscape-0.48.4/src/color-profile.cpp 2013-04-18 18:40:23.471833642 +0200 -@@ -6,6 +6,7 @@ - - #include - #include -+#include - #include - #include - -diff -urN inkscape-0.48.4.org/src/device-manager.h inkscape-0.48.4/src/device-manager.h ---- inkscape-0.48.4.org/src/device-manager.h 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.4/src/device-manager.h 2013-04-18 18:41:12.403213599 +0200 -@@ -11,6 +11,7 @@ - - - #include -+#include - #include - #include - -diff -urN inkscape-0.48.4.org/src/dropper-context.cpp inkscape-0.48.4/src/dropper-context.cpp ---- inkscape-0.48.4.org/src/dropper-context.cpp 2012-12-13 18:00:46.000000000 +0100 -+++ inkscape-0.48.4/src/dropper-context.cpp 2013-04-18 18:41:36.673894020 +0200 -@@ -16,6 +16,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -urN inkscape-0.48.4.org/src/extension/implementation/implementation.h inkscape-0.48.4/src/extension/implementation/implementation.h ---- inkscape-0.48.4.org/src/extension/implementation/implementation.h 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.4/src/extension/implementation/implementation.h 2013-04-18 18:48:37.282107951 +0200 -@@ -13,6 +13,7 @@ - #define __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ - - #include -+#include - #include - #include - -diff -urN inkscape-0.48.4.org/src/inkview.cpp inkscape-0.48.4/src/inkview.cpp ---- inkscape-0.48.4.org/src/inkview.cpp 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/inkview.cpp 2013-04-18 18:49:49.657404010 +0200 -@@ -48,6 +48,7 @@ - #include - #include - -+#include - #include - - #include "gc-core.h" -diff -urN inkscape-0.48.4.org/src/live_effects/parameter/array.h inkscape-0.48.4/src/live_effects/parameter/array.h ---- inkscape-0.48.4.org/src/live_effects/parameter/array.h 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/live_effects/parameter/array.h 2013-04-18 18:55:16.766245615 +0200 -@@ -13,6 +13,7 @@ - - #include - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -urN inkscape-0.48.4.org/src/live_effects/parameter/path.h inkscape-0.48.4/src/live_effects/parameter/path.h ---- inkscape-0.48.4.org/src/live_effects/parameter/path.h 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/live_effects/parameter/path.h 2013-04-18 18:51:41.040418596 +0200 -@@ -12,6 +12,7 @@ - #include - #include <2geom/path.h> - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -urN inkscape-0.48.4.org/src/live_effects/parameter/point.h inkscape-0.48.4/src/live_effects/parameter/point.h ---- inkscape-0.48.4.org/src/live_effects/parameter/point.h 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/live_effects/parameter/point.h 2013-04-18 18:54:39.751913279 +0200 -@@ -12,6 +12,7 @@ - #include - #include <2geom/point.h> - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -urN inkscape-0.48.4.org/src/live_effects/parameter/vector.h inkscape-0.48.4/src/live_effects/parameter/vector.h ---- inkscape-0.48.4.org/src/live_effects/parameter/vector.h 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/live_effects/parameter/vector.h 2013-04-18 18:53:23.269848169 +0200 -@@ -12,6 +12,7 @@ - #include - #include <2geom/point.h> - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -urN inkscape-0.48.4.org/src/selection-chemistry.cpp inkscape-0.48.4/src/selection-chemistry.cpp ---- inkscape-0.48.4.org/src/selection-chemistry.cpp 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/selection-chemistry.cpp 2013-04-18 18:43:09.013129172 +0200 -@@ -25,7 +25,7 @@ - // TOOD fixme: This should be moved into preference repr - SPCycleType SP_CYCLING = SP_CYCLE_FOCUS; - -- -+#include - #include - - #include "svg/svg.h" -diff -urN inkscape-0.48.4.org/src/text-chemistry.cpp inkscape-0.48.4/src/text-chemistry.cpp ---- inkscape-0.48.4.org/src/text-chemistry.cpp 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.4/src/text-chemistry.cpp 2013-04-18 18:44:23.738522844 +0200 -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - - #include "libnr/nr-matrix-fns.h" -diff -urN inkscape-0.48.4.org/src/text-context.cpp inkscape-0.48.4/src/text-context.cpp ---- inkscape-0.48.4.org/src/text-context.cpp 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.4/src/text-context.cpp 2013-04-18 18:45:26.073565601 +0200 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - #include "macros.h" -diff -urN inkscape-0.48.4.org/src/ui/clipboard.cpp inkscape-0.48.4/src/ui/clipboard.cpp ---- inkscape-0.48.4.org/src/ui/clipboard.cpp 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/ui/clipboard.cpp 2013-04-18 18:59:51.744602396 +0200 -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include -diff -urN inkscape-0.48.4.org/src/ui/dialog/inkscape-preferences.cpp inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp ---- inkscape-0.48.4.org/src/ui/dialog/inkscape-preferences.cpp 2012-12-13 18:00:46.000000000 +0100 -+++ inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp 2013-04-18 19:02:20.236881579 +0200 -@@ -17,6 +17,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -urN inkscape-0.48.4.org/src/ui/dialog/memory.cpp inkscape-0.48.4/src/ui/dialog/memory.cpp ---- inkscape-0.48.4.org/src/ui/dialog/memory.cpp 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.4/src/ui/dialog/memory.cpp 2013-04-18 19:03:14.545069899 +0200 -@@ -13,6 +13,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -urN inkscape-0.48.4.org/src/ui/tool/control-point.cpp inkscape-0.48.4/src/ui/tool/control-point.cpp ---- inkscape-0.48.4.org/src/ui/tool/control-point.cpp 2012-02-14 04:22:17.000000000 +0100 -+++ inkscape-0.48.4/src/ui/tool/control-point.cpp 2013-04-18 19:04:07.833213400 +0200 -@@ -9,6 +9,7 @@ - */ - - #include -+#include - #include - #include - #include <2geom/point.h> ---- x/src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 -+++ x/src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 -@@ -239,7 +239,7 @@ - private: - GtkWidget *tool_toolbox; - GtkWidget *aux_toolbox; -- GtkWidget *commands_toolbox,; -+ GtkWidget *commands_toolbox; - GtkWidget *snap_toolbox; - - static void init(SPDesktopWidget *widget); diff --git a/inkscape-poppler-0.26.patch b/inkscape-poppler-0.26.patch deleted file mode 100644 index 84b324a..0000000 --- a/inkscape-poppler-0.26.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-04-28 13:42:17.843140695 +0000 -+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-04-28 14:05:10.646106685 +0000 -@@ -861,7 +861,7 @@ - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); -+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); - #else - blendingColorSpace = GfxColorSpace::parse(&obj5); - #endif -@@ -1085,9 +1085,9 @@ - res->lookupColorSpace(args[0].getName(), &obj); - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0], NULL); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj, NULL); -+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); - } - #else - if (obj.isNull()) { -@@ -1120,9 +1120,9 @@ - res->lookupColorSpace(args[0].getName(), &obj); - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0], NULL); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj, NULL); -+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); - } - #else - if (obj.isNull()) { -@@ -1213,7 +1213,7 @@ - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } -@@ -1273,7 +1273,7 @@ - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } -@@ -1711,7 +1711,7 @@ - GBool savedState = gFalse; - - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- if (!(shading = res->lookupShading(args[0].getName(), NULL))) { -+ if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { - return; - } - #else -@@ -2727,7 +2727,7 @@ - } - if (!obj1.isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- colorSpace = GfxColorSpace::parse(&obj1, NULL); -+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #else - colorSpace = GfxColorSpace::parse(&obj1); - #endif -@@ -2816,7 +2816,7 @@ - } - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- maskColorSpace = GfxColorSpace::parse(&obj1, NULL); -+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #else - maskColorSpace = GfxColorSpace::parse(&obj1); - #endif -@@ -3007,7 +3007,7 @@ - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); -+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); - #else - blendingColorSpace = GfxColorSpace::parse(&obj3); - #endif -- 2.43.0