diff --git a/.gitignore b/.gitignore index da5c16f..75d77e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Xaw3d-1.5E.tar.gz /libXaw3d-1.6.1.tar.bz2 +/libXaw3d-1.6.2.tar.bz2 diff --git a/Xaw3d-1.5-box.c.patch b/Xaw3d-1.5-box.c.patch deleted file mode 100644 index 455f5b8..0000000 --- a/Xaw3d-1.5-box.c.patch +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## box.c.dpatch by Francesco Paolo Lovergine -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xaw3d-1.5+E~/lib/Xaw3d/Box.c xaw3d-1.5+E/lib/Xaw3d/Box.c ---- Xaw3d-1.5libXaw3d-1.6.1/src/Box.c 1996-10-15 16:41:18.000000000 +0200 -+++ Xaw3d-1.5libXaw3d-1.6.1/src/Box.c 2007-04-24 15:28:39.000000000 +0200 -@@ -353,8 +353,16 @@ - else { - width = preferred_width; - do { /* find some width big enough to stay within this height */ -+#if 0 - width *= 2; - if (width > constraint->width) width = constraint->width; -+#endif -+ if (width > constraint->width/2) { /* avoid short int overflow */ -+ width = constraint->width; -+ } -+ else { -+ width *= 2; -+ } - DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); - } while (preferred_height > constraint->height && - width < constraint->width); diff --git a/Xaw3d-1.5E-cast.patch b/Xaw3d-1.5E-cast.patch deleted file mode 100644 index b337434..0000000 --- a/Xaw3d-1.5E-cast.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a809cfbe5335bfa13a9f6496c4e04fffd93d930 Mon Sep 17 00:00:00 2001 -From: Markus Steinborn -Date: Sat, 24 Apr 2010 16:55:21 +0200 -Subject: [PATCH] Xaw3d-1.5E-cast.patch - ---- - xc/lib/Xaw3d/Scrollbar.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git libXaw3d-1.6.1/src/Scrollbar.c libXaw3d-1.6.1/src/Scrollbar.c -index 0566733..6ed1480 100644 ---- libXaw3d-1.6.1/src/Scrollbar.c -+++ libXaw3d-1.6.1/src/Scrollbar.c -@@ -1375,7 +1375,7 @@ static void NotifyThumb (w, event, params, num_params ) - the arrows. */ - top += 0.0001; - /* #endif */ -- XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top); -+ XtCallCallbacks (w, XtNthumbProc, (XtPointer)(long)top); - XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top); - } - --- -1.6.1 - diff --git a/Xaw3d-1.5E-close-destroy-crash.patch b/Xaw3d-1.5E-close-destroy-crash.patch deleted file mode 100644 index c4df7aa..0000000 --- a/Xaw3d-1.5E-close-destroy-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 23b3ca50395f180cba4a923eb8827dcc961629da Mon Sep 17 00:00:00 2001 -From: Markus Steinborn -Date: Sat, 24 Apr 2010 16:48:38 +0200 -Subject: [PATCH] Xaw3d-1.5E-close-destroy-crash.patch - ---- - xc/lib/Xaw3d/XawIm.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git libXaw3d-1.6.1/src/XawIm.c libXaw3d-1.6.1/src/XawIm.c -index ead7166..730c393 100644 ---- libXaw3d-1.6.1/src/XawIm.c -+++ libXaw3d-1.6.1/src/XawIm.c -@@ -331,12 +331,12 @@ static void DestroyAllIM( ve ) - /* - * Close Input Method - */ -- CloseIM(ve); - if (!XFindContext(XDisplayOfIM(ve->im.xim), (Window)ve->im.xim, errContext, - (XPointer*)&contextErrData)) { - if (contextErrData) XtFree((char *)contextErrData); - } - XDeleteContext(XDisplayOfIM(ve->im.xim), (Window)ve->im.xim, errContext); -+ CloseIM(ve); - ve->im.xim = NULL; - - /* --- -1.6.1 - diff --git a/Xaw3d-1.6.1-compat.patch b/Xaw3d-1.6.1-compat.patch deleted file mode 100644 index ca2e8c3..0000000 --- a/Xaw3d-1.6.1-compat.patch +++ /dev/null @@ -1,61 +0,0 @@ -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-1.6.1-i18n.patch b/Xaw3d-1.6.1-i18n.patch deleted file mode 100644 index 1b9d9c8..0000000 --- a/Xaw3d-1.6.1-i18n.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libXaw3d-1.6.1/src/MultiSrc.c.orig 2011-09-19 15:42:36.000000000 -0600 -+++ libXaw3d-1.6.1/src/MultiSrc.c 2012-02-25 14:33:44.336534494 -0700 -@@ -728,6 +728,7 @@ - - if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) { - RemoveOldStringOrFile(old_src, string_set); -+ src->multi_src.allocated_string = old_src->multi_src.allocated_string; - file = InitStringOrFile(src, string_set); - - /* Load pieces does this logic for us, but it shouldn't. Its messy.*/ diff --git a/Xaw3d.spec b/Xaw3d.spec index 2d8b1e6..85fd15f 100644 --- a/Xaw3d.spec +++ b/Xaw3d.spec @@ -1,16 +1,11 @@ Summary: A version of the MIT Athena widget set for X Name: Xaw3d -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Group: System Environment/Libraries Source: http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-%{version}.tar.bz2 -Patch1: Xaw3d-1.5E-cast.patch -Patch3: Xaw3d-1.6.1-i18n.patch -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.6.1-compat.patch Patch10: Xaw3d-1.6.1-fontset.patch Patch11: Xaw3d-1.6.1-hsbar.patch @@ -63,20 +58,18 @@ package. %prep %setup -q -n libXaw3d-%{version} -%patch1 -p1 -%patch3 -p1 -b .i18n -%patch4 -p1 # This doesn't apply cleanly, but has not been applied #%patch5 -p1 -b .debian %patch7 -p1 -b .3Dlabel -%patch8 -p1 -b .close-destroy-crash -%patch9 -p1 -b .compat %patch10 -p1 -b .fontset %patch11 -p1 -b .hsbar %build -%configure --disable-static --enable-arrow-scrollbars +%configure --disable-static \ + --enable-arrow-scrollbars \ + --enable-gray-stipples \ + --enable-multiplane-bitmaps make %{?_smp_mflags} @@ -108,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/Xaw3d %changelog +* Tue Apr 3 2012 Orion Poplawski - 1.6.2-1 +- Update to 1.6.2 +- Drop patches applied upstream +- Enable multiplane-bitmaps and gray-stipples + * Sat Feb 25 2012 Orion Poplawski - 1.6.1-2 - Rebase compat patch diff --git a/sources b/sources index 24464b8..76b6884 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3db4cfe29ee911a519ef254625809f9c libXaw3d-1.6.1.tar.bz2 +b804b1eeba6008a1c11c767eb69f8b12 libXaw3d-1.6.2.tar.bz2