Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of

focus issues. And it doesn't seem it getting any traction upstream.

Next stop GNOME 3.0.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 0 insertions, 290 deletions

diff --git a/graphics/inkscape/files/extra-patch-src_document.cpp b/graphics/inkscape/files/extra-patch-src_document.cpp
deleted file mode 100644
index 04f5510b2..000000000
--- a/graphics/inkscape/files/extra-patch-src_document.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/document.cpp.orig	2009-12-19 14:57:53.000000000 -0500
-+++ src/document.cpp	2009-12-19 14:59:10.000000000 -0500
-@@ -183,8 +183,8 @@ SPDocument::~SPDocument() {
- 
-     if (oldSignalsConnected) {
-         g_signal_handlers_disconnect_by_func(G_OBJECT(INKSCAPE),
--                                             reinterpret_cast<gpointer>(sp_document_reset_key),
--                                             static_cast<gpointer>(this));
-+                                             (gpointer)(sp_document_reset_key),
-+                                             (gpointer)(this));
-     } else {
-         _selection_changed_connection.disconnect();
-         _desktop_activated_connection.disconnect();
diff --git a/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
deleted file mode 100644
index ff6662782..000000000
--- a/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libnr/nr-matrix.cpp.org	2008-04-02 22:01:32.000000000 +0200
-+++ src/libnr/nr-matrix.cpp	2008-04-02 22:01:54.000000000 +0200
-@@ -11,6 +11,7 @@
-  * This code is in public domain
-  */
- 
-+#include <cstdio>
- #include <cstdlib>
- #include "nr-matrix.h"
- 
diff --git a/graphics/inkscape/files/patch-src::livarot::Path.cpp b/graphics/inkscape/files/patch-src::livarot::Path.cpp
deleted file mode 100644
index 587ec22c4..000000000
--- a/graphics/inkscape/files/patch-src::livarot::Path.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/livarot/Path.cpp.orig	Sat Apr 10 03:53:47 2004
-+++ src/livarot/Path.cpp	Sat Apr 10 03:53:52 2004
-@@ -7,6 +7,7 @@
-  */
- 
- #include <glib.h>
-+#include <cstdio>
- #include "Path.h"
- #include <libnr/nr-point.h>
- #include <libnr/nr-point-ops.h>
diff --git a/graphics/inkscape/files/patch-src::remove-last.h b/graphics/inkscape/files/patch-src::remove-last.h
deleted file mode 100644
index 059f14ac7..000000000
--- a/graphics/inkscape/files/patch-src::remove-last.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/remove-last.h.orig	Mon Apr 12 09:56:06 2004
-+++ src/remove-last.h	Mon Apr 12 09:56:47 2004
-@@ -2,6 +2,7 @@
- #define __REMOVE_LAST_H__
- 
- #include <vector>
-+#include <algorithm>
- #include <glib.h>
- 
- template<class T>
-@@ -9,7 +10,7 @@
- {
-     using std::vector;
- 
--    typename vector<T>::reverse_iterator i(find(seq.rbegin(), seq.rend(), elem));
-+    typename vector<T>::reverse_iterator i(std::find(seq.rbegin(), seq.rend(), elem));
-     g_assert( i != seq.rend() );
-     typename vector<T>::iterator ii(&*i);
-     seq.erase(ii);
diff --git a/graphics/inkscape/files/patch-src_document-subset.cpp b/graphics/inkscape/files/patch-src_document-subset.cpp
deleted file mode 100644
index 6f09418b2..000000000
--- a/graphics/inkscape/files/patch-src_document-subset.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/document-subset.cpp.orig	2010-01-17 13:47:18.000000000 +0800
-+++ src/document-subset.cpp	2010-01-17 13:49:59.000000000 +0800
-@@ -184,9 +184,6 @@
- 
-     void _doRemove(SPObject *obj) {
-         Record &record=records[obj];
--        record.release_connection.disconnect();
--        record.position_changed_connection.disconnect();
--        records.erase(obj);
- 
-         if ( record.parent == NULL ) {
-             Record &root = records[NULL];
-@@ -198,6 +195,12 @@
-             }
-         }
- 
-+	/* Record must be ereased after removing from root, or
-+	 * content of record would be invalided. */
-+        record.release_connection.disconnect();
-+        record.position_changed_connection.disconnect();
-+        records.erase(obj);
-+	
-         removed_signal.emit(obj);
-         sp_object_unref(obj);
-     }
diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
deleted file mode 100644
index 82eb4bc8f..000000000
--- a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2009-11-26 03:14:38.000000000 +0100
-+++ src/extension/internal/pdfinput/pdf-parser.cpp	2009-11-26 03:14:47.000000000 +0100
-@@ -809,7 +809,7 @@ void PdfParser::opSetExtGState(Object ar
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5,(Gfx*)this);
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -1009,9 +1009,9 @@ void PdfParser::opSetFillColorSpace(Obje
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1032,9 +1032,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
-+    colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj);
-+    colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
-   }
-   obj.free();
-   if (colorSpace) {
-@@ -1101,7 +1101,7 @@ void PdfParser::opSetFillColorN(Object a
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1145,7 +1145,7 @@ void PdfParser::opSetStrokeColorN(Object
-       builder->updateStyle(state);
-     }
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1543,7 +1543,7 @@ void PdfParser::opShFill(Object args[], 
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--  if (!(shading = res->lookupShading(args[0].getName()))) {
-+  if (!(shading = res->lookupShading(args[0].getName(),(Gfx*)this))) {
-     return;
-   }
- 
-@@ -2507,7 +2655,7 @@ void PdfParser::doImage(Object *ref, Str
-       }
-     }
-     if (!obj1.isNull()) {
--      colorSpace = GfxColorSpace::parse(&obj1);
-+      colorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2592,7 +2740,7 @@ void PdfParser::doImage(Object *ref, Str
- 	  obj2.free();
- 	}
-       }
--      maskColorSpace = GfxColorSpace::parse(&obj1);
-+      maskColorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2767,7 +2915,7 @@ void PdfParser::doForm(Object *str) {
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
-+	blendingColorSpace = GfxColorSpace::parse(&obj3,(Gfx*)this);
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp b/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp
deleted file mode 100644
index 832ff9757..000000000
--- a/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
---- src/trace/potrace/inkscape-potrace.cpp.orig	Sat Jun 24 22:46:26 2006
-+++ src/trace/potrace/inkscape-potrace.cpp	Sun Jun 25 01:29:20 2006
-@@ -54,6 +54,121 @@ static void potraceStatusCallback(double
-     //      (Inkscape::Trace::Potrace::PotraceTracingEngine *)userData;
- }
- 
-+#ifndef log2
-+static const double
-+ln2 = 0.6931471805599452862268,
-+two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-+Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-+Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-+Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-+Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-+Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-+Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-+Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-+
-+static const double zero = 0.0;
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+
-+typedef union
-+{
-+      double value;
-+        struct
-+	      {
-+		      u_int32_t msw;
-+		          u_int32_t lsw;
-+			    } parts;
-+} ieee_double_shape_type;
-+
-+#endif
-+
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+
-+typedef union
-+{
-+      double value;
-+        struct
-+	      {
-+		      u_int32_t lsw;
-+		          u_int32_t msw;
-+			    } parts;
-+} ieee_double_shape_type;
-+
-+#endif
-+
-+#define EXTRACT_WORDS(ix0,ix1,d)                                \
-+    do {                                                            \
-+	  ieee_double_shape_type ew_u;                                  \
-+	  ew_u.value = (d);                                             \
-+	  (ix0) = ew_u.parts.msw;                                       \
-+	  (ix1) = ew_u.parts.lsw;                                       \
-+    } while (0)
-+
-+#define GET_HIGH_WORD(i,d)                                      \
-+    do {                                                            \
-+	  ieee_double_shape_type gh_u;                                  \
-+	  gh_u.value = (d);                                             \
-+	  (i) = gh_u.parts.msw;                                         \
-+    } while (0)
-+
-+#define SET_HIGH_WORD(d,v)                                      \
-+    do {                                                            \
-+	  ieee_double_shape_type sh_u;                                  \
-+	  sh_u.value = (d);                                             \
-+	  sh_u.parts.msw = (v);                                         \
-+	  (d) = sh_u.value;                                             \
-+    } while (0)
-+
-+static double
-+_log2(double x)
-+{
-+    double hfsq,f,s,z,R,w,t1,t2,dk;
-+    int32_t k,hx,i,j;
-+    u_int32_t lx;
-+
-+    EXTRACT_WORDS(hx,lx,x);
-+
-+    k=0;
-+    if (hx < 0x00100000) {			/* x < 2**-1022  */
-+	if (((hx&0x7fffffff)|lx)==0) 
-+	    return -two54/zero;		/* log(+-0)=-inf */
-+	if (hx<0) return (x-x)/zero;	/* log(-#) = NaN */
-+	k -= 54; x *= two54; /* subnormal number, scale up x */
-+	GET_HIGH_WORD(hx,x);
-+    }
-+    if (hx >= 0x7ff00000) return x+x;
-+    k += (hx>>20)-1023;
-+    hx &= 0x000fffff;
-+    i = (hx+0x95f64)&0x100000;
-+    SET_HIGH_WORD(x,hx|(i^0x3ff00000));	/* normalize x or x/2 */
-+    k += (i>>20);
-+    f = x-1.0;
-+    dk = (double)k;
-+    if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
-+	if (f==zero)
-+	    return (dk);
-+	R = f*f*(0.5-0.33333333333333333*f);
-+	return (dk-(R-f)/ln2);
-+    }
-+    s = f/(2.0+f);
-+    z = s*s;
-+    i = hx-0x6147a;
-+    w = z*z;
-+    j = 0x6b851-hx;
-+    t1= w*(Lg2+w*(Lg4+w*Lg6));
-+    t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-+    i |= j;
-+    R = t2+t1;
-+    if(i>0) {
-+	hfsq=0.5*f*f;
-+	return (dk-(hfsq-s*(hfsq+R)-f)/ln2);
-+    } else
-+	return (dk-((s*(f-R))-f)/ln2);
-+}
-+
-+#define log2(x) _log2(x)
-+#endif
-+
- 
- 
-