Bump libgtk3 (and friends) for Gtk+ 3.14

PATCH New Eric Le Bihan 2 participants 10 messages Nov 1, 2014

lore

Share & tools

lore

Eric Le Bihan

author

2014-11-01 09:21 UTC #1 lore raw

PATCH 1/6 libglib2: bump to version 2.42.0

Bump libglib2 to version 2.42.0 and remove obsolete patches.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/libglib2/libglib2-0002-no-gtk-doc.patch    |  25 --
 ...2-0003-implement-GMutex-natively-on-Linux.patch | 279 ---------------------
 package/libglib2/libglib2.mk                       |   3 +-
 3 files changed, 1 insertion(+), 306 deletions(-)
 delete mode 100644 package/libglib2/libglib2-0002-no-gtk-doc.patch
 delete mode 100644 package/libglib2/libglib2-0003-implement-GMutex-natively-on-Linux.patch

package/libglib2/libglib2-0002-no-gtk-doc.patch deleted +0 ~~-25~~

deleted file mode 100644
index 926a263..0000000
@@ -1,25 +0,0 @@
-Same patch as for systemd in commit
-7144f2f04b705538a893e538a6b851f536f433b6:
-
-Fix deactivation of gtk-doc
-
-The tarball contains the Makefile for building documentation with gtk-doc,
-Unfortunately the AM_CONDITIONAL variable is not the correct one, which
-results in an error when running autoreconf.
-
-This patch fixes this issue.
-
-Signed-off-by: Eric Le Bihan <[email protected]>
-Signed-off-by: Hadrien Boutteville <[email protected]>
-
---- a/gtk-doc.make
-+++ b/gtk-doc.make
-@@ -267,7 +267,7 @@
- #
- # Require gtk-doc when making dist
- #
--if HAVE_GTK_DOC
-+if ENABLE_GTK_DOC
- dist-check-gtkdoc: docs
- else
- dist-check-gtkdoc:

package/libglib2/libglib2-0003-implement-GMutex-natively-on-Linux.patch deleted +0 ~~-279~~

279 lines not on this page · raw message

package/libglib2/libglib2.mk +1 -2

index a64ef39..581c51c 100644
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.40
+LIBGLIB2_VERSION_MAJOR = 2.42
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPLv2+
 LIBGLIB2_LICENSE_FILES = COPYING
 
-LIBGLIB2_AUTORECONF = YES
 LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install

Signature · 1 line

1.9.3

Eric Le Bihan

author

2014-11-01 09:21 UTC #2 lore raw

PATCH 2/6 cairo: bump to 1.12.12

In reply to Eric Le Bihan

Bump cairo to version 1.12.12.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/cairo/cairo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/cairo/cairo.mk +1 -1

index 4b5fdfe..e6fb007 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CAIRO_VERSION = 1.12.10
+CAIRO_VERSION = 1.12.12
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
 CAIRO_LICENSE = LGPLv2.1+
 CAIRO_LICENSE_FILES = COPYING

Signature · 1 line

1.9.3

Eric Le Bihan

author

2014-11-01 09:21 UTC #3 lore raw

PATCH 3/6 pango: bump to 1.36.7

In reply to Eric Le Bihan

Bump pango to version 1.36.7.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/pango/pango.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/pango/pango.mk +1 -1

index 46490c1..6e340f4 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 PANGO_VERSION_MAJOR = 1.36
-PANGO_VERSION = $(PANGO_VERSION_MAJOR).3
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).7
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_AUTORECONF = YES

Signature · 1 line

1.9.3

Eric Le Bihan

author

2014-11-01 09:21 UTC #4 lore raw

PATCH 4/6 gdk-pixbuf: bump to 2.30.8

In reply to Eric Le Bihan

Bump gdk-pixbuf to version 2.30.8.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/gdk-pixbuf/gdk-pixbuf.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/gdk-pixbuf/gdk-pixbuf.mk +2 -2

index 71ec67f..a4e3af0 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GDK_PIXBUF_VERSION_MAJOR = 2.28
-GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).2
+GDK_PIXBUF_VERSION_MAJOR = 2.30
+GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).8
 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
 GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
 GDK_PIXBUF_LICENSE = LGPLv2+

Signature · 1 line

1.9.3

Eric Le Bihan

author

2014-11-01 09:21 UTC #5 lore raw

PATCH 5/6 libgtk3: bump to 3.14.4

In reply to Eric Le Bihan

Bump libgtk3 to version 3.14.4.

Also add a patch to fix compilation of a build tool: extract-strings. The bug has already been reported [1], but no proper resolution has been provided yet. This patch only covers the Buildroot issue.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=731013

Signed-off-by Eric Le Bihan <[email protected]>

