From: Kim Kibum Date: Sun, 29 Apr 2012 08:04:49 +0000 (+0900) Subject: upload tizen1.0 source X-Git-Tag: 2.0_alpha~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14e0c2f7787d6a50632561c1bb813c6c7a9ec7bd;p=framework%2Fuifw%2Fxorg%2Flib%2Flibxaw.git upload tizen1.0 source --- diff --git a/packaging/01_Xaw_StripChart_fix.diff b/packaging/01_Xaw_StripChart_fix.diff new file mode 100644 index 0000000..a58b289 --- /dev/null +++ b/packaging/01_Xaw_StripChart_fix.diff @@ -0,0 +1,102 @@ +From: "Nikita V. Youshchenko" +Date: Sat, 02 Nov 2002 17:57:13 +0300 +Subject: A bug in Xaw/StripChart.c causes incorrect scale lines in xload window + +Recently I tried to run xload on a high loaded server (load was more +than 10), and discovered that if window size is rather small, scale +lines are drawn incorrectly (upper than needed). + +This is caused by a bug in Xaw/StripChart.c. +It draws lines with fixed integer steps. Than means that if window +height is 39 pixels, and 10 lines should be drawn to split view into 11 +equal parts, lines will be drawn at 3, 6, 9, ,.., 30. So the bottom part +height will be 9 pixels while other parts height will be 2 pixels. + +This patch makes part heights differ no more than by 1 pixel. + +Debian bug#167448 + +Index: libXaw-X11R7.0-1.0.1/src/StripChart.c +=================================================================== +--- libXaw-X11R7.0-1.0.1.orig/src/StripChart.c 2005-12-30 14:50:24.000000000 -0500 ++++ libXaw-X11R7.0-1.0.1/src/StripChart.c 2006-02-26 19:09:07.000000000 -0500 +@@ -373,12 +373,12 @@ + * the returned value is identical to the initial value of next and data is + * unchanged. Otherwise keeps half a window's worth of data. If data is + * changed, then w->strip_chart.max_value is updated to reflect the +- * largest data point ++ * largest data point. + */ +-static int ++static int + repaint_window(StripChartWidget w, int left, int width) + { +- int i, j; ++ int i, j, k; + int next = w->strip_chart.interval; + int scale = w->strip_chart.scale; + int scalewidth = 0; +@@ -423,8 +423,10 @@ + } + + /* Draw graph reference lines */ ++ k = XtHeight(w) % w->strip_chart.scale; + for (i = 1; i < w->strip_chart.scale; i++) { +- j = i * ((int)XtHeight(w) / w->strip_chart.scale); ++ j = i * (XtHeight(w) / w->strip_chart.scale) + ++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale); + XDrawLine(dpy, win, w->strip_chart.hiGC, left, j, scalewidth, j); + } + } +@@ -446,7 +448,7 @@ + MoveChart(StripChartWidget w, Bool blit) + { + double old_max; +- int left, i, j; ++ int left, i, j, k; + int next = w->strip_chart.interval; + + if (!XtIsRealized((Widget)w)) +@@ -495,8 +497,10 @@ + + /* Draw graph reference lines */ + left = j; ++ k = XtHeight(w) % w->strip_chart.scale; + for (i = 1; i < w->strip_chart.scale; i++) { +- j = i * (XtHeight(w) / w->strip_chart.scale); ++ j = i * (XtHeight(w) / w->strip_chart.scale) + ++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale); + XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w), + w->strip_chart.hiGC, left, j, XtWidth(w), j); + } +@@ -557,23 +561,26 @@ + StripChartWidget w = (StripChartWidget)widget; + XPoint *points; + Cardinal size; +- int i; ++ int i, k; + + if (w->strip_chart.scale <= 1) { + XtFree((char *)w->strip_chart.points); + w->strip_chart.points = NULL; + return; + } +- ++ + size = sizeof(XPoint) * (w->strip_chart.scale - 1); + + points = (XPoint *)XtRealloc((XtPointer)w->strip_chart.points, size); + w->strip_chart.points = points; + + /* Draw graph reference lines into clip mask */ +- ++ k = XtHeight(w) % w->strip_chart.scale; + for (i = 1; i < w->strip_chart.scale; i++) { + points[i - 1].x = 0; +- points[i - 1].y = XtHeight(w) / w->strip_chart.scale; ++ points[i - 1].y = i * (XtHeight(w) / w->strip_chart.scale) + ++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale); + } ++ for (i = w->strip_chart.scale - 1; i > 1; i--) ++ points[i - 1].y -= points[i - 2].y; + } diff --git a/packaging/libxaw-rpmlintrc b/packaging/libxaw-rpmlintrc new file mode 100644 index 0000000..e9fd97b --- /dev/null +++ b/packaging/libxaw-rpmlintrc @@ -0,0 +1,2 @@ +from Config import * +addFilter("libXaw-compat.* devel-file-in-non-devel-package") diff --git a/packaging/libXaw.spec b/packaging/libxaw.spec similarity index 89% rename from packaging/libXaw.spec rename to packaging/libxaw.spec index 328a1cc..90cecd1 100644 --- a/packaging/libXaw.spec +++ b/packaging/libxaw.spec @@ -1,13 +1,13 @@ -Name: libXaw +Name: libxaw Summary: X.Org X11 libXaw runtime library Version: 1.0.8 -Release: 1 +Release: 2.7 Group: System/Libraries License: MIT URL: http://www.x.org/ Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.gz -Source101: libXaw-rpmlintrc +Source101: libxaw-rpmlintrc Patch1: 01_Xaw_StripChart_fix.diff Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -40,11 +40,8 @@ Description: %{summary} %build - -%reconfigure \ - --disable-xaw6 \ - --disable-xaw8 \ - LDFALGS="-Wl,--hash-style=both -Wl,--as-needed" +export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed" +%reconfigure --disable-xaw6 --disable-xaw8 make %{?jobs:-j%jobs}