Skip to contentSkip to conversation

Few more small fixes for world image and another EFL bump

PATCH In review Martin Jansa 2 participants 16 messages Dec 13, 2012 – Dec 14, 2012

lore
Share & tools
lore
#0 lore raw

cover Few more small fixes for world image and another EFL bump

The following changes since commit f36e2e2ea4edcd4a0e65ed1c213bce388231214c:

gcalctool: upgrade to 5.32.0 (2012-12-11 01:54:24 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Andreas Müller (1):
lighttpd: follow oe-core to 1.4.32

Martin Jansa (10):
strongswam: disable systemd support in meta-oe and reenable it in
meta-systemd
qconnman-e: fix unpackaged files QA warning
qt4: rename bbappends to match new 4.8.4 version from oe-core
efl: upgrade to 1.7.3
e-base: bump EFL_SRCREV for E17 beta1 and EFL 1.7.3
e-base: bump EFL_SRCREV for E17 gamma
pixman: drop bbappend with only PRINC left
gnome-control-center: fix QA issue
glade3: disable html doc, fails to build
iotop: don't fail when site.py* does not exist

 meta-efl/classes/e-base.bbclass                                |  2 +-
 meta-efl/recipes-efl/efl/{ecore_1.7.2.bb => ecore_1.7.3.bb}    |  4 ++--
 meta-efl/recipes-efl/efl/{eeze_1.7.2.bb => edbus_1.7.3.bb}     |  4 ++--
 meta-efl/recipes-efl/efl/{edbus_1.7.2.bb => edje_1.7.3.bb}     |  4 ++--
 meta-efl/recipes-efl/efl/{edje_1.7.2.bb => eet_1.7.3.bb}       |  4 ++--
 meta-efl/recipes-efl/efl/{eet_1.7.2.bb => eeze_1.7.3.bb}       |  4 ++--
 meta-efl/recipes-efl/efl/efreet_1.7.2.bb                       | 10 ----------
 meta-efl/recipes-efl/efl/efreet_1.7.3.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/eina_1.7.2.bb                         | 10 ----------
 meta-efl/recipes-efl/efl/eina_1.7.3.bb                         | 10 ++++++++++
 meta-efl/recipes-efl/efl/eio_1.7.2.bb                          | 10 ----------
 meta-efl/recipes-efl/efl/eio_1.7.3.bb                          | 10 ++++++++++
 meta-efl/recipes-efl/efl/elementary_1.7.2.bb                   | 10 ----------
 meta-efl/recipes-efl/efl/elementary_1.7.3.bb                   | 10 ++++++++++
 meta-efl/recipes-efl/efl/embryo_1.7.2.bb                       | 10 ----------
 meta-efl/recipes-efl/efl/embryo_1.7.3.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/emotion_1.7.2.bb                      | 10 ----------
 meta-efl/recipes-efl/efl/emotion_1.7.3.bb                      | 10 ++++++++++
 meta-efl/recipes-efl/efl/ethumb_1.7.2.bb                       | 10 ----------
 meta-efl/recipes-efl/efl/ethumb_1.7.3.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb         | 10 ----------
 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb         | 10 ++++++++++
 meta-efl/recipes-efl/efl/evas_1.7.2.bb                         | 10 ----------
 meta-efl/recipes-efl/efl/evas_1.7.3.bb                         | 10 ++++++++++
 meta-efl/recipes-efl/efl/expedite_1.7.2.bb                     | 10 ----------
 meta-efl/recipes-efl/efl/expedite_1.7.3.bb                     | 10 ++++++++++
 .../gnome-control-center/gnome-control-center_2.32.1.bb        |  9 ++++-----
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb                 |  6 ++++++
 meta-oe/recipes-extended/iotop/iotop_0.4.4.bb                  |  7 ++++---
 meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend       |  1 -
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb                  |  2 ++
 meta-oe/recipes-qt/qconnman/qconnman.inc                       |  2 +-
 ...qt4-embedded_4.8.3.bbappend => qt4-embedded_4.8.4.bbappend} |  0
 ...qt4-x11-free_4.8.3.bbappend => qt4-x11-free_4.8.4.bbappend} |  0
 meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb         |  6 +++++-
 .../recipes-support/strongswan/strongswan_5.0.0.bbappend       |  8 ++++++++
 .../{lighttpd_1.4.31.bbappend => lighttpd_1.4.32.bbappend}     |  2 +-
 37 files changed, 142 insertions(+), 123 deletions(-)
 rename meta-efl/recipes-efl/efl/{ecore_1.7.2.bb => ecore_1.7.3.bb} (50%)
 rename meta-efl/recipes-efl/efl/{eeze_1.7.2.bb => edbus_1.7.3.bb} (41%)
 rename meta-efl/recipes-efl/efl/{edbus_1.7.2.bb => edje_1.7.3.bb} (41%)
 rename meta-efl/recipes-efl/efl/{edje_1.7.2.bb => eet_1.7.3.bb} (41%)
 rename meta-efl/recipes-efl/efl/{eet_1.7.2.bb => eeze_1.7.3.bb} (41%)
 delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eina_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/eina_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eio_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/eio_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.3.bb
 delete mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
 rename meta-oe/recipes-qt/qt4/{qt4-embedded_4.8.3.bbappend => qt4-embedded_4.8.4.bbappend} (100%)
 rename meta-oe/recipes-qt/qt4/{qt4-x11-free_4.8.3.bbappend => qt4-x11-free_4.8.4.bbappend} (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
 rename meta-systemd/oe-core/recipes-extended/lighttpd/{lighttpd_1.4.31.bbappend => lighttpd_1.4.32.bbappend} (85%)
Signature · 1 line
1.8.0.2
#1 lore raw

PATCH 1/11 strongswam: disable systemd support in meta-oe and reenable it in meta-systemd

* fixes:
strongswan-5.0.0: strongswan: Files/directories were installed but not shipped
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/strongswan.service

---
 meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb            | 6 +++++-
 .../meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend  | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb +5 -1
index 52c8bec..efacc8e 100644
@@ -5,7 +5,7 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gmp openssl flex-native flex bison-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2"
 SRC_URI[md5sum] = "c8b861305def7c0abae04f7bbefec212"
@@ -15,6 +15,10 @@ EXTRA_OECONF = "--disable-curl --disable-soup --disable-ldap \
 		--enable-gmp --disable-mysql --disable-sqlite \
 		--enable-openssl"
 
+SYSTEMD_UNITDIR ??= "no"
+
+EXTRA_OECONF += "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
+
 inherit autotools
 
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend new file +8 -0
new file mode 100644
index 0000000..a60a109
@@ -0,0 +1,8 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
Signature · 1 line
1.8.0.2
#2 lore raw

PATCH 2/11 qconnman-e: fix unpackaged files QA warning

In reply to Martin Jansa

* fixes:
qconnman-e-0.0+gitr1+f976b18c7c5584627224784801803e9fd3ebe0ff: qconnman-e: Files/directories were installed but not shipped
/usr/share
/usr/share/qconnman
/usr/share/qconnman/i18n
/usr/share/qconnman/i18n/pt_BR.qm

---
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb | 2 ++
 meta-oe/recipes-qt/qconnman/qconnman.inc      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-qt/qconnman/qconnman-e_git.bb +2 -0
index 87a3610..2fcd3da 100644
@@ -6,3 +6,5 @@ inherit qt4e
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
 EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
+
+FILES_${PN} += "${datadir}/qconnman/"
meta-oe/recipes-qt/qconnman/qconnman.inc +1 -1
index f26274b..44ad9a1 100644
@@ -4,7 +4,7 @@ DEPENDS = "connman"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
Signature · 1 line
1.8.0.2
#3 lore raw

PATCH 3/11 qt4: rename bbappends to match new 4.8.4 version from oe-core

In reply to Martin Jansa

From: Martin Jansa <[email protected]>

---
 .../qt4/{qt4-embedded_4.8.3.bbappend => qt4-embedded_4.8.4.bbappend}      | 0
 .../qt4/{qt4-x11-free_4.8.3.bbappend => qt4-x11-free_4.8.4.bbappend}      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-oe/recipes-qt/qt4/{qt4-embedded_4.8.3.bbappend => qt4-embedded_4.8.4.bbappend} (100%)
 rename meta-oe/recipes-qt/qt4/{qt4-x11-free_4.8.3.bbappend => qt4-x11-free_4.8.4.bbappend} (100%)
meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend renamed from meta-oe/recipes-qt/qt4/qt4-embedded_4.8.3.bbappend +0 -0
similarity index 100%
rename from meta-oe/recipes-qt/qt4/qt4-embedded_4.8.3.bbappend
rename to meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend renamed from meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend +0 -0
similarity index 100%
rename from meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend
rename to meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
Signature · 1 line
1.8.0.2
#4 lore raw

PATCH 4/11 efl: upgrade to 1.7.3

In reply to Martin Jansa
---
 meta-efl/recipes-efl/efl/{ecore_1.7.2.bb => ecore_1.7.3.bb} |  4 ++--
 meta-efl/recipes-efl/efl/{eeze_1.7.2.bb => edbus_1.7.3.bb}  |  4 ++--
 meta-efl/recipes-efl/efl/{edbus_1.7.2.bb => edje_1.7.3.bb}  |  4 ++--
 meta-efl/recipes-efl/efl/{edje_1.7.2.bb => eet_1.7.3.bb}    |  4 ++--
 meta-efl/recipes-efl/efl/{eet_1.7.2.bb => eeze_1.7.3.bb}    |  4 ++--
 meta-efl/recipes-efl/efl/efreet_1.7.2.bb                    | 10 ----------
 meta-efl/recipes-efl/efl/efreet_1.7.3.bb                    | 10 ++++++++++
 meta-efl/recipes-efl/efl/eina_1.7.2.bb                      | 10 ----------
 meta-efl/recipes-efl/efl/eina_1.7.3.bb                      | 10 ++++++++++
 meta-efl/recipes-efl/efl/eio_1.7.2.bb                       | 10 ----------
 meta-efl/recipes-efl/efl/eio_1.7.3.bb                       | 10 ++++++++++
 meta-efl/recipes-efl/efl/elementary_1.7.2.bb                | 10 ----------
 meta-efl/recipes-efl/efl/elementary_1.7.3.bb                | 10 ++++++++++
 meta-efl/recipes-efl/efl/embryo_1.7.2.bb                    | 10 ----------
 meta-efl/recipes-efl/efl/embryo_1.7.3.bb                    | 10 ++++++++++
 meta-efl/recipes-efl/efl/emotion_1.7.2.bb                   | 10 ----------
 meta-efl/recipes-efl/efl/emotion_1.7.3.bb                   | 10 ++++++++++
 meta-efl/recipes-efl/efl/ethumb_1.7.2.bb                    | 10 ----------
 meta-efl/recipes-efl/efl/ethumb_1.7.3.bb                    | 10 ++++++++++
 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb      | 10 ----------
 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb      | 10 ++++++++++
 meta-efl/recipes-efl/efl/evas_1.7.2.bb                      | 10 ----------
 meta-efl/recipes-efl/efl/evas_1.7.3.bb                      | 10 ++++++++++
 meta-efl/recipes-efl/efl/expedite_1.7.2.bb                  | 10 ----------
 meta-efl/recipes-efl/efl/expedite_1.7.3.bb                  | 10 ++++++++++
 25 files changed, 110 insertions(+), 110 deletions(-)
 rename meta-efl/recipes-efl/efl/{ecore_1.7.2.bb => ecore_1.7.3.bb} (50%)
 rename meta-efl/recipes-efl/efl/{eeze_1.7.2.bb => edbus_1.7.3.bb} (41%)
 rename meta-efl/recipes-efl/efl/{edbus_1.7.2.bb => edje_1.7.3.bb} (41%)
 rename meta-efl/recipes-efl/efl/{edje_1.7.2.bb => eet_1.7.3.bb} (41%)
 rename meta-efl/recipes-efl/efl/{eet_1.7.2.bb => eeze_1.7.3.bb} (41%)
 delete mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/efreet_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eina_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/eina_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/eio_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/eio_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/elementary_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/embryo_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/emotion_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/ethumb_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/evas_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/evas_1.7.3.bb
 delete mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.2.bb
 create mode 100644 meta-efl/recipes-efl/efl/expedite_1.7.3.bb
meta-efl/recipes-efl/efl/ecore_1.7.3.bb renamed from meta-efl/recipes-efl/efl/ecore_1.7.2.bb +2 -2
similarity index 50%
rename from meta-efl/recipes-efl/efl/ecore_1.7.2.bb
rename to meta-efl/recipes-efl/efl/ecore_1.7.3.bb
index 3679b71..d65309c 100644
@@ -7,5 +7,5 @@ SRC_URI = "\
   file://fix-ecore-fb-initialization.patch \
 "
 
-SRC_URI[md5sum] = "f6d086ea8bbe64651dc3b5d2e840d106"
-SRC_URI[sha256sum] = "0b9642a67f0d977c2a13ed83ac02387c99309db92a72bf1031482df65ee4a1c7"
+SRC_URI[md5sum] = "355ae8ec2793c89dc93ced936d853b89"
+SRC_URI[sha256sum] = "0e2facbc89dbf5182b5bf5628bcdb37fa837e7b5978ce3f4bf9839cfe06a8830"
meta-efl/recipes-efl/efl/edbus_1.7.3.bb renamed from meta-efl/recipes-efl/efl/eeze_1.7.2.bb +2 -2
similarity index 41%
rename from meta-efl/recipes-efl/efl/eeze_1.7.2.bb
rename to meta-efl/recipes-efl/efl/edbus_1.7.3.bb
index 4412629..d7c87aa 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "4a5d466a00989fe03abd218608cd1d99"
-SRC_URI[sha256sum] = "fbbf42665a2618a2ca7a8080c7a2617cad819b24b3cb3c4f54417aab67ddac97"
+SRC_URI[md5sum] = "c1eaa663812a04dcd5bdf3ea952f19d6"
+SRC_URI[sha256sum] = "f893304271b1b233933cb66ed03810d02bc47794f8c23119f656304632d6b7c9"
meta-efl/recipes-efl/efl/edje_1.7.3.bb renamed from meta-efl/recipes-efl/efl/edbus_1.7.2.bb +2 -2
similarity index 41%
rename from meta-efl/recipes-efl/efl/edbus_1.7.2.bb
rename to meta-efl/recipes-efl/efl/edje_1.7.3.bb
index 159517c..6232e72 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "c8b4c39efed63bdf503d45c8a94557a6"
-SRC_URI[sha256sum] = "e12146e7b6acca6a9f0fac5849a01ffcfa65004f7b1d5053cfb8c0e37d4dea98"
+SRC_URI[md5sum] = "b1901b4d98d1646b45ff27dfd9ff8b7c"
+SRC_URI[sha256sum] = "752c60f843b649d3bdfa51e78c13696ac1cd46374a8dbfe96c07cc7aba5381fb"
meta-efl/recipes-efl/efl/eet_1.7.3.bb renamed from meta-efl/recipes-efl/efl/edje_1.7.2.bb +2 -2
similarity index 41%
rename from meta-efl/recipes-efl/efl/edje_1.7.2.bb
rename to meta-efl/recipes-efl/efl/eet_1.7.3.bb
index 43d9f46..1b1c96e 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "20de3518260eeeed14f54e8d013e23c9"
-SRC_URI[sha256sum] = "fd512821f581b6d16998bac19e479ecf5a191940ba0e0b0a1250f6b04636d08c"
+SRC_URI[md5sum] = "6befcd8b1c12a44ff2c2c91bbbbe001b"
+SRC_URI[sha256sum] = "24c4f2fa8a186aa5e1a810beb58e03c806e26652f58aded6b1148c4cf44e98b3"
meta-efl/recipes-efl/efl/eeze_1.7.3.bb renamed from meta-efl/recipes-efl/efl/eet_1.7.2.bb +2 -2
similarity index 41%
rename from meta-efl/recipes-efl/efl/eet_1.7.2.bb
rename to meta-efl/recipes-efl/efl/eeze_1.7.3.bb
index 27e5178..c80fc5f 100644
@@ -6,5 +6,5 @@ SRC_URI = "\
   ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
 "
 
-SRC_URI[md5sum] = "fb3014a5227e466261a49eee5747597b"
-SRC_URI[sha256sum] = "03693c282db583d1a224d0134a61a3a138ad99cfa329f9c220f585bf8a4677f8"
+SRC_URI[md5sum] = "4ccc70135b1221a532206fb53c84e434"
+SRC_URI[sha256sum] = "22a47e477609dda00e8360f05648367c320289a7132cc2f012e830632da92c6b"
meta-efl/recipes-efl/efl/efreet_1.7.2.bb deleted +0 -10
deleted file mode 100644
index 92499c9..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "7490ccdb57d298e6226b4f5cb956c5c5"
-SRC_URI[sha256sum] = "ebb8175664f9c486bd112a4915bda794ef0ecc68833bb6726cd76a395e64ab94"
meta-efl/recipes-efl/efl/efreet_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..f5ed47b
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "64a279b4568a769f657b9c9820a0bf74"
+SRC_URI[sha256sum] = "bc337d6c2cf80358d25e885c3c3dd3098cbedf1b5e4ef8d2acab41b4870648df"
meta-efl/recipes-efl/efl/eina_1.7.2.bb deleted +0 -10
deleted file mode 100644
index 4feb9c2..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "5d0453d6e7eb6f2c1b4e40b8c5be6f20"
-SRC_URI[sha256sum] = "caa1be5cdf3ed450472d4fa114983762bf40699adff506e6b493e4e37c842018"
meta-efl/recipes-efl/efl/eina_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..71319dd
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "00669561a82bad4df4a6268f1957ae40"
+SRC_URI[sha256sum] = "94e312367a8d04a7d69627e5a3bb1eb4bd8de9d165c0288400527808ef43f956"
meta-efl/recipes-efl/efl/eio_1.7.2.bb deleted +0 -10
deleted file mode 100644
index cfdfe07..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "b8e3b115a63f423a70ce7459c0b77d58"
-SRC_URI[sha256sum] = "c4af1062c27d2e0fef6d6919df39921c832553ff448628a5d9fe3704186a714b"
meta-efl/recipes-efl/efl/eio_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..e90df9c
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "968f7672eb6ee96e4bdd2bbfe55e5e8a"
+SRC_URI[sha256sum] = "f63c02f04edc6c53e29b41488ca3749a8cae5bed76803d60ad80be4ca117c635"
meta-efl/recipes-efl/efl/elementary_1.7.2.bb deleted +0 -10
deleted file mode 100644
index dedc67d..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "589ae692eb8dbe73fa12b1587c8f877d"
-SRC_URI[sha256sum] = "582dd348e7dfcf76d7ec7fcfc3d4f6f8a73b653ffecf6979121a3bce190f98cf"
meta-efl/recipes-efl/efl/elementary_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..d066cb8
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2075fbbe8523027a3659ad08bfcf5a02"
+SRC_URI[sha256sum] = "043375ba63fa8619e053e9014566fc72f22522ef48daedcdfc62dfc1f3eb0a22"
meta-efl/recipes-efl/efl/embryo_1.7.2.bb deleted +0 -10
deleted file mode 100644
index dcf2155..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "4dd84e5c7f515b707e4d0fac92b60cc8"
-SRC_URI[sha256sum] = "48e068da62f3bcad7fcf0dad6715f5a0c1cc75ae05529cc39679aeb7560d6803"
meta-efl/recipes-efl/efl/embryo_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..91bec48
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "eacc4e3a3534965469136a2e7cdd076b"
+SRC_URI[sha256sum] = "3a7388225ce97432e4324f5c2da4d4aaa3e711b8a6e92021b4edd47fbed5099a"
meta-efl/recipes-efl/efl/emotion_1.7.2.bb deleted +0 -10
deleted file mode 100644
index fa681cb..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "e00a876a607cf6a99c5fc768d2fb69de"
-SRC_URI[sha256sum] = "a280b499a51b531a19c368c1f394b27dda4f6c1f5a0edd8f29036169a9402cef"
meta-efl/recipes-efl/efl/emotion_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..63578f5
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "aa1f96d4166edc154e773210e8ac8d21"
+SRC_URI[sha256sum] = "93f5f00127176701b946d0db941d5209c5ca13659e184a31c0883ac1e145ce5d"
meta-efl/recipes-efl/efl/ethumb_1.7.2.bb deleted +0 -10
deleted file mode 100644
index d5e1cea..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "33f8de3b590269b7dbe6960a0337b30f"
-SRC_URI[sha256sum] = "6dcdf94224903c17ac753a388e6a2d0c23ce525859db93f022c3cd2b8f9afe72"
meta-efl/recipes-efl/efl/ethumb_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..2a5e275
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "7394c4776a980490aea0bea5e35f05a4"
+SRC_URI[sha256sum] = "25090565d995029a4fb57ac82ded1470b1beb8c23eeadaf713a30ca0cf58bb29"
meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb deleted +0 -10
deleted file mode 100644
index e37de87..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "991f0ce50e203419f54cb148fb949bb9"
-SRC_URI[sha256sum] = "0ca06936cfe308593c36eb80ac80ad229f2bc3bdc9270b75f96e09595194caae"
meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..3f2e63d
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "e188843ccf4cdcf31f9645fdd28c9567"
+SRC_URI[sha256sum] = "98bf7896535ca9d454bbc5b84b59c619a4b0ac80fadd067a102d20f1a9ea5db0"
meta-efl/recipes-efl/efl/evas_1.7.2.bb deleted +0 -10
deleted file mode 100644
index e9171f9..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "4e412c79609ae107968c9c45c4b900c0"
-SRC_URI[sha256sum] = "2076608e6a9ac3331b17357c152b640ea0f3eccad24a9c270ad325d5434ab811"
meta-efl/recipes-efl/efl/evas_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..8dc4d32
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2a5bab8f87569d770b4a95fc0a382be4"
+SRC_URI[sha256sum] = "d47cb26a384e6d523aa18df4fd558d0415165322ba714b83d99799e8531c617b"
meta-efl/recipes-efl/efl/expedite_1.7.2.bb deleted +0 -10
deleted file mode 100644
index e7f5926..0000000
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "f7bbf5dc5bc1212d3116c5452b4a3510"
-SRC_URI[sha256sum] = "f8a4214e3d210396b267325268ba6fcc31a42634fab5bf2efcbc595dbfb2c25f"
meta-efl/recipes-efl/efl/expedite_1.7.3.bb new file +10 -0
new file mode 100644
index 0000000..f109a80
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "e13456be6c8c6276baeefa2b91d14e7b"
+SRC_URI[sha256sum] = "4b9ec22d25d5847998cd9a60ba2edd47e5e217183e661e60b8440252c62f916f"
Signature · 1 line
1.8.0.2
#5 lore raw

PATCH 5/11 e-base: bump EFL_SRCREV for E17 beta1 and EFL 1.7.3

In reply to Martin Jansa

* changelog:
http://www.enlightenment.org/p.php?p=news/show&l=&news_id=70
http://www.enlightenment.org/p.php?p=news/show&l=&news_id=71

---
 meta-efl/classes/e-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-efl/classes/e-base.bbclass +1 -1
index ab0063b..0c7fa8e 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "80174"
+EFL_SRCREV ?= "80477"
 
 ARM_INSTRUCTION_SET = "arm"
 
Signature · 1 line
1.8.0.2
#6 lore raw

PATCH 6/11 e-base: bump EFL_SRCREV for E17 gamma

In reply to Martin Jansa

* changelog:
http://www.enlightenment.org/p.php?p=news/show&l=&news_id=72

---
 meta-efl/classes/e-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-efl/classes/e-base.bbclass +1 -1
index 0c7fa8e..1124d53 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "80477"
+EFL_SRCREV ?= "80662"
 
 ARM_INSTRUCTION_SET = "arm"
 
Signature · 1 line
1.8.0.2
#7 lore raw

PATCH 7/11 pixman: drop bbappend with only PRINC left

In reply to Martin Jansa

* pixman in oe-core was upgraded to 0.28, so upgrade path is OK

---
 meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend deleted +0 -1
deleted file mode 100644
index d9f1c29..0000000
@@ -1 +0,0 @@
-PRINC := "${@int(PRINC) + 1}"
Signature · 1 line
1.8.0.2
#9 lore raw

PATCH 9/11 glade3: disable html doc, fails to build

In reply to Martin Jansa
---
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb +6 -0
index 8cd6a0e..049f7e3 100644
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "gtk+ gnome-doc-utils-native"
 
+PR = "r1"
+
 inherit autotools pkgconfig pythonnative
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
@@ -14,6 +16,10 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+do_configure_prepend() {
+  sed -i 's/HAVE_GNOME_DOC_UTILS/HAVE_GNOME_DOC_UTILS_IGNORED/g' ${S}/Makefile.am
+}
+
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
 FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
Signature · 1 line
1.8.0.2
#8 lore raw

PATCH 8/11 gnome-control-center: fix QA issue

In reply to Martin Jansa

* fixes:
gnome-control-center-2.32.1: non -staticdev package contains static .a library: gnome-control-center-dev path '/work/armv5te-oe-linux-gnueabi/gnome-control-center/2.32.1-r0/packages-split/gnome-control-center-dev/usr/lib/window-manager-settings/libmetacity.a' l

---
 .../gnome-control-center/gnome-control-center_2.32.1.bb          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +4 -5
index 59d81b4..ea4ce4b 100644
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra"
 
+PR = "r1"
+
 inherit gnome
 
 SRC_URI[archive.md5sum] = "b4e8ab5c7556ae07addbfcfb4fa2f761"
@@ -22,8 +24,5 @@ FILES_${PN} += "${datadir}/icon* \
                 ${datadir}/desktop-directories \
                "
 FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
-FILES_${PN}-dev += "${libdir}/window-manager-settings/*a"
-
-
-
-
+FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la"
+FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a"
Signature · 1 line
1.8.0.2
#13 lore raw

PATCH 10/11 iotop: don't fail when site.py* does not exist

In reply to Martin Jansa

* also remove usr/share/share removal, it's taken care of in distutils.bbclass now

---
 meta-oe/recipes-extended/iotop/iotop_0.4.4.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta-oe/recipes-extended/iotop/iotop_0.4.4.bb +4 -3
index 8be41af..3b8150b 100644
@@ -4,6 +4,8 @@ DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \
  a table of current I/O usage by processes on the system."
 HOMEPAGE = "http://guichaz.free.fr/iotop/"
 
+PR = "r1"
+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
 
@@ -14,9 +16,8 @@ SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d68648
 inherit distutils
 
 do_install_append() {
-	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo
-	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py
-	[ -d ${D}${datadir}/share ] && rmdir ${D}${datadir}/share
+	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true
+	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py  || true
 }
 
 RDEPENDS_${PN} = "python-distutils python-curses python-textutils \
Signature · 1 line
1.8.0.2
#14 lore raw

PATCH 11/11 lighttpd: follow oe-core to 1.4.32

In reply to Martin Jansa

From: Andreas Müller <[email protected]>

---
 .../lighttpd/{lighttpd_1.4.31.bbappend => lighttpd_1.4.32.bbappend}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-systemd/oe-core/recipes-extended/lighttpd/{lighttpd_1.4.31.bbappend => lighttpd_1.4.32.bbappend} (85%)
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend renamed from meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend +1 -1
similarity index 85%
rename from meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
rename to meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
index b016bdc..0e08358 100644
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd
 
Signature · 1 line
1.8.0.2
#10 lore raw

Re: [meta-oe][PATCH 09/11] glade3: disable html doc, fails to build

In reply to Martin Jansa
Quoted 30 lines · Martin Jansa
---
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb +6 -1
index 8cd6a0e..049f7e3 100644
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "gtk+ gnome-doc-utils-native"
 
+PR = "r1"
+
 inherit autotools pkgconfig pythonnative
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
@@ -14,6 +16,10 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+do_configure_prepend() {
+  sed -i 's/HAVE_GNOME_DOC_UTILS/HAVE_GNOME_DOC_UTILS_IGNORED/g' ${S}/Makefile.am
+}
+
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
 FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
--
Quoted 2 lines

1.8.0.2

I am using the documentation from time to time. Don't misunderstand
me: For now I have no problem disabling it but could you send the error information so we know what fails - maybe later there is a chance for fixing it.

Andreas

#12 lore raw

PATCH v2 9/11 glade3: disable help, fails to build

In reply to Martin Jansa

* fixes:

| http://www.oasis-open.org/docbook/xml/4.1.2/ent/iso-grk1.ent:1: validity error : All markup of the conditional section is not in the same entity
| HTTP/1.1 200 OK
|    ^
| http://www.oasis-open.org/docbook/xml/4.1.2/ent/iso-grk1.ent:1: parser error : Content error in the external subset
| HTTP/1.1 200 OK
|       ^
| unable to parse sl/glade3.xml
| make[2]: *** [glade3-sl.omf] Error 1
| make[2]: *** Waiting for unfinished jobs....
| make[2]: Leaving directory `/OE/jansa-test/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/glade3/3.8.2-r0/glade3-3.8.2/help'
---
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb +6 -0
index 8cd6a0e..733b8ed 100644
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "gtk+ gnome-doc-utils-native"
 
+PR = "r1"
+
 inherit autotools pkgconfig pythonnative
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
@@ -14,6 +16,10 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+do_configure_prepend() {
+	sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am
+}
+
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
 FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
Signature · 1 line
1.8.0.2
#15 lore raw

PATCH 12/12 emotion: disable generic-vlc backend

In reply to Martin Jansa

* we don't have vlc in DEPENDS, but when it happens to be built before emotion, it causes undeterministic builds and unpackaged files emotion-1.7.3: emotion: Files/directories were installed but not shipped
/usr/lib/emotion/utils/em_generic_vlc

---
 meta-efl/recipes-efl/efl/emotion.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-efl/recipes-efl/efl/emotion.inc +2 -2
index 134ef40..a4ef02d 100644
@@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base eio"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+EXTRA_OECONF = "--disable-xine --disable-generic-vlc --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
Signature · 1 line
1.8.0.2
#11 lore raw

Re: [meta-oe][PATCH 09/11] glade3: disable html doc, fails to build

In reply to Andreas Müller
Quoted 23 lines · Andreas Müller
Quoted 22 lines · Martin Jansa
---
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb +2 -0
index 8cd6a0e..049f7e3 100644
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "gtk+ gnome-doc-utils-native"
 
+PR = "r1"
+
 inherit autotools pkgconfig pythonnative
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
@@ -14,6 +16,10 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
Quoted 14 lines
Quoted 10 lines
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb +4 -1
+do_configure_prepend() {
+  sed -i 's/HAVE_GNOME_DOC_UTILS/HAVE_GNOME_DOC_UTILS_IGNORED/g' ${S}/Makefile.am
+}
+
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
 FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
--

1.8.0.2

I am using the documentation from time to time. Don't misunderstand
me: For now I have no problem disabling it but could you send the error information so we know what fails - maybe later there is a chance for fixing it.

Extended description in PATCHv2 and this bug is also related:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416