* [PATCH 0/5] remove gtk+-native
@ 2013-03-29 21:19 Andreas Müller
2013-03-29 21:19 ` [PATCH 1/5] gtk+: don't provide native build Andreas Müller
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Andreas Müller @ 2013-03-29 21:19 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 3ed59ee53ee7d87694670a7ba864165146b90a6b:
scripts/contrib/build-perf-test.sh: add timings for bitbake -p (2013-03-29 16:22:52 +0000)
are available in the git repository at:
git://gitorious.org/schnitzeltony-oe-meta/oe-core.git gtk+-native-farewell
Andreas Müller (5):
gtk+: don't provide native build
remove gtk-update-icon-cache-native virtuals
packagegroup-toolset-native: replace gtk+-native by gtk-update-icon-cache-native
sstate.bbclass: remove reference to gtk+-native
seperatebuilddir.inc: remove reference to gtk+-native
meta/classes/gtk-icon-cache.bbclass | 2 +-
meta/classes/sstate.bbclass | 2 +-
meta/conf/distro/include/default-providers.inc | 1 -
meta/conf/distro/include/seperatebuilddir.inc | 1 -
meta/recipes-gnome/gtk+/gtk+.inc | 8 --------
meta/recipes-gnome/gtk+/gtk+_2.24.15.bb | 10 +---------
.../gtk+/gtk-update-icon-cache-native_3.4.4.bb | 2 --
.../packagegroups/packagegroup-toolset-native.bb | 2 +-
8 files changed, 4 insertions(+), 24 deletions(-)
--
1.7.4.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] gtk+: don't provide native build
2013-03-29 21:19 [PATCH 0/5] remove gtk+-native Andreas Müller
@ 2013-03-29 21:19 ` Andreas Müller
2013-03-29 21:19 ` [PATCH 2/5] remove gtk-update-icon-cache-native virtuals Andreas Müller
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2013-03-29 21:19 UTC (permalink / raw)
To: openembedded-core
The only part required from native build is gtk-update-icon-cache. This is
provided by gtk-update-icon-cache-native_3.4.4. This version works properly
with gtk+. The patch was tested for gnome-icon-theme and hicolor-icon-theme by:
1. building xfce/gtk+ (gtk3-less) image
2. checking for existing icon-theme.cache in rootfs
3. running image / open menus + test applications
4. executing 'gtk-update-icon-cache-2.0 --validate <both icon-themes-dirs>'
5. executing 'gtk-update-icon-cache-2.0 -f <both icon-themes-dirs>' + exact size checking
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/recipes-gnome/gtk+/gtk+.inc | 8 --------
meta/recipes-gnome/gtk+/gtk+_2.24.15.bb | 10 +---------
2 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index f05838a..84edaf3 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
SECTION = "libs"
-PROVIDES_class-native = "virtual/gtk-update-icon-cache-native"
-
X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
libgcrypt cairo gdk-pixbuf"
@@ -81,12 +79,6 @@ do_install () {
mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0
}
-do_install_append_class-native () {
- # Ideally we'd use alternatives in the sysroot, but they don't work.
- # As we know we don't have a native GTK+ 3 (yet), make a symlink instead.
- ln -s gtk-update-icon-cache-2.0 ${D}${bindir}/gtk-update-icon-cache
-}
-
SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess"
gtk_sysroot_preprocess () {
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb
index 4e045e4..02d66f8 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.15.bb
@@ -28,7 +28,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
# file://combo-arrow-size.patch;striplevel=0
# file://configurefix.patch
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "68f034fb4f68086790d7488cf00e71c8"
SRC_URI[sha256sum] = "d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b"
@@ -38,14 +38,6 @@ EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-gli
LIBV = "2.10.0"
PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*"
-BBCLASSEXTEND = "native"
-RRECOMMENDS_${PN}_class-native = ""
-DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native"
-
-do_install_append_class-native () {
- create_wrapper ${D}/${bindir}/gtk-update-icon-cache-2.0 \
- GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
-}
python populate_packages_prepend () {
gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] remove gtk-update-icon-cache-native virtuals
2013-03-29 21:19 [PATCH 0/5] remove gtk+-native Andreas Müller
2013-03-29 21:19 ` [PATCH 1/5] gtk+: don't provide native build Andreas Müller
@ 2013-03-29 21:19 ` Andreas Müller
2013-03-29 21:19 ` [PATCH 3/5] packagegroup-toolset-native: replace gtk+-native by gtk-update-icon-cache-native Andreas Müller
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2013-03-29 21:19 UTC (permalink / raw)
To: openembedded-core
gtk-update-icon-cache-native is the only provider now
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/classes/gtk-icon-cache.bbclass | 2 +-
meta/conf/distro/include/default-providers.inc | 1 -
.../gtk+/gtk-update-icon-cache-native_3.4.4.bb | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index a5d642c..6d205a1 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,6 +1,6 @@
FILES_${PN} += "${datadir}/icons/hicolor"
-DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} virtual/gtk-update-icon-cache-native"
+DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native"
#
# On host, the postinstall MUST return 1 because we do not know if the intercept
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index e3a44e6..4b66522 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -12,7 +12,6 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
-PREFERRED_PROVIDER_virtual/gtk-update-icon-cache-native ?= "gtk-update-icon-cache-native"
#
# Default virtual runtime providers
diff --git a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
index ea99c14..93c30a7 100644
--- a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
+++ b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb
@@ -2,8 +2,6 @@ SUMMARY = "gtk-update-icon-cache built natively"
DESCRIPTION = "Just gtk-update-icon-cache built from GTK+ natively, for on-host postinst script execution."
SECTION = "libs"
-PROVIDES = "virtual/gtk-update-icon-cache-native"
-
DEPENDS = "gdk-pixbuf-native"
LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] packagegroup-toolset-native: replace gtk+-native by gtk-update-icon-cache-native
2013-03-29 21:19 [PATCH 0/5] remove gtk+-native Andreas Müller
2013-03-29 21:19 ` [PATCH 1/5] gtk+: don't provide native build Andreas Müller
2013-03-29 21:19 ` [PATCH 2/5] remove gtk-update-icon-cache-native virtuals Andreas Müller
@ 2013-03-29 21:19 ` Andreas Müller
2013-03-29 21:20 ` [PATCH 4/5] sstate.bbclass: remove reference to gtk+-native Andreas Müller
2013-03-29 21:20 ` [PATCH 5/5] seperatebuilddir.inc: " Andreas Müller
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2013-03-29 21:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../packagegroups/packagegroup-toolset-native.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
index 5c544ec..82ee820 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb
@@ -84,7 +84,7 @@ DEPENDS = "\
gperf-native \
groff-native \
gtk-doc-stub-native \
- gtk+-native \
+ gtk-update-icon-cache-native \
guile-native \
guilt-native \
gzip-native \
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] sstate.bbclass: remove reference to gtk+-native
2013-03-29 21:19 [PATCH 0/5] remove gtk+-native Andreas Müller
` (2 preceding siblings ...)
2013-03-29 21:19 ` [PATCH 3/5] packagegroup-toolset-native: replace gtk+-native by gtk-update-icon-cache-native Andreas Müller
@ 2013-03-29 21:20 ` Andreas Müller
2013-03-29 21:20 ` [PATCH 5/5] seperatebuilddir.inc: " Andreas Müller
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2013-03-29 21:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/classes/sstate.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index ce9f243..6a7c219 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -641,7 +641,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
return True
return False
def isPostInstDep(x):
- if x in ["qemu-native", "gdk-pixbuf-native", "gtk+-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]:
+ if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]:
return True
return False
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] seperatebuilddir.inc: remove reference to gtk+-native
2013-03-29 21:19 [PATCH 0/5] remove gtk+-native Andreas Müller
` (3 preceding siblings ...)
2013-03-29 21:20 ` [PATCH 4/5] sstate.bbclass: remove reference to gtk+-native Andreas Müller
@ 2013-03-29 21:20 ` Andreas Müller
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2013-03-29 21:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta/conf/distro/include/seperatebuilddir.inc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
index 06df5fd..a9ca240 100644
--- a/meta/conf/distro/include/seperatebuilddir.inc
+++ b/meta/conf/distro/include/seperatebuilddir.inc
@@ -222,7 +222,6 @@ B_pn-gtk+3 = "${SEPB}"
B_pn-gtk-doc-stub = "${SEPB}"
B_pn-gtk-doc-stub-native = "${SEPB}"
B_pn-gtk-engines = "${SEPB}"
-B_pn-gtk+-native = "${SEPB}"
##make[1]: *** No rule to make target `data/gtkrc', needed by `all-am'. Stop
##B_pn-gtk-sato-engine = "${SEPB}"
B_pn-guile = "${SEPB}"
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-29 21:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-29 21:19 [PATCH 0/5] remove gtk+-native Andreas Müller
2013-03-29 21:19 ` [PATCH 1/5] gtk+: don't provide native build Andreas Müller
2013-03-29 21:19 ` [PATCH 2/5] remove gtk-update-icon-cache-native virtuals Andreas Müller
2013-03-29 21:19 ` [PATCH 3/5] packagegroup-toolset-native: replace gtk+-native by gtk-update-icon-cache-native Andreas Müller
2013-03-29 21:20 ` [PATCH 4/5] sstate.bbclass: remove reference to gtk+-native Andreas Müller
2013-03-29 21:20 ` [PATCH 5/5] seperatebuilddir.inc: " Andreas Müller
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.