[oe-commits] org.oe.dev merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'

mickeyl commit openembedded-commits at lists.openembedded.org
Thu Jan 24 17:21:17 UTC 2008


merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'
     and 'c0a3e474625678b13727e12b833983f6e3389de1'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 38f8ae6418f23fd2c13f29ecf5b41628ff3dedcd
ViewMTN: http://monotone.openembedded.org/revision/info/38f8ae6418f23fd2c13f29ecf5b41628ff3dedcd
Files:
1
packages/fakeroot/fakeroot-native-1.8.3
packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch
packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch
packages/fakeroot/files/configure-libtool.patch
packages/fakeroot/fakeroot-native_1.8.3.bb
packages/fakeroot/fakeroot-native_1.9.1.bb
packages/fakeroot/fakeroot_1.8.3.bb
packages/fakeroot/fakeroot_1.9.1.bb
packages/gtk+/gtk+-2.12.3
contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch
packages/gpephone/libtapi_svn.bb
packages/gpephone/libvoc_svn.bb
packages/gtk+/gtk+-2.12.3/cellrenderer-cairo.patch
packages/gtk+/gtk+-2.12.3/combo-arrow-size.patch
packages/gtk+/gtk+-2.12.3/disable-print.patch
packages/gtk+/gtk+-2.12.3/entry-cairo.patch
packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch
packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch
packages/gtk+/gtk+-2.12.3/menu-deactivate.patch
packages/gtk+/gtk+-2.12.3/no-demos.patch
packages/gtk+/gtk+-2.12.3/pangoxft2.10.6.diff
packages/gtk+/gtk+-2.12.3/range-no-redraw.patch
packages/gtk+/gtk+-2.12.3/run-iconcache.patch
packages/gtk+/gtk+-2.12.3/scrolled-placement.patch
packages/gtk+/gtk+-2.12.3/toggle-font.diff
packages/gtk+/gtk+-2.12.3/xsettings.patch
packages/gtk+/gtk+_2.12.3.bb
classes/debian.bbclass
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf
contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog
packages/cups/cups.inc
packages/cups/cups_1.2.10.bb
packages/cups/cups_1.2.12.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.1.bb
packages/dbus/dbus_1.0.2.bb
packages/dbus/dbus_1.1.1.bb
packages/gtk+/gtk+.inc
packages/libxml/libxml2_2.6.29.bb
packages/linux/linux_2.6.23.bb
packages/python/python-edbus_cvs.bb
Diffs:

