Skip to contentSkip to conversation

libgtk3: version bump

PATCH New Vicente Olivert Riera 3 participants 6 messages Nov 11, 2014

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

v2 cover libgtk3: version bump

Changes since v1:
- Join patches 2 and 3 in a single one, so the patch series works at each point of the series.
- Add a hash file

Vicente Olivert Riera (2):
libgtk3: rename patches to follow the new name structure
libgtk3: bump version to 3.14.5

 ...0001-no-gtk-doc.patch => 0001-no-gtk-doc.patch} |    0
 ...ck.patch => 0002-fix-introspection-check.patch} |    0
 ...-bridge.patch => 0003-disable-atk-bridge.patch} |    0
 ... 0004-Fix-undefined-reference-to-get_xkb.patch} |    0
 ...tch => 0005-do-not-build-extract-strings.patch} |    0
 ...lug-is-conditionally-supported-on-X11-onl.patch |   57 ++++++++++++++++++++
 package/libgtk3/libgtk3.hash                       |    2 +
 package/libgtk3/libgtk3.mk                         |    2 +-
 8 files changed, 60 insertions(+), 1 deletions(-)
 rename package/libgtk3/{libgtk3-0001-no-gtk-doc.patch => 0001-no-gtk-doc.patch} (100%)
 rename package/libgtk3/{libgtk3-0002-fix-introspection-check.patch => 0002-fix-introspection-check.patch} (100%)
 rename package/libgtk3/{libgtk3-0003-disable-atk-bridge.patch => 0003-disable-atk-bridge.patch} (100%)
 rename package/libgtk3/{libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch => 0004-Fix-undefined-reference-to-get_xkb.patch} (100%)
 rename package/libgtk3/{libgtk3-0005-do-not-build-extract-strings.patch => 0005-do-not-build-extract-strings.patch} (100%)
 create mode 100644 package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
 create mode 100644 package/libgtk3/libgtk3.hash
author
#1 lore raw

PATCH v2 1/2 libgtk3: rename patches to follow the new name structure

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 ...0001-no-gtk-doc.patch => 0001-no-gtk-doc.patch} |    0
 ...ck.patch => 0002-fix-introspection-check.patch} |    0
 ...-bridge.patch => 0003-disable-atk-bridge.patch} |    0
 ... 0004-Fix-undefined-reference-to-get_xkb.patch} |    0
 ...tch => 0005-do-not-build-extract-strings.patch} |    0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename package/libgtk3/{libgtk3-0001-no-gtk-doc.patch => 0001-no-gtk-doc.patch} (100%)
 rename package/libgtk3/{libgtk3-0002-fix-introspection-check.patch => 0002-fix-introspection-check.patch} (100%)
 rename package/libgtk3/{libgtk3-0003-disable-atk-bridge.patch => 0003-disable-atk-bridge.patch} (100%)
 rename package/libgtk3/{libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch => 0004-Fix-undefined-reference-to-get_xkb.patch} (100%)
 rename package/libgtk3/{libgtk3-0005-do-not-build-extract-strings.patch => 0005-do-not-build-extract-strings.patch} (100%)
package/libgtk3/0001-no-gtk-doc.patch renamed from package/libgtk3/libgtk3-0001-no-gtk-doc.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0001-no-gtk-doc.patch
rename to package/libgtk3/0001-no-gtk-doc.patch
package/libgtk3/0002-fix-introspection-check.patch renamed from package/libgtk3/libgtk3-0002-fix-introspection-check.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0002-fix-introspection-check.patch
rename to package/libgtk3/0002-fix-introspection-check.patch
package/libgtk3/0003-disable-atk-bridge.patch renamed from package/libgtk3/libgtk3-0003-disable-atk-bridge.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0003-disable-atk-bridge.patch
rename to package/libgtk3/0003-disable-atk-bridge.patch
package/libgtk3/0004-Fix-undefined-reference-to-get_xkb.patch renamed from package/libgtk3/libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch
rename to package/libgtk3/0004-Fix-undefined-reference-to-get_xkb.patch
package/libgtk3/0005-do-not-build-extract-strings.patch renamed from package/libgtk3/libgtk3-0005-do-not-build-extract-strings.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0005-do-not-build-extract-strings.patch
rename to package/libgtk3/0005-do-not-build-extract-strings.patch
Signature · 1 line
1.7.1
#2 lore raw

PATCH v2 1/2 libgtk3: rename patches to follow the new name structure

