summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-11 15:32:38 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-11 15:32:38 -0300
commit995dab37c4558447073ea6cb2c6ef7b89849912c (patch)
tree1b37cc72fc3a796bfa2856c7f710f978304b3a84 /extra
parent20604a1579dcd51b5a46fc7d09cf4b1535219446 (diff)
parent1a1b748f1738b1989a834d75b1623be21bf9bab5 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/perl-datetime-format-iso8601/PKGBUILD extra/kde-agent/PKGBUILD extra/labplot/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r--extra/blender/blender-ffmpeg.diff13
-rw-r--r--extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch11
-rw-r--r--extra/cinepaint/cinepaint-0.22.1-gcc43.patch73
-rw-r--r--extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch42
-rw-r--r--extra/inkscape/gcc46.patch849
-rw-r--r--extra/kde-agent/PKGBUILD20
-rw-r--r--extra/kde-agent/agent-shutdown.sh13
-rw-r--r--extra/kde-agent/agent-startup.sh19
-rw-r--r--extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch22
-rw-r--r--extra/kdelibs/fix-double-POST-action.patch27
-rw-r--r--extra/labplot/PKGBUILD40
-rw-r--r--extra/labplot/define-missing-constant.patch15
-rw-r--r--extra/labplot/hdf5-1.8.patch58
-rw-r--r--extra/opencv/gcc46.patch10
-rw-r--r--extra/opencv/ptrcvcapture.patch17
-rw-r--r--extra/opencv/v4l-mmap.patch14
-rw-r--r--extra/opencv/v4l_2.6.38.patch33
-rw-r--r--extra/usbmuxd/usbmuxd-udevuser.patch11
18 files changed, 0 insertions, 1287 deletions
diff --git a/extra/blender/blender-ffmpeg.diff b/extra/blender/blender-ffmpeg.diff
deleted file mode 100644
index ffef489e2..000000000
--- a/extra/blender/blender-ffmpeg.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: intern/ffmpeg/ffmpeg_compat.h
-===================================================================
---- intern/ffmpeg/ffmpeg_compat.h (revision 37744)
-+++ intern/ffmpeg/ffmpeg_compat.h (revision 37745)
-@@ -40,7 +40,7 @@
- #define FFMPEG_HAVE_AVIO 1
- #endif
-
--#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1))
-+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
- #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
- #endif
-
diff --git a/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch b/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch
deleted file mode 100644
index f1d09fa27..000000000
--- a/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2008-09-03 02:07:08.000000000 +0200
-+++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp 2008-09-03 02:08:02.000000000 +0200
-@@ -226,7 +226,7 @@
-
- int awake(void)
- {
-- Fl::awake(0);
-+ Fl::awake((void *)0);
- return 0;
- }
- int leerWait(void) { return 0; }
diff --git a/extra/cinepaint/cinepaint-0.22.1-gcc43.patch b/extra/cinepaint/cinepaint-0.22.1-gcc43.patch
deleted file mode 100644
index 64ba76099..000000000
--- a/extra/cinepaint/cinepaint-0.22.1-gcc43.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
-+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
-@@ -34,6 +34,7 @@
-
-
- #include <fstream>
-+#include <cstring>
- #include "TNT/tnt_misc.hpp" // proof_least_square_fit()
- #include "TNT/tnt_stopwatch.hpp"
- #include "TNT/jama_qr.hpp" // JAMA::QR
-Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
-+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
-@@ -26,6 +26,7 @@
- */
- #include <iostream>
- #include <cmath> // pow()
-+#include <cstring>
-
- #include "br_types.hpp" // ImageID
- #include "br_enums.hpp" // DataType, ReportWhat
-Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
-+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
-@@ -29,6 +29,7 @@
-
- #include "icc_utils.h"
- #include "icc_fenster.h"
-+#include <cstdlib>
-
- using namespace icc_examin_ns;
-
-Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_speicher.h
-+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
-@@ -33,6 +33,8 @@
-
- #include "icc_utils.h"
- #include <string>
-+#include <cstdlib>
-+#include <cstring>
-
- #define DBG_SPEICHER_START if(icc_debug >= 3) DBG_PROG_START
- #define DBG_SPEICHER_ENDE if(icc_debug >= 3) DBG_PROG_ENDE
-Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/threads.cpp
-+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
-@@ -42,6 +42,7 @@
- #include <iostream>
- # if HAVE_PTHREAD_H
- // Use POSIX threading...
-+#include <climits>
-
- int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p)
- {
-Index: cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/pdf/pdf.cpp
-+++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
-@@ -39,6 +39,7 @@
-
- #include "pdf.h"
- #include "pdf_dialog.h"
-+#include <cstring>
-
- extern "C" {
- #include <gtk/gtk.h>
diff --git a/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch b/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch
deleted file mode 100644
index e030593c2..000000000
--- a/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig 2008-06-27 19:28:52.000000000 +0200
-+++ ./plug-ins/icc_examin/icc_examin/icc_oyranos.h 2008-06-27 19:31:34.000000000 +0200
-@@ -142,9 +142,6 @@
-
- // colour transformations
- ColourTransformKey erzeugeTrafo (
-- const char* eingangs_profil__geraet,
-- int byte,
-- int kanaele,
- const char* ausgangs_profil__geraet,
- int byte,
- int kanaele,
-@@ -152,9 +149,6 @@
- const char* cmm, // 4 bytes 'lcms' 'APPL'
- int cmm_optionen); // BPC, precission
- ColourTransformKey erzeugeTrafo (
-- const char* eingangs_profil__geraet,
-- int byte,
-- int kanaele,
- const char* ausgangs_profil__geraet,
- int byte,
- int kanaele,
-@@ -163,9 +157,6 @@
- int cmm_optionen,
- std::list<const char*> &profile );
- ColourTransformKey erzeugeTrafo (
-- const char* eingangs_profil__geraet,
-- int byte,
-- int kanaele,
- const char* ausgangs_profil__geraet,
- int byte,
- int kanaele,
-@@ -181,9 +172,6 @@
- std::string cmm;
- private:
- ColourTransformKey erzeugeSchluessel_ (
-- const char* eingangs_profil__geraet,
-- int byte,
-- int kanaele,
- const char* ausgangs_profil__geraet,
- int byte,
- int kanaele,
diff --git a/extra/inkscape/gcc46.patch b/extra/inkscape/gcc46.patch
deleted file mode 100644
index d04914c87..000000000
--- a/extra/inkscape/gcc46.patch
+++ /dev/null
@@ -1,849 +0,0 @@
-diff -aur old/src/2geom/utils.h new/src/2geom/utils.h
---- old/src/2geom/utils.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/2geom/utils.h 2011-05-26 14:38:55.912288964 +0000
-@@ -35,6 +35,7 @@
-
- #include <cmath>
- #include <vector>
-+#include <cstddef>
-
- namespace Geom {
-
-diff -aur old/src/arc-context.h new/src/arc-context.h
---- old/src/arc-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/arc-context.h 2011-05-26 14:37:30.814792031 +0000
-@@ -15,6 +15,7 @@
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #include <2geom/point.h>
-diff -aur old/src/box3d-context.h new/src/box3d-context.h
---- old/src/box3d-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/box3d-context.h 2011-05-26 14:37:30.814792031 +0000
-@@ -15,6 +15,7 @@
- * Released under GNU GPL
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "proj_pt.h"
-diff -aur old/src/conn-avoid-ref.h new/src/conn-avoid-ref.h
---- old/src/conn-avoid-ref.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/conn-avoid-ref.h 2011-05-26 14:37:30.814792031 +0000
-@@ -14,6 +14,7 @@
- */
-
- #include <glib/gslist.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- struct SPDesktop;
-diff -aur old/src/connection-pool.h new/src/connection-pool.h
---- old/src/connection-pool.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/connection-pool.h 2011-05-26 14:37:30.814792031 +0000
-@@ -3,6 +3,7 @@
-
- #include <glib-object.h>
- #include <gtkmm.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- namespace Inkscape
-diff -aur old/src/connector-context.h new/src/connector-context.h
---- old/src/connector-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/connector-context.h 2011-05-26 14:37:30.814792120 +0000
-@@ -12,6 +12,7 @@
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <sigc++/connection.h>
- #include "event-context.h"
-diff -aur old/src/desktop.h new/src/desktop.h
---- old/src/desktop.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/desktop.h 2011-05-26 14:37:30.814792120 +0000
-@@ -27,6 +27,7 @@
-
- #include <gdk/gdkevents.h>
- #include <gtk/gtktypeutils.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- #include <2geom/matrix.h>
-diff -aur old/src/dialogs/object-attributes.cpp new/src/dialogs/object-attributes.cpp
---- old/src/dialogs/object-attributes.cpp 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/dialogs/object-attributes.cpp 2011-05-26 14:37:30.814792120 +0000
-@@ -13,6 +13,7 @@
- #include <glibmm/i18n.h>
- #include <string>
- #include <cstring>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/ptr_fun.h>
- #include <sigc++/adaptors/bind.h>
-diff -aur old/src/display/canvas-temporary-item.h new/src/display/canvas-temporary-item.h
---- old/src/display/canvas-temporary-item.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/display/canvas-temporary-item.h 2011-05-26 14:37:30.814792120 +0000
-@@ -14,6 +14,7 @@
-
- #include "display/display-forward.h"
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- namespace Inkscape {
-diff -aur old/src/document.h new/src/document.h
---- old/src/document.h 2010-08-04 16:45:00.868588000 +0000
-+++ new/src/document.h 2011-05-26 14:37:30.814792120 +0000
-@@ -17,6 +17,7 @@
-
- #include <glib-object.h>
- #include <gtk/gtksignal.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <sigc++/class_slot.h>
-
-diff -aur old/src/document-private.h new/src/document-private.h
---- old/src/document-private.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/document-private.h 2011-05-26 14:37:30.814792120 +0000
-@@ -14,6 +14,7 @@
- */
-
- #include <map>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "xml/event-fns.h"
- #include "sp-defs.h"
-diff -aur old/src/document-subset.h new/src/document-subset.h
---- old/src/document-subset.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/document-subset.h 2011-05-26 14:37:30.814792120 +0000
-@@ -10,6 +10,7 @@
- #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
- #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/slot.h>
-
-diff -aur old/src/draw-context.h new/src/draw-context.h
---- old/src/draw-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/draw-context.h 2011-05-26 14:37:30.814792120 +0000
-@@ -14,6 +14,7 @@
- * Released under GNU GPL
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include <forward.h>
-diff -aur old/src/extension/timer.h new/src/extension/timer.h
---- old/src/extension/timer.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/extension/timer.h 2011-05-26 14:37:30.814792120 +0000
-@@ -13,6 +13,7 @@
- #ifndef INKSCAPE_EXTENSION_TIMER_H__
- #define INKSCAPE_EXTENSION_TIMER_H__
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glibmm/timeval.h>
- #include "extension-forward.h"
-diff -aur old/src/flood-context.h new/src/flood-context.h
---- old/src/flood-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/flood-context.h 2011-05-26 14:37:30.814792120 +0000
-@@ -11,6 +11,7 @@
- * Released under GNU GPL
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtk/gtk.h>
- #include "event-context.h"
-diff -aur old/src/gc-alloc.h new/src/gc-alloc.h
---- old/src/gc-alloc.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/gc-alloc.h 2011-05-26 14:37:30.814792120 +0000
-@@ -16,6 +16,7 @@
- #define SEEN_INKSCAPE_GC_ALLOC_H
-
- #include <limits>
-+#include <cstddef>
- #include "gc-core.h"
-
- namespace Inkscape {
-diff -aur old/src/gc.cpp new/src/gc.cpp
---- old/src/gc.cpp 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/gc.cpp 2011-05-26 14:37:30.814792120 +0000
-@@ -16,6 +16,7 @@
- #include <glib/gmessages.h>
- #include <sigc++/functors/ptr_fun.h>
- #include <glibmm/main.h>
-+#include <cstddef>
-
- namespace Inkscape {
- namespace GC {
-diff -aur old/src/gc-finalized.h new/src/gc-finalized.h
---- old/src/gc-finalized.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/gc-finalized.h 2011-05-26 14:37:30.814792120 +0000
-@@ -17,6 +17,7 @@
- #define SEEN_INKSCAPE_GC_FINALIZED_H
-
- #include <new>
-+#include <cstddef>
- #include "gc-core.h"
-
- namespace Inkscape {
-diff -aur old/src/gradient-context.h new/src/gradient-context.h
---- old/src/gradient-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/gradient-context.h 2011-05-26 14:37:30.814792120 +0000
-@@ -15,6 +15,7 @@
- * Released under GNU GPL
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
-
-diff -aur old/src/gradient-drag.h new/src/gradient-drag.h
---- old/src/gradient-drag.h 2010-08-04 16:45:00.868588000 +0000
-+++ new/src/gradient-drag.h 2011-05-26 14:37:30.814792120 +0000
-@@ -15,6 +15,7 @@
- */
-
- #include <glib/gslist.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <vector>
-
-diff -aur old/src/knot.h new/src/knot.h
---- old/src/knot.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/knot.h 2011-05-26 14:37:30.814792120 +0000
-@@ -20,6 +20,7 @@
- #include "forward.h"
- #include <2geom/point.h>
- #include "knot-enums.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- class SPKnot;
-diff -aur old/src/libavoid/geomtypes.h new/src/libavoid/geomtypes.h
---- old/src/libavoid/geomtypes.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/libavoid/geomtypes.h 2011-05-26 14:37:30.814792120 +0000
-@@ -29,6 +29,7 @@
- #ifndef AVOID_GEOMTYPES_H
- #define AVOID_GEOMTYPES_H
-
-+#include <cstddef>
- #include <vector>
- #include <utility>
-
-diff -aur old/src/live_effects/lpeobject-reference.h new/src/live_effects/lpeobject-reference.h
---- old/src/live_effects/lpeobject-reference.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/live_effects/lpeobject-reference.h 2011-05-26 14:37:30.818124452 +0000
-@@ -11,6 +11,7 @@
-
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- namespace Inkscape {
-diff -aur old/src/live_effects/parameter/path.h new/src/live_effects/parameter/path.h
---- old/src/live_effects/parameter/path.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/live_effects/parameter/path.h 2011-05-26 14:37:30.818124452 +0000
-@@ -16,6 +16,7 @@
-
- #include "live_effects/parameter/parameter.h"
- #include "live_effects/parameter/path-reference.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- namespace Inkscape {
-diff -aur old/src/live_effects/parameter/path-reference.h new/src/live_effects/parameter/path-reference.h
---- old/src/live_effects/parameter/path-reference.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/live_effects/parameter/path-reference.h 2011-05-26 14:37:30.818124452 +0000
-@@ -11,6 +11,7 @@
-
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- class Path;
-diff -aur old/src/Makefile.am new/src/Makefile.am
---- old/src/Makefile.am 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/Makefile.am 2011-05-26 14:37:30.814792031 +0000
-@@ -205,7 +205,7 @@
-
- inkscape_SOURCES += main.cpp $(win32_sources)
- inkscape_LDADD = $(all_libs)
--inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
-+inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
-
- inkview_SOURCES += inkview.cpp $(win32_sources)
- inkview_LDADD = $(all_libs)
-diff -aur old/src/message-stack.h new/src/message-stack.h
---- old/src/message-stack.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/message-stack.h 2011-05-26 14:37:30.818124452 +0000
-@@ -14,6 +14,7 @@
- #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
- #define SEEN_INKSCAPE_MESSAGE_STACK_H
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glib.h>
- #include <stdarg.h>
-diff -aur old/src/object-hierarchy.h new/src/object-hierarchy.h
---- old/src/object-hierarchy.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/object-hierarchy.h 2011-05-26 14:37:30.818124452 +0000
-@@ -14,6 +14,7 @@
-
- #include <exception>
- #include <list>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/signal.h>
- #include <glib/gmessages.h>
-diff -aur old/src/persp3d-reference.h new/src/persp3d-reference.h
---- old/src/persp3d-reference.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/persp3d-reference.h 2011-05-26 14:37:30.818124452 +0000
-@@ -11,6 +11,7 @@
- */
-
- #include "uri-references.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "persp3d.h"
-
-diff -aur old/src/rect-context.h new/src/rect-context.h
---- old/src/rect-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/rect-context.h 2011-05-26 14:37:30.818124452 +0000
-@@ -14,6 +14,7 @@
- * Released under GNU GPL
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "libnr/nr-point.h"
-diff -aur old/src/selcue.h new/src/selcue.h
---- old/src/selcue.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/selcue.h 2011-05-26 14:37:30.818124452 +0000
-@@ -14,6 +14,7 @@
- */
-
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- class SPDesktop;
-diff -aur old/src/selection-describer.h new/src/selection-describer.h
---- old/src/selection-describer.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/selection-describer.h 2011-05-26 14:37:30.818124452 +0000
-@@ -12,6 +12,7 @@
- #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
- #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "message-context.h"
-
-diff -aur old/src/selection.h new/src/selection.h
---- old/src/selection.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/selection.h 2011-05-26 14:37:30.818124452 +0000
-@@ -19,6 +19,7 @@
- #include <vector>
- #include <map>
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- //#include "libnr/nr-rect.h"
-diff -aur old/src/seltrans.h new/src/seltrans.h
---- old/src/seltrans.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/seltrans.h 2011-05-26 14:37:30.818124452 +0000
-@@ -15,6 +15,7 @@
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <2geom/point.h>
- #include <2geom/matrix.h>
-diff -aur old/src/sp-conn-end.h new/src/sp-conn-end.h
---- old/src/sp-conn-end.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-conn-end.h 2011-05-26 14:37:30.818124452 +0000
-@@ -2,6 +2,7 @@
- #define SEEN_SP_CONN_END
-
- #include <glib/gtypes.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #include "sp-use-reference.h"
-diff -aur old/src/sp-conn-end-pair.h new/src/sp-conn-end-pair.h
---- old/src/sp-conn-end-pair.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-conn-end-pair.h 2011-05-26 14:37:30.818124452 +0000
-@@ -15,6 +15,7 @@
-
- #include "forward.h"
- #include "libnr/nr-point.h"
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/slot.h>
- #include <sigc++/signal.h>
-diff -aur old/src/sp-gradient.h new/src/sp-gradient.h
---- old/src/sp-gradient.h 2010-08-04 16:45:00.868588000 +0000
-+++ new/src/sp-gradient.h 2011-05-26 14:37:30.818124452 +0000
-@@ -25,6 +25,7 @@
- #include "sp-gradient-units.h"
- #include "sp-gradient-vector.h"
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- struct SPGradientReference;
-diff -aur old/src/spiral-context.h new/src/spiral-context.h
---- old/src/spiral-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/spiral-context.h 2011-05-26 14:37:30.821456796 +0000
-@@ -16,6 +16,7 @@
- */
-
- #include <gtk/gtktypeutils.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "libnr/nr-point.h"
-diff -aur old/src/sp-object.h new/src/sp-object.h
---- old/src/sp-object.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-object.h 2011-05-26 14:37:30.818124452 +0000
-@@ -56,6 +56,7 @@
-
-
- #include <glib-object.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/slot.h>
- #include <sigc++/signal.h>
-diff -aur old/src/sp-offset.h new/src/sp-offset.h
---- old/src/sp-offset.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-offset.h 2011-05-26 14:37:30.818124452 +0000
-@@ -16,6 +16,7 @@
-
- #include "sp-shape.h"
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- #define SP_TYPE_OFFSET (sp_offset_get_type ())
-diff -aur old/src/sp-pattern.h new/src/sp-pattern.h
---- old/src/sp-pattern.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-pattern.h 2011-05-26 14:37:30.818124452 +0000
-@@ -32,6 +32,7 @@
- #include "sp-paint-server.h"
- #include "uri-references.h"
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- class SPPatternReference : public Inkscape::URIReference {
-diff -aur old/src/sp-shape.h new/src/sp-shape.h
---- old/src/sp-shape.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-shape.h 2011-05-26 14:37:30.818124452 +0000
-@@ -19,6 +19,7 @@
- #include "sp-marker-loc.h"
- #include <2geom/forward.h>
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #define SP_TYPE_SHAPE (sp_shape_get_type ())
-diff -aur old/src/sp-switch.h new/src/sp-switch.h
---- old/src/sp-switch.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-switch.h 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
-
- #include "sp-item-group.h"
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #define SP_TYPE_SWITCH (CSwitch::getType())
-diff -aur old/src/sp-text.h new/src/sp-text.h
---- old/src/sp-text.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-text.h 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
- */
-
- #include <glib/gtypes.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "sp-item.h"
- #include "sp-string.h"
-diff -aur old/src/sp-tref-reference.h new/src/sp-tref-reference.h
---- old/src/sp-tref-reference.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-tref-reference.h 2011-05-26 14:37:30.821456796 +0000
-@@ -13,6 +13,7 @@
-
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- #include "util/share.h"
-diff -aur old/src/sp-use.h new/src/sp-use.h
---- old/src/sp-use.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-use.h 2011-05-26 14:37:30.821456796 +0000
-@@ -13,6 +13,7 @@
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "svg/svg-length.h"
- #include "sp-item.h"
-diff -aur old/src/sp-use-reference.h new/src/sp-use-reference.h
---- old/src/sp-use-reference.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/sp-use-reference.h 2011-05-26 14:37:30.821456796 +0000
-@@ -11,6 +11,7 @@
-
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- class Path;
-diff -aur old/src/star-context.h new/src/star-context.h
---- old/src/star-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/star-context.h 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "libnr/nr-point.h"
-diff -aur old/src/style.h new/src/style.h
---- old/src/style.h 2010-08-04 16:45:00.868588000 +0000
-+++ new/src/style.h 2011-05-26 14:37:30.821456796 +0000
-@@ -24,6 +24,7 @@
- #include "uri.h"
- #include "sp-paint-server.h"
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- namespace Inkscape {
-diff -aur old/src/text-context.h new/src/text-context.h
---- old/src/text-context.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/text-context.h 2011-05-26 14:37:30.821456796 +0000
-@@ -15,6 +15,7 @@
- */
-
- /* #include <gdk/gdkic.h> */
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtk/gtkimcontext.h>
-
-diff -aur old/src/ui/dialog/desktop-tracker.h new/src/ui/dialog/desktop-tracker.h
---- old/src/ui/dialog/desktop-tracker.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/dialog/desktop-tracker.h 2011-05-26 14:37:30.821456796 +0000
-@@ -11,6 +11,7 @@
- #ifndef SEEN_DIALOG_DESKTOP_TRACKER
- #define SEEN_DIALOG_DESKTOP_TRACKER
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <glib/gtypes.h>
-
-diff -aur old/src/ui/dialog/document-metadata.h new/src/ui/dialog/document-metadata.h
---- old/src/ui/dialog/document-metadata.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/dialog/document-metadata.h 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
- #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
-
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtkmm/notebook.h>
- #include <glibmm/i18n.h>
-diff -aur old/src/ui/dialog/document-properties.h new/src/ui/dialog/document-properties.h
---- old/src/ui/dialog/document-properties.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/dialog/document-properties.h 2011-05-26 14:37:30.821456796 +0000
-@@ -15,6 +15,7 @@
- #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
-
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>//
- #include <gtkmm/notebook.h>
- #include <glibmm/i18n.h>
-diff -aur old/src/ui/dialog/inkscape-preferences.h new/src/ui/dialog/inkscape-preferences.h
---- old/src/ui/dialog/inkscape-preferences.h 2010-11-06 18:47:19.806162000 +0000
-+++ new/src/ui/dialog/inkscape-preferences.h 2011-05-26 14:37:30.821456796 +0000
-@@ -28,6 +28,7 @@
- #include <gtkmm/frame.h>
- #include <gtkmm/notebook.h>
- #include "ui/widget/preferences-widget.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glibmm/i18n.h>
- #include <gtkmm/textview.h>
-diff -aur old/src/ui/dialog/undo-history.cpp new/src/ui/dialog/undo-history.cpp
---- old/src/ui/dialog/undo-history.cpp 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/dialog/undo-history.cpp 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
-
- #include <glibmm/i18n.h>
- #include <gtk/gtkimage.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
-
-diff -aur old/src/ui/tool/control-point.h new/src/ui/tool/control-point.h
---- old/src/ui/tool/control-point.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/tool/control-point.h 2011-05-26 14:37:30.821456796 +0000
-@@ -12,6 +12,7 @@
- #define SEEN_UI_TOOL_CONTROL_POINT_H
-
- #include <boost/utility.hpp>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gdkmm.h>
- #include <gtkmm.h>
-diff -aur old/src/ui/tool/control-point-selection.h new/src/ui/tool/control-point-selection.h
---- old/src/ui/tool/control-point-selection.h 2010-08-04 16:45:00.868588000 +0000
-+++ new/src/ui/tool/control-point-selection.h 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
-
- #include <memory>
- #include <boost/optional.hpp>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <2geom/forward.h>
- #include <2geom/point.h>
-diff -aur old/src/ui/tool/manipulator.h new/src/ui/tool/manipulator.h
---- old/src/ui/tool/manipulator.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/tool/manipulator.h 2011-05-26 14:37:30.821456796 +0000
-@@ -13,6 +13,7 @@
-
- #include <set>
- #include <map>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glib.h>
- #include <gdk/gdk.h>
-diff -aur old/src/ui/tool/multi-path-manipulator.h new/src/ui/tool/multi-path-manipulator.h
---- old/src/ui/tool/multi-path-manipulator.h 2010-11-06 18:47:19.806162000 +0000
-+++ new/src/ui/tool/multi-path-manipulator.h 2011-05-26 14:37:30.821456796 +0000
-@@ -11,6 +11,7 @@
- #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
- #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include "display/display-forward.h"
- #include "forward.h"
-diff -aur old/src/ui/tool/node.h new/src/ui/tool/node.h
---- old/src/ui/tool/node.h 2011-01-02 04:34:09.814902000 +0000
-+++ new/src/ui/tool/node.h 2011-05-26 14:37:30.821456796 +0000
-@@ -15,6 +15,7 @@
- #include <iterator>
- #include <iosfwd>
- #include <stdexcept>
-+#include <cstddef>
- #include <tr1/functional>
- #include <boost/utility.hpp>
- #include <boost/shared_ptr.hpp>
-diff -aur old/src/ui/tool/node-tool.h new/src/ui/tool/node-tool.h
---- old/src/ui/tool/node-tool.h 2010-11-06 18:47:19.806162000 +0000
-+++ new/src/ui/tool/node-tool.h 2011-05-26 14:37:30.821456796 +0000
-@@ -14,6 +14,7 @@
- #include <memory>
- #include <boost/ptr_container/ptr_map.hpp>
- #include <glib.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "forward.h"
-diff -aur old/src/ui/view/view.h new/src/ui/view/view.h
---- old/src/ui/view/view.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/view/view.h 2011-05-26 14:37:30.821456796 +0000
-@@ -15,6 +15,7 @@
- */
-
- #include <gdk/gdktypes.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include "message.h"
- #include "gc-managed.h"
-diff -aur old/src/ui/widget/color-picker.h new/src/ui/widget/color-picker.h
---- old/src/ui/widget/color-picker.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/widget/color-picker.h 2011-05-26 14:37:30.824789230 +0000
-@@ -13,6 +13,7 @@
- #ifndef __COLOR_PICKER_H__
- #define __COLOR_PICKER_H__
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtkmm/button.h>
- #include <gtkmm/dialog.h>
-diff -aur old/src/ui/widget/page-sizer.h new/src/ui/widget/page-sizer.h
---- old/src/ui/widget/page-sizer.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/widget/page-sizer.h 2011-05-26 14:37:30.824789230 +0000
-@@ -13,6 +13,7 @@
- #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
-
- #include <gtkmm.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- #include "helper/units.h"
-diff -aur old/src/ui/widget/preferences-widget.h new/src/ui/widget/preferences-widget.h
---- old/src/ui/widget/preferences-widget.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/widget/preferences-widget.h 2011-05-26 14:37:30.824789230 +0000
-@@ -26,6 +26,7 @@
- #include <gtkmm/drawingarea.h>
- #include <gtkmm/frame.h>
- #include <gtkmm/filechooserbutton.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glibmm/i18n.h>
-
-diff -aur old/src/ui/widget/selected-style.h new/src/ui/widget/selected-style.h
---- old/src/ui/widget/selected-style.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/widget/selected-style.h 2011-05-26 14:37:30.824789230 +0000
-@@ -23,6 +23,7 @@
- #include <gtkmm/adjustment.h>
- #include <gtkmm/spinbutton.h>
-
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- #include <glibmm/i18n.h>
-diff -aur old/src/ui/widget/style-subject.h new/src/ui/widget/style-subject.h
---- old/src/ui/widget/style-subject.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/ui/widget/style-subject.h 2011-05-26 14:37:30.824789230 +0000
-@@ -14,6 +14,7 @@
- #include "libnr/nr-rect.h"
- #include <2geom/rect.h>
- #include "sp-item.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- class SPDesktop;
-diff -aur old/src/uri-references.h new/src/uri-references.h
---- old/src/uri-references.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/uri-references.h 2011-05-26 14:37:30.824789230 +0000
-@@ -13,6 +13,7 @@
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/trackable.h>
-
-diff -aur old/src/util/forward-pointer-iterator.h new/src/util/forward-pointer-iterator.h
---- old/src/util/forward-pointer-iterator.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/util/forward-pointer-iterator.h 2011-05-26 14:37:30.824789230 +0000
-@@ -15,6 +15,7 @@
- #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
-
- #include <iterator>
-+#include <cstddef>
- #include "util/reference.h"
-
- namespace Inkscape {
-diff -aur old/src/util/share.h new/src/util/share.h
---- old/src/util/share.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/util/share.h 2011-05-26 14:37:30.824789230 +0000
-@@ -14,6 +14,7 @@
-
- #include "gc-core.h"
- #include <cstring>
-+#include <cstddef>
-
- namespace Inkscape {
- namespace Util {
-diff -aur old/src/util/unordered-containers.h new/src/util/unordered-containers.h
---- old/src/util/unordered-containers.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/util/unordered-containers.h 2011-05-26 14:37:30.824789230 +0000
-@@ -41,6 +41,8 @@
- # define INK_UNORDERED_MAP __gnu_cxx::hash_map
- # define INK_HASH __gnu_cxx::hash
-
-+#include <cstddef>
-+
- namespace __gnu_cxx {
- // hash function for pointers
- // TR1 and Boost have this defined by default, __gnu_cxx doesn't
-diff -aur old/src/widgets/desktop-widget.h new/src/widgets/desktop-widget.h
---- old/src/widgets/desktop-widget.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/widgets/desktop-widget.h 2011-05-26 14:37:30.824789230 +0000
-@@ -21,6 +21,7 @@
- #include "ui/view/view-widget.h"
- #include "ui/view/edit-widget-interface.h"
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- // forward declaration
-diff -aur old/src/widgets/gradient-image.h new/src/widgets/gradient-image.h
---- old/src/widgets/gradient-image.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/widgets/gradient-image.h 2011-05-26 14:37:30.824789230 +0000
-@@ -19,6 +19,7 @@
-
- #include <glib.h>
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
-diff -aur old/src/widgets/gradient-vector.h new/src/widgets/gradient-vector.h
---- old/src/widgets/gradient-vector.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/widgets/gradient-vector.h 2011-05-26 14:37:30.824789230 +0000
-@@ -17,6 +17,7 @@
-
- #include <glib.h>
-
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #include <gtk/gtkvbox.h>
-diff -aur old/src/widgets/sp-attribute-widget.h new/src/widgets/sp-attribute-widget.h
---- old/src/widgets/sp-attribute-widget.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/widgets/sp-attribute-widget.h 2011-05-26 14:37:30.824789230 +0000
-@@ -14,6 +14,7 @@
- #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
-
- #include <glib.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
-
- #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
-diff -aur old/src/widgets/sp-color-notebook.cpp new/src/widgets/sp-color-notebook.cpp
---- old/src/widgets/sp-color-notebook.cpp 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/widgets/sp-color-notebook.cpp 2011-05-26 14:37:30.824789230 +0000
-@@ -22,6 +22,7 @@
- #include <cstring>
- #include <string>
- #include <cstdlib>
-+#include <cstddef>
- #include <gtk/gtk.h>
- #include <glibmm/i18n.h>
-
-diff -aur old/src/xml/helper-observer.h new/src/xml/helper-observer.h
---- old/src/xml/helper-observer.h 2010-07-13 03:48:40.691600000 +0000
-+++ new/src/xml/helper-observer.h 2011-05-26 14:37:30.824789230 +0000
-@@ -5,6 +5,7 @@
- #include "node.h"
- #include "../sp-object.h"
- //#include "../sp-object-repr.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
-
- namespace Inkscape {
diff --git a/extra/kde-agent/PKGBUILD b/extra/kde-agent/PKGBUILD
deleted file mode 100644
index b8554ccf8..000000000
--- a/extra/kde-agent/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 48318 2009-08-01 13:49:37Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kde-agent
-pkgver=20090801
-pkgrel=2
-pkgdesc="Startup and shutdown scripts for gpg-agent and ssh-agent in KDE"
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('pinentry' 'openssh' 'qt')
-source=(agent-startup.sh
- agent-shutdown.sh)
-
-build() {
- install -D -m 755 $srcdir/agent-startup.sh $pkgdir/etc/kde/env/agent-startup.sh
- install -D -m 755 $srcdir/agent-shutdown.sh $pkgdir/etc/kde/shutdown/agent-shutdown.sh
-}
-md5sums=('7daec96c125e1e238a35f31ea4a476f0'
- '18e8d01124b19f7df2937c06e177bf7f')
diff --git a/extra/kde-agent/agent-shutdown.sh b/extra/kde-agent/agent-shutdown.sh
deleted file mode 100644
index 71b056af3..000000000
--- a/extra/kde-agent/agent-shutdown.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# This file is executed at kde shutdown.
-# Uncomment the following lines to kill the agents
-# that were started at session startup.
-
-if [ "${GPG_AGENT_INFO}" ]; then
- kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
-fi
-#
-if [ "${SSH_AGENT_PID}" ]; then
- ssh-agent -k
-fi
diff --git a/extra/kde-agent/agent-startup.sh b/extra/kde-agent/agent-startup.sh
deleted file mode 100644
index 0897a237c..000000000
--- a/extra/kde-agent/agent-startup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Agents startup file
-#
-# This file is sourced at kde startup, so that
-# the environment variables set here are available
-# throughout the session.
-
-# Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at kde startup.
-# If you do so, do not forget to uncomment the respective
-# lines in KDEDIR/shutdown/agent-shutdown.sh to
-# properly kill the agents when the session ends.
-
-if [ -x /usr/bin/gpg-agent ]; then
- eval "$(/usr/bin/gpg-agent --daemon --pinentry-program /usr/bin/pinentry-qt4)"
-fi
-#
-if [ -x /usr/bin/ssh-agent ]; then
- eval "$(/usr/bin/ssh-agent -s)"
-fi
diff --git a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch
deleted file mode 100644
index fec667663..000000000
--- a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0
-Author: Aaron Seigo <aseigo@kde.org>
-Date: Fri May 6 22:51:50 2011 +0200
-
- get rid of duplicate connect
-
- patch contributed by Luc Menut
- BUG:262614
- REVIEW:101284
-
-diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp
-index cbc7175..bef53e5 100644
---- a/plasma/generic/containmentactions/applauncher/launch.cpp
-+++ b/plasma/generic/containmentactions/applauncher/launch.cpp
-@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args)
- {
- m_menu = new KMenu();
- connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
-- connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
-
- m_action->setMenu(m_menu);
- }
diff --git a/extra/kdelibs/fix-double-POST-action.patch b/extra/kdelibs/fix-double-POST-action.patch
deleted file mode 100644
index 2672d65db..000000000
--- a/extra/kdelibs/fix-double-POST-action.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 92db24adfa941003db1d885df01157056617f30b
-Author: Maks Orlovich <maksim@kde.org>
-Date: Sun May 8 14:39:03 2011 -0400
-
- Fix the job-on-hold reuse logic, which caused the double-POST problem)
-
- adawit, could you please at least READ what you're backporting if you are
- going to be this aggressive? Or better yet, please don't backport anything
- that's not fixing a critical bug or is trivial, as per:
- http://techbase.kde.org/Policies/Minor_Point_Release_Policy
-
- CCMAIL: adawit@kde.org
- BUG: 272466
-
-diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
-index 55da053..9f5607e 100644
---- a/kio/kio/scheduler.cpp
-+++ b/kio/kio/scheduler.cpp
-@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
- bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
-
- if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
-- canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
-+ canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
- if (canJobReuse) {
- KIO::MetaData outgoing = tJob->outgoingMetaData();
- const QString resume = outgoing.value("resume");
diff --git a/extra/labplot/PKGBUILD b/extra/labplot/PKGBUILD
deleted file mode 100644
index 4f9cf027a..000000000
--- a/extra/labplot/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 69056 2010-02-16 15:06:54Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=labplot
-pkgver=1.6.0.2
-pkgrel=6
-pkgdesc="Plotting, Data analysis and visualisation"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://staff.mbi-berlin.de/gerlach/Linux/LabPlot/"
-license=("GPL")
-depends=('kdelibs3' 'gsl' 'imagemagick' \
- 'fftw' 'netcdf>=4.1')
-makedepends=('libxml++>=2.26' 'audiofile')
-options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/$pkgname/LabPlot-$pkgver.tar.gz define-missing-constant.patch
- 'hdf5-1.8.patch')
-
-md5sums=('850256dcd02c4a8ede5b5fe3fbc21ab7' 'e8133bb7b8da63f4ae5a0b998c37b702'
- '1d38c7304a53b238f8cecb337771ed6f')
-
-
-build() {
- cd $srcdir/LabPlot-${pkgver}
- patch -p1 < ../define-missing-constant.patch || return 1
- patch -Np0 -i ${srcdir}/hdf5-1.8.patch || return 1
-
- # source kde3 variables
- source /etc/profile.d/kde3.sh
-
- # build and install
- ./configure --prefix=/opt/kde --enable-mt \
- --without-arts --disable-audiofile \
- --mandir=/opt/kde/share/man
- --disable-KexiDB
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-}
-
diff --git a/extra/labplot/define-missing-constant.patch b/extra/labplot/define-missing-constant.patch
deleted file mode 100644
index f61211279..000000000
--- a/extra/labplot/define-missing-constant.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/constants.h b/src/constants.h
-index 77d76bf..1bada49 100644
---- a/src/constants.h
-+++ b/src/constants.h
-@@ -17,6 +17,10 @@
- #endif
- #endif
-
-+#ifndef GSL_CONST_CGSM_GAUSS
-+#define GSL_CONST_CGSM_GAUSS (1e0) /* g / abamp s^2 */
-+#endif
-+
- #ifdef HAVE_R
- #include <R.h>
- #include <Rmath.h>
diff --git a/extra/labplot/hdf5-1.8.patch b/extra/labplot/hdf5-1.8.patch
deleted file mode 100644
index 8d9780bb4..000000000
--- a/extra/labplot/hdf5-1.8.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- src.orig/FilterHDF5.cc 2009-10-15 17:33:15.736674721 +0200
-+++ src/FilterHDF5.cc 2009-10-15 17:23:51.386155522 +0200
-@@ -76,7 +76,7 @@
- printf(" GROUP \"%s\" \n", name);
- numgroups++;
-
-- hid_t group = H5Gopen(loc_id, name);
-+ hid_t group = H5Gopen(loc_id, name, H5P_DEFAULT);
-
- int nrattr = H5Aget_num_attrs(group);
- printf(" GROUP has %d attributes\n",nrattr);
-@@ -129,7 +129,7 @@
- printf(" DATASET \"%s\"\n", name);
-
- hid_t dataset;
-- dataset = H5Dopen(loc_id, name);
-+ dataset = H5Dopen(loc_id, name, H5P_DEFAULT);
-
- numsets++;
- data.resize(numsets);
-@@ -260,7 +260,7 @@
-
- int *matrix = new int[DY];
- hsize_t tdims[] = {1};
-- hid_t s4_tid = H5Tarray_create(H5T_NATIVE_INT,1,tdims,NULL);
-+ hid_t s4_tid = H5Tarray_create(H5T_NATIVE_INT,1,tdims);
- hid_t s3_tid = H5Tcreate(H5T_COMPOUND, sizeof(s4_tid));
- status = H5Tinsert(s3_tid, H5Tget_member_name (datatype,j), 0, s4_tid);
-
-@@ -279,7 +279,7 @@
-
- float *matrix = new float[DY];
- hsize_t tdims[] = {1};
-- hid_t s4_tid = H5Tarray_create(H5T_NATIVE_FLOAT,1,tdims,NULL);
-+ hid_t s4_tid = H5Tarray_create(H5T_NATIVE_FLOAT,1,tdims);
- hid_t s3_tid = H5Tcreate(H5T_COMPOUND, sizeof(s4_tid));
- status = H5Tinsert(s3_tid, H5Tget_member_name (datatype,j), 0, s4_tid);
-
-@@ -467,7 +467,7 @@
- hid_t file = H5Fopen(filename.latin1(), H5F_ACC_RDONLY, H5P_DEFAULT);
-
- printf(" ROOT GROUP :\n");
-- hid_t group = H5Gopen(file, "/");
-+ hid_t group = H5Gopen(file, "/", H5P_DEFAULT);
-
- int nrattr = H5Aget_num_attrs(group);
- attributes.resize(nrattr);
-@@ -567,7 +567,8 @@
- H5Tset_order(datatype, H5T_ORDER_BE);
- break;
- }
-- hid_t dataset = H5Dcreate(file,s->Title().latin1(),type,dataspace,H5P_DEFAULT);
-+ hid_t dataset = H5Dcreate(file,s->Title().latin1(),type,dataspace,
-+ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
- hid_t status;
- switch(datatype) {
-
diff --git a/extra/opencv/gcc46.patch b/extra/opencv/gcc46.patch
deleted file mode 100644
index a69499b4f..000000000
--- a/extra/opencv/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp
-===================================================================
---- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804)
-+++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861)
-@@ -56,4 +56,5 @@
- #include <algorithm>
- #include <cmath>
-+#include <cstddef>
- #include <complex>
- #include <map>
diff --git a/extra/opencv/ptrcvcapture.patch b/extra/opencv/ptrcvcapture.patch
deleted file mode 100644
index c1316f0ea..000000000
--- a/extra/opencv/ptrcvcapture.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: modules/highgui/src/cap.cpp
-===================================================================
---- modules/highgui/src/cap.cpp (revision 4283)
-+++ modules/highgui/src/cap.cpp (working copy)
-@@ -52,10 +52,10 @@
- namespace cv
- {
-
--template<> inline void Ptr<CvCapture>::delete_obj()
-+template<> void Ptr<CvCapture>::delete_obj()
- { cvReleaseCapture(&obj); }
-
--template<> inline void Ptr<CvVideoWriter>::delete_obj()
-+template<> void Ptr<CvVideoWriter>::delete_obj()
- { cvReleaseVideoWriter(&obj); }
-
- }
diff --git a/extra/opencv/v4l-mmap.patch b/extra/opencv/v4l-mmap.patch
deleted file mode 100644
index b7bbc9b74..000000000
--- a/extra/opencv/v4l-mmap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.ros.org/trac/opencv/ticket/141
-http://bugs.gentoo.org/313649
-
---- src/highgui/cvcap_libv4l.cpp
-+++ src/highgui/cvcap_libv4l.cpp
-@@ -782,7 +782,7 @@
-
- capture->buffers[n_buffers].length = buf.length;
- capture->buffers[n_buffers].start =
-- mmap (NULL /* start anywhere */,
-+ v4l2_mmap (NULL /* start anywhere */,
- buf.length,
- PROT_READ | PROT_WRITE /* required */,
- MAP_SHARED /* recommended */,
diff --git a/extra/opencv/v4l_2.6.38.patch b/extra/opencv/v4l_2.6.38.patch
deleted file mode 100644
index dd23cd133..000000000
--- a/extra/opencv/v4l_2.6.38.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp
---- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800
-+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800
-@@ -214,7 +214,7 @@
- #include <sys/types.h>
- #include <sys/mman.h>
-
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-
- #include <string.h>
- #include <stdlib.h>
-diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp
---- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800
-+++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800
-@@ -224,7 +224,7 @@
- #include "highgui.h"
- #include "precomp.hpp"
-
--#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
-+#if !defined WIN32 && defined HAVE_CAMV4L2
-
- #define CLEAR(x) memset (&(x), 0, sizeof (x))
-
-@@ -241,7 +241,7 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <linux/videodev2.h>
-
- #include <libv4l1.h>
diff --git a/extra/usbmuxd/usbmuxd-udevuser.patch b/extra/usbmuxd/usbmuxd-udevuser.patch
deleted file mode 100644
index af091e64d..000000000
--- a/extra/usbmuxd/usbmuxd-udevuser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- usbmuxd-1.0.6/udev/85-usbmuxd.rules.in.orig 2010-11-09 04:23:44.873368717 -0800
-+++ usbmuxd-1.0.6/udev/85-usbmuxd.rules.in 2010-11-09 04:24:13.986655838 -0800
-@@ -1,7 +1,7 @@
- # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
-
- # Forces iPhone 1.0, 3G, 3GS, iPodTouch 1/2 and iPad to USB configuration 3 and run usbmuxd
--ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
-+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
-
- # Exit usbmuxd when the last device is removed
- ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"