* [PATCH 00/14] GTK+ upgrades
@ 2016-10-26 13:27 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 01/14] pango: Upgrade 1.40.1 -> 1.40.3 Jussi Kukkonen
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Mostly unexciting upgrades to GNOME libraries fall 2016 releases.
Thanks,
Jussi
The following changes since commit 30d1af89ce2a2fb30f32a898ec12c9a51db57013:
image_types: Use softer setting of WKS_FILE (2016-10-25 17:58:59 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/gtk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gtk
Jussi Kukkonen (14):
pango: Upgrade 1.40.1 -> 1.40.3
adwaita-icon-theme: Upgrade 3.20 -> 3.22.0
gnome-themes-standard: Upgrade 3.20.2 -> 3.22.2
glib-2.0: Upgrade 2.48.2 -> 2.50.1
libsoup-2.4: Upgrade 2.54.1 -> 2.56.0
atk: Upgrade 2.20.0 -> 2.22.0
at-spi2-core: Upgrade 2.20.2 -> 2.22.0
at-spi2-atk: Upgrade 2.20.1 -> 2.22.0
freetype: Upgrade 2.6.5 -> 2.7
glib-networking: Upgrade 2.48.2 -> 2.50.0
gdk-pixbuf: 2.34.0 -> 2.36.0
gtk-icon-utils-native: Upgrade 3.20.9 -> 3.22.1
gtk+: Upgrade 2.24.30 -> 2.24.31
gtk+3: Upgrade 3.20.9 -> 3.22.1
.../glib-2.0/0002-tests-Ignore-y2k-warnings.patch | 42 ---
.../{glib-2.0_2.48.2.bb => glib-2.0_2.50.1.bb} | 5 +-
meta/recipes-core/glib-2.0/glib.inc | 3 +-
...working_2.48.2.bb => glib-networking_2.50.0.bb} | 4 +-
.../{gdk-pixbuf_2.34.0.bb => gdk-pixbuf_2.36.0.bb} | 4 +-
...-theme_3.20.bb => adwaita-icon-theme_3.22.0.bb} | 7 +-
...d_3.20.2.bb => gnome-themes-standard_3.22.2.bb} | 12 +-
meta/recipes-gnome/gtk+/gtk+3.inc | 2 +-
...Redo-focus-handling-in-treeview-once-more.patch | 39 ---
.../0003-Add-disable-opengl-configure-option.patch | 365 ++++++++-------------
.../gtk+/{gtk+3_3.20.9.bb => gtk+3_3.22.1.bb} | 5 +-
.../gtk+/{gtk+_2.24.30.bb => gtk+_2.24.31.bb} | 4 +-
...e_3.20.9.bb => gtk-icon-utils-native_3.22.1.bb} | 4 +-
.../{freetype_2.6.5.bb => freetype_2.7.bb} | 4 +-
.../pango/{pango_1.40.1.bb => pango_1.40.3.bb} | 4 +-
...at-spi2-atk_2.20.1.bb => at-spi2-atk_2.22.0.bb} | 4 +-
...-spi2-core_2.20.2.bb => at-spi2-core_2.22.0.bb} | 4 +-
.../atk/{atk_2.20.0.bb => atk_2.22.0.bb} | 4 +-
...libsoup-2.4_2.54.1.bb => libsoup-2.4_2.56.0.bb} | 4 +-
19 files changed, 169 insertions(+), 351 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.48.2.bb => glib-2.0_2.50.1.bb} (82%)
rename meta/recipes-core/glib-networking/{glib-networking_2.48.2.bb => glib-networking_2.50.0.bb} (88%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.34.0.bb => gdk-pixbuf_2.36.0.bb} (96%)
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.20.bb => adwaita-icon-theme_3.22.0.bb} (86%)
rename meta/recipes-gnome/gnome/{gnome-themes-standard_3.20.2.bb => gnome-themes-standard_3.22.2.bb} (78%)
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.20.9.bb => gtk+3_3.22.1.bb} (78%)
rename meta/recipes-gnome/gtk+/{gtk+_2.24.30.bb => gtk+_2.24.31.bb} (91%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.20.9.bb => gtk-icon-utils-native_3.22.1.bb} (93%)
rename meta/recipes-graphics/freetype/{freetype_2.6.5.bb => freetype_2.7.bb} (93%)
rename meta/recipes-graphics/pango/{pango_1.40.1.bb => pango_1.40.3.bb} (92%)
rename meta/recipes-support/atk/{at-spi2-atk_2.20.1.bb => at-spi2-atk_2.22.0.bb} (81%)
rename meta/recipes-support/atk/{at-spi2-core_2.20.2.bb => at-spi2-core_2.22.0.bb} (88%)
rename meta/recipes-support/atk/{atk_2.20.0.bb => atk_2.22.0.bb} (79%)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.54.1.bb => libsoup-2.4_2.56.0.bb} (90%)
--
2.1.4
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 01/14] pango: Upgrade 1.40.1 -> 1.40.3
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 02/14] adwaita-icon-theme: Upgrade 3.20 -> 3.22.0 Jussi Kukkonen
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Bug fix releases.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/pango/{pango_1.40.1.bb => pango_1.40.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/pango/{pango_1.40.1.bb => pango_1.40.3.bb} (92%)
diff --git a/meta/recipes-graphics/pango/pango_1.40.1.bb b/meta/recipes-graphics/pango/pango_1.40.3.bb
similarity index 92%
rename from meta/recipes-graphics/pango/pango_1.40.1.bb
rename to meta/recipes-graphics/pango/pango_1.40.3.bb
index f9f344a..338ef4a 100644
--- a/meta/recipes-graphics/pango/pango_1.40.1.bb
+++ b/meta/recipes-graphics/pango/pango_1.40.3.bb
@@ -17,8 +17,8 @@ SRC_URI += "file://run-ptest \
file://0001-Drop-introspection-macros-from-acinclude.m4.patch \
file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \
"
-SRC_URI[archive.md5sum] = "6fc88c6529890d6c8e03074d57a3eceb"
-SRC_URI[archive.sha256sum] = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40"
+SRC_URI[archive.md5sum] = "17c26720f5a862a12f7e1745e2f1d966"
+SRC_URI[archive.sha256sum] = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 02/14] adwaita-icon-theme: Upgrade 3.20 -> 3.22.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 01/14] pango: Upgrade 1.40.1 -> 1.40.3 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 03/14] gnome-themes-standard: Upgrade 3.20.2 -> 3.22.2 Jussi Kukkonen
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Package 512x512 icons in adwaita-icon-theme-hires.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../{adwaita-icon-theme_3.20.bb => adwaita-icon-theme_3.22.0.bb} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.20.bb => adwaita-icon-theme_3.22.0.bb} (86%)
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.20.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.22.0.bb
similarity index 86%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.20.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.22.0.bb
index bb0eaeb..1cbc1e6 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.20.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.22.0.bb
@@ -13,8 +13,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "411be2bd68dd8b0a3c86aca2eb351ce4"
-SRC_URI[sha256sum] = "7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35"
+SRC_URI[md5sum] = "cde51d7dfcbcfa3b8cdc3e5f0df8c799"
+SRC_URI[sha256sum] = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7"
do_install_append() {
# Build uses gtk-encode-symbolic-svg to create png versions:
@@ -36,6 +36,7 @@ FILES_${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.p
${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png"
FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \
${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png"
-FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/"
+FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \
+ ${prefix}/share/icons/Adwaita/512x512/"
FILES_${PN} = "${prefix}/share/icons/Adwaita/ \
${prefix}/share/pkgconfig/adwaita-icon-theme.pc"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 03/14] gnome-themes-standard: Upgrade 3.20.2 -> 3.22.2
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 01/14] pango: Upgrade 1.40.1 -> 1.40.3 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 02/14] adwaita-icon-theme: Upgrade 3.20 -> 3.22.0 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 04/14] glib-2.0: Upgrade 2.48.2 -> 2.50.1 Jussi Kukkonen
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly release.
Package the new dark variant of GTK2-Adwaita separately.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...es-standard_3.20.2.bb => gnome-themes-standard_3.22.2.bb} | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gnome/{gnome-themes-standard_3.20.2.bb => gnome-themes-standard_3.22.2.bb} (78%)
diff --git a/meta/recipes-gnome/gnome/gnome-themes-standard_3.20.2.bb b/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.2.bb
similarity index 78%
rename from meta/recipes-gnome/gnome/gnome-themes-standard_3.20.2.bb
rename to meta/recipes-gnome/gnome/gnome-themes-standard_3.22.2.bb
index c98d870..2b3cc97 100644
--- a/meta/recipes-gnome/gnome/gnome-themes-standard_3.20.2.bb
+++ b/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.2.bb
@@ -16,8 +16,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "adc3b1d57330561fea524842d0c0b485"
-SRC_URI[sha256sum] = "9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915"
+SRC_URI[md5sum] = "84624dbcecab7add32672abae030314d"
+SRC_URI[sha256sum] = "b34516cd59b873c187c1897c25bac3b9ce2d30a472f1fd7ae9d7105d93e17da5"
EXTRA_OECONF = "--disable-gtk3-engine"
@@ -31,9 +31,15 @@ do_install_append() {
# gtk+3 and includes lots of icons (is also broken with B != S).
PACKAGES += "gnome-theme-adwaita \
gnome-theme-adwaita-dbg \
- gnome-theme-adwaita-dev"
+ gnome-theme-adwaita-dev \
+ gnome-theme-adwaita-dark \
+ "
FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \
${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so"
FILES_gnome-theme-adwaita-dev = "${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la"
FILES_gnome-theme-adwaita-dbg = "${libdir}/gtk-2.0/2.10.0/engines/.debug/libadwaita.so"
+
+FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark"
+RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita"
+
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 04/14] glib-2.0: Upgrade 2.48.2 -> 2.50.1
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (2 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 03/14] gnome-themes-standard: Upgrade 3.20.2 -> 3.22.2 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 05/14] libsoup-2.4: Upgrade 2.54.1 -> 2.56.0 Jussi Kukkonen
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly feature release.
glib-2.0-utils now includes "gio" command line utility.
Drop a patch that's now upstream. Add PACKAGECONFIG for libmount,
enabled by default.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../glib-2.0/0002-tests-Ignore-y2k-warnings.patch | 42 ----------------------
.../{glib-2.0_2.48.2.bb => glib-2.0_2.50.1.bb} | 5 ++-
meta/recipes-core/glib-2.0/glib.inc | 3 +-
3 files changed, 4 insertions(+), 46 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.48.2.bb => glib-2.0_2.50.1.bb} (82%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch b/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch
deleted file mode 100644
index f61fa0a..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0002-tests-Ignore-y2k-warnings.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b06b22fecc7deda8c65e28670562ca2371e4e725 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 16 Apr 2016 13:43:54 -0700
-Subject: [PATCH 2/2] tests: Ignore y2k warnings
-
-silences
-| ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c: In function 'test_strftime':
-| ../../../../../../../../workspace/sources/glib-2.0/glib/tests/gdatetime.c:1338:3: error: '%c' yields only last 2 digits of year in some locales [-Werror=format-y2k]
-| "a%a A%A b%b B%B c%c C%C d%d e%e F%F g%g G%G h%h H%H I%I j%j m%m M%M "
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- glib/tests/gdatetime.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
-index 16a163c..e6062fc 100644
---- a/glib/tests/gdatetime.c
-+++ b/glib/tests/gdatetime.c
-@@ -1326,6 +1326,9 @@ test_z (void)
- g_time_zone_unref (tz);
- }
-
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-y2k"
-+
- static void
- test_strftime (void)
- {
-@@ -1351,6 +1354,7 @@ test_strftime (void)
- }
- #endif
- }
-+#pragma GCC diagnostic pop
-
- static void
- test_find_interval (void)
---
-2.8.0
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb
similarity index 82%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb
index a45f644..00ae7ef 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.48.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb
@@ -16,11 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://gi-exclude.patch \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
file://0001-Do-not-ignore-return-value-of-write.patch \
- file://0002-tests-Ignore-y2k-warnings.patch \
"
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
file://relocate-modules.patch"
-SRC_URI[md5sum] = "f4ac1aa2efd4f5798c37625ea697ac57"
-SRC_URI[sha256sum] = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"
+SRC_URI[md5sum] = "6baee4d7e3b1ec791b4ced93976365ee"
+SRC_URI[sha256sum] = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 906e0d4..acac0ba 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -30,9 +30,10 @@ inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even
S = "${WORKDIR}/glib-${PV}"
-PACKAGECONFIG ??= "system-pcre"
+PACKAGECONFIG ??= "system-pcre libmount"
# To use the system pcre it must be configured with --enable-unicode-properties
PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre"
+PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux"
CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 05/14] libsoup-2.4: Upgrade 2.54.1 -> 2.56.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (3 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 04/14] glib-2.0: Upgrade 2.48.2 -> 2.50.1 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 06/14] atk: Upgrade 2.20.0 -> 2.22.0 Jussi Kukkonen
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly feature release, mostly bug fixes.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../libsoup/{libsoup-2.4_2.54.1.bb => libsoup-2.4_2.56.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.54.1.bb => libsoup-2.4_2.56.0.bb} (90%)
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb
similarity index 90%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb
index b93a9fd..16c6068 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.54.1.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb
@@ -11,8 +11,8 @@ SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
-SRC_URI[md5sum] = "73b1fb774de16c29b380f87016f9f9dd"
-SRC_URI[sha256sum] = "47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633"
+SRC_URI[md5sum] = "465083f74b7bb035959ddb0599313986"
+SRC_URI[sha256sum] = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5"
S = "${WORKDIR}/libsoup-${PV}"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 06/14] atk: Upgrade 2.20.0 -> 2.22.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (4 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 05/14] libsoup-2.4: Upgrade 2.54.1 -> 2.56.0 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 07/14] at-spi2-core: Upgrade 2.20.2 " Jussi Kukkonen
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly release, mostly bug fixes.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-support/atk/{atk_2.20.0.bb => atk_2.22.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{atk_2.20.0.bb => atk_2.22.0.bb} (79%)
diff --git a/meta/recipes-support/atk/atk_2.20.0.bb b/meta/recipes-support/atk/atk_2.22.0.bb
similarity index 79%
rename from meta/recipes-support/atk/atk_2.20.0.bb
rename to meta/recipes-support/atk/atk_2.22.0.bb
index 0422354..bc80f95 100644
--- a/meta/recipes-support/atk/atk_2.20.0.bb
+++ b/meta/recipes-support/atk/atk_2.22.0.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "5187b0972f4d3905f285540b31395e20"
-SRC_URI[archive.sha256sum] = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"
+SRC_URI[archive.md5sum] = "c7f2adcf75e4058727174cde970e9129"
+SRC_URI[archive.sha256sum] = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6"
BBCLASSEXTEND = "native"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 07/14] at-spi2-core: Upgrade 2.20.2 -> 2.22.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (5 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 06/14] atk: Upgrade 2.20.0 -> 2.22.0 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 08/14] at-spi2-atk: Upgrade 2.20.1 " Jussi Kukkonen
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly release, mostly bug fixes.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../atk/{at-spi2-core_2.20.2.bb => at-spi2-core_2.22.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{at-spi2-core_2.20.2.bb => at-spi2-core_2.22.0.bb} (88%)
diff --git a/meta/recipes-support/atk/at-spi2-core_2.20.2.bb b/meta/recipes-support/atk/at-spi2-core_2.22.0.bb
similarity index 88%
rename from meta/recipes-support/atk/at-spi2-core_2.20.2.bb
rename to meta/recipes-support/atk/at-spi2-core_2.22.0.bb
index 199243a..272849e 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.20.2.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.22.0.bb
@@ -9,8 +9,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-build-Add-with-systemduserunitdir.patch \
"
-SRC_URI[md5sum] = "f6f6303da2e72317f881703f40bf0c62"
-SRC_URI[sha256sum] = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143"
+SRC_URI[md5sum] = "3da5fe62a653e49dad1c47f9a46fee56"
+SRC_URI[sha256sum] = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 08/14] at-spi2-atk: Upgrade 2.20.1 -> 2.22.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (6 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 07/14] at-spi2-core: Upgrade 2.20.2 " Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 09/14] freetype: Upgrade 2.6.5 -> 2.7 Jussi Kukkonen
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly release, mostly bug fixes.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../atk/{at-spi2-atk_2.20.1.bb => at-spi2-atk_2.22.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{at-spi2-atk_2.20.1.bb => at-spi2-atk_2.22.0.bb} (81%)
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.20.1.bb b/meta/recipes-support/atk/at-spi2-atk_2.22.0.bb
similarity index 81%
rename from meta/recipes-support/atk/at-spi2-atk_2.20.1.bb
rename to meta/recipes-support/atk/at-spi2-atk_2.22.0.bb
index d4120b6..80ba642 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.20.1.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.22.0.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "23309b6f8e1623871ace6347fb734dce"
-SRC_URI[sha256sum] = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e"
+SRC_URI[md5sum] = "aa62aed21b8e03dc44ab81ae49d893ca"
+SRC_URI[sha256sum] = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1"
DEPENDS = "dbus glib-2.0 atk at-spi2-core"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 09/14] freetype: Upgrade 2.6.5 -> 2.7
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (7 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 08/14] at-spi2-atk: Upgrade 2.20.1 " Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 10/14] glib-networking: Upgrade 2.48.2 -> 2.50.0 Jussi Kukkonen
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Includes new default subpixel hinting mode (aka ClearType).
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-graphics/freetype/{freetype_2.6.5.bb => freetype_2.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/freetype/{freetype_2.6.5.bb => freetype_2.7.bb} (93%)
diff --git a/meta/recipes-graphics/freetype/freetype_2.6.5.bb b/meta/recipes-graphics/freetype/freetype_2.7.bb
similarity index 93%
rename from meta/recipes-graphics/freetype/freetype_2.6.5.bb
rename to meta/recipes-graphics/freetype/freetype_2.7.bb
index 97dde3a..36da1fb 100644
--- a/meta/recipes-graphics/freetype/freetype_2.6.5.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.7.bb
@@ -18,8 +18,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
-SRC_URI[md5sum] = "6a386964e18ba28cb93370e57a19031b"
-SRC_URI[sha256sum] = "e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0"
+SRC_URI[md5sum] = "be4601619827b7935e1d861745923a68"
+SRC_URI[sha256sum] = "d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48"
inherit autotools pkgconfig binconfig-disabled multilib_header
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 10/14] glib-networking: Upgrade 2.48.2 -> 2.50.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (8 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 09/14] freetype: Upgrade 2.6.5 -> 2.7 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 11/14] gdk-pixbuf: 2.34.0 -> 2.36.0 Jussi Kukkonen
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly feature release, mostly bug fixes.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../{glib-networking_2.48.2.bb => glib-networking_2.50.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.48.2.bb => glib-networking_2.50.0.bb} (88%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.48.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.48.2.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.50.0.bb
index 50d9983..0baaffd 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.48.2.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.50.0.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "libs"
DEPENDS = "glib-2.0 intltool-native"
-SRC_URI[archive.md5sum] = "d7cf81d52c856b0c66f7821021f40e08"
-SRC_URI[archive.sha256sum] = "925c0c49d6b2b8b5695f2e33cd952d1dbb7d18d3f2f796413577719315bb3a84"
+SRC_URI[archive.md5sum] = "4d06d0224646f274918b1cb6da9a07f6"
+SRC_URI[archive.sha256sum] = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"
PACKAGECONFIG ??= "ca-certificates gnutls"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 11/14] gdk-pixbuf: 2.34.0 -> 2.36.0
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (9 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 10/14] glib-networking: Upgrade 2.48.2 -> 2.50.0 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 12/14] gtk-icon-utils-native: Upgrade 3.20.9 -> 3.22.1 Jussi Kukkonen
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly feature release, mostly bug fixes.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
.../gdk-pixbuf/{gdk-pixbuf_2.34.0.bb => gdk-pixbuf_2.36.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.34.0.bb => gdk-pixbuf_2.36.0.bb} (96%)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.34.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb
similarity index 96%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.34.0.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb
index 4f39494..a5ebeca 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.34.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb
@@ -19,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://fatal-loader.patch \
"
-SRC_URI[md5sum] = "63cb19f92cf7709ccf44bbb6fe1ff70c"
-SRC_URI[sha256sum] = "d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879"
+SRC_URI[md5sum] = "1a3baf91956c7923dab49ee3de100ce1"
+SRC_URI[sha256sum] = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c"
inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 12/14] gtk-icon-utils-native: Upgrade 3.20.9 -> 3.22.1
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (10 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 11/14] gdk-pixbuf: 2.34.0 -> 2.36.0 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 13/14] gtk+: Upgrade 2.24.30 -> 2.24.31 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 14/14] gtk+3: Upgrade 3.20.9 -> 3.22.1 Jussi Kukkonen
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly feature release.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...tk-icon-utils-native_3.20.9.bb => gtk-icon-utils-native_3.22.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.20.9.bb => gtk-icon-utils-native_3.22.1.bb} (93%)
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.9.bb b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.1.bb
similarity index 93%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.9.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.1.bb
index 71c1d62..e6ffc55 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.20.9.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.1.bb
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "cc76cac5e18c772c6784bf19a3dff08b"
-SRC_URI[sha256sum] = "83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17"
+SRC_URI[md5sum] = "ebfa5e52167f2b8a4ec6024d51d86f1f"
+SRC_URI[sha256sum] = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 13/14] gtk+: Upgrade 2.24.30 -> 2.24.31
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (11 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 12/14] gtk-icon-utils-native: Upgrade 3.20.9 -> 3.22.1 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 14/14] gtk+3: Upgrade 3.20.9 -> 3.22.1 Jussi Kukkonen
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Bug fix release.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-gnome/gtk+/{gtk+_2.24.30.bb => gtk+_2.24.31.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+_2.24.30.bb => gtk+_2.24.31.bb} (91%)
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.30.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.31.bb
similarity index 91%
rename from meta/recipes-gnome/gtk+/gtk+_2.24.30.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.24.31.bb
index 4fe990d..84d0b4d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.30.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.31.bb
@@ -12,8 +12,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
file://strict-prototypes.patch \
"
-SRC_URI[md5sum] = "04568ba5c58b75e3c7543e45628ad789"
-SRC_URI[sha256sum] = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50"
+SRC_URI[md5sum] = "526a1008586094a2cbb4592fd3f9ee10"
+SRC_URI[sha256sum] = "68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658"
EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 14/14] gtk+3: Upgrade 3.20.9 -> 3.22.1
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
` (12 preceding siblings ...)
2016-10-26 13:27 ` [PATCH 13/14] gtk+: Upgrade 2.24.30 -> 2.24.31 Jussi Kukkonen
@ 2016-10-26 13:27 ` Jussi Kukkonen
13 siblings, 0 replies; 15+ messages in thread
From: Jussi Kukkonen @ 2016-10-26 13:27 UTC (permalink / raw)
To: openembedded-core
Six-monthly feature release.
* Rebase the --disable-opengl patch.
* Remove a backported patch.
* Inherit gettext as that seems to have been missing.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-gnome/gtk+/gtk+3.inc | 2 +-
...Redo-focus-handling-in-treeview-once-more.patch | 39 ---
.../0003-Add-disable-opengl-configure-option.patch | 365 ++++++++-------------
.../gtk+/{gtk+3_3.20.9.bb => gtk+3_3.22.1.bb} | 5 +-
4 files changed, 132 insertions(+), 279 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.20.9.bb => gtk+3_3.22.1.bb} (78%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 83e9b92..8a08f2d 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
-inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection
+inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
# This should be in autotools.bbclass, but until something elses uses it putting
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch
deleted file mode 100644
index e819add..0000000
--- a/meta/recipes-gnome/gtk+/gtk+3/0001-Redo-focus-handling-in-treeview-once-more.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Backport [29faa2db]
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
-
-From 29faa2db44b04b9cf7f4d96e32691f424490c730 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 11 Sep 2016 11:47:55 -0400
-Subject: [PATCH] Redo focus handling in treeview once more
-
-The fix for bug 767468 had some unintended side-effects. This is
-an attempt at doing the same fix (don't grab focus when we are
-grab-shadowed), while avoiding the breakage, by using GTK+'s
-internal tracking for grab-shadowed-ness.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=770508
----
- gtk/gtktreeview.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
-index a7463cc..73d3557 100644
---- a/gtk/gtktreeview.c
-+++ b/gtk/gtktreeview.c
-@@ -3050,11 +3050,10 @@ static void
- grab_focus_and_unset_draw_keyfocus (GtkTreeView *tree_view)
- {
- GtkWidget *widget = GTK_WIDGET (tree_view);
-- GtkWidget *grab_widget = gtk_grab_get_current ();
-
- if (gtk_widget_get_can_focus (widget) &&
- !gtk_widget_has_focus (widget) &&
-- (!grab_widget || grab_widget == widget))
-+ !_gtk_widget_get_shadowed (widget))
- gtk_widget_grab_focus (widget);
-
- tree_view->priv->draw_keyfocus = 0;
---
-2.9.3
-
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index 0912c44..e6ee21b 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -1,7 +1,7 @@
-From a8fa547fdc1416b330aced805f5343ad912932ae Mon Sep 17 00:00:00 2001
+From cdfd6216ac49fc7622d563d671a5b6511492827d Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 21 Jun 2016 15:11:39 +0300
-Subject: [PATCH 3/4] Add --disable-opengl configure option
+Subject: [PATCH] Add --disable-opengl configure option
--disable-opengl will remove the dependency on libepoxy and on the
OpenGL APIs. This is useful for those who want to keep using gtk+3
@@ -14,40 +14,41 @@ the very least modified.
The patch is _not_ great from a maintenance point of view and
modifying the library API is also a fairly nasty thing to do.
-Long-term it would be good to find an alternative solution to this
-(maybe a no-op backend for libepoxy?)
+Next long term release (4.0) will require alternative solutions
+as it actually will depend on OpenGL.
Upstream-Status: Inappropriate [Evil eye expected from upstream]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
- configure.ac | 13 +++++++++++--
- demos/gtk-demo/glarea.c | 13 +++++++++++++
- docs/tools/Makefile.am | 9 +++++++--
- docs/tools/widgets.c | 4 +++-
- gdk/gdkdisplay.c | 4 +++-
- gdk/gdkgl.c | 10 ++++++++++
- gdk/gdkglcontext.c | 6 ++++++
- gdk/gdkwindow.c | 13 +++++++++++++
- gdk/x11/Makefile.am | 30 ++++++++++++++++++++++++++----
- gdk/x11/gdkdisplay-x11.c | 6 +++++-
- gdk/x11/gdkscreen-x11.c | 5 +++++
- gdk/x11/gdkwindow-x11.c | 4 ++++
- gdk/x11/gdkx-autocleanups.h | 2 ++
- gdk/x11/gdkx-with-gl-context.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- gdk/x11/gdkx.h | 59 -----------------------------------------------------------
- gtk/Makefile.am | 3 +--
- gtk/gtkglarea.c | 20 +++++++++++++++++++-
- gtk/inspector/general.c | 6 ++++++
- tests/Makefile.am | 10 +++++++---
- testsuite/gtk/objects-finalize.c | 2 ++
- 21 files changed, 260 insertions(+), 76 deletions(-)
+ configure.ac | 13 +++++--
+ demos/gtk-demo/glarea.c | 13 +++++++
+ docs/tools/Makefile.am | 9 +++--
+ docs/tools/widgets.c | 4 ++-
+ gdk/gdkdisplay.c | 4 ++-
+ gdk/gdkgl.c | 10 ++++++
+ gdk/gdkglcontext.c | 6 ++++
+ gdk/gdkwindow.c | 13 +++++++
+ gdk/x11/Makefile.am | 30 +++++++++++++---
+ gdk/x11/gdkdisplay-x11.c | 6 +++-
+ gdk/x11/gdkscreen-x11.c | 5 +++
+ gdk/x11/gdkwindow-x11.c | 4 +++
+ gdk/x11/gdkx-autocleanups.h | 2 ++
+ gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 -
+ gdk/x11/gdkx-without-gl-context.h | 58 ++++++++++++++++++++++++++++++
+ gtk/Makefile.am | 3 +-
+ gtk/gtkglarea.c | 20 ++++++++++-
+ gtk/inspector/general.c | 6 ++++
+ tests/Makefile.am | 10 ++++--
+ testsuite/gtk/objects-finalize.c | 2 ++
+ 20 files changed, 201 insertions(+), 18 deletions(-)
+ rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%)
+ create mode 100644 gdk/x11/gdkx-without-gl-context.h
diff --git a/configure.ac b/configure.ac
-index a01824e..dde9dc5 100644
+index 1cfdbc4..2d1a945 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -342,6 +342,15 @@ AC_ARG_ENABLE(mir-backend,
+@@ -346,6 +346,15 @@ AC_ARG_ENABLE(mir-backend,
[enable the Mir gdk backend])],
[backend_set=yes])
@@ -63,7 +64,7 @@ index a01824e..dde9dc5 100644
AC_ARG_ENABLE(glx,
[AS_HELP_STRING([--enable-glx],
[When enabled Gdk will try to initialize GLX])])
-@@ -1333,7 +1342,7 @@ CFLAGS="$saved_cflags"
+@@ -1352,7 +1361,7 @@ CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
@@ -72,7 +73,7 @@ index a01824e..dde9dc5 100644
PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-@@ -1367,7 +1376,7 @@ fi
+@@ -1386,7 +1395,7 @@ fi
PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
@@ -82,11 +83,14 @@ index a01824e..dde9dc5 100644
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
fi
diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
-index 3aba729..c6c79f7 100644
+index 715b067..4a9c7c8 100644
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
-@@ -5,7 +5,9 @@
+@@ -3,9 +3,12 @@
+ * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
+ */
++#include "config.h"
#include <math.h>
#include <gtk/gtk.h>
+#if HAVE_OPENGL
@@ -104,7 +108,7 @@ index 3aba729..c6c79f7 100644
/* The object we are drawing */
static const GLfloat vertex_data[] = {
0.f, 0.5f, 0.f, 1.f,
-@@ -213,6 +217,7 @@ compute_mvp (float *res,
+@@ -215,6 +219,7 @@ compute_mvp (float *res,
static GLuint position_buffer;
static GLuint program;
static GLuint mvp_location;
@@ -112,18 +116,18 @@ index 3aba729..c6c79f7 100644
/* We need to set up our state when we realize the GtkGLArea widget */
static void
-@@ -223,8 +228,10 @@ realize (GtkWidget *widget)
- if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
- return;
+@@ -241,8 +246,10 @@ realize (GtkWidget *widget)
+ fragment_path = "/glarea/glarea-gl.fs.glsl";
+ }
+#ifdef HAVE_OPENGL
init_buffers (&position_buffer, NULL);
- init_shaders (&program, &mvp_location);
+ init_shaders (vertex_path, fragment_path, &program, &mvp_location);
+#endif
}
/* We should tear down the state when unrealizing */
-@@ -236,10 +243,13 @@ unrealize (GtkWidget *widget)
+@@ -254,10 +261,13 @@ unrealize (GtkWidget *widget)
if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
return;
@@ -137,7 +141,7 @@ index 3aba729..c6c79f7 100644
static void
draw_triangle (void)
{
-@@ -272,6 +282,7 @@ draw_triangle (void)
+@@ -290,6 +300,7 @@ draw_triangle (void)
glBindBuffer (GL_ARRAY_BUFFER, 0);
glUseProgram (0);
}
@@ -145,7 +149,7 @@ index 3aba729..c6c79f7 100644
static gboolean
render (GtkGLArea *area,
-@@ -280,6 +291,7 @@ render (GtkGLArea *area,
+@@ -298,6 +309,7 @@ render (GtkGLArea *area,
if (gtk_gl_area_get_error (area) != NULL)
return FALSE;
@@ -153,7 +157,7 @@ index 3aba729..c6c79f7 100644
/* Clear the viewport */
glClearColor (0.5, 0.5, 0.5, 1.0);
glClear (GL_COLOR_BUFFER_BIT);
-@@ -289,6 +301,7 @@ render (GtkGLArea *area,
+@@ -307,6 +319,7 @@ render (GtkGLArea *area,
/* Flush the contents of the pipeline */
glFlush ();
@@ -204,10 +208,10 @@ index 932daf1..54239d6 100644
return info;
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
-index 6150ef7..2223629 100644
+index ed0e65f..1f81b71 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
-@@ -2360,7 +2360,9 @@ gboolean
+@@ -2409,7 +2409,9 @@ gboolean
gdk_display_make_gl_context_current (GdkDisplay *display,
GdkGLContext *context)
{
@@ -219,7 +223,7 @@ index 6150ef7..2223629 100644
GdkRenderingMode
diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
-index e8ba770..ba7c84b 100644
+index 51d2b02..efa9e95 100644
--- a/gdk/gdkgl.c
+++ b/gdk/gdkgl.c
@@ -22,7 +22,9 @@
@@ -240,7 +244,7 @@ index e8ba770..ba7c84b 100644
static const char *
get_vertex_type_name (int type)
{
-@@ -254,6 +257,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
+@@ -208,6 +211,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
glUseProgram (paint_data->current_program->program);
}
}
@@ -248,15 +252,15 @@ index e8ba770..ba7c84b 100644
void
gdk_gl_texture_quads (GdkGLContext *paint_context,
-@@ -261,6 +265,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
- int n_quads,
- GdkTexturedQuad *quads)
+@@ -216,6 +220,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
+ GdkTexturedQuad *quads,
+ gboolean flip_colors)
{
+#ifdef HAVE_OPENGL
GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context);
GdkGLContextProgram *program;
GdkWindow *window = gdk_gl_context_get_window (paint_context);
-@@ -324,6 +329,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
+@@ -289,6 +294,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
glDisableVertexAttribArray (program->position_location);
glDisableVertexAttribArray (program->uv_location);
@@ -264,7 +268,7 @@ index e8ba770..ba7c84b 100644
}
/* x,y,width,height describes a rectangle in the gl render buffer
-@@ -372,6 +378,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
+@@ -337,6 +343,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
int width,
int height)
{
@@ -272,7 +276,7 @@ index e8ba770..ba7c84b 100644
GdkGLContext *paint_context;
cairo_surface_t *image;
cairo_matrix_t matrix;
-@@ -692,6 +699,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr,
+@@ -706,6 +713,7 @@ out:
if (clip_region)
cairo_region_destroy (clip_region);
@@ -280,7 +284,7 @@ index e8ba770..ba7c84b 100644
}
/* This is always called with the paint context current */
-@@ -699,6 +707,7 @@ void
+@@ -713,6 +721,7 @@ void
gdk_gl_texture_from_surface (cairo_surface_t *surface,
cairo_region_t *region)
{
@@ -288,14 +292,14 @@ index e8ba770..ba7c84b 100644
GdkGLContext *paint_context;
cairo_surface_t *image;
double device_x_offset, device_y_offset;
-@@ -799,4 +808,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
+@@ -813,4 +822,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
glDisable (GL_SCISSOR_TEST);
glDeleteTextures (1, &texture_id);
+#endif
}
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
-index 00a33eb..bd8a793 100644
+index bf6e45f..d016e4b 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -85,7 +85,9 @@
@@ -308,23 +312,23 @@ index 00a33eb..bd8a793 100644
typedef struct {
GdkDisplay *display;
-@@ -239,6 +241,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
+@@ -243,6 +243,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
int height,
guint texture_target)
{
+#ifdef HAVE_OPENGL
- g_return_if_fail (GDK_IS_GL_CONTEXT (context));
+ GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
- glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
-@@ -246,6 +249,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
- glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
- cairo_image_surface_get_data (image_surface));
- glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+ g_return_if_fail (GDK_IS_GL_CONTEXT (context));
+@@ -286,6 +287,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
+ glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride));
+ }
+ }
+#endif
}
- static void
-@@ -635,6 +639,7 @@ gdk_gl_context_realize (GdkGLContext *context,
+ static gboolean
+@@ -760,6 +764,7 @@ gdk_gl_context_realize (GdkGLContext *context,
static void
gdk_gl_context_check_extensions (GdkGLContext *context)
{
@@ -332,7 +336,7 @@ index 00a33eb..bd8a793 100644
GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
gboolean has_npot, has_texture_rectangle;
-@@ -677,6 +682,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
+@@ -824,6 +829,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
priv->use_texture_rectangle ? "yes" : "no"));
priv->extensions_checked = TRUE;
@@ -341,10 +345,10 @@ index 00a33eb..bd8a793 100644
/**
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index 66ebb9d..74a0c3a 100644
+index 514732d..0e4fc7e 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
-@@ -44,7 +44,9 @@
+@@ -45,7 +45,9 @@
#include <math.h>
@@ -354,7 +358,7 @@ index 66ebb9d..74a0c3a 100644
/* for the use of round() */
#include "fallback-c89.c"
-@@ -2759,6 +2761,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window,
+@@ -2801,6 +2803,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window,
{
GError *internal_error = NULL;
@@ -368,7 +372,7 @@ index 66ebb9d..74a0c3a 100644
if (_gdk_gl_flags & GDK_GL_DISABLE)
{
g_set_error_literal (error, GDK_GL_ERROR,
-@@ -2955,6 +2964,7 @@ gdk_window_begin_paint_region (GdkWindow *window,
+@@ -2936,6 +2945,7 @@ gdk_window_begin_paint_internal (GdkWindow *window,
}
else
{
@@ -376,7 +380,7 @@ index 66ebb9d..74a0c3a 100644
gdk_gl_context_make_current (context);
/* With gl we always need a surface to combine the gl
drawing with the native drawing. */
-@@ -2969,6 +2979,7 @@ gdk_window_begin_paint_region (GdkWindow *window,
+@@ -2950,6 +2960,7 @@ gdk_window_begin_paint_internal (GdkWindow *window,
glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glViewport (0, 0, ww, wh);
@@ -384,7 +388,7 @@ index 66ebb9d..74a0c3a 100644
}
}
-@@ -3117,6 +3128,7 @@ gdk_window_end_paint (GdkWindow *window)
+@@ -3013,6 +3024,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
gdk_gl_context_make_current (window->gl_paint_context);
@@ -392,7 +396,7 @@ index 66ebb9d..74a0c3a 100644
if (!cairo_region_is_empty (opaque_region))
gdk_gl_texture_from_surface (window->current_paint.surface,
opaque_region);
-@@ -3127,6 +3139,7 @@ gdk_window_end_paint (GdkWindow *window)
+@@ -3023,6 +3035,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
window->current_paint.need_blend_region);
glDisable(GL_BLEND);
}
@@ -401,10 +405,10 @@ index 66ebb9d..74a0c3a 100644
cairo_region_destroy (opaque_region);
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
-index c488a31..4ce3c07 100644
+index 6289f3a..cbbac79 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
-@@ -39,8 +39,6 @@ libgdk_x11_la_SOURCES = \
+@@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \
gdkeventtranslator.c \
gdkeventtranslator.h \
gdkgeometry-x11.c \
@@ -412,8 +416,8 @@ index c488a31..4ce3c07 100644
- gdkglcontext-x11.h \
gdkkeys-x11.c \
gdkmain-x11.c \
- gdkproperty-x11.c \
-@@ -53,14 +51,32 @@ libgdk_x11_la_SOURCES = \
+ gdkmonitor-x11.c \
+@@ -56,14 +54,32 @@ libgdk_x11_la_SOURCES = \
gdkwindow-x11.h \
gdkxftdefaults.c \
gdkxid.c \
@@ -447,15 +451,15 @@ index c488a31..4ce3c07 100644
libgdkx11include_HEADERS = \
gdkx-autocleanups.h \
gdkx11applaunchcontext.h \
-@@ -74,7 +90,6 @@ libgdkx11include_HEADERS = \
+@@ -77,7 +93,6 @@ libgdkx11include_HEADERS = \
gdkx11display.h \
gdkx11displaymanager.h \
gdkx11dnd.h \
- gdkx11glcontext.h \
gdkx11keys.h \
+ gdkx11monitor.h \
gdkx11property.h \
- gdkx11screen.h \
-@@ -83,9 +98,16 @@ libgdkx11include_HEADERS = \
+@@ -87,9 +102,16 @@ libgdkx11include_HEADERS = \
gdkx11visual.h \
gdkx11window.h
@@ -473,7 +477,7 @@ index c488a31..4ce3c07 100644
+
-include $(top_srcdir)/git.mk
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index de91c64..42d50f6 100644
+index ad65e29..91345ee 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -37,7 +37,9 @@
@@ -486,7 +490,7 @@ index de91c64..42d50f6 100644
#include "gdk-private.h"
#include <glib.h>
-@@ -2959,7 +2961,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
+@@ -2994,7 +2996,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
@@ -498,10 +502,10 @@ index de91c64..42d50f6 100644
display_class->get_default_seat = gdk_x11_display_get_default_seat;
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index 9d8ed20..bd46b00 100644
+index 450872d..f8a2f6e 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
-@@ -1968,3 +1968,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
+@@ -1642,3 +1642,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
{
return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP");
}
@@ -511,7 +515,7 @@ index 9d8ed20..bd46b00 100644
+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
+#endif
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 9ed087a..30d6eb7 100644
+index fe311a7..d16bdfe 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -36,7 +36,9 @@
@@ -524,7 +528,7 @@ index 9ed087a..30d6eb7 100644
#include "gdkprivate-x11.h"
#include "gdk-private.h"
-@@ -5782,7 +5784,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
+@@ -5781,7 +5783,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
impl_class->show_window_menu = gdk_x11_window_show_window_menu;
@@ -548,71 +552,21 @@ index edb0ea7..a317d61 100644
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
-diff --git a/gdk/x11/gdkx-with-gl-context.h b/gdk/x11/gdkx-with-gl-context.h
-new file mode 100644
-index 0000000..ae05fa6
---- /dev/null
+diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h
+similarity index 98%
+rename from gdk/x11/gdkx.h
+rename to gdk/x11/gdkx-with-gl-context.h
+index 1f64bcc..ae05fa6 100644
+--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx-with-gl-context.h
-@@ -0,0 +1,59 @@
-+/* GDK - The GIMP Drawing Kit
-+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+/*
-+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
-+ * file for a list of people on the GTK+ Team. See the ChangeLog
-+ * files for a list of changes. These files are distributed with
-+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
-+ */
-+
-+#ifndef __GDK_X_H__
-+#define __GDK_X_H__
-+
-+#include <gdk/gdk.h>
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+
-+#define __GDKX_H_INSIDE__
-+
-+#include <gdk/x11/gdkx11applaunchcontext.h>
-+#include <gdk/x11/gdkx11cursor.h>
-+#include <gdk/x11/gdkx11device.h>
-+#include <gdk/x11/gdkx11device-core.h>
-+#include <gdk/x11/gdkx11device-xi2.h>
-+#include <gdk/x11/gdkx11devicemanager.h>
-+#include <gdk/x11/gdkx11devicemanager-core.h>
-+#include <gdk/x11/gdkx11devicemanager-xi2.h>
-+#include <gdk/x11/gdkx11display.h>
-+#include <gdk/x11/gdkx11displaymanager.h>
-+#include <gdk/x11/gdkx11dnd.h>
-+#include <gdk/x11/gdkx11glcontext.h>
-+#include <gdk/x11/gdkx11keys.h>
-+#include <gdk/x11/gdkx11property.h>
-+#include <gdk/x11/gdkx11screen.h>
-+#include <gdk/x11/gdkx11selection.h>
-+#include <gdk/x11/gdkx11utils.h>
-+#include <gdk/x11/gdkx11visual.h>
-+#include <gdk/x11/gdkx11window.h>
-+
-+#include <gdk/x11/gdkx-autocleanups.h>
-+
-+#undef __GDKX_H_INSIDE__
-+
-+#endif /* __GDK_X_H__ */
+@@ -45,7 +45,6 @@
+ #include <gdk/x11/gdkx11dnd.h>
+ #include <gdk/x11/gdkx11glcontext.h>
+ #include <gdk/x11/gdkx11keys.h>
+-#include <gdk/x11/gdkx11monitor.h>
+ #include <gdk/x11/gdkx11property.h>
+ #include <gdk/x11/gdkx11screen.h>
+ #include <gdk/x11/gdkx11selection.h>
diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h
new file mode 100644
index 0000000..c9e2617
@@ -677,76 +631,11 @@ index 0000000..c9e2617
+#undef __GDKX_H_INSIDE__
+
+#endif /* __GDK_X_H__ */
-diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
-deleted file mode 100644
-index ae05fa6..0000000
---- a/gdk/x11/gdkx.h
-+++ /dev/null
-@@ -1,59 +0,0 @@
--/* GDK - The GIMP Drawing Kit
-- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-- */
--
--/*
-- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
-- * file for a list of people on the GTK+ Team. See the ChangeLog
-- * files for a list of changes. These files are distributed with
-- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
-- */
--
--#ifndef __GDK_X_H__
--#define __GDK_X_H__
--
--#include <gdk/gdk.h>
--
--#include <X11/Xlib.h>
--#include <X11/Xutil.h>
--
--#define __GDKX_H_INSIDE__
--
--#include <gdk/x11/gdkx11applaunchcontext.h>
--#include <gdk/x11/gdkx11cursor.h>
--#include <gdk/x11/gdkx11device.h>
--#include <gdk/x11/gdkx11device-core.h>
--#include <gdk/x11/gdkx11device-xi2.h>
--#include <gdk/x11/gdkx11devicemanager.h>
--#include <gdk/x11/gdkx11devicemanager-core.h>
--#include <gdk/x11/gdkx11devicemanager-xi2.h>
--#include <gdk/x11/gdkx11display.h>
--#include <gdk/x11/gdkx11displaymanager.h>
--#include <gdk/x11/gdkx11dnd.h>
--#include <gdk/x11/gdkx11glcontext.h>
--#include <gdk/x11/gdkx11keys.h>
--#include <gdk/x11/gdkx11property.h>
--#include <gdk/x11/gdkx11screen.h>
--#include <gdk/x11/gdkx11selection.h>
--#include <gdk/x11/gdkx11utils.h>
--#include <gdk/x11/gdkx11visual.h>
--#include <gdk/x11/gdkx11window.h>
--
--#include <gdk/x11/gdkx-autocleanups.h>
--
--#undef __GDKX_H_INSIDE__
--
--#endif /* __GDK_X_H__ */
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 6a53a2b..49a35e6 100644
+index 3b76b82..eb4a065 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
-@@ -1351,14 +1351,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
+@@ -1378,14 +1378,13 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
&& cp xgen-gptbc gtkprivatetypebuiltins.c \
&& rm -f xgen-gptbc
@@ -763,7 +652,7 @@ index 6a53a2b..49a35e6 100644
gtktestutils.c: gtktypefuncs.c
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
-index 245fc6b..4214ad1 100644
+index 094378e..f7c7f47 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -28,7 +28,9 @@
@@ -776,7 +665,7 @@ index 245fc6b..4214ad1 100644
/**
* SECTION:gtkglarea
-@@ -357,9 +359,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area)
+@@ -368,9 +370,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area)
static void
gtk_gl_area_resize (GtkGLArea *area, int width, int height)
{
@@ -789,7 +678,7 @@ index 245fc6b..4214ad1 100644
/*
* Creates all the buffer objects needed for rendering the scene
*/
-@@ -467,6 +472,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
+@@ -482,6 +487,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
priv->needs_render = TRUE;
}
@@ -797,7 +686,7 @@ index 245fc6b..4214ad1 100644
/**
* gtk_gl_area_attach_buffers:
-@@ -485,6 +491,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
+@@ -500,6 +506,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
void
gtk_gl_area_attach_buffers (GtkGLArea *area)
{
@@ -805,7 +694,7 @@ index 245fc6b..4214ad1 100644
GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
g_return_if_fail (GTK_IS_GL_AREA (area));
-@@ -517,11 +524,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
+@@ -532,11 +539,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT,
GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer);
}
@@ -819,7 +708,7 @@ index 245fc6b..4214ad1 100644
GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
if (priv->context == NULL)
-@@ -553,6 +562,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
+@@ -568,6 +577,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
glDeleteFramebuffersEXT (1, &priv->frame_buffer);
priv->frame_buffer = 0;
}
@@ -827,7 +716,7 @@ index 245fc6b..4214ad1 100644
}
static void
-@@ -663,6 +673,7 @@ gtk_gl_area_draw (GtkWidget *widget,
+@@ -678,6 +688,7 @@ gtk_gl_area_draw (GtkWidget *widget,
GtkGLArea *area = GTK_GL_AREA (widget);
GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
gboolean unused;
@@ -835,7 +724,7 @@ index 245fc6b..4214ad1 100644
int w, h, scale;
GLenum status;
-@@ -674,7 +685,6 @@ gtk_gl_area_draw (GtkWidget *widget,
+@@ -689,7 +700,6 @@ gtk_gl_area_draw (GtkWidget *widget,
gtk_widget_get_allocated_height (widget));
return FALSE;
}
@@ -843,7 +732,7 @@ index 245fc6b..4214ad1 100644
if (priv->context == NULL)
return FALSE;
-@@ -720,6 +730,14 @@ gtk_gl_area_draw (GtkWidget *widget,
+@@ -735,6 +745,14 @@ gtk_gl_area_draw (GtkWidget *widget,
}
return TRUE;
@@ -859,7 +748,7 @@ index 245fc6b..4214ad1 100644
static gboolean
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
-index 4eab3a7..c4e900e 100644
+index 31dd6aa..1cedbd3 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -33,8 +33,10 @@
@@ -873,7 +762,7 @@ index 4eab3a7..c4e900e 100644
#ifdef GDK_WINDOWING_WIN32
#include "win32/gdkwin32.h"
-@@ -147,6 +149,7 @@ append_extension_row (GtkInspectorGeneral *gen,
+@@ -196,6 +198,7 @@ add_label_row (GtkInspectorGeneral *gen,
gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label);
}
@@ -881,15 +770,15 @@ index 4eab3a7..c4e900e 100644
#ifdef GDK_WINDOWING_X11
static void
append_glx_extension_row (GtkInspectorGeneral *gen,
-@@ -156,6 +159,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
- append_extension_row (gen, ext, epoxy_has_glx_extension (dpy, 0, ext));
+@@ -205,6 +208,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
+ add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0);
}
#endif
+#endif
#ifdef GDK_WINDOWING_WAYLAND
static void
-@@ -171,6 +175,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen,
+@@ -220,6 +224,7 @@ append_egl_extension_row (GtkInspectorGeneral *gen,
static void
init_gl (GtkInspectorGeneral *gen)
{
@@ -897,7 +786,7 @@ index 4eab3a7..c4e900e 100644
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
{
-@@ -197,6 +202,7 @@ init_gl (GtkInspectorGeneral *gen)
+@@ -246,6 +251,7 @@ init_gl (GtkInspectorGeneral *gen)
}
else
#endif
@@ -906,7 +795,7 @@ index 4eab3a7..c4e900e 100644
if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
{
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 681807d..2941a36 100644
+index 649981f..a0e48a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \
@@ -918,19 +807,20 @@ index 681807d..2941a36 100644
testgrid \
testgtk \
testheaderbar \
-@@ -169,11 +167,17 @@ noinst_PROGRAMS = $(TEST_PROGS) \
+@@ -169,12 +167,18 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testactionbar \
testwindowsize \
testpopover \
- gdkgears \
listmodel \
testpopup \
+ testpopupat \
$(NULL)
+if HAVE_OPENGL
+noinst_PROGRAMS +=
-+ testglarea \
-+ testglblending \
++ testglarea \
++ testglblending \
+ gdkgears
+endif
+
@@ -938,7 +828,7 @@ index 681807d..2941a36 100644
noinst_PROGRAMS += testerrors
endif
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
-index e0ebee0..703643c 100644
+index 0b3a519..07b096f 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -115,8 +115,10 @@ main (int argc, char **argv)
@@ -951,4 +841,7 @@ index e0ebee0..703643c 100644
+#endif
/* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */
all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
- all_types[i] != gdk_pixbuf_simple_anim_iter_get_type())
+ all_types[i] != GDK_TYPE_DRAWING_CONTEXT &&
+--
+2.1.4
+
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.1.bb
similarity index 78%
rename from meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.22.1.bb
index 38e095a..5fb0edd 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.20.9.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.1.bb
@@ -7,10 +7,9 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
file://0003-Add-disable-opengl-configure-option.patch \
file://0004-configure.ac-Fix-wayland-protocols-path.patch \
- file://0001-Redo-focus-handling-in-treeview-once-more.patch \
"
-SRC_URI[md5sum] = "cc76cac5e18c772c6784bf19a3dff08b"
-SRC_URI[sha256sum] = "83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17"
+SRC_URI[md5sum] = "ebfa5e52167f2b8a4ec6024d51d86f1f"
+SRC_URI[sha256sum] = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"
S = "${WORKDIR}/gtk+-${PV}"
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2016-10-26 13:28 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-26 13:27 [PATCH 00/14] GTK+ upgrades Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 01/14] pango: Upgrade 1.40.1 -> 1.40.3 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 02/14] adwaita-icon-theme: Upgrade 3.20 -> 3.22.0 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 03/14] gnome-themes-standard: Upgrade 3.20.2 -> 3.22.2 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 04/14] glib-2.0: Upgrade 2.48.2 -> 2.50.1 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 05/14] libsoup-2.4: Upgrade 2.54.1 -> 2.56.0 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 06/14] atk: Upgrade 2.20.0 -> 2.22.0 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 07/14] at-spi2-core: Upgrade 2.20.2 " Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 08/14] at-spi2-atk: Upgrade 2.20.1 " Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 09/14] freetype: Upgrade 2.6.5 -> 2.7 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 10/14] glib-networking: Upgrade 2.48.2 -> 2.50.0 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 11/14] gdk-pixbuf: 2.34.0 -> 2.36.0 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 12/14] gtk-icon-utils-native: Upgrade 3.20.9 -> 3.22.1 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 13/14] gtk+: Upgrade 2.24.30 -> 2.24.31 Jussi Kukkonen
2016-10-26 13:27 ` [PATCH 14/14] gtk+3: Upgrade 3.20.9 -> 3.22.1 Jussi Kukkonen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.