Vicente, All,

On 2014-11-11 11:15 +0000, Vicente Olivert Riera spake thusly:

Quoted 1 line
Signed-off-by Vicente Olivert Riera <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 40 lines
---
 ...0001-no-gtk-doc.patch => 0001-no-gtk-doc.patch} |    0
 ...ck.patch => 0002-fix-introspection-check.patch} |    0
 ...-bridge.patch => 0003-disable-atk-bridge.patch} |    0
 ... 0004-Fix-undefined-reference-to-get_xkb.patch} |    0
 ...tch => 0005-do-not-build-extract-strings.patch} |    0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename package/libgtk3/{libgtk3-0001-no-gtk-doc.patch => 0001-no-gtk-doc.patch} (100%)
 rename package/libgtk3/{libgtk3-0002-fix-introspection-check.patch => 0002-fix-introspection-check.patch} (100%)
 rename package/libgtk3/{libgtk3-0003-disable-atk-bridge.patch => 0003-disable-atk-bridge.patch} (100%)
 rename package/libgtk3/{libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch => 0004-Fix-undefined-reference-to-get_xkb.patch} (100%)
 rename package/libgtk3/{libgtk3-0005-do-not-build-extract-strings.patch => 0005-do-not-build-extract-strings.patch} (100%)
package/libgtk3/0001-no-gtk-doc.patch renamed from package/libgtk3/libgtk3-0001-no-gtk-doc.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0001-no-gtk-doc.patch
rename to package/libgtk3/0001-no-gtk-doc.patch
package/libgtk3/0002-fix-introspection-check.patch renamed from package/libgtk3/libgtk3-0002-fix-introspection-check.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0002-fix-introspection-check.patch
rename to package/libgtk3/0002-fix-introspection-check.patch
package/libgtk3/0003-disable-atk-bridge.patch renamed from package/libgtk3/libgtk3-0003-disable-atk-bridge.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0003-disable-atk-bridge.patch
rename to package/libgtk3/0003-disable-atk-bridge.patch
package/libgtk3/0004-Fix-undefined-reference-to-get_xkb.patch renamed from package/libgtk3/libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0004-Fix-undefined-reference-to-get_xkb.patch
rename to package/libgtk3/0004-Fix-undefined-reference-to-get_xkb.patch
package/libgtk3/0005-do-not-build-extract-strings.patch renamed from package/libgtk3/libgtk3-0005-do-not-build-extract-strings.patch +0 -0
similarity index 100%
rename from package/libgtk3/libgtk3-0005-do-not-build-extract-strings.patch
rename to package/libgtk3/0005-do-not-build-extract-strings.patch
Signature · 6 lines
1.7.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#3 lore raw

PATCH v2 2/2 libgtk3: bump version to 3.14.5

In reply to Vicente Olivert Riera

- Bump version to 3.14.5
- Add a hash file
- Add a new patch to fix a regression

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 ...lug-is-conditionally-supported-on-X11-onl.patch |   57 ++++++++++++++++++++
 package/libgtk3/libgtk3.hash                       |    2 +
 package/libgtk3/libgtk3.mk                         |    2 +-
 3 files changed, 60 insertions(+), 1 deletions(-)
 create mode 100644 package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
 create mode 100644 package/libgtk3/libgtk3.hash
