[oe-commits] org.oe.dev merge of '4f67bea2562b34f365d7ca6807e88dc68459418f'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Jul 21 23:53:55 UTC 2007
merge of '4f67bea2562b34f365d7ca6807e88dc68459418f'
and 'd7f98d5dc21d49fa11962464baefb4ec32e5b204'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cdbdfc939fc7956220af47779e33f3214fd6b4de
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cdbdfc939fc7956220af47779e33f3214fd6b4de
Files:
1
packages/gtk+/gtk+-2.10.14
packages/gtk+/gtk+-2.10.14/automake-lossage.patch
packages/gtk+/gtk+-2.10.14/disable-print.patch
packages/gtk+/gtk+-2.10.14/disable-tooltips.patch
packages/gtk+/gtk+-2.10.14/gnome-bug-341177.patch
packages/gtk+/gtk+-2.10.14/gtk+-handhelds.patch
packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch
packages/gtk+/gtk+-2.10.14/hardcoded_libtool.patch
packages/gtk+/gtk+-2.10.14/integer-pixops.patch
packages/gtk+/gtk+-2.10.14/menu-deactivate.patch
packages/gtk+/gtk+-2.10.14/migration.patch
packages/gtk+/gtk+-2.10.14/no-demos.patch
packages/gtk+/gtk+-2.10.14/no-xwc.patch
packages/gtk+/gtk+-2.10.14/plana-pixops.patch
packages/gtk+/gtk+-2.10.14/run-iconcache.patch
packages/gtk+/gtk+-2.10.14/scroll-timings.patch
packages/gtk+/gtk+-2.10.14/single-click.patch
packages/gtk+/gtk+-2.10.14/small-gtkfilesel.patch
packages/gtk+/gtk+-2.10.14/spinbutton.patch
packages/gtk+/gtk+-2.10.14/xsettings.patch
packages/gtk+/gtk+_2.10.14.bb
packages/efl1/ecore/configure-abstract-sockets.patch
packages/efl1/epsilon_0.3.0.010.bb
packages/efl1/ecore-native_0.9.9.038.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_0.9.9.038.bb
packages/efl1/ecore_cvs.bb
packages/efl1/edje-native_0.5.0.040.bb
packages/efl1/edje-native_cvs.bb
packages/efl1/edje_0.5.0.040.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet-native_0.9.10.040.bb
packages/efl1/eet-native_cvs.bb
packages/efl1/eet_0.9.10.040.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_0.0.3.005.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo-native_0.9.1.040.bb
packages/efl1/embryo-native_cvs.bb
packages/efl1/embryo_0.9.1.040.bb
packages/efl1/embryo_cvs.bb
packages/efl1/emotion_0.0.1.007.bb
packages/efl1/emotion_cvs.bb
packages/efl1/epeg_0.9.0.010.bb
packages/efl1/epeg_cvs.bb
packages/efl1/esmart_0.9.0.010.bb
packages/efl1/esmart_cvs.bb
packages/efl1/etk_0.1.0.004.bb
packages/efl1/etk_cvs.bb
packages/efl1/evas-native_0.9.9.040.bb
packages/efl1/evas-native_cvs.bb
packages/efl1/evas_0.9.9.040.bb
packages/efl1/evas_cvs.bb
packages/efl1/ewl_0.5.1.010.bb
packages/efl1/ewl_cvs.bb
packages/poppler/poppler_cvs.bb
packages/poppler/poppler0.6_cvs.bb
packages/efl1/epdf
classes/efl_base.bbclass
classes/efl_library.bbclass
packages/efl1/edbus_cvs.bb
packages/efl1/epdf/fix-plugin-path-check.patch
packages/efl1/evolve-native_cvs.bb
packages/efl1/evolve_cvs.bb
conf/distro/include/sane-srcdates.inc
packages/efl1/ecore.inc
packages/efl1/edb_cvs.bb
packages/efl1/engrave_cvs.bb
packages/efl1/enhance_cvs.bb
packages/efl1/epdf_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/efl1/evas.inc
packages/efl1/exml_cvs.bb
packages/efl1/imlib2_1.4.0.002.bb
Diffs:
#
# mt diff -r4f67bea2562b34f365d7ca6807e88dc68459418f -rcdbdfc939fc7956220af47779e33f3214fd6b4de
#
#
#
# add_dir "packages/gtk+/gtk+-2.10.14"
#
# add_file "packages/gtk+/gtk+-2.10.14/automake-lossage.patch"
# content [387bad02f979c8ad88bc331616df368917de84fa]
#
# add_file "packages/gtk+/gtk+-2.10.14/disable-print.patch"
# content [23d191cedf8d3a5bd65f4bd9791e9090faa0d995]
#
# add_file "packages/gtk+/gtk+-2.10.14/disable-tooltips.patch"
# content [abe17e4c50f4bf741c5fe8cfc0218108bc30bd13]
#
# add_file "packages/gtk+/gtk+-2.10.14/gnome-bug-341177.patch"
# content [eb5192fa45519371befbc95fdf729beeea3e3877]
#
# add_file "packages/gtk+/gtk+-2.10.14/gtk+-handhelds.patch"
# content [2e46f66d5f810ba03f766d6c9bd8b1649d53f386]
#
# add_file "packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch"
# content [f8a32fce3abbb76c766cc6906e0300f3b281cbeb]
#
# add_file "packages/gtk+/gtk+-2.10.14/hardcoded_libtool.patch"
# content [c9c51ebeaf32844e38b9cc0062ca09911a680f3a]
#
# add_file "packages/gtk+/gtk+-2.10.14/integer-pixops.patch"
# content [10ccd0407ad93389f551ec131e123713a49084cd]
#
# add_file "packages/gtk+/gtk+-2.10.14/menu-deactivate.patch"
# content [e0d8b253f81a5a01dbf5ffb9cfadda1799d7a3af]
#
# add_file "packages/gtk+/gtk+-2.10.14/migration.patch"
# content [08898ee400bb324b9f10cc6e8e744c6b685e0549]
#
# add_file "packages/gtk+/gtk+-2.10.14/no-demos.patch"
# content [765d8c563c164194e2b075eb32f57ef54bbba098]
#
# add_file "packages/gtk+/gtk+-2.10.14/no-xwc.patch"
# content [f7c6168255ab8fdf067a4a9f8fc98dfc30b035a4]
#
# add_file "packages/gtk+/gtk+-2.10.14/plana-pixops.patch"
# content [521cffc1336167619579f425f2203833aacd28b9]
#
# add_file "packages/gtk+/gtk+-2.10.14/run-iconcache.patch"
# content [2ab8f280d83e22b887247404cd6d7ac1afc3ed37]
#
# add_file "packages/gtk+/gtk+-2.10.14/scroll-timings.patch"
# content [d107628896cd78842b7ee76e56e4bbf0262ee02b]
#
# add_file "packages/gtk+/gtk+-2.10.14/single-click.patch"
# content [0016f764f5e73469d50c67a985639dc9a6c91299]
#
# add_file "packages/gtk+/gtk+-2.10.14/small-gtkfilesel.patch"
# content [038a757b9499f4beac8605039314c35b9c047ef4]
#
# add_file "packages/gtk+/gtk+-2.10.14/spinbutton.patch"
# content [9e9877594aad75d8b453a750f48151e7f105aeb2]
#
# add_file "packages/gtk+/gtk+-2.10.14/xsettings.patch"
# content [1492aa80fb7bcb9008296d469f4d55183c904d37]
#
# add_file "packages/gtk+/gtk+_2.10.14.bb"
# content [e6069d663f44b850fc362305e7de211e0f29afd7]
#
============================================================
--- packages/gtk+/gtk+-2.10.14/automake-lossage.patch 387bad02f979c8ad88bc331616df368917de84fa
+++ packages/gtk+/gtk+-2.10.14/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.14/disable-print.patch 23d191cedf8d3a5bd65f4bd9791e9090faa0d995
+++ packages/gtk+/gtk+-2.10.14/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.14/disable-tooltips.patch abe17e4c50f4bf741c5fe8cfc0218108bc30bd13
+++ packages/gtk+/gtk+-2.10.14/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.14/gnome-bug-341177.patch eb5192fa45519371befbc95fdf729beeea3e3877
+++ packages/gtk+/gtk+-2.10.14/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.14/gtk+-handhelds.patch 2e46f66d5f810ba03f766d6c9bd8b1649d53f386
+++ packages/gtk+/gtk+-2.10.14/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:
+%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd7f98d5dc21d49fa11962464baefb4ec32e5b204 -rcdbdfc939fc7956220af47779e33f3214fd6b4de
#
#
#
# delete "packages/efl1/ecore/configure-abstract-sockets.patch"
#
# delete "packages/efl1/epsilon_0.3.0.010.bb"
#
# rename "packages/efl1/ecore-native_0.9.9.038.bb"
# to "packages/efl1/ecore-native_cvs.bb"
#
# rename "packages/efl1/ecore_0.9.9.038.bb"
# to "packages/efl1/ecore_cvs.bb"
#
# rename "packages/efl1/edje-native_0.5.0.040.bb"
# to "packages/efl1/edje-native_cvs.bb"
#
# rename "packages/efl1/edje_0.5.0.040.bb"
# to "packages/efl1/edje_cvs.bb"
#
# rename "packages/efl1/eet-native_0.9.10.040.bb"
# to "packages/efl1/eet-native_cvs.bb"
#
# rename "packages/efl1/eet_0.9.10.040.bb"
# to "packages/efl1/eet_cvs.bb"
#
# rename "packages/efl1/efreet_0.0.3.005.bb"
# to "packages/efl1/efreet_cvs.bb"
#
# rename "packages/efl1/embryo-native_0.9.1.040.bb"
# to "packages/efl1/embryo-native_cvs.bb"
#
# rename "packages/efl1/embryo_0.9.1.040.bb"
# to "packages/efl1/embryo_cvs.bb"
#
# rename "packages/efl1/emotion_0.0.1.007.bb"
# to "packages/efl1/emotion_cvs.bb"
#
# rename "packages/efl1/epeg_0.9.0.010.bb"
# to "packages/efl1/epeg_cvs.bb"
#
# rename "packages/efl1/esmart_0.9.0.010.bb"
# to "packages/efl1/esmart_cvs.bb"
#
# rename "packages/efl1/etk_0.1.0.004.bb"
# to "packages/efl1/etk_cvs.bb"
#
# rename "packages/efl1/evas-native_0.9.9.040.bb"
# to "packages/efl1/evas-native_cvs.bb"
#
# rename "packages/efl1/evas_0.9.9.040.bb"
# to "packages/efl1/evas_cvs.bb"
#
# rename "packages/efl1/ewl_0.5.1.010.bb"
# to "packages/efl1/ewl_cvs.bb"
#
# rename "packages/poppler/poppler_cvs.bb"
# to "packages/poppler/poppler0.6_cvs.bb"
#
# add_dir "packages/efl1/epdf"
#
# add_file "classes/efl_base.bbclass"
# content [aabadd6f5cd07bd1ce37b7a34cf28f7031160028]
#
# add_file "classes/efl_library.bbclass"
# content [b3ae5ff81c40f3b543f2519e362531a715eeef03]
#
# add_file "packages/efl1/edbus_cvs.bb"
# content [1826c7cb68c61f853f9e04fb53e1b03a022c7894]
#
# add_file "packages/efl1/epdf/fix-plugin-path-check.patch"
# content [917c11e702bf01b1b341e285286bb27f75393f93]
#
# add_file "packages/efl1/evolve-native_cvs.bb"
# content [57dc1c09dc6065d94f285d1e8e3d08a1c918460e]
#
# add_file "packages/efl1/evolve_cvs.bb"
# content [28b3b6d8799b62cf4ed73c7cce33e729e5eb548c]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2b41f0b4202e7f574bbc791177357abce12a84a0]
# to [0dcb9e0e4e87a918b1f6dcdc07054dde621b8bbb]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [17a8335856faa8d9c108f59dd7ce54f1db34ec00]
# to [ee1cbaae633a563dca59af7fa44f9ffc26267d24]
#
# patch "packages/efl1/ecore.inc"
# from [8bf0449e6585d11368ae42e9f7202d62e3cfbd68]
# to [77e800a680cc16d7b45d6800e92bbb3e3f2e02da]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [0afdc56ffc7928972b6e2d526cec184ec5e4b55c]
# to [dec22496c322b59a7a8bc85c16638bc3df968b44]
#
# patch "packages/efl1/edb_cvs.bb"
# from [b4eb4df3b61b65bfc5847d0d2bdfc4324f6343f0]
# to [0c9ee11913353b13d047a4fb9c6c3e86c2679262]
#
# patch "packages/efl1/edje-native_cvs.bb"
# from [53e76aba99247f77e3a535e1d4d6ee804334404e]
# to [61b907b3153cd9a90f2727727c2eb99ff6a16c59]
#
# patch "packages/efl1/edje_cvs.bb"
# from [0d2e945fe7b8505afe353cad7ca2ed6f7096470e]
# to [490a1f7b46b3e56b0050f754761788f5a7a50e41]
#
# patch "packages/efl1/eet-native_cvs.bb"
# from [f60f5da7e746b8614fcb291b30edb7b94829642d]
# to [fb7051cc00a6ec87793f53562dab0a8229f70586]
#
# patch "packages/efl1/eet_cvs.bb"
# from [9b5c783cd0eefe0adc9947dbf646f04a024f460c]
# to [9b9106bc2a2e203587ff882bc53340d3c9f6238d]
#
# patch "packages/efl1/efreet_cvs.bb"
# from [06512c3c5add76dd392ef2824b1b901502bb2fd6]
# to [9d7e4a84538a39b3ad1b606e3222f3b0897ec4e2]
#
# patch "packages/efl1/embryo_cvs.bb"
# from [a3587d78d26ddbb3c8a173e62c94c46037bc6873]
# to [3e96e67d89254836f8a22fc911513a683838c569]
#
# patch "packages/efl1/emotion_cvs.bb"
# from [fedd137c32fd4fdab54c1011a673afce37039483]
# to [0dea4f9c68cea7dac11077352cd9dbbe1d81fd41]
#
# patch "packages/efl1/engrave_cvs.bb"
# from [27cbe98d887b025aa8f8db65a39f02449f32c9e0]
# to [bec559cdd998186f53c02ed352d159987b2b2e41]
#
# patch "packages/efl1/enhance_cvs.bb"
# from [8e6a6c4d69706cf1da23145efdfdab1f582322e8]
# to [98e5f9a53bbca75e2b369d6556728f366b26ade6]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [28eb7a221e878c3becb89058b8df2edd6b8cbb5c]
# to [e413e42ab3491388c723c09e3d825d3bbe55542c]
#
# patch "packages/efl1/epeg_cvs.bb"
# from [0c01a5880d104a4e291b47214ec08c7083489c0a]
# to [fceb3b23bf774810acb12e16ce0a0e7d904868a0]
#
# patch "packages/efl1/epsilon_cvs.bb"
# from [84537388001ab7881f12e1cd06386a69174a3595]
# to [ed403881091c3fab241a1bfc86fd69b4a645f221]
#
# patch "packages/efl1/esmart_cvs.bb"
# from [50ef9d7ecd9979943010a6a384223d87e0c2abab]
# to [ee68efdac13ac563cdc6a6c8e818e1f391d255ce]
#
# patch "packages/efl1/etk_cvs.bb"
# from [f268a57f29e455ec9994f66eeb3c7394ed772463]
# to [30cb3b710327fe056966375324ff69d0f0335450]
#
# patch "packages/efl1/evas-native_cvs.bb"
# from [6af2e197ee9a6722c719178eb81b88c2d36485ed]
# to [43075f93e3ccaafd51b16995c68d846aaa61d951]
#
# patch "packages/efl1/evas.inc"
# from [8cf61bd0660a5b5710e0547d0bed9fd06e0c0b25]
# to [f72bdeb6410f9ee7c0b2e888e67a14c17fa3c1c1]
#
# patch "packages/efl1/evas_cvs.bb"
# from [4fcd71f0e352f97f6e84c02bd4aef385c1042b8a]
# to [876a23f29e979df031ca09d730a1840667e998e4]
#
# patch "packages/efl1/ewl_cvs.bb"
# from [afa672ceeb3faa99b64d4897e214dbbff358a5fa]
# to [dc929b34b3fd94b358ec70f0cc96d56aa4f08a60]
#
# patch "packages/efl1/exml_cvs.bb"
# from [164cb4bc367489b0658e4db9c45909c7001aad94]
# to [2564777dc378cdf2b521b0e39fe35257f04e8314]
#
# patch "packages/efl1/imlib2_1.4.0.002.bb"
# from [edfcc8589430da26392ebd4318c0fa48be9ffdae]
# to [58a676b069eb953275a7f7356044d18b6693b484]
#
============================================================
--- classes/efl_base.bbclass aabadd6f5cd07bd1ce37b7a34cf28f7031160028
+++ classes/efl_base.bbclass aabadd6f5cd07bd1ce37b7a34cf28f7031160028
@@ -0,0 +1,20 @@
+inherit autotools pkgconfig
+
+#do_prepsources () {
+# make clean distclean || true
+#}
+#addtask prepsources after do_fetch before do_unpack
+
+SECTION = "e/libs"
+HOMEPAGE = "http://www.enlightenment.org"
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-07-10/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
+FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a"
+
============================================================
--- classes/efl_library.bbclass b3ae5ff81c40f3b543f2519e362531a715eeef03
+++ classes/efl_library.bbclass b3ae5ff81c40f3b543f2519e362531a715eeef03
@@ -0,0 +1,9 @@
+inherit efl_base
+
+SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
+FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la"
+FILES_${PN} = "${libdir}/*.so*"
============================================================
--- packages/efl1/edbus_cvs.bb 1826c7cb68c61f853f9e04fb53e1b03a022c7894
+++ packages/efl1/edbus_cvs.bb 1826c7cb68c61f853f9e04fb53e1b03a022c7894
@@ -0,0 +1,12 @@
+DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
+DEPENDS = "dbus ecore"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl_library
+
+SRC_URI = "${E_CVS};module=e17/proto/e_dbus"
+S = "${WORKDIR}/e_dbus"
+
+# TODO increase package granularity
+
============================================================
--- packages/efl1/epdf/fix-plugin-path-check.patch 917c11e702bf01b1b341e285286bb27f75393f93
+++ packages/efl1/epdf/fix-plugin-path-check.patch 917c11e702bf01b1b341e285286bb27f75393f93
@@ -0,0 +1,24 @@
+Index: epdf/configure.in
+===================================================================
+--- epdf.orig/configure.in
++++ epdf/configure.in
+@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL,
+ [
+ have_ewl="yes"
+ requirements="$requirements ewl"
+- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
+ AC_SUBST(EWL_TEST_LIBS_DIR)
+ AC_SUBST(EWL_TEST_SOURCE_DIR)
+ ],
+@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON,
+ [
+ have_epsilon="yes"
+ requirements="$requirements epsilon imlib2"
+- EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
++ EPSILON_PLUGINS_DIR="/usr/lib/epsilon/plugins/"
+ AC_SUBST(EPSILON_PLUGINS_DIR)
+ ],
+ [
============================================================
--- packages/efl1/evolve-native_cvs.bb 57dc1c09dc6065d94f285d1e8e3d08a1c918460e
+++ packages/efl1/evolve-native_cvs.bb 57dc1c09dc6065d94f285d1e8e3d08a1c918460e
@@ -0,0 +1,6 @@
+require evolve_cvs.bb
+inherit native
+DEPENDS = "etk-native"
+
+# needs ecore-x :/
+BROKEN = "1"
============================================================
--- packages/efl1/evolve_cvs.bb 28b3b6d8799b62cf4ed73c7cce33e729e5eb548c
+++ packages/efl1/evolve_cvs.bb 28b3b6d8799b62cf4ed73c7cce33e729e5eb548c
@@ -0,0 +1,6 @@
+DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language"
+LICENSE = "MIT"
+DEPENDS = "etk evolve-native"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit efl_library
============================================================
--- conf/distro/include/sane-srcdates.inc 2b41f0b4202e7f574bbc791177357abce12a84a0
+++ conf/distro/include/sane-srcdates.inc 0dcb9e0e4e87a918b1f6dcdc07054dde621b8bbb
@@ -50,22 +50,48 @@ SRCDATE_gtkhtml2 ?= "20060323"
SRCDATE_gnome-vfs ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"
-# Enlightenment (libs)
-SRCDATE_edb ?= "20070601"
-SRCDATE_enhanve ?= "20070601"
-SRCDATE_engrave ?= "20070601"
-SRCDATE_exml ?= "20070601"
+# Enlightenment Foundation Libraries
+# Caution: This is not alphabetically, but (roughly) dependency-sorted.
+# Please leave it like that.
+SRCDATE_edb-native = "20070721"
+SRCDATE_edb ?= "20070721"
+SRCDATE_eet-native = "20070721"
+SRCDATE_eet ?= "20070721"
+SRCDATE_evas-native ?= "20070721"
+SRCDATE_evas ?= "20070721"
+SRCDATE_ecore-native ?= "20070721"
+SRCDATE_ecore ?= "20070721"
+SRCDATE_edbus ?= "20070721"
+SRCDATE_embryo-native ?= "20070721"
+SRCDATE_embryo ?= "20070721"
+SRCDATE_edje-native ?= "20070721"
+SRCDATE_edje ?= "20070721"
+SRCDATE_emotion ?= "20070721"
+SRCDATE_etk-native ?= "20070721"
+SRCDATE_etk ?= "20070721"
+SRCDATE_ewl ?= "20070721"
+SRCDATE_epeg ?= "20070721"
+SRCDATE_epsilon ?= "20070721"
+SRCDATE_epdf ?= "20070721"
+SRCDATE_esmart ?= "20070721"
+SRCDATE_efreet ?= "20070721"
+SRCDATE_exml ?= "20070721"
+SRCDATE_enhance ?= "20070721"
+SRCDATE_engrave ?= "20070721"
+SRCDATE_evolve-native ?= "20070721"
+SRCDATE_evolve ?= "20070721"
-# Enlightenment (apps)
-SRCDATE_edje-viewer = "20070601"
-SRCDATE_emphasis = "20070601"
-SRCDATE_ephoto = "20070601"
-SRCDATE_examine = "20070601"
-SRCDATE_expedite = "20070601"
-SRCDATE_elitaire = "20070504"
-SRCDATE_entice = "20070601"
-SRCDATE_e-utils = "20070601"
-SRCDTE_exhibit = "20070601"
+# Enlightenment Applications
+SRCDATE_edje-viewer ?= "20070601"
+SRCDATE_edje-editor ?= "20070721"
+SRCDATE_emphasis ?= "20070601"
+SRCDATE_ephoto ?= "20070601"
+SRCDATE_examine ?= "20070601"
+SRCDATE_exhibit ?= "20070721"
+SRCDATE_expedite ?= "20070601"
+SRCDATE_elitaire ?= "20070504"
+SRCDATE_entice ?= "20070601"
+SRCDATE_e-utils ?= "20070601"
# Misc apps, sorted by alphabet
SRCDATE_avetanabt ?= "20060814"
@@ -108,5 +134,5 @@ SRCDATE_zroadmap ?= "20060814"
SRCDATE_zroadmap ?= "20060814"
# Freedesktop.org
-SRCDATE_poppler = "20070708"
+SRCDATE_poppler0.6 = "20070708"
============================================================
--- packages/efl1/ecore-native_0.9.9.038.bb 17a8335856faa8d9c108f59dd7ce54f1db34ec00
+++ packages/efl1/ecore-native_cvs.bb ee1cbaae633a563dca59af7fa44f9ffc26267d24
@@ -1,14 +1,15 @@ DEPENDS = "eet-native evas-native"
require ecore.inc
inherit native
DEPENDS = "eet-native evas-native"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "\
--enable-ecore-txt \
--disable-ecore-x-xcb \
--disable-ecore-x \
--enable-ecore-job \
- --enable-ecore-directfb \
+ --disable-ecore-directfb \
+ --disable-ecore-sdl \
--enable-ecore-fb \
--enable-ecore-evas \
--disable-ecore-evas-gl \
@@ -18,7 +19,6 @@ EXTRA_OECONF = "\
--enable-abstract-sockets \
--enable-ecore-con \
--enable-ecore-ipc \
- --enable-ecore-dbus \
--enable-ecore-file \
--enable-inotify \
--disable-poll \
============================================================
--- packages/efl1/ecore.inc 8bf0449e6585d11368ae42e9f7202d62e3cfbd68
+++ packages/efl1/ecore.inc 77e800a680cc16d7b45d6800e92bbb3e3f2e02da
@@ -1,32 +1,27 @@ LICENSE = "MIT"
DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
foundation libraries. It makes makes doing selections, drag and drop, event loops, \
timeouts and idle handlers fast, optimized, and convenient."
LICENSE = "MIT"
-DEPENDS = "curl dbus directfb eet evas tslib"
+DEPENDS = "curl directfb eet evas tslib"
# optional
# DEPENDS += "openssl virtual/libiconv"
+PV = "0.9.9+cvs${SRCDATE}"
-inherit efl1
+inherit efl_library
-SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
- file://configure-abstract-sockets.patch;patch=1 \
- file://fix-tslib-configure.patch;patch=1 \
- file://fix-directfb-include.patch;patch=1"
+SRC_URI += "\
+ file://fix-tslib-configure.patch;patch=1 \
+ file://fix-directfb-include.patch;patch=1 \
+"
-S = "${WORKDIR}/ecore-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
-
-do_stage() {
- autotools_stage_all
-}
-
PACKAGES += "\
${PN}-con \
${PN}-config \
- ${PN}-dbus \
${PN}-desktop \
${PN}-directfb \
+ ${PN}-sdl \
${PN}-evas \
${PN}-fb \
${PN}-file \
@@ -38,9 +33,9 @@ FILES_${PN}-config = "${libdir}/libecore
FILES_${PN} = "${libdir}/libecore.so.*"
FILES_${PN}-con = "${libdir}/libecore_con.so.*"
FILES_${PN}-config = "${libdir}/libecore_config.so.*"
-FILES_${PN}-dbus = "${libdir}/libecore_dbus.so.*"
FILES_${PN}-desktop = "${libdir}/libecore_desktop.so.*"
FILES_${PN}-directfb = "${libdir}/libecore_directfb.so.*"
+FILES_${PN}-sdl = "${libdir}/libecore_sdl.so.*"
FILES_${PN}-evas = "${libdir}/libecore_evas.so.*"
FILES_${PN}-fb = "${libdir}/libecore_fb.so.*"
FILES_${PN}-file = "${libdir}/libecore_file.so.*"
@@ -48,4 +43,3 @@ FILES_${PN}-x = "${libdir}/libecore_x.so
FILES_${PN}-job = "${libdir}/libecore_job.so.*"
FILES_${PN}-txt = "${libdir}/libecore_txt.so.*"
FILES_${PN}-x = "${libdir}/libecore_x.so.*"
-
============================================================
--- packages/efl1/ecore_0.9.9.038.bb 0afdc56ffc7928972b6e2d526cec184ec5e4b55c
+++ packages/efl1/ecore_cvs.bb dec22496c322b59a7a8bc85c16638bc3df968b44
@@ -1,5 +1,5 @@ require ecore.inc
require ecore.inc
-PR = "r4"
+PR = "r5"
EXTRA_OECONF = "\
--enable-ecore-txt \
@@ -7,6 +7,7 @@ EXTRA_OECONF = "\
--enable-ecore-x \
--enable-ecore-job \
--enable-ecore-directfb \
+ --enable-ecore-sdl \
--enable-ecore-fb \
--enable-ecore-evas \
--disable-ecore-evas-gl \
@@ -16,7 +17,6 @@ EXTRA_OECONF = "\
--enable-abstract-sockets \
--enable-ecore-con \
--enable-ecore-ipc \
- --enable-ecore-dbus \
--enable-ecore-file \
--enable-inotify \
--disable-poll \
============================================================
--- packages/efl1/edb_cvs.bb b4eb4df3b61b65bfc5847d0d2bdfc4324f6343f0
+++ packages/efl1/edb_cvs.bb 0c9ee11913353b13d047a4fb9c6c3e86c2679262
@@ -1,14 +1,5 @@ PV = "0.0.0+cvs${SRCDATE}"
DESCRIPTION = "Edb is a database library"
LICENSE = "MIT"
PV = "0.0.0+cvs${SRCDATE}"
+inherit efl_library
-inherit efl1
-
-SRC_URI = "${E_CVS};module=e17/libs/edb"
-S = "${WORKDIR}/edb"
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list