[oe-commits] org.oe.dev gtk 2.10.7: add WIP version:
koen commit
openembedded-commits at lists.openembedded.org
Mon Jan 8 16:34:25 UTC 2007
gtk 2.10.7: add WIP version:
* created a gtk-2.10.inc with shared metadata
* run-iconcache and hardcoded-libtool still need to get rediffed
* pangoxft patch has been dropped because cairo is about as fast as xft now
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: fe7afda01b0900886e5c9d3d14655f2739680faf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fe7afda01b0900886e5c9d3d14655f2739680faf
Files:
1
packages/gtk+/gtk+-2.10.7
packages/gtk+/gtk+-2.10.7/automake-lossage.patch
packages/gtk+/gtk+-2.10.7/disable-print.patch
packages/gtk+/gtk+-2.10.7/disable-tooltips.patch
packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch
packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch
packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch
packages/gtk+/gtk+-2.10.7/integer-pixops.patch
packages/gtk+/gtk+-2.10.7/menu-deactivate.patch
packages/gtk+/gtk+-2.10.7/migration.patch
packages/gtk+/gtk+-2.10.7/no-demos.patch
packages/gtk+/gtk+-2.10.7/no-xwc.patch
packages/gtk+/gtk+-2.10.7/run-iconcache.patch
packages/gtk+/gtk+-2.10.7/scroll-timings.patch
packages/gtk+/gtk+-2.10.7/single-click.patch
packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch
packages/gtk+/gtk+-2.10.7/spinbutton.patch
packages/gtk+/gtk+-2.10.7/xsettings.patch
packages/gtk+/gtk+_2.10.7.bb
packages/gtk+/gtk-2.10.inc
Diffs:
#
# mt diff -r36c8c4c3164e016389666a8caeffccfb83b5b77e -rfe7afda01b0900886e5c9d3d14655f2739680faf
#
#
#
# add_dir "packages/gtk+/gtk+-2.10.7"
#
# add_file "packages/gtk+/gtk+-2.10.7/automake-lossage.patch"
# content [387bad02f979c8ad88bc331616df368917de84fa]
#
# add_file "packages/gtk+/gtk+-2.10.7/disable-print.patch"
# content [23d191cedf8d3a5bd65f4bd9791e9090faa0d995]
#
# add_file "packages/gtk+/gtk+-2.10.7/disable-tooltips.patch"
# content [abe17e4c50f4bf741c5fe8cfc0218108bc30bd13]
#
# add_file "packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch"
# content [eb5192fa45519371befbc95fdf729beeea3e3877]
#
# add_file "packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch"
# content [2e46f66d5f810ba03f766d6c9bd8b1649d53f386]
#
# add_file "packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch"
# content [f8a32fce3abbb76c766cc6906e0300f3b281cbeb]
#
# add_file "packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch"
# content [8ef3a0ff4d681297be56b1cac6f1bcfea2cb16c5]
#
# add_file "packages/gtk+/gtk+-2.10.7/integer-pixops.patch"
# content [10ccd0407ad93389f551ec131e123713a49084cd]
#
# add_file "packages/gtk+/gtk+-2.10.7/menu-deactivate.patch"
# content [e0d8b253f81a5a01dbf5ffb9cfadda1799d7a3af]
#
# add_file "packages/gtk+/gtk+-2.10.7/migration.patch"
# content [08898ee400bb324b9f10cc6e8e744c6b685e0549]
#
# add_file "packages/gtk+/gtk+-2.10.7/no-demos.patch"
# content [765d8c563c164194e2b075eb32f57ef54bbba098]
#
# add_file "packages/gtk+/gtk+-2.10.7/no-xwc.patch"
# content [f7c6168255ab8fdf067a4a9f8fc98dfc30b035a4]
#
# add_file "packages/gtk+/gtk+-2.10.7/run-iconcache.patch"
# content [cea5b9be8afbf9ec65fb24b3abeafdd6bfb28924]
#
# add_file "packages/gtk+/gtk+-2.10.7/scroll-timings.patch"
# content [d107628896cd78842b7ee76e56e4bbf0262ee02b]
#
# add_file "packages/gtk+/gtk+-2.10.7/single-click.patch"
# content [0016f764f5e73469d50c67a985639dc9a6c91299]
#
# add_file "packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch"
# content [038a757b9499f4beac8605039314c35b9c047ef4]
#
# add_file "packages/gtk+/gtk+-2.10.7/spinbutton.patch"
# content [9e9877594aad75d8b453a750f48151e7f105aeb2]
#
# add_file "packages/gtk+/gtk+-2.10.7/xsettings.patch"
# content [1492aa80fb7bcb9008296d469f4d55183c904d37]
#
# add_file "packages/gtk+/gtk+_2.10.7.bb"
# content [19816b5f17b7d091cabac7596926b2e3cde6ca15]
#
# add_file "packages/gtk+/gtk-2.10.inc"
# content [8059c0389dc599b41477b067be3b6354b1079a11]
#
============================================================
--- packages/gtk+/gtk+-2.10.7/automake-lossage.patch 387bad02f979c8ad88bc331616df368917de84fa
+++ packages/gtk+/gtk+-2.10.7/automake-lossage.patch 387bad02f979c8ad88bc331616df368917de84fa
@@ -0,0 +1,24 @@
+--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
++++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
+@@ -52,21 +52,5 @@
+
+ dist-hook: html
+ cp -Rp $(srcdir)/html $(distdir)
+-else
+-html:
+- echo "***"
+- echo "*** Warning: Tutorial not built"
+- echo "***"
+-
+-pdf:
+- echo "***"
+- echo "*** Warning: Tutorial not built"
+- echo "***"
+-
+-dist-hook:
+- echo "***"
+- echo "*** Warning: Tutorial not built"
+- echo "*** DISTRIBUTION IS INCOMPLETE"
+- echo "***"
+ endif
+
============================================================
--- packages/gtk+/gtk+-2.10.7/disable-print.patch 23d191cedf8d3a5bd65f4bd9791e9090faa0d995
+++ packages/gtk+/gtk+-2.10.7/disable-print.patch 23d191cedf8d3a5bd65f4bd9791e9090faa0d995
@@ -0,0 +1,50 @@
+--- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200
++++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200
+@@ -1539,26 +1539,27 @@
+ # Printing system checks
+ ################################################################
+
+-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+-if test "x$CUPS_CONFIG" != "xno"; then
+- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+- CUPS_LIBS=`cups-config --libs`
+-
+- CUPS_API_VERSION=`cups-config --api-version`
+- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
+- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
+-
+- if test $CUPS_API_MAJOR -gt 1 -o \
+- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
+- AC_DEFINE(HAVE_CUPS_API_1_2)
+- fi
+-
+- AC_SUBST(CUPS_API_MAJOR)
+- AC_SUBST(CUPS_API_MINOR)
+- AC_SUBST(CUPS_CFLAGS)
+- AC_SUBST(CUPS_LIBS)
+-fi
+-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
++#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
++#if test "x$CUPS_CONFIG" != "xno"; then
++# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
++# CUPS_LIBS=`cups-config --libs`
++#
++# CUPS_API_VERSION=`cups-config --api-version`
++# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
++# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
++#
++# if test $CUPS_API_MAJOR -gt 1 -o \
++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
++# AC_DEFINE(HAVE_CUPS_API_1_2)
++# fi
++#
++# AC_SUBST(CUPS_API_MAJOR)
++# AC_SUBST(CUPS_API_MINOR)
++# AC_SUBST(CUPS_CFLAGS)
++# AC_SUBST(CUPS_LIBS)
++#fi
++#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
++AM_CONDITIONAL(HAVE_CUPS,false)
+
+ gtk_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
============================================================
--- packages/gtk+/gtk+-2.10.7/disable-tooltips.patch abe17e4c50f4bf741c5fe8cfc0218108bc30bd13
+++ packages/gtk+/gtk+-2.10.7/disable-tooltips.patch abe17e4c50f4bf741c5fe8cfc0218108bc30bd13
@@ -0,0 +1,11 @@
+--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
++++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
+@@ -118,7 +118,7 @@
+ tooltips->tips_data_list = NULL;
+
+ tooltips->delay = DEFAULT_DELAY;
+- tooltips->enabled = TRUE;
++ tooltips->enabled = FALSE;
+ tooltips->timer_tag = 0;
+ tooltips->use_sticky_delay = FALSE;
+ tooltips->last_popdown.tv_sec = -1;
============================================================
--- packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch eb5192fa45519371befbc95fdf729beeea3e3877
+++ packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch eb5192fa45519371befbc95fdf729beeea3e3877
@@ -0,0 +1,217 @@
+diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c
+--- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005
++++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006
+@@ -71,35 +71,24 @@ get_check_shift (int check_size)
+ return check_shift;
+ }
+
+-static void
+-pixops_scale_nearest (guchar *dest_buf,
+- int render_x0,
+- int render_y0,
+- int render_x1,
+- int render_y1,
+- int dest_rowstride,
+- int dest_channels,
+- gboolean dest_has_alpha,
+- const guchar *src_buf,
+- int src_width,
+- int src_height,
+- int src_rowstride,
+- int src_channels,
+- gboolean src_has_alpha,
+- double scale_x,
+- double scale_y)
+-{
+- int i;
+- int x;
+- int x_step = (1 << SCALE_SHIFT) / scale_x;
+- int y_step = (1 << SCALE_SHIFT) / scale_y;
+- int xmax, xstart, xstop, x_pos, y_pos;
+- const guchar *p;
++typedef struct { guchar a,b,c; } b3;
++extern void BUG_bad_size_of_struct_b3(void);
+
+-#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \
++#define INNER_LOOP_PREP() \
++ do { \
++ x = render_x0 * x_step + x_step / 2; \
+ xmax = x + (render_x1 - render_x0) * x_step; \
+ xstart = MIN (0, xmax); \
+ xstop = MIN (src_width << SCALE_SHIFT, xmax); \
++ } while(0)
++
++#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\
++ do { \
++ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \
++ y_pos = CLAMP (y_pos, 0, src_height - 1); \
++ src = src_buf + y_pos * src_rowstride; \
++ dest = dest_buf + i * dest_rowstride; \
++ x = render_x0 * x_step + x_step / 2; \
+ p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \
+ while (x < xstart) \
+ { \
+@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des
+ ASSIGN_PIXEL; \
+ dest += DEST_CHANNELS; \
+ x += x_step; \
+- }
++ } \
++ } while(0)
+
+- for (i = 0; i < (render_y1 - render_y0); i++)
+- {
+- const guchar *src;
+- guchar *dest;
+- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
+- y_pos = CLAMP (y_pos, 0, src_height - 1);
+- src = src_buf + y_pos * src_rowstride;
+- dest = dest_buf + i * dest_rowstride;
++static void
++pixops_scale_nearest (guchar *dest_buf,
++ int render_x0,
++ int render_y0,
++ int render_x1,
++ int render_y1,
++ int dest_rowstride,
++ int dest_channels,
++ gboolean dest_has_alpha,
++ const guchar *src_buf,
++ int src_width,
++ int src_height,
++ int src_rowstride,
++ int src_channels,
++ gboolean src_has_alpha,
++ double scale_x,
++ double scale_y)
++{
++ int i;
++ int x;
++ int x_step = (1 << SCALE_SHIFT) / scale_x;
++ int y_step = (1 << SCALE_SHIFT) / scale_y;
++ int xmax, xstart, xstop, x_pos, y_pos;
++ const guchar *p;
+
+- x = render_x0 * x_step + x_step / 2;
++ const guchar *src;
++ guchar *dest;
+
+- if (src_channels == 3)
+- {
+- if (dest_channels == 3)
+- {
+- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]);
+- }
+- else
+- {
+- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff);
+- }
+- }
+- else if (src_channels == 4)
+- {
+- if (dest_channels == 3)
+- {
+- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]);
+- }
+- else
+- {
+- guint32 *p32;
+- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p));
+- }
+- }
++ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3();
++
++ INNER_LOOP_PREP();
++
++ if (src_channels == 3)
++ {
++ if (dest_channels == 3)
++ for (i = 0; i < (render_y1 - render_y0); i++)
++ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p);
++ else
++ for (i = 0; i < (render_y1 - render_y0); i++)
++ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) );
++ }
++ else if (src_channels == 4)
++ {
++ if (dest_channels == 3)
++ for (i = 0; i < (render_y1 - render_y0); i++)
++ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p);
++ else
++ for (i = 0; i < (render_y1 - render_y0); i++)
++ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p));
+ }
+ }
+
+@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar
+ const guchar *p;
+ unsigned int a0;
+
++ INNER_LOOP_PREP();
++
+ for (i = 0; i < (render_y1 - render_y0); i++)
+ {
+ const guchar *src;
+ guchar *dest;
+- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
+- y_pos = CLAMP (y_pos, 0, src_height - 1);
+- src = src_buf + y_pos * src_rowstride;
+- dest = dest_buf + i * dest_rowstride;
+-
+- x = render_x0 * x_step + x_step / 2;
+
+- INNER_LOOP(src_channels, dest_channels,
++ INNER_LOOP_BODY(src_channels, dest_channels,
+ if (src_has_alpha)
+ a0 = (p[3] * overall_alpha) / 0xff;
+ else
+@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar
+ case 0:
+ break;
+ case 255:
+- dest[0] = p[0];
+- dest[1] = p[1];
+- dest[2] = p[2];
++ *(b3*)dest = *(b3*)p;
+ if (dest_has_alpha)
+ dest[3] = 0xff;
+ break;
+@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar
+ const guchar *p;
+ unsigned int a0;
+
++ INNER_LOOP_PREP();
++
+ for (i = 0; i < (render_y1 - render_y0); i++)
+ {
+ const guchar *src;
+ guchar *dest;
+- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
+- y_pos = CLAMP (y_pos, 0, src_height - 1);
+- src = src_buf + y_pos * src_rowstride;
+- dest = dest_buf + i * dest_rowstride;
+-
+- x = render_x0 * x_step + x_step / 2;
+-
+
+ if (((i + check_y) >> check_shift) & 1)
+ {
+@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar
+ }
+
+ j = 0;
+- INNER_LOOP(src_channels, dest_channels,
++ INNER_LOOP_BODY(src_channels, dest_channels,
+ if (src_has_alpha)
+ a0 = (p[3] * overall_alpha + 0xff) >> 8;
+ else
+@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar
+ );
+ }
+ }
+-#undef INNER_LOOP
++#undef INNER_LOOP_BODY
++#undef INNER_LOOP_PREP
+
+ static void
+ composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
============================================================
--- packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch 2e46f66d5f810ba03f766d6c9bd8b1649d53f386
+++ packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch 2e46f66d5f810ba03f766d6c9bd8b1649d53f386
@@ -0,0 +1,149 @@
+Index: gtk+-2.10.6/gtk/gtkarrow.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100
++++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000
+@@ -31,7 +31,7 @@
+ #include "gtkintl.h"
+ #include "gtkalias.h"
+
+-#define MIN_ARROW_SIZE 15
++#define MIN_ARROW_SIZE 7
+
+ enum {
+ PROP_0,
+@@ -53,6 +53,8 @@
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
++static void gtk_arrow_size_request (GtkWidget *arrow,
++ GtkRequisition *requisition);
+
+
+ G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
+@@ -88,6 +90,7 @@
+ GTK_PARAM_READWRITE));
+
+ widget_class->expose_event = gtk_arrow_expose;
++ widget_class->size_request = gtk_arrow_size_request;
+ }
+
+ static void
+@@ -143,13 +146,18 @@
+ }
+
+ static void
++gtk_arrow_size_request (GtkWidget *arrow,
++ GtkRequisition *requisition)
++{
++ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
++ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
++}
++
++static void
+ gtk_arrow_init (GtkArrow *arrow)
+ {
+ GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
+
+- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
+- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
+-
+ arrow->arrow_type = GTK_ARROW_RIGHT;
+ arrow->shadow_type = GTK_SHADOW_OUT;
+ }
+Index: gtk+-2.10.6/gtk/gtkentry.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000
++++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000
+@@ -577,6 +577,18 @@
+ 0.0,
+ GTK_PARAM_READWRITE));
+
++ // Added by gtk+-handhelds.patch
++ gtk_widget_class_install_style_property (widget_class,
++ g_param_spec_int ("min_width",
++ P_("Minimum width"),
++ P_("Minimum width of the entry field"),
++ 0,
++ G_MAXINT,
++ MIN_ENTRY_WIDTH,
++ G_PARAM_READABLE));
++
++
++
+ /**
+ * GtkEntry:truncate-multiline:
+ *
+@@ -1286,7 +1298,7 @@
+ {
+ GtkEntry *en%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list