package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch new file +57 -0
new file mode 100644
index 0000000..081cd1e
@@ -0,0 +1,57 @@
+window: GtkPlug is conditionally supported on X11 only
+
+Apply an upstream patch to fix a build regression in 3.14.5. This patch
+will be included in the next 3.14.6 release, so we can remove it in the 
+next version bump.
+
+Error message:
+
+./.libs/libgtk-3.so: undefined reference to `GTK_IS_PLUG'
+
+Bug report:
+  https://bugzilla.gnome.org/show_bug.cgi?id=739885
+
+Upstream commit:
+  https://git.gnome.org/browse/gtk+/commit/?id=36fedb0c4b373272afc2d76a7c790d696ed48034
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+From 36fedb0c4b373272afc2d76a7c790d696ed48034 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <[email protected]>
+Date: Mon, 10 Nov 2014 14:08:20 +0000
+Subject: [PATCH] window: GtkPlug is conditionally supported on X11 only
+
+We cannot do a type check on it if we don't have the X11 backend
+compiled in.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739885
+---
+ gtk/gtkwindow.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 0d0fb88..6cb355b 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object)
+ {
+   GtkWindow *window = GTK_WINDOW (object);
+   GtkWindowPrivate *priv = window->priv;
++  gboolean is_plug;
+ 
+   G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object);
+ 
+-  if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window))
++#ifdef GDK_WINDOWING_X11
++  is_plug = GTK_IS_PLUG (window);
++#else
++  is_plug = FALSE;
++#endif
++
++  if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug)
+     {
+       priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object));
+       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
+-- 
+1.7.1
+
package/libgtk3/libgtk3.hash new file +2 -0
new file mode 100644
index 0000000..dc5cf26
@@ -0,0 +1,2 @@
+# From http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.14/gtk+-3.14.5.sha256sum
+sha256	ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2	gtk+-3.14.5.tar.xz
package/libgtk3/libgtk3.mk +1 -1
index 540f08d..b406c09 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGTK3_VERSION_MAJOR = 3.14
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).4
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).5
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
 LIBGTK3_LICENSE = LGPLv2+
Signature · 1 line
1.7.1
#4 lore raw

PATCH v2 2/2 libgtk3: bump version to 3.14.5

Vicente, All,

On 2014-11-11 11:15 +0000, Vicente Olivert Riera spake thusly:

Quoted 5 lines

- Bump version to 3.14.5
- Add a hash file
- Add a new patch to fix a regression

Signed-off-by Vicente Olivert Riera <[email protected]>

Manually downloaded, and manually verified the hash. Patch indeed exactly as from upstream.

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 99 lines
---
 ...lug-is-conditionally-supported-on-X11-onl.patch |   57 ++++++++++++++++++++
 package/libgtk3/libgtk3.hash                       |    2 +
 package/libgtk3/libgtk3.mk                         |    2 +-
 3 files changed, 60 insertions(+), 1 deletions(-)
 create mode 100644 package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch
 create mode 100644 package/libgtk3/libgtk3.hash
package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch new file +57 -0
new file mode 100644
index 0000000..081cd1e
@@ -0,0 +1,57 @@
+window: GtkPlug is conditionally supported on X11 only
+
+Apply an upstream patch to fix a build regression in 3.14.5. This patch
+will be included in the next 3.14.6 release, so we can remove it in the 
+next version bump.
+
+Error message:
+
+./.libs/libgtk-3.so: undefined reference to `GTK_IS_PLUG'
+
+Bug report:
+  https://bugzilla.gnome.org/show_bug.cgi?id=739885
+
+Upstream commit:
+  https://git.gnome.org/browse/gtk+/commit/?id=36fedb0c4b373272afc2d76a7c790d696ed48034
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+From 36fedb0c4b373272afc2d76a7c790d696ed48034 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <[email protected]>
+Date: Mon, 10 Nov 2014 14:08:20 +0000
+Subject: [PATCH] window: GtkPlug is conditionally supported on X11 only
+
+We cannot do a type check on it if we don't have the X11 backend
+compiled in.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739885
+---
+ gtk/gtkwindow.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 0d0fb88..6cb355b 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object)
+ {
+   GtkWindow *window = GTK_WINDOW (object);
+   GtkWindowPrivate *priv = window->priv;
++  gboolean is_plug;
+ 
+   G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object);
+ 
+-  if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window))
++#ifdef GDK_WINDOWING_X11
++  is_plug = GTK_IS_PLUG (window);
++#else
++  is_plug = FALSE;
++#endif
++
++  if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug)
+     {
+       priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object));
+       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
+-- 
+1.7.1
+
package/libgtk3/libgtk3.hash new file +2 -0
new file mode 100644
index 0000000..dc5cf26
@@ -0,0 +1,2 @@
+# From http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.14/gtk+-3.14.5.sha256sum
+sha256	ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2	gtk+-3.14.5.tar.xz
package/libgtk3/libgtk3.mk +1 -1
index 540f08d..b406c09 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGTK3_VERSION_MAJOR = 3.14
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).4
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).5
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
 LIBGTK3_LICENSE = LGPLv2+
Signature · 6 lines
1.7.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

v2 cover libgtk3: version bump

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

Quoted 8 lines · Vicente Olivert Riera

Changes since v1:
- Join patches 2 and 3 in a single one, so the patch series works at each point of the series.
- Add a hash file

Vicente Olivert Riera (2):
libgtk3: rename patches to follow the new name structure
libgtk3: bump version to 3.14.5

Both patches applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com