Author: gotar Date: Wed Sep 15 22:00:01 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 3 more patches from Fred R. Beck code
---- Files affected:
packages/lignumCAD:
lignumCAD-delete-pointer.patch (NONE -> 1.1) (NEW), lignumCAD-ui.patch
(NONE -> 1.1) (NEW), lignumCAD-xft.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/lignumCAD/lignumCAD-delete-pointer.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-delete-pointer.patch:1.1
--- /dev/null Thu Sep 16 00:00:01 2010
+++ packages/lignumCAD/lignumCAD-delete-pointer.patch Wed Sep 15 23:59:56 2010
@@ -0,0 +1,23 @@
+diff -rpu lignumCAD.pld/ochiddendraw.cpp lignumCAD.pld2/ochiddendraw.cpp
+--- lignumCAD.pld/ochiddendraw.cpp 2002-11-13 14:35:48.000000000 +0100
++++ lignumCAD.pld2/ochiddendraw.cpp 2010-09-15 22:29:54.000000000 +0200
+@@ -206,6 +206,6 @@ namespace Space3D {
+
+ glEndList();
+
+- delete brep_hlr;
++ delete &brep_hlr;
+ }
+ } // End of Space3D namespace
+diff -rpu lignumCAD.pld/ocsoliddraw.cpp lignumCAD.pld2/ocsoliddraw.cpp
+--- lignumCAD.pld/ocsoliddraw.cpp 2010-09-15 23:40:39.000000000 +0200
++++ lignumCAD.pld2/ocsoliddraw.cpp 2010-09-15 23:30:06.000000000 +0200
+@@ -558,7 +558,7 @@ namespace Space3D {
+
+ glEndList();
+
+- delete brep_hlr;
++ delete &brep_hlr;
+ }
+
+ void OCSolidDraw::updateMaterial ( void )
================================================================
Index: packages/lignumCAD/lignumCAD-ui.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-ui.patch:1.1
--- /dev/null Thu Sep 16 00:00:01 2010
+++ packages/lignumCAD/lignumCAD-ui.patch Wed Sep 15 23:59:56 2010
@@ -0,0 +1,122 @@
+diff -urp lignumCAD.pld2a/centerlineinfodialog.ui
lignumCAD.pld/centerlineinfodialog.ui
+--- lignumCAD.pld2a/centerlineinfodialog.ui 2002-12-03 21:41:52.000000000
+0100
++++ lignumCAD.pld/centerlineinfodialog.ui 2010-09-15 23:54:08.000000000
+0200
+@@ -356,7 +356,11 @@
+ </tabstops>
+ <includes>
+ <include location="local" impldecl="in
implementation">centerlineinfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthspinbox/lcdefaultlengthspinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lcconstraintchooser/lcconstraintchooser.h</include>
+ </includes>
++
+ <slots>
+ <slot>buttonHelp_clicked()</slot>
+ </slots>
+diff -urp lignumCAD.pld2a/dimensioninfodialog.ui
lignumCAD.pld/dimensioninfodialog.ui
+--- lignumCAD.pld2a/dimensioninfodialog.ui 2002-12-12 18:00:09.000000000
+0100
++++ lignumCAD.pld/dimensioninfodialog.ui 2010-09-15 23:54:08.000000000
+0200
+@@ -471,6 +471,9 @@
+ </tabstops>
+ <includes>
+ <include location="local" impldecl="in
implementation">dimensioninfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthspinbox/lcdefaultlengthspinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lcconstraintchooser/lcconstraintchooser.h</include>
+ </includes>
+ <slots>
+ <slot>buttonHelp_clicked()</slot>
+diff -urp lignumCAD.pld2a/modelinfodialog.ui lignumCAD.pld/modelinfodialog.ui
+--- lignumCAD.pld2a/modelinfodialog.ui 2002-09-19 02:20:12.000000000 +0200
++++ lignumCAD.pld/modelinfodialog.ui 2010-09-15 23:54:08.000000000 +0200
+@@ -343,6 +343,7 @@ standard file requestor if you want to o
+ </tabstops>
+ <includes>
+ <include location="local" impldecl="in
implementation">modelinfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
+ </includes>
+ <slots>
+ <slot access="private" specifier="non virtual">modelNameEdit_textChanged(
const QString & text )</slot>
+diff -urp lignumCAD.pld2a/newmodelwizard.ui lignumCAD.pld/newmodelwizard.ui
+--- lignumCAD.pld2a/newmodelwizard.ui 2002-11-26 18:32:36.000000000 +0100
++++ lignumCAD.pld/newmodelwizard.ui 2010-09-15 23:54:08.000000000 +0200
+@@ -458,6 +458,7 @@ standard file requestor if you want to o
+ <include location="local" impldecl="in
implementation">pagefactory.h</include>
+ <include location="global" impldecl="in
implementation">qbuttongroup.h</include>
+ <include location="local" impldecl="in
implementation">newmodelwizard.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
+ </includes>
+ <forwards>
+ <forward>class QRadioButton;</forward>
+diff -urp lignumCAD.pld2a/offsetinfodialog.ui lignumCAD.pld/offsetinfodialog.ui
+--- lignumCAD.pld2a/offsetinfodialog.ui 2002-11-26 16:58:24.000000000
+0100
++++ lignumCAD.pld/offsetinfodialog.ui 2010-09-15 23:54:08.000000000 +0200
+@@ -155,6 +155,7 @@
+ </tabstops>
+ <includes>
+ <include location="local" impldecl="in
implementation">offsetinfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthconstraint/lcdefaultlengthconstraint.h</include>
+ </includes>
+ <slots>
+ <slot>buttonHelp_clicked()</slot>
+diff -urp lignumCAD.pld2a/parameterinfodialog.ui
lignumCAD.pld/parameterinfodialog.ui
+--- lignumCAD.pld2a/parameterinfodialog.ui 2002-09-20 14:31:50.000000000
+0200
++++ lignumCAD.pld/parameterinfodialog.ui 2010-09-15 23:54:08.000000000
+0200
+@@ -158,6 +158,7 @@
+ </tabstops>
+ <includes>
+ <include location="local" impldecl="in
implementation">parameterinfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthconstraint/lcdefaultlengthconstraint.h</include>
+ </includes>
+ <slots>
+ <slot>buttonHelp_clicked()</slot>
+diff -urp lignumCAD.pld2a/preferencesdialog.ui
lignumCAD.pld/preferencesdialog.ui
+--- lignumCAD.pld2a/preferencesdialog.ui 2002-09-19 15:24:54.000000000
+0200
++++ lignumCAD.pld/preferencesdialog.ui 2010-09-15 23:54:08.000000000 +0200
+@@ -1553,6 +1553,14 @@ Note that the clearance length specified
+ <include location="global" impldecl="in
implementation">qpicture.h</include>
+ <include location="global" impldecl="in
implementation">qpaintdevicemetrics.h</include>
+ <include location="local" impldecl="in
implementation">preferencesdialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthspinbox/lcdefaultlengthspinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lcconstraintchooser/lcconstraintchooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultcombobox/lcdefaultcombobox.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultratiospinbox/lcdefaultratiospinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lccolorchooser/lccolorchooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultfilechooser/lcdefaultfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcfontchooser/lcfontchooser.h</include>
+ </includes>
+ <variables>
+ <variable>OpenGLExample* example_;</variable>
+diff -urp lignumCAD.pld2a/rectangleinfodialog.ui
lignumCAD.pld/rectangleinfodialog.ui
+--- lignumCAD.pld2a/rectangleinfodialog.ui 2002-09-19 22:20:19.000000000
+0200
++++ lignumCAD.pld/rectangleinfodialog.ui 2010-09-15 23:54:08.000000000
+0200
+@@ -929,6 +929,15 @@
+ <includes>
+ <include location="local" impldecl="in
implementation">constants.h</include>
+ <include location="local" impldecl="in
implementation">rectangleinfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthspinbox/lcdefaultlengthspinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lcconstraintchooser/lcconstraintchooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultcombobox/lcdefaultcombobox.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultratiospinbox/lcdefaultratiospinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lccolorchooser/lccolorchooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultfilechooser/lcdefaultfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcfontchooser/lcfontchooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultspinbox/lcdefaultspinbox.h</include>
+ </includes>
+ <slots>
+ <slot>init()</slot>
+diff -urp lignumCAD.pld2a/referencelineinfodialog.ui
lignumCAD.pld/referencelineinfodialog.ui
+--- lignumCAD.pld2a/referencelineinfodialog.ui 2002-12-03 21:41:52.000000000
+0100
++++ lignumCAD.pld/referencelineinfodialog.ui 2010-09-15 23:54:08.000000000
+0200
+@@ -356,6 +356,9 @@
+ </tabstops>
+ <includes>
+ <include location="local" impldecl="in
implementation">referencelineinfodialog.ui.h</include>
++ <include location="local" impldecl="in
implementation">../lcfilechooser/lcfilechooser.h</include>
++ <include location="local" impldecl="in
implementation">../lcdefaultlengthspinbox/lcdefaultlengthspinbox.h</include>
++ <include location="local" impldecl="in
implementation">../lcconstraintchooser/lcconstraintchooser.h</include>
+ </includes>
+ <slots>
+ <slot>buttonHelp_clicked()</slot>
================================================================
Index: packages/lignumCAD/lignumCAD-xft.patch
diff -u /dev/null packages/lignumCAD/lignumCAD-xft.patch:1.1
--- /dev/null Thu Sep 16 00:00:01 2010
+++ packages/lignumCAD/lignumCAD-xft.patch Wed Sep 15 23:59:56 2010
@@ -0,0 +1,78 @@
+diff -urp lignumCAD.pld2a/xftname.c lignumCAD.pld/xftname.c
+--- lignumCAD.pld2a/xftname.c 2010-09-15 19:20:43.000000000 +0200
++++ lignumCAD.pld/xftname.c 2010-09-15 23:58:54.000000000 +0200
+@@ -164,7 +164,7 @@ _XftNameConvert (XftType type, char *str
+ v.u.i = atoi (string);
+ break;
+ case XftTypeString:
+- v.u.s = string;
++ v.u.s = (unsigned char *)string;
+ break;
+ case XftTypeBool:
+ v.u.b = XftDefaultParseBool (string);
+@@ -335,14 +335,18 @@ _XftNameUnparseValue (XftValue v, char *
+ sprintf (temp, "%g", v.u.d);
+ return _XftNameUnparseString (temp, 0, destp, lenp);
+ case XftTypeString:
+- return _XftNameUnparseString (v.u.s, escape, destp, lenp);
++ return _XftNameUnparseString ((char *)v.u.s, escape, destp, lenp);
+ case XftTypeBool:
+ return _XftNameUnparseString (v.u.b ? "True" : "False", 0, destp, lenp);
+ case XftTypeMatrix:
+ sprintf (temp, "%g %g %g %g",
+ v.u.m->xx, v.u.m->xy, v.u.m->yx, v.u.m->yy);
+ return _XftNameUnparseString (temp, 0, destp, lenp);
+- }
++ case FcTypeCharSet:
++ case FcTypeFTFace:
++ case FcTypeLangSet:
++ return True;
++ }
+ return False;
+ }
+
+@@ -363,6 +367,44 @@ _XftNameUnparseValueList (XftValueList *
+ #define XFT_ESCAPE_FIXED "\\-:,"
+ #define XFT_ESCAPE_VARIABLE "\\=_:,"
+
++static int
++XftPatternPosition (const XftPattern *p, const char *object)
++{
++ int low, high, mid, c;
++
++ low = 0;
++ high = p->num - 1;
++ c = 1;
++ mid = 0;
++ while (low <= high)
++ {
++ mid = (low + high) >> 1;
++ c = strcmp (p->elts[mid].object, object);
++ if (c == 0)
++ return mid;
++ if (c < 0)
++ low = mid + 1;
++ else
++ high = mid - 1;
++ }
++ if (c < 0)
++ mid++;
++ return -(mid + 1);
++}
++
++XftPatternElt *
++XftPatternFindElt (const XftPattern *p, const char *object)
++{
++ int i = XftPatternPosition (p, object);
++ if (i < 0)
++ return 0;
++ return &p->elts[i];
++}
++
++XftPatternElt *
++XftPatternFind (XftPattern *p, const char *object, Bool insert)
++{ return FcPatternFind (p, object, insert); }
++
+ Bool
+ XftNameUnparse (XftPattern *pat, char *dest, int len)
+ {
================================================================
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