---
 ...libgtk3-0005-do-not-build-extract-strings.patch | 47 ++++++++++++++++++++++
 package/libgtk3/libgtk3.mk                         | 13 ++++--
 2 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 package/libgtk3/libgtk3-0005-do-not-build-extract-strings.patch

package/libgtk3/libgtk3-0005-do-not-build-extract-strings.patch new file +47 -0

new file mode 100644
index 0000000..cad010f
@@ -0,0 +1,47 @@
+Do not build util/extract-strings
+
+Do to build util/extract-strings, as it will be built by host-libgtk3 and
+installed in $(HOST_DIR)/usr/bin (thus avoiding the -lint linking issue with
+uClibc).
+
+Signed-off-by: Eric Le Bihan <[email protected]>
+
+Index: gtk+-3.14.0/Makefile.am
+===================================================================
+--- gtk+-3.14.0.orig/Makefile.am	2014-09-22 05:17:44.000000000 +0200
++++ gtk+-3.14.0/Makefile.am	2014-09-25 16:08:32.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Makefile.am for GTK+
+ include $(top_srcdir)/Makefile.decl
+ 
+-SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
++SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+Index: gtk+-3.14.0/gtk/Makefile.am
+===================================================================
+--- gtk+-3.14.0.orig/gtk/Makefile.am	2014-09-22 05:09:39.000000000 +0200
++++ gtk+-3.14.0/gtk/Makefile.am	2014-09-25 16:09:10.000000000 +0200
+@@ -1330,7 +1330,7 @@
+ 
+ %.ui.h: %.ui
+ 	$(AM_V_GEN) mkdir -p $(dir $@) \
+-	&& $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
++	&& extract-strings$(EXEEXT) $< > $@
+ 
+ #
+ # rules to generate built sources
+Index: gtk+-3.14.0/gtk/inspector/Makefile.am
+===================================================================
+--- gtk+-3.14.0.orig/gtk/inspector/Makefile.am	2014-09-04 20:11:33.000000000 +0200
++++ gtk+-3.14.0/gtk/inspector/Makefile.am	2014-09-25 16:09:48.000000000 +0200
+@@ -114,7 +114,7 @@
+ template_headers = $(templates:.ui=.ui.h)
+ 
+ %.ui.h : %.ui 
+-	$(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
++	$(AM_V_GEN) extract-strings$(EXEEXT) $< > $@
+ 
+ EXTRA_DIST += 				\
+ 	inspector.gresource.xml 	\

package/libgtk3/libgtk3.mk +10 -3

index 73b3e17..540f08d 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBGTK3_VERSION_MAJOR = 3.12
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).2
+LIBGTK3_VERSION_MAJOR = 3.14
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).4
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
 LIBGTK3_LICENSE = LGPLv2+

@@ -135,7 +135,8 @@ LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_COMPILE_GLIB_SCHEMAS
 # for both native and target builds).
 #
 # But no native version of libintl is available (the functions are
-# provided by glibc). So gtk-update-icon-cache will not build.
+# provided by glibc). So gtk-update-icon-cache will not build, and
+# extract-strings neither.
 #
 # As a workaround, we build gtk-update-icon-cache on our own, set
 # --enable-gtk2-dependency=yes and force './configure' to use our version.

@@ -160,11 +161,17 @@ define HOST_LIBGTK3_BUILD_CMDS
 		$(@D)/gtk/updateiconcache.c \
 		$(HOST_LIBGTK3_CFLAGS) \
 		-o $(@D)/gtk/gtk-update-icon-cache
+	$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
+		$(@D)/util/extract-strings.c \
+		$(HOST_LIBGTK3_CFLAGS) \
+		-o $(@D)/util/extract-strings
 endef
 
 define HOST_LIBGTK3_INSTALL_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/gtk/gtk-update-icon-cache \
 		$(HOST_DIR)/usr/bin/gtk-update-icon-cache
+	$(INSTALL) -D -m 0755 $(@D)/util/extract-strings \
+		$(HOST_DIR)/usr/bin/extract-strings
 endef
 
 $(eval $(autotools-package))

Signature · 1 line

1.9.3

Eric Le Bihan

author

2014-11-01 09:21 UTC #6 lore raw

PATCH 6/6 adwaita-icon-theme: new package

In reply to Eric Le Bihan

This package provides the Adwaita icon theme from the GNOME desktop environment.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/Config.in                                |  1 +
 package/adwaita-icon-theme/Config.in             |  4 ++++
 package/adwaita-icon-theme/adwaita-icon-theme.mk | 14 ++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/adwaita-icon-theme/Config.in
 create mode 100644 package/adwaita-icon-theme/adwaita-icon-theme.mk

package/Config.in +1 -0

