From 21eadb793dabdbe08eb692fc385e0a667f330f5a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Feb 2012 17:37:05 -0700 Subject: [PATCH] Rebase compat patch --- Xaw3d-1.5E-compat.patch | 80 ---------------------------------------- Xaw3d-1.6.1-compat.patch | 61 ++++++++++++++++++++++++++++++ Xaw3d.spec | 10 +++-- 3 files changed, 67 insertions(+), 84 deletions(-) delete mode 100644 Xaw3d-1.5E-compat.patch create mode 100644 Xaw3d-1.6.1-compat.patch diff --git a/Xaw3d-1.5E-compat.patch b/Xaw3d-1.5E-compat.patch deleted file mode 100644 index ab8cc54..0000000 --- a/Xaw3d-1.5E-compat.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 59033c0e4242f3a09a5116b4120e5c8353f89372 Mon Sep 17 00:00:00 2001 -From: Markus Steinborn -Date: Sat, 24 Apr 2010 16:53:58 +0200 -Subject: [PATCH] Xaw3d-1.5E-compat.patch - ---- - xc/lib/Xaw3d/Command.c | 2 ++ - xc/lib/Xaw3d/Label.c | 2 ++ - xc/lib/Xaw3d/Text.c | 11 +++++++++++ - xc/lib/Xaw3d/Text.h | 6 ++++++ - 4 files changed, 21 insertions(+), 0 deletions(-) - -diff --git libXaw3d-1.6.1/src/Command.c libXaw3d-1.6.1/src/Command.c -index 5fe16b6..6e04860 100644 ---- libXaw3d-1.6.1/src/Command.c -+++ libXaw3d-1.6.1/src/Command.c -@@ -91,6 +91,8 @@ static XtResource resources[] = { - {XtNcornerRoundPercent, XtCCornerRoundPercent, XtRDimension, - sizeof(Dimension), offset(command.corner_round), XtRImmediate, - (XtPointer) 25}, -+ {XtNshadowWidth, XtCShadowWidth, XtRDimension, sizeof(Dimension), -+ offset(threeD.shadow_width), XtRImmediate, (XtPointer) 2}, - {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension), - XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate, - (XtPointer) 0} -diff --git libXaw3d-1.6.1/src/Label.c libXaw3d-1.6.1/src/Label.c -index 5fd2e32..8bda3a7 100644 ---- libXaw3d-1.6.1/src/Label.c -+++ libXaw3d-1.6.1/src/Label.c -@@ -113,6 +113,8 @@ static XtResource resources[] = { - offset(label.pixmap), XtRImmediate, (XtPointer)None}, - {XtNresize, XtCResize, XtRBoolean, sizeof(Boolean), - offset(label.resize), XtRImmediate, (XtPointer)True}, -+ {XtNshadowWidth, XtCShadowWidth, XtRDimension, sizeof(Dimension), -+ offset(threeD.shadow_width), XtRImmediate, (XtPointer) 0}, - {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension), - XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate, - (XtPointer)1} -diff --git libXaw3d-1.6.1/src/Text.c libXaw3d-1.6.1/src/Text.c -index baaba17..81ff472 100644 ---- libXaw3d-1.6.1/src/Text.c -+++ libXaw3d-1.6.1/src/Text.c -@@ -3527,6 +3527,17 @@ Widget w; - return ((TextWidget)w)->text.source; - } - -+Widget -+#if NeedFunctionPrototypes -+XawTextGetSink(Widget w) -+#else -+XawTextGetSink(w) -+Widget w; -+#endif -+{ -+ return (((TextWidget)w)->text.sink); -+} -+ - void - #if NeedFunctionPrototypes - XawTextDisplayCaret (Widget w, -diff --git libXaw3d-1.6.1/include/X11/Xaw3d/Text.h libXaw3d-1.6.1/include/X11/Xaw3d/Text.h -index 9157927..d68f94e 100644 ---- libXaw3d-1.6.1/include/X11/Xaw3d/Text.h -+++ libXaw3d-1.6.1/include/X11/Xaw3d/Text.h -@@ -274,6 +274,12 @@ extern Widget XawTextGetSource( - #endif - ); - -+extern Widget XawTextGetSink( -+#if NeedFunctionPrototypes -+ Widget /* w */ -+#endif -+); -+ - extern XawTextPosition XawTextSearch( - #if NeedFunctionPrototypes - Widget /* w */, --- -1.6.1 - diff --git a/Xaw3d-1.6.1-compat.patch b/Xaw3d-1.6.1-compat.patch new file mode 100644 index 0000000..ca2e8c3 --- /dev/null +++ b/Xaw3d-1.6.1-compat.patch @@ -0,0 +1,61 @@ +diff -up libXaw3d-1.6.1/include/X11/Xaw3d/Text.h.compat libXaw3d-1.6.1/include/X11/Xaw3d/Text.h +--- libXaw3d-1.6.1/include/X11/Xaw3d/Text.h.compat 2011-09-19 15:42:36.000000000 -0600 ++++ libXaw3d-1.6.1/include/X11/Xaw3d/Text.h 2012-02-26 17:35:36.777982148 -0700 +@@ -242,6 +242,12 @@ extern Widget XawTextGetSource( + Widget /* w */ + ); + ++extern Widget XawTextGetSink( ++#if NeedFunctionPrototypes ++ Widget /* w */ ++#endif ++); ++ + extern XawTextPosition XawTextSearch( + Widget /* w */, + #if NeedWidePrototypes +diff -up libXaw3d-1.6.1/src/Command.c.compat libXaw3d-1.6.1/src/Command.c +--- libXaw3d-1.6.1/src/Command.c.compat 2011-09-19 15:42:36.000000000 -0600 ++++ libXaw3d-1.6.1/src/Command.c 2012-02-26 17:33:12.007416808 -0700 +@@ -92,6 +92,8 @@ static XtResource resources[] = { + {XtNcornerRoundPercent, XtCCornerRoundPercent, XtRDimension, + sizeof(Dimension), offset(command.corner_round), XtRImmediate, + (XtPointer) 25}, ++ {XtNshadowWidth, XtCShadowWidth, XtRDimension, sizeof(Dimension), ++ offset(threeD.shadow_width), XtRImmediate, (XtPointer) 2}, + {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension), + XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate, + (XtPointer) 0} +diff -up libXaw3d-1.6.1/src/Label.c.compat libXaw3d-1.6.1/src/Label.c +--- libXaw3d-1.6.1/src/Label.c.compat 2012-02-26 17:33:11.990417563 -0700 ++++ libXaw3d-1.6.1/src/Label.c 2012-02-26 17:33:12.008416763 -0700 +@@ -115,6 +115,8 @@ static XtResource resources[] = { + offset(label.pixmap), XtRImmediate, (XtPointer)None}, + {XtNresize, XtCResize, XtRBoolean, sizeof(Boolean), + offset(label.resize), XtRImmediate, (XtPointer)True}, ++ {XtNshadowWidth, XtCShadowWidth, XtRDimension, sizeof(Dimension), ++ offset(threeD.shadow_width), XtRImmediate, (XtPointer) 0}, + {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension), + XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate, + (XtPointer)1} +diff -up libXaw3d-1.6.1/src/Text.c.compat libXaw3d-1.6.1/src/Text.c +--- libXaw3d-1.6.1/src/Text.c.compat 2011-10-06 13:17:19.000000000 -0600 ++++ libXaw3d-1.6.1/src/Text.c 2012-02-26 17:34:39.884510665 -0700 +@@ -3312,6 +3312,17 @@ XawTextGetSource(Widget w) + return ((TextWidget)w)->text.source; + } + ++Widget ++#if NeedFunctionPrototypes ++XawTextGetSink(Widget w) ++#else ++XawTextGetSink(w) ++Widget w; ++#endif ++{ ++ return (((TextWidget)w)->text.sink); ++} ++ + void + XawTextDisplayCaret (Widget w, + #if NeedWidePrototypes diff --git a/Xaw3d.spec b/Xaw3d.spec index 9660f5e..14ebb70 100644 --- a/Xaw3d.spec +++ b/Xaw3d.spec @@ -10,7 +10,7 @@ Patch4: Xaw3d-1.5-box.c.patch Patch5: Xaw3d-1.5-debian-fixes.patch Patch7: Xaw3d-1.6.1-3Dlabel.patch Patch8: Xaw3d-1.5E-close-destroy-crash.patch -Patch9: Xaw3d-1.5E-compat.patch +Patch9: Xaw3d-1.6.1-compat.patch Patch10: Xaw3d-1.6.1-fontset.patch Patch11: Xaw3d-1.6.1-hsbar.patch @@ -67,11 +67,10 @@ package. %patch3 -p1 -b .i18n %patch4 -p1 # This doesn't apply cleanly, but has not been applied -#patch5 -p1 +#%patch5 -p1 -b .debian %patch7 -p1 -b .3Dlabel %patch8 -p1 -b .close-destroy-crash -# This doesn't apply cleanly, but has not been applied -#patch9 -p1 -b .compat +%patch9 -p1 -b .compat %patch10 -p1 -b .fontset %patch11 -p1 -b .hsbar @@ -109,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/Xaw3d %changelog +* Sat Feb 25 2012 Orion Poplawski - 1.6.1-2 +- Rebase compat patch + * Sat Feb 25 2012 Orion Poplawski - 1.6.1-1 - Update to 1.6.1