#
# mt diff -rbc23cf53ce799d3e52d33fa659150040636e3134 -r38f8ae6418f23fd2c13f29ecf5b41628ff3dedcd
#
# 
# 
# delete "packages/fakeroot/fakeroot-native-1.8.3"
# 
# delete "packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch"
# 
# rename "packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch"
#     to "packages/fakeroot/files/configure-libtool.patch"
# 
# rename "packages/fakeroot/fakeroot-native_1.8.3.bb"
#     to "packages/fakeroot/fakeroot-native_1.9.1.bb"
# 
# rename "packages/fakeroot/fakeroot_1.8.3.bb"
#     to "packages/fakeroot/fakeroot_1.9.1.bb"
# 
# add_dir "packages/gtk+/gtk+-2.12.3"
# 
# add_file "contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch"
#  content [aa0a48dd67bcf8e49876d9d5b923ee0ca8267d7f]
# 
# add_file "packages/gpephone/libtapi_svn.bb"
#  content [637aa49c7639955062f4676733fef8e47e364c1e]
# 
# add_file "packages/gpephone/libvoc_svn.bb"
#  content [258f865916c78c2f7e26f30b529acc434598321f]
# 
# add_file "packages/gtk+/gtk+-2.12.3/cellrenderer-cairo.patch"
#  content [f343e9c8fa9252834d1fc2d38498f7ca81027cf7]
# 
# add_file "packages/gtk+/gtk+-2.12.3/combo-arrow-size.patch"
#  content [86b154ddff681414b9ee93698f070af87eba8941]
# 
# add_file "packages/gtk+/gtk+-2.12.3/disable-print.patch"
#  content [15ba697401f4585005e6347d20498c7b1417f917]
# 
# add_file "packages/gtk+/gtk+-2.12.3/entry-cairo.patch"
#  content [7716bcd4fe95b61148fe31a6054081e08dfa616e]
# 
# add_file "packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch"
#  content [f8a32fce3abbb76c766cc6906e0300f3b281cbeb]
# 
# add_file "packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch"
#  content [c9c51ebeaf32844e38b9cc0062ca09911a680f3a]
# 
# add_file "packages/gtk+/gtk+-2.12.3/menu-deactivate.patch"
#  content [e0d8b253f81a5a01dbf5ffb9cfadda1799d7a3af]
# 
# add_file "packages/gtk+/gtk+-2.12.3/no-demos.patch"
#  content [765d8c563c164194e2b075eb32f57ef54bbba098]
# 
# add_file "packages/gtk+/gtk+-2.12.3/pangoxft2.10.6.diff"
#  content [c646b9f34fcf6fe7f0ddfef6d3ae66dfe24da0ab]
# 
# add_file "packages/gtk+/gtk+-2.12.3/range-no-redraw.patch"
#  content [2a456a9d163cedfca69de0662b26ad7060a41827]
# 
# add_file "packages/gtk+/gtk+-2.12.3/run-iconcache.patch"
#  content [2ab8f280d83e22b887247404cd6d7ac1afc3ed37]
# 
# add_file "packages/gtk+/gtk+-2.12.3/scrolled-placement.patch"
#  content [7258aed311d562ad735d04a51494b529cf66483b]
# 
# add_file "packages/gtk+/gtk+-2.12.3/toggle-font.diff"
#  content [892becbc52bd83e40c849d6d81f6f25f5d1d36ed]
# 
# add_file "packages/gtk+/gtk+-2.12.3/xsettings.patch"
#  content [1492aa80fb7bcb9008296d469f4d55183c904d37]
# 
# add_file "packages/gtk+/gtk+_2.12.3.bb"
#  content [7160ff887391b65883e37a5a1fbb1007a4356f49]
# 
# patch "classes/debian.bbclass"
#  from [2a365d85a6678f446949df94f9e76dad1677e376]
#    to [a83f52e8f361ddfc20c5cd874c5cd5c013e1bf8d]
# 
# patch "conf/machine/at32stk1000.conf"
#  from [ef27dae8874a54216b87007d17d0e99660400f4d]
#    to [f879f3d6c973dc116c1b2c1f62ef587d4b4906fe]
# 
# patch "conf/machine/atngw100.conf"
#  from [733b58380532065056c1b4b9d8b3f6f4a1c11f8d]
#    to [3be4e9a4b5ba7595209dd7a081329f095488a40d]
# 
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog"
#  from [2df8564f8e5c8c2b0b1b8969e9febf66cd00800a]
#    to [b1e7c5d0ed3dddbab736f23b57df2386b6937e4d]
# 
# patch "packages/cups/cups.inc"
#  from [222ec9d8aeac6ec4e9ebcaaaa920915c43052b25]
#    to [08e5210923c3872e4467981f0a7aaa9738a57165]
# 
# patch "packages/cups/cups_1.2.10.bb"
#  from [61eb68a7e7eb38c6af4139bae6ef7c9be81c5acf]
#    to [e2406d561f2df9078da93d2a26c2ebd15e78b078]
# 
# patch "packages/cups/cups_1.2.12.bb"
#  from [dc5d10665104ca7d5faa51dabb605e562691f6e9]
#    to [8edcc03e28f79076b582dc309d6a7690e3901663]
# 
# patch "packages/dbus/dbus.inc"
#  from [ea256c4c8b990fd68875bffd43137d01b3d8dd0a]
#    to [fcd0cd4dfa3ffd03a9285bb1e358d9664c80653b]
# 
# patch "packages/dbus/dbus_1.0.1.bb"
#  from [e01bd6fd36c624af9c31cd0f6020204db116a678]
#    to [5d798e693580447b3ba53ec4e1a628938c3651af]
# 
# patch "packages/dbus/dbus_1.0.2.bb"
#  from [9de1f18991491d917d3af33afea1153ea2e6aca2]
#    to [189ca0f0d84af77a57900ff46ff779ec64e27b24]
# 
# patch "packages/dbus/dbus_1.1.1.bb"
#  from [8067523daef0e32a078d9ed9d83ac3254616dcc5]
#    to [bade67e59960ff917ea8dcfe8978a1f1023618c2]
# 
# patch "packages/fakeroot/fakeroot-native_1.9.1.bb"
#  from [7407435ed787b345bb9a3d69762a1616144a29a0]
#    to [1c5c52a4e43a3d29fb7e01fc9314439465e94212]
# 
# patch "packages/fakeroot/fakeroot_1.9.1.bb"
#  from [534172d2aa3a4939aaced19e321eacaad90ec58d]
#    to [46dec87ce96a08cef69df1aeb4a65b53a49463a8]
# 
# patch "packages/gtk+/gtk+.inc"
#  from [96ca94f87b25f43f0517b4454a035d2d1c5e107c]
#    to [328403e10a5ff78ea6fa90afb26faaa2e137947a]
# 
# patch "packages/libxml/libxml2_2.6.29.bb"
#  from [c2449acb83459ee9a068c8c6044ea5de37d714ce]
#    to [74558b89eaffb7fdd847368d871f463438a97864]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [3707b0a151fd6264c4c804bdc6e1a228803fea0c]
#    to [8ad01fe63d105bb77ac6f9c29bb95d4288cc9b0b]
# 
============================================================
--- contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch	aa0a48dd67bcf8e49876d9d5b923ee0ca8267d7f
+++ contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch	aa0a48dd67bcf8e49876d9d5b923ee0ca8267d7f
@@ -0,0 +1,22 @@
+#
+# old_revision [63896b37ec0e055133c2e295f7c89e4677091511]
+#
+# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog"
+#  from [b1e7c5d0ed3dddbab736f23b57df2386b6937e4d]
+#    to [bb02f8caa6f5eaa903b4d65150392583072c7bea]
+#
+============================================================
+--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog  
+b1e7c5d0ed3dddbab736f23b57df2386b6937e4d
++++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog  
+bb02f8caa6f5eaa903b4d65150392583072c7bea
+@@ -1,3 +1,9 @@
++openembedded-essential (1.4ubuntu1) gutsy; urgency=low
++
++  * prepare ubuntu package
++
++ -- Rolf Leggewie <oe-devel at rolf.leggewie.biz>  Thu, 24 Jan 2008 13:49:26 +0100
++
+ openembedded-essential (1.4) unstable; urgency=low
+ 
+   * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy.
============================================================
--- packages/gpephone/libtapi_svn.bb	637aa49c7639955062f4676733fef8e47e364c1e
+++ packages/gpephone/libtapi_svn.bb	637aa49c7639955062f4676733fef8e47e364c1e
@@ -0,0 +1,17 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS telephony library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libglade libgsmd"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/libvoc_svn.bb	258f865916c78c2f7e26f30b529acc434598321f
+++ packages/gpephone/libvoc_svn.bb	258f865916c78c2f7e26f30b529acc434598321f
@@ -0,0 +1,17 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS voice call library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libglade libgsmd"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gtk+/gtk+-2.12.3/cellrenderer-cairo.patch	f343e9c8fa9252834d1fc2d38498f7ca81027cf7
+++ packages/gtk+/gtk+-2.12.3/cellrenderer-cairo.patch	f343e9c8fa9252834d1fc2d38498f7ca81027cf7
@@ -0,0 +1,32 @@
+Index: gtk/gtkcellrenderer.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
+retrieving revision 1.55
+diff -u -r1.55 gtkcellrenderer.c
+--- gtk/gtkcellrenderer.c	14 May 2006 04:25:28 -0000	1.55
++++ gtk/gtkcellrenderer.c	30 Jun 2006 10:57:43 -0000
+@@ -551,6 +551,7 @@
+ 
+   if (cell->cell_background_set && !selected)
+     {
++#ifdef USE_CAIRO_INTERNALLY
+       cairo_t *cr = gdk_cairo_create (window);
+ 
+       gdk_cairo_rectangle (cr, background_area);
+@@ -558,6 +559,16 @@
+       cairo_fill (cr);
+       
+       cairo_destroy (cr);
++#else
++      GdkGC *gc;
++
++      gc = gdk_gc_new (window);
++      gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
++      gdk_draw_rectangle (window, gc, TRUE,
++                          background_area->x, background_area->y,
++                          background_area->width, background_area->height);
++      g_object_unref (gc);
++#endif
+     }
+ 
+   GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
============================================================
--- packages/gtk+/gtk+-2.12.3/combo-arrow-size.patch	86b154ddff681414b9ee93698f070af87eba8941
+++ packages/gtk+/gtk+-2.12.3/combo-arrow-size.patch	86b154ddff681414b9ee93698f070af87eba8941
@@ -0,0 +1,67 @@
+Index: gtk/gtkcombobox.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
+retrieving revision 1.185
+diff -u -p -r1.185 gtkcombobox.c
+--- gtk/gtkcombobox.c	12 Oct 2006 13:48:07 -0000	1.185
++++ gtk/gtkcombobox.c	1 Nov 2006 19:01:09 -0000
+@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla
+                                                                  FALSE,
+                                                                  GTK_PARAM_READABLE));
+ 
++  /**
++   * GtkComboBox:arrow-size:
++   *
++   * Sets the minimum size of the arrow in the combo box.  Note
++   * that the arrow size is coupled to the font size, so in case
++   * a larger font is used, the arrow will be larger than set
++   * by arrow size.
++   *
++   * Since: 2.12
++   */
++  gtk_widget_class_install_style_property (widget_class,
++					   g_param_spec_int ("arrow-size",
++							     P_("Arrow Size"),
++							     P_("The minimum size of the arrow in the combo box"),
++							     0,
++							     G_MAXINT,
++							     15,
++							     GTK_PARAM_READABLE));
++
+   g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate));
+ }
+ 
+@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget   
+ {
+   gint width, height;
+   gint focus_width, focus_pad;
++  gint font_size;
++  gint arrow_size;
+   GtkRequisition bin_req;
++  PangoContext *context;
++  PangoFontMetrics *metrics;
++  PangoFontDescription *font_desc;
+ 
+   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
+  
+@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget   
+   gtk_widget_style_get (GTK_WIDGET (widget),
+ 			"focus-line-width", &focus_width,
+ 			"focus-padding", &focus_pad,
++			"arrow-size", &arrow_size,
+ 			NULL);
++
++  font_desc = GTK_BIN (widget)->child->style->font_desc;
++  context = gtk_widget_get_pango_context (widget);
++  metrics = pango_context_get_metrics (context, font_desc,
++				       pango_context_get_language (context));
++  font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
++			    pango_font_metrics_get_descent (metrics));
++  pango_font_metrics_unref (metrics);
++
++  arrow_size = MAX (arrow_size, font_size);
++
++  gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size);
+ 
+   if (!combo_box->priv->tree_view)
+     {
============================================================
--- packages/gtk+/gtk+-2.12.3/disable-print.patch	15ba697401f4585005e6347d20498c7b1417f917
+++ packages/gtk+/gtk+-2.12.3/disable-print.patch	15ba697401f4585005e6347d20498c7b1417f917
@@ -0,0 +1,26 @@
+--- gtk+-2.12.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
++++ gtk+-2.12.0/configure.in	2006-07-05 18:11:44.000000000 +0200
+@@ -1554,22 +1554 @@
+-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)
+-
+-  AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
+-fi
+-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
++AM_CONDITIONAL(HAVE_CUPS, false)
============================================================
--- packages/gtk+/gtk+-2.12.3/entry-cairo.patch	7716bcd4fe95b61148fe31a6054081e08dfa616e
+++ packages/gtk+/gtk+-2.12.3/entry-cairo.patch	7716bcd4fe95b61148fe31a6054081e08dfa616e
@@ -0,0 +1,103 @@
+Index: gtk/gtkentry.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
+retrieving revision 1.317
+diff -u -r1.317 gtkentry.c
+--- gtk/gtkentry.c	29 Jun 2006 09:18:05 -0000	1.317
++++ gtk/gtkentry.c	2 Jul 2006 14:14:24 -0000
+@@ -3337,7 +3337,9 @@
+   if (GTK_WIDGET_DRAWABLE (entry))
+     {
+       PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
++#ifdef USE_CAIRO_INTERNALLY
+       cairo_t *cr;
++#endif
+       gint x, y;
+       gint start_pos, end_pos;
+       
+@@ -3345,23 +3347,35 @@
+       
+       get_layout_position (entry, &x, &y);
+ 
++#ifdef USE_CAIRO_INTERNALLY
+       cr = gdk_cairo_create (entry->text_area);
+ 
+       cairo_move_to (cr, x, y);
+       gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
+       pango_cairo_show_layout (cr, layout);
++#else
++      gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state],
++                       x, y,
++                       layout);
++#endif
+ 
+       if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
+ 	{
+ 	  gint *ranges;
+ 	  gint n_ranges, i;
+           PangoRectangle logical_rect;
+-	  GdkColor *selection_color, *text_color;
+           GtkBorder inner_border;
++#ifdef USE_CAIRO_INTERNALLY
++	  GdkColor *selection_color, *text_color;
++#else
++	  GdkGC *selection_gc, *text_gc;
++          GdkRegion *clip_region;
++#endif
+ 
+ 	  pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+ 	  gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
+ 
++#ifdef USE_CAIRO_INTERNALLY
+ 	  if (GTK_WIDGET_HAS_FOCUS (entry))
+ 	    {
+ 	      selection_color = &widget->style->base [GTK_STATE_SELECTED];
+@@ -3390,11 +3404,46 @@
+ 	  cairo_move_to (cr, x, y);
+ 	  gdk_cairo_set_source_color (cr, text_color);
+ 	  pango_cairo_show_layout (cr, layout);
+-	  
++#else
++          if (GTK_WIDGET_HAS_FOCUS (entry))
++            {
++              selection_gc = widget->style->base_gc [GTK_STATE_SELECTED];
++              text_gc = widget->style->text_gc [GTK_STATE_SELECTED];
++            }
++          else
++            {
++              selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE];
++              text_gc = widget->style->text_gc [GTK_STATE_ACTIVE];
++            }
++
++          clip_region = gdk_region_new ();
++          for (i = 0; i < n_ranges; ++i)
++            {
++              GdkRectangle rect;
++
++              rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i];
++              rect.y = y;
++              rect.width = ranges[2 * i + 1];
++              rect.height = logical_rect.height;
++
++              gdk_draw_rectangle (entry->text_area, selection_gc, TRUE,
++                                  rect.x, rect.y, rect.width, rect.height);
++
++              gdk_region_union_with_rect (clip_region, &rect);
++            }
++
++          gdk_gc_set_clip_region (text_gc, clip_region);
++          gdk_draw_layout (entry->text_area, text_gc,
++                           x, y,
++                           layout);
++          gdk_gc_set_clip_region (text_gc, NULL);
++          gdk_region_destroy (clip_region);
++#endif	  
+ 	  g_free (ranges);
+ 	}
+-
++#ifdef USE_CAIRO_INTERNALLY
+       cairo_destroy (cr);
++#endif
+     }
+ }
+ 
============================================================
--- packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch	f8a32fce3abbb76c766cc6906e0300f3b281cbeb
+++ packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch	f8a32fce3abbb76c766cc6906e0300f3b281cbeb
@@ %s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rc0a3e474625678b13727e12b833983f6e3389de1 -r38f8ae6418f23fd2c13f29ecf5b41628ff3dedcd
#
# 
# 
# patch "packages/python/python-edbus_cvs.bb"
#  from [3c44990b9fd2056c30a3802025080abd052c42f8]
#    to [8d1d00ca5115e7226c39fbda403b7c1f6246e0a2]
# 
============================================================
--- packages/python/python-edbus_cvs.bb	3c44990b9fd2056c30a3802025080abd052c42f8
+++ packages/python/python-edbus_cvs.bb	8d1d00ca5115e7226c39fbda403b7c1f6246e0a2
@@ -1,7 +1,7 @@ require python-efl.inc
 require python-efl.inc
-DEPENDS += "edbus dbus-1.1"
+DEPENDS += "edbus dbus"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"






More information about the Openembedded-commits mailing list