index 5d5a9ee..bb9d4b5 100644
@@ -624,6 +624,7 @@ menu "Filesystem"
 endmenu
 
 menu "Graphics"
+	source "package/adwaita-icon-theme/Config.in"
 	source "package/atk/Config.in"
 	source "package/cairo/Config.in"
 	source "package/fltk/Config.in"

package/adwaita-icon-theme/Config.in new file +4 -0

new file mode 100644
index 0000000..6fabd48
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_ADWAITA_ICON_THEME
+	bool "adwaita icon theme"
+	help
+	  Adwaita icon theme

package/adwaita-icon-theme/adwaita-icon-theme.mk new file +14 -0

new file mode 100644
index 0000000..ef797a2
@@ -0,0 +1,14 @@
+################################################################################
+#
+# adwaita-icon-theme
+#
+################################################################################
+
+ADWAITA_ICON_THEME_VERSION_MAJOR = 3.14
+ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
+ADWAITA_ICON_THEME_SITE = ftp://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
+ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
+ADWAITA_ICON_THEME_LICENSE = LGPLv3
+ADWAITA_ICON_THEME_LICENSE_FILES = COPYING_LGPL COPYING_CCBYSA3
+
+$(eval $(autotools-package))

Signature · 1 line

1.9.3

Thomas Petazzoni

2014-11-01 14:32 UTC #7 lore raw

PATCH 6/6 adwaita-icon-theme: new package

Dear Eric Le Bihan,

package/Config.in menu "Filesystem" · line 627

Quoted 2 lines · Eric Le Bihan

menu "Graphics"
package/Config.in +1 -0
+	source "package/adwaita-icon-theme/Config.in"

At some point it would be great to find a good place for "data" such as icon themes or fonts. We currently have no good place, and they end up in "Libraries" -> "Graphics" or some other not very appropriate place.

Quoted 7 lines

package/adwaita-icon-theme/adwaita-icon-theme.mk new file +1 -0

new file mode 100644
index 0000000..ef797a2
@@ -0,0 +1,14 @@
+################################################################################

package/adwaita-icon-theme/adwaita-icon-theme.mk line 11

Quoted 10 lines

package/adwaita-icon-theme/adwaita-icon-theme.mk new file +10 -0

+#
+# adwaita-icon-theme
+#
+################################################################################
+
+ADWAITA_ICON_THEME_VERSION_MAJOR = 3.14
+ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
+ADWAITA_ICON_THEME_SITE = ftp://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
+ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
+ADWAITA_ICON_THEME_LICENSE = LGPLv3

License is LGPLv3 or CC-BY-SA 3.0.

package/adwaita-icon-theme/adwaita-icon-theme.mk line 12

Quoted 1 line

package/adwaita-icon-theme/adwaita-icon-theme.mk new file +1 -0
+ADWAITA_ICON_THEME_LICENSE_FILES = COPYING_LGPL COPYING_CCBYSA3

I've also added the COPYING file, which clearly states that the license is LGPLv3 or CC-BY-SA.

Committed with these issues fixed.

Best regards,

Thomas

Signature · 3 lines

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

Thomas Petazzoni

2014-11-01 22:37 UTC #8 lore raw

PATCH 6/6 adwaita-icon-theme: new package

In reply to Eric Le Bihan

Dear Eric Le Bihan,

Quoted 11 lines · Eric Le Bihan

This package provides the Adwaita icon theme from the GNOME desktop environment.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/Config.in                                |  1 +
 package/adwaita-icon-theme/Config.in             |  4 ++++
 package/adwaita-icon-theme/adwaita-icon-theme.mk | 14 ++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/adwaita-icon-theme/Config.in
 create mode 100644 package/adwaita-icon-theme/adwaita-icon-theme.mk

This package needs gtk-update-icon-cache, so presumably, it should depend on host-libgtk3, and therefore also only be selectable for Gtk3-enabled configuratons, no?

See:
http://autobuild.buildroot.org/results/f8d/f8d0e2198fa54f9141512e2db6dc46e3cee1cd44/build-end.log

Can you have a look?

Thanks!

Thomas

Signature · 3 lines

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

Thomas Petazzoni

2014-11-01 14:33 UTC #9 lore raw

cover Bump libgtk3 (and friends) for Gtk+ 3.14

In reply to Eric Le Bihan

Dear Eric Le Bihan,

Quoted 7 lines · Eric Le Bihan

Eric Le Bihan (6):
libglib2: bump to version 2.42.0
cairo: bump to 1.12.12
pango: bump to 1.36.7
gdk-pixbuf: bump to 2.30.8
libgtk3: bump to 3.14.4
adwaita-icon-theme: new package

All applied, thanks.

Thomas

Signature · 3 lines

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