Skip to contentSkip to conversation

Fixes for multilib

PATCH Applied [email protected] 2 participants 7 messages Feb 22, 2012 – Feb 28, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Fixes for multilib

From: Zhai Edwin <[email protected]>

All,
These are fixes for multilib, and [Yocto 1906].

Pls. help to pull.

Thanks,
Edwin

The following changes since commit 41a83ccfe50ec69425a4828fb5836d38d3f99e67:

guile: fix cross configure failure (2012-02-10 17:01:42 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (3):
quicky: Fix for multilib
texi2html: Fix for multilib
vte: fix scroll issue

 meta/recipes-extended/texi2html/texi2html_5.0.bb |    2 +-
 meta/recipes-qt/qt-apps/quicky_0.4.bb            |    2 +-
 meta/recipes-support/vte/vte.inc                 |    3 +-
 meta/recipes-support/vte/vte/scrollbar_fix.patch |  122 ++++++++++++++++++++++
 meta/recipes-support/vte/vte_0.28.2.bb           |    2 +-
 5 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
author
#1 lore raw

PATCH 1/3 quicky: Fix for multilib

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-qt/qt-apps/quicky_0.4.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-qt/qt-apps/quicky_0.4.bb +1 -1
index 20c04f8..73d3e99 100644
@@ -17,5 +17,5 @@ inherit qmake2 pkgconfig
 
 do_install() {
 	install -d ${D}${bindir}
-	install -m 0755 ${S}/${PN} ${D}${bindir}
+	install -m 0755 ${S}/${BPN} ${D}${bindir}
 }
Signature · 1 line
1.7.1
author
#2 lore raw

PATCH 2/3 texi2html: Fix for multilib

In reply to [email protected]

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-extended/texi2html/texi2html_5.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-extended/texi2html/texi2html_5.0.bb +1 -1
index 068f8bc..02f3fe1 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 PR = "r0"
 
-SRC_URI     = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2 \
+SRC_URI     = "http://download.savannah.gnu.org/releases/texi2html/${BPN}-${PV}.tar.bz2 \
                file://fix_gettext_version.patch"
 
 SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
Signature · 1 line
1.7.1
author
#3 lore raw

PATCH 3/3 vte: fix scroll issue

In reply to [email protected]

From: Zhai Edwin <[email protected]>

On qemu x86-64, scrollbar in vte got broken with one commit to change the way of emiting "changed" signal. This patch revert it as work around.

[YOCTO #1906] got fixed.

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-support/vte/vte.inc                 |    3 +-
 meta/recipes-support/vte/vte/scrollbar_fix.patch |  122 ++++++++++++++++++++++
 meta/recipes-support/vte/vte_0.28.2.bb           |    2 +-
 3 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
meta/recipes-support/vte/vte.inc +2 -1
index 54bd8ae..d3406e5 100644
@@ -6,7 +6,8 @@ RDEPENDS_libvte = "vte-termcap"
 
 inherit gnome
 
-SRC_URI += "file://introspection.patch"
+SRC_URI += "file://introspection.patch\ 
+            file://scrollbar_fix.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
meta/recipes-support/vte/vte/scrollbar_fix.patch new file +122 -0

122 lines not on this page · raw message

meta/recipes-support/vte/vte_0.28.2.bb +1 -1
index 33f71b5..507e272 100644
@@ -2,7 +2,7 @@ require vte.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
 SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
Signature · 1 line
1.7.1
#4 lore raw

Re: [PATCH 3/3] vte: fix scroll issue

Quoted 6 lines · On Wed, 2012-02-22 at 13:33 +0800, [email protected] wrote:

From: Zhai Edwin <[email protected]>

On qemu x86-64, scrollbar in vte got broken with one commit to change the way of emiting "changed" signal. This patch revert it as work around.

[YOCTO #1906] got fixed.

This patch worries me a bit (well, a lot really). Why is this only broken on 64 bit? How does this revert fix things? It looks like its not the real problem to me?

Cheers,

Richard

Quoted 167 lines
Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-support/vte/vte.inc                 |    3 +-
 meta/recipes-support/vte/vte/scrollbar_fix.patch |  122 ++++++++++++++++++++++
 meta/recipes-support/vte/vte_0.28.2.bb           |    2 +-
 3 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
meta/recipes-support/vte/vte.inc +2 -1
index 54bd8ae..d3406e5 100644
@@ -6,7 +6,8 @@ RDEPENDS_libvte = "vte-termcap"
 
 inherit gnome
 
-SRC_URI += "file://introspection.patch"
+SRC_URI += "file://introspection.patch\ 
+            file://scrollbar_fix.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
meta/recipes-support/vte/vte/scrollbar_fix.patch new file +122 -0
new file mode 100644
index 0000000..707377a
@@ -0,0 +1,122 @@
+On qemu x86-64, matchbox-terminal has broken scrollbar, because of following
+commit in vte. This patch revert it as work around.
+
+Signed-off-by: Zhai Edwin <[email protected]>
+
+Upstream-Status: Inappropriate [workaround]
+
+commit 6eadb8494797e44910b86b5e101823cf527c04e1
+Author: Kristian Høgsberg <[email protected]>
+Date:   Thu Jul 15 09:07:51 2010 -0400
+
+    Use accessors for setting adjustment
+    
+    We use g_object_freeze_notify() to emit the same amount of ::changed
+    signals.
+
+Index: vte-0.28.2/src/vte.c
+===================================================================
+--- vte-0.28.2.orig/src/vte.c	2011-08-29 05:31:45.000000000 +0800
++++ vte-0.28.2/src/vte.c	2012-02-21 11:03:22.000000000 +0800
+@@ -2018,15 +2018,13 @@
+ 		glong v;
+ 		gdouble current;
+ 
+-		g_object_freeze_notify (G_OBJECT (terminal->adjustment));
+-
+ 		v = _vte_ring_delta (screen->row_data);
+ 		current = gtk_adjustment_get_lower(terminal->adjustment);
+ 		if (current != v) {
+ 			_vte_debug_print(VTE_DEBUG_ADJ,
+ 					"Changing lower bound from %.0f to %ld\n",
+ 					 current, v);
+-			gtk_adjustment_set_lower(terminal->adjustment, v);
++			terminal->adjustment->lower = v;
+ 			changed = TRUE;
+ 		}
+ 
+@@ -2039,19 +2037,19 @@
+ 			_vte_debug_print(VTE_DEBUG_ADJ,
+ 					"Changing upper bound from %.0f to %ld\n",
+ 					 current, v);
+-			gtk_adjustment_set_upper(terminal->adjustment, v);
++			terminal->adjustment->upper = v;
+ 			changed = TRUE;
+ 		}
+ 
+-		g_object_thaw_notify (G_OBJECT (terminal->adjustment));
+-
+-		if (changed)
++		if (changed) {
+ 			_vte_debug_print(VTE_DEBUG_SIGNALS,
+ 					"Emitting adjustment_changed.\n");
++			gtk_adjustment_changed(terminal->adjustment);
++		}
+ 		terminal->pvt->adjustment_changed_pending = FALSE;
+ 	}
+ 	if (terminal->pvt->adjustment_value_changed_pending) {
+-		glong v, delta;
++		glong v;
+ 		_vte_debug_print(VTE_DEBUG_SIGNALS,
+ 				"Emitting adjustment_value_changed.\n");
+ 		terminal->pvt->adjustment_value_changed_pending = FALSE;
+@@ -2062,9 +2060,9 @@
+ 			 * via the adjustment - e.g. user interaction with the
+ 			 * scrollbar
+ 			 */
+-			delta = terminal->pvt->screen->scroll_delta;
++			terminal->adjustment->value = terminal->pvt->screen->scroll_delta;
+ 			terminal->pvt->screen->scroll_delta = v;
+-			gtk_adjustment_set_value(terminal->adjustment, delta);
++			gtk_adjustment_value_changed(terminal->adjustment);
+ 		}
+ 	}
+ }
+@@ -2141,15 +2139,13 @@
+ 
+ 	_vte_terminal_adjust_adjustments(terminal);
+ 
+-        g_object_freeze_notify(G_OBJECT(terminal->adjustment));
+-
+ 	/* The step increment should always be one. */
+ 	v = gtk_adjustment_get_step_increment(terminal->adjustment);
+ 	if (v != 1) {
+ 		_vte_debug_print(VTE_DEBUG_ADJ,
+ 				"Changing step increment from %.0lf to %ld\n",
+ 				v, terminal->row_count);
+-		gtk_adjustment_set_step_increment(terminal->adjustment, 1);
++		terminal->adjustment->step_increment = 1;
+ 		changed = TRUE;
+ 	}
+ 
+@@ -2160,8 +2156,7 @@
+ 		_vte_debug_print(VTE_DEBUG_ADJ,
+ 				"Changing page size from %.0f to %ld\n",
+ 				 v, terminal->row_count);
+-		gtk_adjustment_set_page_size(terminal->adjustment,
+-					     terminal->row_count);
++		terminal->adjustment->page_size = terminal->row_count;
+ 		changed = TRUE;
+ 	}
+ 
+@@ -2173,16 +2168,15 @@
+ 				"Changing page increment from "
+ 				"%.0f to %ld\n",
+ 				v, terminal->row_count);
+-		gtk_adjustment_set_page_increment(terminal->adjustment,
+-						  terminal->row_count);
++		terminal->adjustment->page_increment = terminal->row_count;
+ 		changed = TRUE;
+ 	}
+ 
+-	g_object_thaw_notify(G_OBJECT(terminal->adjustment));
+-
+-	if (changed)
++	if (changed) {
+ 		_vte_debug_print(VTE_DEBUG_SIGNALS,
+ 				"Emitting adjustment_changed.\n");
++		gtk_adjustment_changed(terminal->adjustment);
++	}
+ }
+ 
+ /* Scroll a fixed number of lines up or down in the current screen. */
meta/recipes-support/vte/vte_0.28.2.bb +1 -1
index 33f71b5..507e272 100644
@@ -2,7 +2,7 @@ require vte.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
 SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#5 lore raw

Re: [PATCH 3/3] vte: fix scroll issue

Quoted 6 lines · Richard Purdie
Quoted 5 lines · On Wed, 2012-02-22 at 13:33 +0800, [email protected] wrote:

From: Zhai Edwin <[email protected]>

On qemu x86-64, scrollbar in vte got broken with one commit to change the way of emiting "changed" signal. This patch revert it as work around.

Quoted 6 lines
Quoted 1 line

[YOCTO #1906] got fixed.

This patch worries me a bit (well, a lot really). Why is this only broken on 64 bit? How does this revert fix things? It looks like its not the real problem to me?

The root cause is unkown. I suspect something in gtk caused the "changed" signal missing with the new method. I have created a bug for vte in gnome.org, but no response so far.

Quoted 179 lines

Cheers,

Richard

Quoted 163 lines
Signed-off-by Zhai Edwin <[email protected]>
---
 meta/recipes-support/vte/vte.inc                 |    3 +-
 meta/recipes-support/vte/vte/scrollbar_fix.patch |  122 ++++++++++++++++++++++
 meta/recipes-support/vte/vte_0.28.2.bb           |    2 +-
 3 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
meta/recipes-support/vte/vte.inc +2 -1
index 54bd8ae..d3406e5 100644
@@ -6,7 +6,8 @@ RDEPENDS_libvte = "vte-termcap"
 
 inherit gnome
 
-SRC_URI += "file://introspection.patch"
+SRC_URI += "file://introspection.patch\ 
+            file://scrollbar_fix.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
meta/recipes-support/vte/vte/scrollbar_fix.patch new file +122 -0
new file mode 100644
index 0000000..707377a
@@ -0,0 +1,122 @@
+On qemu x86-64, matchbox-terminal has broken scrollbar, because of following
+commit in vte. This patch revert it as work around.
+
+Signed-off-by: Zhai Edwin <[email protected]>
+
+Upstream-Status: Inappropriate [workaround]
+
+commit 6eadb8494797e44910b86b5e101823cf527c04e1
+Author: Kristian Høgsberg <[email protected]>
+Date:   Thu Jul 15 09:07:51 2010 -0400
+
+    Use accessors for setting adjustment
+    
+    We use g_object_freeze_notify() to emit the same amount of ::changed
+    signals.
+
+Index: vte-0.28.2/src/vte.c
+===================================================================
+--- vte-0.28.2.orig/src/vte.c	2011-08-29 05:31:45.000000000 +0800
++++ vte-0.28.2/src/vte.c	2012-02-21 11:03:22.000000000 +0800
+@@ -2018,15 +2018,13 @@
+ 		glong v;
+ 		gdouble current;
+ 
+-		g_object_freeze_notify (G_OBJECT (terminal->adjustment));
+-
+ 		v = _vte_ring_delta (screen->row_data);
+ 		current = gtk_adjustment_get_lower(terminal->adjustment);
+ 		if (current != v) {
+ 			_vte_debug_print(VTE_DEBUG_ADJ,
+ 					"Changing lower bound from %.0f to %ld\n",
+ 					 current, v);
+-			gtk_adjustment_set_lower(terminal->adjustment, v);
++			terminal->adjustment->lower = v;
+ 			changed = TRUE;
+ 		}
+ 
+@@ -2039,19 +2037,19 @@
+ 			_vte_debug_print(VTE_DEBUG_ADJ,
+ 					"Changing upper bound from %.0f to %ld\n",
+ 					 current, v);
+-			gtk_adjustment_set_upper(terminal->adjustment, v);
++			terminal->adjustment->upper = v;
+ 			changed = TRUE;
+ 		}
+ 
+-		g_object_thaw_notify (G_OBJECT (terminal->adjustment));
+-
+-		if (changed)
++		if (changed) {
+ 			_vte_debug_print(VTE_DEBUG_SIGNALS,
+ 					"Emitting adjustment_changed.\n");
++			gtk_adjustment_changed(terminal->adjustment);
++		}
+ 		terminal->pvt->adjustment_changed_pending = FALSE;
+ 	}
+ 	if (terminal->pvt->adjustment_value_changed_pending) {
+-		glong v, delta;
++		glong v;
+ 		_vte_debug_print(VTE_DEBUG_SIGNALS,
+ 				"Emitting adjustment_value_changed.\n");
+ 		terminal->pvt->adjustment_value_changed_pending = FALSE;
+@@ -2062,9 +2060,9 @@
+ 			 * via the adjustment - e.g. user interaction with the
+ 			 * scrollbar
+ 			 */
+-			delta = terminal->pvt->screen->scroll_delta;
++			terminal->adjustment->value = terminal->pvt->screen->scroll_delta;
+ 			terminal->pvt->screen->scroll_delta = v;
+-			gtk_adjustment_set_value(terminal->adjustment, delta);
++			gtk_adjustment_value_changed(terminal->adjustment);
+ 		}
+ 	}
+ }
+@@ -2141,15 +2139,13 @@
+ 
+ 	_vte_terminal_adjust_adjustments(terminal);
+ 
+-        g_object_freeze_notify(G_OBJECT(terminal->adjustment));
+-
+ 	/* The step increment should always be one. */
+ 	v = gtk_adjustment_get_step_increment(terminal->adjustment);
+ 	if (v != 1) {
+ 		_vte_debug_print(VTE_DEBUG_ADJ,
+ 				"Changing step increment from %.0lf to %ld\n",
+ 				v, terminal->row_count);
+-		gtk_adjustment_set_step_increment(terminal->adjustment, 1);
++		terminal->adjustment->step_increment = 1;
+ 		changed = TRUE;
+ 	}
+ 
+@@ -2160,8 +2156,7 @@
+ 		_vte_debug_print(VTE_DEBUG_ADJ,
+ 				"Changing page size from %.0f to %ld\n",
+ 				 v, terminal->row_count);
+-		gtk_adjustment_set_page_size(terminal->adjustment,
+-					     terminal->row_count);
++		terminal->adjustment->page_size = terminal->row_count;
+ 		changed = TRUE;
+ 	}
+ 
+@@ -2173,16 +2168,15 @@
+ 				"Changing page increment from "
+ 				"%.0f to %ld\n",
+ 				v, terminal->row_count);
+-		gtk_adjustment_set_page_increment(terminal->adjustment,
+-						  terminal->row_count);
++		terminal->adjustment->page_increment = terminal->row_count;
+ 		changed = TRUE;
+ 	}
+ 
+-	g_object_thaw_notify(G_OBJECT(terminal->adjustment));
+-
+-	if (changed)
++	if (changed) {
+ 		_vte_debug_print(VTE_DEBUG_SIGNALS,
+ 				"Emitting adjustment_changed.\n");
++		gtk_adjustment_changed(terminal->adjustment);
++	}
+ }
+ 
+ /* Scroll a fixed number of lines up or down in the current screen. */
meta/recipes-support/vte/vte_0.28.2.bb +1 -1
index 33f71b5..507e272 100644
@@ -2,7 +2,7 @@ require vte.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
 SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
best rgds,
edwin
Applied
#6 lore raw
In reply to [email protected]
Quoted 14 lines · On Wed, 2012-02-22 at 13:33 +0800, [email protected] wrote:

From: Zhai Edwin <[email protected]>

All,
These are fixes for multilib, and [Yocto 1906].

Pls. help to pull.

Thanks,
Edwin

The following changes since commit 41a83ccfe50ec69425a4828fb5836d38d3f99e67:

guile: fix cross configure failure (2012-02-10 17:01:42 +0000)

Quoted 7 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (3):
quicky: Fix for multilib
texi2html: Fix for multilib

I merged these to master, thanks.

Quoted 1 line

vte: fix scroll issue

I had some questions on this one.

Cheers,

Richard