[oe] [meta-gnome/meta-oe/meta-xfce/V2 01/20] midori: update to 0.5.2
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../midori/{midori_0.5.0.bb = midori_0.5.2.bb}|4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta-gnome/recipes-connectivity/midori/{midori_0.5.0.bb =
midori_0.5.2.bb} (89%)
diff --git a/meta-gnome/recipes-connectivity/midori/midori_0.5.0.bb
b/meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
similarity index 89%
rename from meta-gnome/recipes-connectivity/midori/midori_0.5.0.bb
rename to meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
index f046375..f4f6221 100644
--- a/meta-gnome/recipes-connectivity/midori/midori_0.5.0.bb
+++ b/meta-gnome/recipes-connectivity/midori/midori_0.5.2.bb
@@ -6,8 +6,8 @@ DEPENDS = webkit-gtk libsoup-2.4 openssl python-native
python-docutils-native l
SRC_URI =
http://archive.xfce.org/src/apps/midori/0.5/midori-${PV}.tar.bz2;name=midori \
-SRC_URI[midori.md5sum] = ad11685633e23f8173e2cd947d945cce
-SRC_URI[midori.sha256sum] =
d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0
+SRC_URI[midori.md5sum] = e2c1e0b617397ec9f9eef4fdb47b3565
+SRC_URI[midori.sha256sum] =
a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c
inherit gtk-icon-cache pkgconfig vala pythonnative
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 00/20] updates and fixes
V1-V2:
* polkit/networkmanager+datetime(new) rule into own recipe [13-15]: This is more
flexible so distro/image can decide to use it or not
* [12+19+20]: new
The following changes since commit f7fc06cc5143b66b47c83965e0e430809c17ab57:
nostromo: make SRC_URI work for multilib builds. (2013-06-18 23:40:06 +0100)
are available in the git repository at:
git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
updates-and-fixes2
Andreas Müller (20):
midori: update to 0.5.2
tumbler: add curl to dependencies to make build deterministic
tumbler: update to 0.1.29
poppler: update to 0.22.4
xfce4-xkb-plugin: update to 0.7.0 tarball
atkmm: add glibmm to DEPENDS
p11-kit: initial add 0.19.1
gcr: initial add 3.8.2
mozjs: initial add 17.0.0
polkit: update to 0.111
networkmanager: rework dependencies/configure-option and use PACKAGECONFIG
networkmanager: replace absolute paths
polkit-group-rule.inc: add a common template for polkit-rules/user-groups
polkit-group-rule-network: initial add
polkit-group-rule-datetime: initial add
lxdm: remove consolekit dependencies in systemd environment and fix build
xfce4-power-manager: rework polkit/consolekit selection and implement
polkit/systemd shutdown
xarchiver: update to 0.5.3 for various bugfixes
xfwm4: don't turn into unusablity after setting system time backwards
xfce4-genmon-plugin: Allow timer period to be set at 250ms resolution
.../midori/{midori_0.5.0.bb = midori_0.5.2.bb}|4 +-
meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb | 20 +
.../networkmanager/networkmanager_0.9.8.0.bb | 20 +-
...-not-include-RequiredDefines.h-for-depend.patch | 35 +
meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb | 35 +
.../files/50-org.freedesktop.NetworkManager.rules |8 +
.../files/50-org.freedesktop.timedate1.rules |8 +
...ession-Set-error-if-we-cannot-find-a-sess.patch | 70 --
...ession-Actually-return-TRUE-if-a-session-.patch | 46 --
.../polkit-0.104/obsolete_automake_macros.patch| 23 -
.../polkit/polkit-group-rule-datetime.bb | 14 +
.../polkit/polkit-group-rule-network.bb| 14 +
.../recipes-extended/polkit/polkit-group-rule.inc |9 +
.../{polkit-0.104 = polkit}/polkit-1_pam.patch|0
.../polkit/{polkit_0.104.bb = polkit_0.111.bb}| 51 +-
meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb |2 +-
...heck-only-for-ck-connector-in-case-consol.patch | 48 ++
meta-oe/recipes-graphics/lxdm/lxdm_git.bb |6 +-
meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb | 18 +
...sh.cc-add-cast-to-fix-build-for-enable-fi.patch | 42 --
.../{poppler_0.22.3.bb = poppler_0.22.4.bb} |7 +-
.../{xarchiver_0.5.2.bb = xarchiver_git.bb} | 16 +-
...-period-to-be-set-at-250ms-resolution.-Pa.patch | 36 +
.../genmon/xfce4-genmon-plugin_3.4.0.bb|2 +
...xkb-plugin_git.bb = xfce4-xkb-plugin_0.7.0.bb} | 13 +-
.../{tumbler_0.1.27.bb = tumbler_0.1.29.bb} |6 +-
...shutdown-reboot-functionality-for-systemd.patch | 677
.../xfce4-power-manager_1.2.0.bb |9 +-
...-display-events-when-time-is-set-backward.patch | 33 +
meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb |1 +
30 files changed, 1038 insertions(+), 235 deletions(-)
rename meta-gnome/recipes-connectivity/midori/{midori_0.5.0.bb =
midori_0.5.2.bb} (89%)
create mode 100644 meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
create mode 100644
meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
create mode 100644 meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
create mode 100644
meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
create mode 100644
meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
delete mode 100644
meta-oe/recipes-extended/polkit/polkit-0.104/0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch
delete mode 100644
meta-oe/recipes-extended/polkit/polkit-0.104/0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch
delete mode 100644
meta-oe/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
create mode 100644
meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
create mode 100644 meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
create mode 100644 meta-oe/recipes-extended/polkit/polkit-group-rule.inc
rename meta-oe/recipes-extended/polkit/{polkit-0.104 =
polkit}/polkit-1_pam.patch (100%)
rename meta-oe/recipes-extended/polkit/{polkit_0.104.bb = polkit_0.111.bb}
(50%)
create mode 100644
meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
create mode 100644 meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb
delete mode 100644
meta-oe/recipes-support/poppler/poppler/0001-splash
[oe] [meta-gnome/meta-oe/meta-xfce/V2 03/20] tumbler: update to 0.1.29
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../{tumbler_0.1.27.bb = tumbler_0.1.29.bb} |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/tumbler/{tumbler_0.1.27.bb = tumbler_0.1.29.bb}
(89%)
diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb
b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb
rename to meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb
index 402762c..fd28e84 100644
--- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb
+++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb
@@ -6,8 +6,8 @@ DEPENDS = dbus-glib freetype gdk-pixbuf poppler curl
inherit xfce
-SRC_URI[md5sum] = 3fa90528c3e7e77d8ace4bffcf0a2748
-SRC_URI[sha256sum] =
4c60b3b92877257fcc54d18acbbe4ad73c84a7ff7608a430ad5a05b452923869
+SRC_URI[md5sum] = f844215c5e3918eae58abdd85f146780
+SRC_URI[sha256sum] =
c3bac4ee609e22be6c7f01a4fdf6086bc6b57940d82f99570a2d9d547a32fc93
INSANE_SKIP_${PN} = dev-so
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 02/20] tumbler: add curl to dependencies to make build deterministic
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb index 93a95d5..402762c 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.27.bb @@ -2,7 +2,7 @@ DESCRIPTION=Thumbnail service implementing the thumbnail management D-Bus speci SECTION = x11/libs LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 -DEPENDS = dbus-glib freetype gdk-pixbuf poppler +DEPENDS = dbus-glib freetype gdk-pixbuf poppler curl inherit xfce -- 1.7.4.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 05/20] xfce4-xkb-plugin: update to 0.7.0 tarball
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...xkb-plugin_git.bb = xfce4-xkb-plugin_0.7.0.bb} | 13 +++--
1 files changed, 3 insertions(+), 10 deletions(-)
rename meta-xfce/recipes-panel-plugins/xkb/{xfce4-xkb-plugin_git.bb =
xfce4-xkb-plugin_0.7.0.bb} (63%)
diff --git a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_git.bb
b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb
similarity index 63%
rename from meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_git.bb
rename to meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb
index a1f1a2f..d27e4cd 100644
--- a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_git.bb
+++ b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.7.0.bb
@@ -6,17 +6,10 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b
inherit xfce-panel-plugin
-DEPENDS += libxklavier libwnck librsvg garcon
-
-PV = 0.5.4.3+gitr${SRCPV}
+SRC_URI[md5sum] = 7fbc3d8c84d6662d819dd1803f0fee34
+SRC_URI[sha256sum] =
28367c309863581ae4de529b35bdedf5a1c918096a9a2e6e771554cba7bf5a6a
-SRC_URI =
git://git.xfce.org/panel-plugins/xfce4-xkb-plugin;protocol=git;branch=master
-SRCREV = b98b82d8522842e38a6355f9144f8348a6ab2aeb
-S = ${WORKDIR}/git
-
-do_configure_prepend() {
-NOCONFIGURE=yes ./autogen.sh
-}
+DEPENDS += libxklavier libwnck librsvg garcon
FILES_${PN} += ${datadir}/xfce4/xkb
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 04/20] poppler: update to 0.22.4
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...sh.cc-add-cast-to-fix-build-for-enable-fi.patch | 42
.../{poppler_0.22.3.bb = poppler_0.22.4.bb} |7 +--
2 files changed, 2 insertions(+), 47 deletions(-)
delete mode 100644
meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
rename meta-oe/recipes-support/poppler/{poppler_0.22.3.bb =
poppler_0.22.4.bb} (80%)
diff --git
a/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
b/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
deleted file mode 100644
index 291c7ee..000
---
a/meta-oe/recipes-support/poppler/poppler/0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8bd7428c28750f682fe3cc1a35291e5696c17638 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
-Date: Sun, 12 May 2013 18:00:06 +0200
-Subject: [PATCH] splash/Splash.cc: add cast to fix build for
- --enable-fixedpoint
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| Splash.cc:1497:30: error: conversion from 'SplashCoord {aka FixedPoint}' to
'Guchar {aka unsigned char}' is ambiguous
-| Splash.cc:1497:30: note: candidates are:
-| In file included from SplashMath.h:27:0,
-| from Splash.cc:44:
-| ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
-| ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
-| ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
-
-Upstream-Status: Submitted [1]
-
-[1] http://lists.freedesktop.org/archives/poppler/2013-May/010247.html
-
-Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
- splash/Splash.cc |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/splash/Splash.cc b/splash/Splash.cc
-index cd0ec72..6630370 100644
a/splash/Splash.cc
-+++ b/splash/Splash.cc
-@@ -1494,7 +1494,7 @@ inline void Splash::drawAALine(SplashPipe *pipe, int x0,
int x1, int y) {
- #endif
-
- if (t != 0) {
-- pipe-shape = aaGamma[t];
-+ pipe-shape = (int)aaGamma[t];
- (this-*pipe-run)(pipe);
- updateModX(x);
- updateModY(y);
---
-1.7.4.4
-
diff --git a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
b/meta-oe/recipes-support/poppler/poppler_0.22.4.bb
similarity index 80%
rename from meta-oe/recipes-support/poppler/poppler_0.22.3.bb
rename to meta-oe/recipes-support/poppler/poppler_0.22.4.bb
index c8ff8a4..f1f4561 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.22.4.bb
@@ -2,14 +2,11 @@ DESCRIPTION = Poppler is a PDF rendering library based on
the xpdf-3.0 code bas
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r2
-
SRC_URI = \
http://poppler.freedesktop.org/${PN}-${PV}.tar.gz \
-file://0001-splash-Splash.cc-add-cast-to-fix-build-for-enable-fi.patch \
-SRC_URI[md5sum] = be915388eaad6865cee5a156c8119ec1
-SRC_URI[sha256sum] =
916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431
+SRC_URI[md5sum] = 49d55921ce795778c7231fe9f2fe923b
+SRC_URI[sha256sum] =
4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b
DEPENDS = fontconfig jpeg zlib gtk+ cairo tiff lcms
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 06/20] atkmm: add glibmm to DEPENDS
error was: | configure:15671: error: Package requirements (atk = 1.12 glibmm-2.4 = 2.36) were not met: | | No package 'glibmm-2.4' found Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb b/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb index 35ba589..12522f2 100644 --- a/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb +++ b/meta-oe/recipes-gnome/atk/atkmm_2.22.7.bb @@ -5,7 +5,7 @@ LICENSE = LGPLv2.1 GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe -DEPENDS = atk +DEPENDS = atk glibmm inherit gnome autotools pkgconfig -- 1.7.4.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 07/20] p11-kit: initial add 0.19.1
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb | 18 ++
1 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb
diff --git a/meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb
b/meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb
new file mode 100644
index 000..c5b6129
--- /dev/null
+++ b/meta-oe/recipes-support/p11-kit/p11-kit_0.19.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = Provides a way to load and enumerate PKCS#11 modules
+LICENSE = BSD
+LIC_FILES_CHKSUM = file://COPYING;md5=02933887f609807fbb57aa4237d14a50
+
+inherit autotools gettext pkgconfig
+
+DEPENDS = libtasn1 libffi
+
+SRC_URI = http://p11-glue.freedesktop.org/releases/${PN}-${PV}.tar.gz;
+SRC_URI[md5sum] = d96046ab6ac00d005342caf416ed76ab
+SRC_URI[sha256sum] =
94fbed372c11d0a404762aad966e54eb4f44c1d5b871a1b79a1a3b4cf36ed256
+
+FILES_${PN}-dev += \
+${libdir}/p11-kit-proxy.so \
+${libdir}/pkcs11/p11-kit-trust.so \
+
+FILES_${PN}-dev += ${libdir}/pkcs11/*.la
+FILES_${PN}-dbg += ${libdir}/pkcs11/.debug
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 08/20] gcr: initial add 3.8.2
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb | 20
1 files changed, 20 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
new file mode 100644
index 000..65309da
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = A library for bits of crypto UI and parsing etc
+HOMEPAGE = http://www.gnome.org/;
+BUGTRACKER = https://bugzilla.gnome.org/;
+
+LICENSE = GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605
+
+DEPENDS = gtk+3 p11-kit
+
+inherit autotools gnome gtk-doc
+
+GNOME_COMPRESS_TYPE=xz
+
+SRC_URI[archive.md5sum] = f5e66afcab19897a0de0590735329fb1
+SRC_URI[archive.sha256sum] =
a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1
+
+FILES_${PN} += \
+${datadir}/dbus-1 \
+${datadir}/gcr-3 \
+
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 09/20] mozjs: initial add 17.0.0
later versions of polkit will need it
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...-not-include-RequiredDefines.h-for-depend.patch | 35
meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb | 35
2 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644
meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
create mode 100644 meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
diff --git
a/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
new file mode 100644
index 000..bc141d9
--- /dev/null
+++
b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
@@ -0,0 +1,35 @@
+From 0a61b0b98c152f10404ccbdeeac583a486638a7a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Thu, 6 Jun 2013 18:36:01 +0200
+Subject: [PATCH] js.pc.in: do not include RequiredDefines.h for depending
+ packages
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+in our cross environment the would fail with:
+
+| cc1: fatal error: /usr/include/js-17.0/js/RequiredDefines.h: No such file or
directory
+
+and currently it only defines __STDC_LIMIT_MACROS
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ js.pc.in |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/js.pc.in b/js.pc.in
+index 13d761d..a95a7bd 100644
+--- a/js.pc.in
b/js.pc.in
+@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
+ Version: @MOZILLA_VERSION@
+ Requires.private: @NSPR_PKGCONF_CHECK@
+ Libs: -L${libdir} -l@LIBRARY_NAME@
+-Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h
-I${includedir}/@MODULE@
++Cflags: -I${includedir}/@MODULE@
+--
+1.7.6.5
+
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
new file mode 100644
index 000..311372f
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
@@ -0,0 +1,35 @@
+SUMMARY = SpiderMonkey is Mozilla's JavaScript engine written in C/C++
+LICENSE = MPL-2.0
+LIC_FILES_CHKSUM = file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad
+
+SRC_URI = \
+http://ftp.mozilla.org/pub/mozilla.org/js/${PN}${PV}.tar.gz \
+file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \
+
+SRC_URI[md5sum] = 20b6f8f1140ef6e47daa3b16965c9202
+SRC_URI[sha256sum] =
321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba
+
+S = ${WORKDIR}/${PN}${PV}/js/src
+
+inherit autotools pkgconfig perlnative
+
+DEPENDS += nspr
+
+# nspr's package-config is ignored so set libs manually
+EXTRA_OECONF = \
+--target=${TARGET_SYS} \
+--host=${BUILD_SYS} \
+--build=${BUILD_SYS} \
+--prefix=${prefix} \
+--with-nspr-libs='-lplds4 -lplc4 -lnspr4' \
+--enable-threadsafe \
+
+
+# mozjs requires autoreconf 2.13
+do_configure() {
+./configure ${EXTRA_OECONF}
+}
+
+PACKAGES =+ lib${PN}
+FILES_lib${PN} += ${libdir}/lib*.so
+FILES_${PN}-dev += ${bindir}/js17-config
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 17/20] xfce4-power-manager: rework polkit/consolekit selection and implement polkit/systemd shutdown
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- ...shutdown-reboot-functionality-for-systemd.patch | 677 .../xfce4-power-manager_1.2.0.bb |9 +- 2 files changed, 684 insertions(+), 2 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-Add-shutdown-reboot-functionality-for-systemd.patch diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-Add-shutdown-reboot-functionality-for-systemd.patch b/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-Add-shutdown-reboot-functionality-for-systemd.patch new file mode 100644 index 000..d5c5487 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-Add-shutdown-reboot-functionality-for-systemd.patch @@ -0,0 +1,677 @@ +From 02688f73ed26097c693d43f76e4b7d5698e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com +Date: Fri, 7 Jun 2013 18:38:42 +0200 +Subject: [PATCH] Add shutdown/reboot functionality for systemd +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [2] + +[1] http://git.xfce.org/xfce/xfce4-session/commit/?id=ae28aef315a7a6b90f1649ce6d1f30b842791cbf +[2] https://bugzilla.xfce.org/show_bug.cgi?id=10167 + +Signed-off-by: Andreas Müller schnitzelt...@googlemail.com +--- + configure.ac |2 + + src/Makefile.am| 14 +++- + src/xfpm-manager.c | 29 ++- + src/xfpm-power.c | 66 ++- + src/xfpm-systemd.c | 245 + src/xfpm-systemd.h | 60 + + 6 files changed, 411 insertions(+), 5 deletions(-) + create mode 100644 src/xfpm-systemd.c + create mode 100644 src/xfpm-systemd.h + +diff --git a/configure.ac b/configure.ac +index 633b340..1db2036 100644 +--- a/configure.ac b/configure.ac +@@ -95,6 +95,8 @@ if test x$ac_cv_enable_polkit = xno; then + polkit=no + else + AC_MSG_RESULT([yes]) ++m4_define([polkit_minimum_version], [0.100]) ++XDT_CHECK_PACKAGE([SYSTEMD], [polkit-gobject-1], [polkit_minimum_version]) + AC_DEFINE(ENABLE_POLKIT, 1 , [PolicyKit support]) + polkit=yes + fi +diff --git a/src/Makefile.am b/src/Makefile.am +index 0435bed..9b7fdd0 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -18,8 +18,6 @@ xfce4_power_manager_SOURCES = \ + xfpm-xfconf.h \ + xfpm-disks.c\ + xfpm-disks.h\ +- xfpm-console-kit.c \ +- xfpm-console-kit.h \ + egg-idletime.c \ + egg-idletime.h \ + xfpm-backlight.c\ +@@ -39,6 +37,16 @@ xfce4_power_manager_SOURCES = \ + xfpm-errors.c \ + xfpm-errors.h + ++if ENABLE_POLKIT ++xfce4_power_manager_SOURCES +=\ ++ xfpm-systemd.c \ ++ xfpm-systemd.h ++else ++xfce4_power_manager_SOURCES += \ ++ xfpm-console-kit.c \ ++ xfpm-console-kit.h ++endif ++ + xfce4_power_manager_CFLAGS =\ + -I$(top_srcdir) \ + -I$(top_srcdir)/common \ +@@ -52,6 +60,7 @@ xfce4_power_manager_CFLAGS =\ + $(LIBXFCE4UI_CFLAGS)\ + $(XFCONF_CFLAGS)\ + $(LIBNOTIFY_CFLAGS) \ ++ $(SYSTEMD_CFLAGS) \ + $(XRANDR_CFLAGS)\ + $(DPMS_CFLAGS) \ + $(PLATFORM_CPPFLAGS)\ +@@ -70,6 +79,7 @@ xfce4_power_manager_LDADD = \ + $(LIBXFCE4UI_LIBS) \ + $(XFCONF_LIBS) \ + $(LIBNOTIFY_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(XRANDR_LIBS) \ + $(DPMS_LIBS) + +diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c +index 472ee3e..9bfb53c 100644 +--- a/src/xfpm-manager.c b/src/xfpm-manager.c +@@ -43,7 +43,6 @@ + #include xfpm-disks.h + #include xfpm-dpms.h + #include xfpm-manager.h +-#include xfpm-console-kit.h + #include xfpm-button.h + #include xfpm-backlight.h + #include xfpm-inhibit.h +@@ -58,6 +57,12 @@ + #include xfpm-enum-types.h + #include xfpm-dbus-monitor.h + ++#ifdef ENABLE_POLKIT ++#include xfpm-systemd.h ++#else ++#include xfpm-console-kit.h ++#endif ++ + static void xfpm_manager_finalize (GObject *object); + + static void xfpm_manager_dbus_class_init (XfpmManagerClass *klass); +@@ -80,7 +85,11 @@ struct XfpmManagerPrivate + XfpmButton *button; + XfpmXfconf *conf; + XfpmBacklight *backlight; ++#ifdef ENABLE_POLKIT
[oe] [meta-gnome/meta-oe/meta-xfce/V2 15/20] polkit-group-rule-datetime: initial add
add user-group 'datetime' allowing members to change date/time/timezone settings
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../files/50-org.freedesktop.timedate1.rules |8
.../polkit/polkit-group-rule-datetime.bb | 14 ++
2 files changed, 22 insertions(+), 0 deletions(-)
create mode 100644
meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
create mode 100644
meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
diff --git
a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
new file mode 100644
index 000..95b0e0f
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
@@ -0,0 +1,8 @@
+/* give group 'datetime' rights to change settings */
+/* based upon
http://lists.freedesktop.org/archives/systemd-devel/2013-March/009576.html */
+
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf(org.freedesktop.timedate1.) == 0
subject.isInGroup(datetime)) {
+return polkit.Result.YES;
+ }
+});
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
new file mode 100644
index 000..373e4f0
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = Create usergroup datetime. All members off this group are
allowed set date/time/timezone via system dbus
+LICENSE = MIT
+LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58
+
+require polkit-group-rule.inc
+
+SRC_URI = file://50-org.freedesktop.timedate1.rules
+
+do_install() {
+install -m 0755 ${WORKDIR}/50-org.freedesktop.timedate1.rules
${D}${sysconfdir}/polkit-1/rules.d
+}
+
+USERADD_PACKAGES = ${PN}
+GROUPADD_PARAM_${PN} = --system datetime
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 16/20] lxdm: remove consolekit dependencies in systemd environment and fix build
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...heck-only-for-ck-connector-in-case-consol.patch | 48
meta-oe/recipes-graphics/lxdm/lxdm_git.bb |6 ++-
2 files changed, 52 insertions(+), 2 deletions(-)
create mode 100644
meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
diff --git
a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
new file mode 100644
index 000..e2ba52a
--- /dev/null
+++
b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
@@ -0,0 +1,48 @@
+From 8657bfcfc5c26382989001e9b6d18295d740c709 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Fri, 7 Jun 2013 14:13:41 +0200
+Subject: [PATCH] configure: check only for ck-connector in case consolekit is
+ enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+it failed for --disable-consolekit with
+
+| lxdm.c:70:26: fatal error: ck-connector.h: No such file or directory
+| compilation terminated.
+| make[2]: *** [lxdm_binary-lxdm.o] Error 1
+
+Upstream-Status: submitted [1]
+
+[1] http://sourceforge.net/mailarchive/message.php?msg_id=31010893
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ configure.ac |3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9e21a22..49ba944 100644
+--- a/configure.ac
b/configure.ac
+@@ -28,8 +28,6 @@ if test x$USE_PAM != xno ; then
+fi])
+ fi
+
+-AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
+-
+ # Checks for header files.
+ AC_PATH_X
+ AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
+@@ -102,6 +100,7 @@ if test x$enable_consolekit = xyes ; then
+ AC_SUBST(CONSOLEKIT_LIBS)],[
+ echo ConsoleKit devel package not found
+ ])
++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
+ fi
+
+
+--
+1.7.6.5
+
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index 6675691..8767e98 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -8,6 +8,7 @@ SRC_URI = \
file://lxdm-pam \
file://lxdm-pam-debug \
${@base_contains(DISTRO_TYPE, debug, ,
file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch,d)} \
+file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \
LXDM_PAM = ${@base_contains(DISTRO_TYPE, debug, lxdm-pam-debug,
lxdm-pam,d)}
@@ -17,7 +18,8 @@ PV = 0.4.2+git${SRCPV}
PE = 1
PR = r7
-DEPENDS = cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11
libxcb pango
+DEPENDS = cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango
+DEPENDS += ${@base_contains(DISTRO_FEATURES, systemd, , consolekit,
d)}
# combine oe-core way with angstrom DISTRO_TYPE
DISTRO_TYPE ?= ${@base_contains(IMAGE_FEATURES, debug-tweaks, debug,
,d)}
@@ -26,7 +28,7 @@ inherit autotools gettext systemd
S = ${WORKDIR}/git
-EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'systemd',
'--with-systemdsystemunitdir=${systemd_unitdir}/system/',
'--without-systemdsystemunitdir', d)}
+EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'systemd',
'--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit',
'--without-systemdsystemunitdir', d)}
do_compile_append() {
# default background configured not available / no password field
available / no default screensaver
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 19/20] xfwm4: don't turn into unusablity after setting system time backwards
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...-display-events-when-time-is-set-backward.patch | 33
meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb |1 +
2 files changed, 34 insertions(+), 0 deletions(-)
create mode 100644
meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch
diff --git
a/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch
b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch
new file mode 100644
index 000..08fd76b
--- /dev/null
+++
b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch
@@ -0,0 +1,33 @@
+From e87977696f03b0c9f72884f8e3e3ec3248dfd80a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Tue, 18 Jun 2013 12:46:42 +0200
+Subject: [PATCH] don't block display events when time is set backwards
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://bugzilla.xfce.org/show_bug.cgi?id=10184
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ src/display.c |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/display.c b/src/display.c
+index 00318d5..651bc7a 100644
+--- a/src/display.c
b/src/display.c
+@@ -733,7 +733,7 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent
*ev)
+ break;
+ }
+
+-if ((timestamp != (guint32) CurrentTime)
TIMESTAMP_IS_BEFORE(display-current_time, timestamp))
++if ((timestamp != (guint32) CurrentTime) /*
TIMESTAMP_IS_BEFORE(display-current_time, timestamp)*/)
+ {
+ display-current_time = timestamp;
+ }
+--
+1.7.6.5
+
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
index 687339b..86ac20e 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
@@ -8,6 +8,7 @@ inherit xfce update-alternatives
SRC_URI[md5sum] = 10de50c79ed944cbb9c87741062c2a76
SRC_URI[sha256sum] =
380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740
+SRC_URI +=
file://0001-don-t-block-display-events-when-time-is-set-backward.patch
python populate_packages_prepend () {
themedir = d.expand('${datadir}/themes')
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 13/20] polkit-group-rule.inc: add a common template for polkit-rules/user-groups
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../recipes-extended/polkit/polkit-group-rule.inc |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-extended/polkit/polkit-group-rule.inc
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
new file mode 100644
index 000..8d1a89a
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
@@ -0,0 +1,9 @@
+# polkit must prepare polkid group
+DEPENDS += polkit
+
+inherit allarch useradd
+
+do_install_prepend() {
+install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d
+chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d
+}
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 20/20] xfce4-genmon-plugin: Allow timer period to be set at 250ms resolution
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- ...-period-to-be-set-at-250ms-resolution.-Pa.patch | 36 .../genmon/xfce4-genmon-plugin_3.4.0.bb|2 + 2 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch diff --git a/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch b/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch new file mode 100644 index 000..28c0eb1 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch @@ -0,0 +1,36 @@ +From 2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 Mon Sep 17 00:00:00 2001 +From: John Lindgren john.lindg...@aol.com +Date: Tue, 21 Aug 2012 19:33:45 -0400 +Subject: [PATCH] Allow timer period to be set at 250ms resolution. Patch + from Miguel Guedes. Closes: #9102. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Applied [1] + +[1] http://git.xfce.org/panel-plugins/xfce4-genmon-plugin/commit/?id=2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 + +Signed-off-by: Andreas Müller schnitzelt...@googlemail.com +--- + panel-plugin/config_gui.c |4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c +index a4c891d..90e55c1 100644 +--- a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c +@@ -106,8 +106,8 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, + gtk_widget_show (alignment1); + gtk_container_add (GTK_CONTAINER (eventbox1), alignment1); + +-wSc_Period_adj = gtk_adjustment_new (15, 1, 60*60*24, 1, 1, 0); +-wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), 1, 0); ++wSc_Period_adj = gtk_adjustment_new (15, .25, 60*60*24, .25, 1, 0); ++wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), .25, 2); + gtk_widget_show (wSc_Period); + gtk_container_add (GTK_CONTAINER (alignment1), wSc_Period); + gtk_tooltips_set_tip (tooltips, wSc_Period, +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb index e5ef85f..a13db62 100644 --- a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb +++ b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe inherit xfce-panel-plugin +SRC_URI += file://0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch + SRC_URI[md5sum] = 24108b339bb040ed360266f53a245224 SRC_URI[sha256sum] = b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387 -- 1.7.4.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 11/20] networkmanager: rework dependencies/configure-option and use PACKAGECONFIG
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../networkmanager/networkmanager_0.9.8.0.bb | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git
a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
index 5b53f7f..6957f35 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
@@ -4,8 +4,7 @@ SECTION = net/misc
LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=cbbffd568227ada506640fe950a4823b
-DEPENDS = libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux
ppp
-DEPENDS += ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
+DEPENDS = libnl dbus dbus-glib udev wireless-tools gnutls util-linux ppp
inherit gnome gettext systemd
@@ -33,7 +32,14 @@ EXTRA_OECONF = \
--with-tests \
-EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'systemd',
'--with-systemdsystemunitdir=${systemd_unitdir}/system/',
'--without-systemdsystemunitdir', d)}
+PACKAGECONFIG ??=
${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}
+PACKAGECONFIG[systemd] = \
+--with-systemdsystemunitdir=${systemd_unitdir}/system
--with-session-tracking=systemd --enable-polkit, \
+--without-systemdsystemunitdir=, \
+polkit \
+
+# consolekit is not picked by shlibs, so add it to RDEPENDS too
+PACKAGECONFIG[consolekit] =
--with-session-tracking=consolekit,,consolekit,consolekit
# Work around dbus permission problems since we lack a proper at_console
do_install_prepend() {
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 18/20] xarchiver: update to 0.5.3 for various bugfixes
xarchiver is unmaintained for long time. Since I think it is worth to invest
further development I did collect pending patches, wrote some myself, pushed
into my git repo and contacted the developer. He signalled 'green light' for me
maintaining xarchiver in the future. As long as I have not yet created/uploaded
a tarball let us use my git-repo for the sources.
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../{xarchiver_0.5.2.bb = xarchiver_git.bb} | 16 +++-
1 files changed, 11 insertions(+), 5 deletions(-)
rename meta-xfce/recipes-apps/xarchiver/{xarchiver_0.5.2.bb =
xarchiver_git.bb} (60%)
diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.2.bb
b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
similarity index 60%
rename from meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.2.bb
rename to meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
index 6482adc..b616267 100644
--- a/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.2.bb
+++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
@@ -1,22 +1,28 @@
DESCRIPTION = Lightweight, desktop independent GTK+ archive manager
HOMEPAGE = http://xarchiver.sourceforge.net;
SECTION = x11
-PR = r3
LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
DEPENDS = gtk+ glib-2.0 xfce4-dev-tools-native
-SRC_URI = ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.bz2
-SRC_URI[md5sum] = 2bc7f06403cc6582dd4a8029ec9d038d
-SRC_URI[sha256sum] =
cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa677ad2a
+SRC_URI = git://gitorious.org/xfce/xarchiver.git;protocol=git;branch=master
+SRCREV = e80e90528c9aab2fe36d9078b945b44c05cc20d3
+PV = 0.5.3
+S = ${WORKDIR}/git
inherit gettext pkgconfig autotools gtk-icon-cache
# install tap files for thunar-archive-plugin in
${libdir}/thunar-archive-plugin
EXTRA_OECONF += --libexecdir=${libdir}
+EXTRA_OECONF += --enable-maintainer-mode
+
+do_configure_prepend() {
+ NOCONFIGURE=yes ./autogen.sh
+}
+
FILES_${PN} += ${libdir}/thunar-archive-plugin
-RRECOMMENDS_${PN} = lzop zip tar bzip2 unzip
+RRECOMMENDS_${PN} = lzop zip tar bzip2 unzip xz
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 12/20] networkmanager: replace absolute paths
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../networkmanager/networkmanager_0.9.8.0.bb |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
index 6957f35..07f0c28 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb
@@ -50,14 +50,14 @@ do_install_prepend() {
}
do_install_append () {
-install -d ${D}/etc/dbus-1/event.d
+install -d ${D}${sysconfdir}/dbus-1/event.d
# Additional test binaries
-install -d ${D}/usr/bin
-install -m 0755 ${S}/test/.libs/libnm* ${D}/usr/bin
+install -d ${D}${bindir}
+install -m 0755 ${S}/test/.libs/libnm* ${D}${bindir}
# Install an empty VPN folder as nm-connection-editor will happily
segfault without it :o.
# With or without VPN support built in ;).
-install -d ${D}/etc/NetworkManager/VPN
+install -d ${D}${sysconfdir}/NetworkManager/VPN
}
PACKAGES =+ libnmutil libnmglib libnmglib-vpn ${PN}-tests
${PN}-bash-completion
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-oe/meta-xfce/V2 14/20] polkit-group-rule-network: initial add
add user-group 'network' allowing memebers to change networkmanager settings
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../files/50-org.freedesktop.NetworkManager.rules |8
.../polkit/polkit-group-rule-network.bb| 14 ++
2 files changed, 22 insertions(+), 0 deletions(-)
create mode 100644
meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
create mode 100644 meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
diff --git
a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
new file mode 100644
index 000..4b50cf8
--- /dev/null
+++
b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
@@ -0,0 +1,8 @@
+/* give group 'network' rights to change settings */
+/* taken from
https://wiki.archlinux.org/index.php/NetworkManager#Set_up_PolicyKit_permissions
*/
+
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf(org.freedesktop.NetworkManager.) == 0
subject.isInGroup(network)) {
+return polkit.Result.YES;
+ }
+});
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
new file mode 100644
index 000..bba1136
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = Create usergroup network. All members off this group are
allowed to modify networkmanager settings
+LICENSE = MIT
+LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58
+
+require polkit-group-rule.inc
+
+SRC_URI = file://50-org.freedesktop.NetworkManager.rules
+
+do_install() {
+install -m 0755 ${WORKDIR}/50-org.freedesktop.NetworkManager.rules
${D}${sysconfdir}/polkit-1/rules.d
+}
+
+USERADD_PACKAGES = ${PN}
+GROUPADD_PARAM_${PN} = --system network
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-gnome 1/2] abiword: remove abiword.inc - it is of no use
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-gnome/recipes-gnome/abiword/abiword.inc | 64 --
1 files changed, 0 insertions(+), 64 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword.inc
diff --git a/meta-gnome/recipes-gnome/abiword/abiword.inc
b/meta-gnome/recipes-gnome/abiword/abiword.inc
deleted file mode 100644
index 39c590c..000
--- a/meta-gnome/recipes-gnome/abiword/abiword.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-DESCRIPTION = AbiWord is free word processing program similar to Microsoft(r)
Word
-SECTION = gnome/office
-HOMEPAGE = http://www.abiword.org;
-LICENSE = GPLv2
-
-DEPENDS = libgsf libglade libfribidi libxml2 wv
-RRECOMMENDS_${PN}= glibc-gconv-ibm850 glibc-gconv-cp1252 \
- glibc-gconv-iso8859-15 glibc-gconv-iso8859-1
-
-# Share this file between recipes that use cvs and that pull tarballs
-# (one day change this to differentiate automatically based on PV and set the
-# SRC_URI and S var directly)
-RELURI =
http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;
-RELSRC = ${WORKDIR}/abiword-${PV}/abi
-
-CVSURI = cvs://anoncvs:anon...@anoncvs.abisource.com/cvsroot;module=abi
-CVSSRC = ${WORKDIR}/abi
-
-#want 2.x from 2.x.y for the installation directory
-SHRT_VER =
${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}
-
-FILES_${PN} += \
-${datadir}/icons/* \
-${datadir}/mime-info \
-${datadir}/abiword-${SHRT_VER}/glade \
-${datadir}/abiword-${SHRT_VER}/system.profile-en \
-${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
-
-
-#${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
-#${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE =
-
-# This is a minimalistic AbiWord build
-#
-# if you are planning to build plugins, make sure to comment out the
-# --disable-exports options
-
-EXTRA_OECONF = --enable-embedded=poky\
---disable-printing \
---with-sys-wv \
---disable-exports \
---disable-spellcheck
-
-# TODO -- refactor this, so that instead of two strings and profiles
-# packages we have lots of locale packages, each with a set of strings and
-# a profile
-#
-PACKAGES += abiword-strings abiword-systemprofiles
-
-FILES_abiword-strings += ${datadir}/abiword-${SHRT_VER}/strings
-FILES_abiword-systemprofiles +=
${datadir}/abiword-${SHRT_VER}/system.profile*
-
-# AbiWord configure.ac does not play nicely with autoreconf
-# so use the autogen.sh script that comes with AbiWord
-#
-do_configure() {
-cd ${S}
-export NOCONFIGURE=no; ./autogen.sh
-oe_runconf
-}
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-gnome 2/2] asio: fix runtime dependencies for images with dev-pkgs in IMAGE_FEATURES
asio-dev created REDEPENS on asio which was not existent. This caused do_rootfs
for other packages fail with something like:
| * satisfy_dependencies_for: Cannot satisfy the following dependencies for
abiword-dev:
| *asio (= 1.4.1-r0.0) *
| * opkg_install_cmd: Cannot install package abiword-dev.
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/recipes-support/asio/asio.inc |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-support/asio/asio.inc
b/meta-oe/recipes-support/asio/asio.inc
index 190ec0f..49c236f 100644
--- a/meta-oe/recipes-support/asio/asio.inc
+++ b/meta-oe/recipes-support/asio/asio.inc
@@ -11,3 +11,4 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2
inherit autotools
+ALLOW_EMPTY_${PN} = 1
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [oe-commits] Jonathan Liu : qt-creator: add new recipe for version 2.7.2
On Mon, Jul 8, 2013 at 10:30 AM, g...@git.openembedded.org wrote:
Module: meta-openembedded.git
Branch: master
Commit: 4d2b8ed90614a21d8d7d7c38d013c0c74d9c
URL:
http://git.openembedded.org/?p=meta-openembedded.gita=commit;h=4d2b8ed90614a21d8d7d7c38d013c0c74d9c
Author: Jonathan Liu net...@gmail.com
Date: Sat Jul 6 02:46:58 2013 +
qt-creator: add new recipe for version 2.7.2
Signed-off-by: Jonathan Liu net...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb | 30
+
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb
b/meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb
new file mode 100644
index 000..2948d81
--- /dev/null
+++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = Lightweight, cross-platform integrated development
environment
+
+HOMEPAGE = http://qt-project.org/;
+LICENSE = LGPLv2.1
+LIC_FILES_CHKSUM =
file://LGPL_EXCEPTION.TXT;md5=eb6c371255e1262c55ae9b652a90b528 \
+file://LICENSE.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad
+SECTION = qt/app
+
+SRC_URI =
http://download.qt-project.org/official_releases/qtcreator/2.7/${PV}/${BP}-src.tar.gz;
+SRC_URI[md5sum] = 7f1c10740784d3edf2347c27be21fd1a
+SRC_URI[sha256sum] =
5df913faa43a5fbf44fb1f25faaf6d258134b8f9e6b8ef8a21277136dec9e189
+
+S = ${WORKDIR}/${BP}-src
+
+inherit qt4x11
+
+do_install() {
+ oe_runmake INSTALL_ROOT=${D}${prefix} install
+ oe_runmake INSTALL_ROOT=${D}${prefix} install_docs
+ rm -f ${D}${libdir}/qtcreator/lib*.so
+}
+
+FILES_${PN} += ${datadir}/icons \
+${datadir}/qtcreator \
+${libdir}/qtcreator/*
+FILES_${PN}-dbg += ${datadir}/qtcreator/*/*/*/*/.debug \
+${libdir}/qtcreator/.debug \
+${libdir}/qtcreator/*/*/.debug
+RRECOMMENDS_${PN} += packagegroup-core-buildessential \
+ packagegroup-qt-toolchain-target
I get
Log data follows:
| DEBUG: Executing python function sysroot_cleansstate
| DEBUG: Python function sysroot_cleansstate finished
| DEBUG: Executing shell function do_configure
| NOTE: using qmake spec in
/home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/share/qt4/mkspecs/linux-gnueabi-oe-g++,
using profiles ''
| Project MESSAGE: Cannot build Qt Creator with Qt version .
| Project ERROR: Use at least Qt 4.8.0.
| ERROR: Error calling
/home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/qmake2
on qtcreator.pro
| ERROR: Function failed: do_configure (see
/home/andreas/tmp/oe-core-eglibc/work/cortexa8hf-vfp-neon-angstrom-linux-gnueabi/qt-creator/2.7.2-r0/temp/log.do_configure.29576
for further information)
Is it possible that iti is caused by checking host's qt version (this is 4.7.4)?
Andreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [oe-commits] Jonathan Liu : qt-creator: add new recipe for version 2.7.2
On Mon, Jul 15, 2013 at 3:03 PM, Jonathan Liu net...@gmail.com wrote:
On 15/07/2013 7:03 PM, Andreas Müller wrote:
On Mon, Jul 8, 2013 at 10:30 AM, g...@git.openembedded.org wrote:
Module: meta-openembedded.git
Branch: master
Commit: 4d2b8ed90614a21d8d7d7c38d013c0c74d9c
URL:
http://git.openembedded.org/?p=meta-openembedded.gita=commit;h=4d2b8ed90614a21d8d7d7c38d013c0c74d9c
Author: Jonathan Liu net...@gmail.com
Date: Sat Jul 6 02:46:58 2013 +
qt-creator: add new recipe for version 2.7.2
Signed-off-by: Jonathan Liu net...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb | 30
+
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb
b/meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb
new file mode 100644
index 000..2948d81
--- /dev/null
+++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.7.2.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = Lightweight, cross-platform integrated development
environment
+
+HOMEPAGE = http://qt-project.org/;
+LICENSE = LGPLv2.1
+LIC_FILES_CHKSUM =
file://LGPL_EXCEPTION.TXT;md5=eb6c371255e1262c55ae9b652a90b528 \
+
file://LICENSE.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad
+SECTION = qt/app
+
+SRC_URI =
http://download.qt-project.org/official_releases/qtcreator/2.7/${PV}/${BP}-src.tar.gz;
+SRC_URI[md5sum] = 7f1c10740784d3edf2347c27be21fd1a
+SRC_URI[sha256sum] =
5df913faa43a5fbf44fb1f25faaf6d258134b8f9e6b8ef8a21277136dec9e189
+
+S = ${WORKDIR}/${BP}-src
+
+inherit qt4x11
+
+do_install() {
+ oe_runmake INSTALL_ROOT=${D}${prefix} install
+ oe_runmake INSTALL_ROOT=${D}${prefix} install_docs
+ rm -f ${D}${libdir}/qtcreator/lib*.so
+}
+
+FILES_${PN} += ${datadir}/icons \
+${datadir}/qtcreator \
+${libdir}/qtcreator/*
+FILES_${PN}-dbg += ${datadir}/qtcreator/*/*/*/*/.debug \
+${libdir}/qtcreator/.debug \
+${libdir}/qtcreator/*/*/.debug
+RRECOMMENDS_${PN} += packagegroup-core-buildessential \
+ packagegroup-qt-toolchain-target
I get
Log data follows:
| DEBUG: Executing python function sysroot_cleansstate
| DEBUG: Python function sysroot_cleansstate finished
| DEBUG: Executing shell function do_configure
| NOTE: using qmake spec in
/home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/share/qt4/mkspecs/linux-gnueabi-oe-g++,
using profiles ''
| Project MESSAGE: Cannot build Qt Creator with Qt version .
| Project ERROR: Use at least Qt 4.8.0.
| ERROR: Error calling
/home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/qmake2
on qtcreator.pro
| ERROR: Function failed: do_configure (see
/home/andreas/tmp/oe-core-eglibc/work/cortexa8hf-vfp-neon-angstrom-linux-gnueabi/qt-creator/2.7.2-r0/temp/log.do_configure.29576
for further information)
Is it possible that iti is caused by checking host's qt version (this is
4.7.4)?
Andreas
Are you using the latest openembedded-core master? These have been many
fixes for Qt.
For example:
http://cgit.openembedded.org/openembedded-core/commit/?id=dcaa40e65d986587fa7c44f4285bbd0883478cc3
Regards,
Jonathan
Thanks for the helping hint. You are right I am not using latest
oe-core. After cherry-picking qt-related patches (especially the one
you mentioned) configure passes.
But now I fail for known ARM issue [1]
-I.moc/release-shared -I.uic -o .obj/release-shared/botan.o
../3rdparty/botan/botan.cpp
| ../3rdparty/botan/botan.cpp:46220:21: fatal error: cpuid.h: No such
file or directory
|#include cpuid.h
| ^
| compilation terminated.
| make[3]: *** [.obj/release-shared/botan.o] Error 1
Have not found a solution yet. FWIW qt-creator 2.8.0 fails same.
Andreas
[1] https://bugreports.qt-project.org/browse/QTCREATORBUG-8107
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 09/12] tumbler: add dependency on xfce4-dev-tools
On Fri, Aug 9, 2013 at 10:54 AM, Martin Jansa martin.ja...@gmail.com wrote: * tumbler configure needs XDT_I18N macro provided by xfce4-dev-tools | tumbler-0.1.29/configure: line 13752: syntax error near unexpected token `$linguas' | tumbler-0.1.29/configure: line 13752: `XDT_I18N($linguas)' | Configure failed. The contents of all config.log files follows to aid debugging Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb index fd28e84..286dad2 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb @@ -2,7 +2,7 @@ DESCRIPTION=Thumbnail service implementing the thumbnail management D-Bus speci SECTION = x11/libs LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 -DEPENDS = dbus-glib freetype gdk-pixbuf poppler curl +DEPENDS = dbus-glib freetype gdk-pixbuf poppler curl xfce4-dev-tools inherit xfce -- 1.8.3.2 I think xfce4-dev-tools-native would be the better depends Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking] ntp: enable systemd-timedated control for ntp.service
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-networking/recipes-support/ntp/ntp.inc |5 +
meta-networking/recipes-support/ntp/ntp/ntpd.list |1 +
2 files changed, 6 insertions(+), 0 deletions(-)
create mode 100644 meta-networking/recipes-support/ntp/ntp/ntpd.list
diff --git a/meta-networking/recipes-support/ntp/ntp.inc
b/meta-networking/recipes-support/ntp/ntp.inc
index 79e7401..ebfa222 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -22,6 +22,7 @@ SRC_URI =
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
file://ntpd.service \
file://sntp.service \
file://sntp \
+ file://ntpd.list \
inherit autotools update-rc.d systemd
@@ -63,6 +64,10 @@ do_install_append() {
install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/
+
+# see http://www.freedesktop.org/wiki/Software/systemd/timedated/
+install -d ${D}${libdir}/systemd/ntp-units.d
+install -m 0644 ${WORKDIR}/ntpd.list
${D}${libdir}/systemd/ntp-units.d/60-ntpd.list
}
PACKAGES += ntpdate sntp ${PN}-tickadj ${PN}-utils
diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd.list
b/meta-networking/recipes-support/ntp/ntp/ntpd.list
new file mode 100644
index 000..d1fe6b7
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp/ntpd.list
@@ -0,0 +1 @@
+ntpd.service
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking] ntp: disable automatic panic shutdown for ntpd
Taken from [1]: However, if the difference between the client time and server time is greater than the panic threshold, which defaults to 1000 s, the daemon will send a message to the system log and shut down without setting the clock. On RTC-less or 'fresh' systems with unpredicatble inital date ntpd will stop with work undone (note: I did NOT find the message mentioned above - so it took long way to fix). This is a wide use case for using NTP in production: No need for initial datetime setup by some operator. [1] http://doc.ntp.org/4.1.1/debug.htm Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- .../recipes-support/ntp/ntp/ntpd.service |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-networking/recipes-support/ntp/ntp/ntpd.service index bd87b1e..eb9c030 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntpd.service +++ b/meta-networking/recipes-support/ntp/ntp/ntpd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/run/ntpd.pid -ExecStart=/usr/bin/ntpd -p /run/ntpd.pid +ExecStart=/usr/bin/ntpd -p /run/ntpd.pid -g [Install] WantedBy=multi-user.target -- 1.7.6.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 1/9] libcanberra: add PACKAGES_DYNAMIC so we use the splitted packages
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../libcanberra/libcanberra_0.29.bb|1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index 89cbce0..378fddc 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -32,6 +32,7 @@ python populate_packages_prepend() {
}
PACKAGES =+ ${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd
+PACKAGES_DYNAMIC += ^libcanberra-.*
FILES_${PN} = ${bindir}/ ${libdir}/${BPN}.so.*
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 0/9] minor libcanberra cleanup / new xfce stuff
[1-3] libcanberra: While working on event sounds libcanberra needed some love.
Sounds still doesn't work properly in gtk2 environment. There will be
follow ups.
[4-9] Updates + new datetime setter for XFCE
Andreas Müller (9):
libcanberra: add PACKAGES_DYNAMIC so we use the splitted packages
libcanberra: remove r0 - it is of no use
libcanberra: handle alsa and pulsaudio by PACKAGECONFIG - defaults
based upon DISTRO_FEATURES
libxfce4ui: update to git head
xfce4-settings: move to schnitzeltony's git repo to get new datetime
setter
xfwm4: move to git repo
xfce4-weather-plugin: update to 0.8.3
xfce4-equake-plugin: initial add 1.3.3
packagegroup-xfce-extended: add xfce4-equake-plugin
.../libcanberra/libcanberra_0.29.bb| 12 +-
.../equake/xfce4-equake-plugin_1.3.3.bb| 13 +
.../weather/files/port-to-libxfce4ui.patch | 104 --
.../weather/xfce4-weather-plugin_0.7.4.bb | 23 -
.../weather/xfce4-weather-plugin_0.8.3.bb | 11 +
.../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 17 +-
.../packagegroups/packagegroup-xfce-extended.bb|1 +
...the-settings-manager-window-size-bug-9384.patch | 155 ---
.../0001-add-cursor-theme-xfce-invisible.patch |8 +-
...ngs-dialog-add-touchscreen-pointer-option.patch | 1083 +---
...tect-a-change-of-pointer-device-used-and-.patch | 10 +-
...e4-settings_4.11.0.bb = xfce4-settings_git.bb} | 23 +-
.../xfwm4/{xfwm4_4.10.1.bb = xfwm4_git.bb}| 17 +-
13 files changed, 90 insertions(+), 1387 deletions(-)
create mode 100644
meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.3.bb
delete mode 100644
meta-xfce/recipes-panel-plugins/weather/files/port-to-libxfce4ui.patch
delete mode 100644
meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb
create mode 100644
meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb
delete mode 100644
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch
rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.11.0.bb =
xfce4-settings_git.bb} (64%)
rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.10.1.bb = xfwm4_git.bb} (70%)
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 3/9] libcanberra: handle alsa and pulsaudio by PACKAGECONFIG - defaults based upon DISTRO_FEATURES
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../libcanberra/libcanberra_0.29.bb| 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index 6bb974c..da94c20 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -4,7 +4,7 @@ LICENSE = LGPLv2.1+
LIC_FILES_CHKSUM = file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03
-DEPENDS = alsa-lib gstreamer gtk+ gtk+3 libtool libvorbis pulseaudio
+DEPENDS = gstreamer gtk+ gtk+3 libtool libvorbis
inherit autotools
@@ -14,9 +14,7 @@ SRC_URI[sha256sum] =
127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8
EXTRA_OECONF = \
--enable-null \
---enable-alsa \
--enable-gstreamer \
---enable-pulse \
--disable-oss \
--enable-gtk \
--enable-gtk3 \
@@ -24,6 +22,12 @@ EXTRA_OECONF = \
--disable-lynx \
+PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES','alsa','alsa','',d)} \
+
${@base_contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \
+
+PACKAGECONFIG[alsa] = --enable-alsa, --disable-alsa, alsa-lib
+PACKAGECONFIG[pulseaudio] = --enable-pulse, --disable-pulse, pulseaudio
+
python populate_packages_prepend() {
plugindir = d.expand('${libdir}/${P}/')
do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$',
'libcanberra-%s', '%s support library', extra_depends='' )
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 4/9] libxfce4ui: update to git head
* in commit f30f9742e64ea5ec3b23d977b904f24799d773d6 the signature for
xfce_shortcut_conflict_dialog was changed. This change is required for
xfce4-setings HEAD. In the next patch of this series the development
of a datetime setter for xfce4-settings will be introduced and this
is put on top of xfce4-setings HEAD.
* there has been no release since 04.2012
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 17 +
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index b5eb604..594358d 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -2,14 +2,23 @@ DESCRIPTION = Xfce4 Widget library and X Window System
interaction
SECTION = x11/libs
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=252890d9eee26aab7b432e8b8a616475
-PR = r1
DEPENDS = gtk+ intltool libxfce4util startup-notification xfconf glade3
inherit xfce
-SRC_URI +=
file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch
-SRC_URI[md5sum] = 6df1ce474a3d4885aee31cda9dbc9192
-SRC_URI[sha256sum] =
a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2
+SRC_URI = \
+git://git.xfce.org/xfce/libxfce4ui;protocol=git \
+file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
+
+SRCREV = 530b72f50fcbd8cb4b970fcc97be0321bf78183e
+PV = 4.10.0+git${SRCPV}
+S = ${WORKDIR}/git
+
+EXTRA_OECONF += --enable-maintainer-mode --disable-debug
+
+do_configure_prepend() {
+ NOCONFIGURE=yes ./autogen.sh
+}
FILES_${PN}-dbg += ${libdir}/glade3/modules/.debug
FILES_${PN}-dev += ${libdir}/glade3/modules/*.la \
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 2/9] libcanberra: remove r0 - it is of no use
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- .../libcanberra/libcanberra_0.29.bb|1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb index 378fddc..6bb974c 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03 DEPENDS = alsa-lib gstreamer gtk+ gtk+3 libtool libvorbis pulseaudio -PR = r0 inherit autotools -- 1.7.6.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 8/9] xfce4-equake-plugin: initial add 1.3.3
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../equake/xfce4-equake-plugin_1.3.3.bb| 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644
meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.3.bb
diff --git
a/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.3.bb
b/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.3.bb
new file mode 100644
index 000..95d1d66
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.3.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = Equake XFCE is a panel plugin for the XFCE panel which monitors
earthquakes and displays an update each time a new earthquake occurs.
+HOMEPAGE = http://freecode.com/projects/equake-xfce;
+SECTION = x11/application
+LICENSE = GPLv3
+LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+
+inherit xfce-panel-plugin
+
+SRC_URI =
http://www.e-quake.org/wp-uploads/2013/09/xfce4-equake-plugin-${PV}.tar.gz;
+SRC_URI[md5sum] = fa1e934f5b7e522efc4e30a99278f908
+SRC_URI[sha256sum] =
ea37e691606dbcd705f98cecccabd69b870c7acd008f47faae6d0fee21fe14a2
+
+FILES_${PN} += ${libdir}/xfce4/panel-plugins/xfce4-equake-plugin
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 6/9] xfwm4: move to git repo
follow libxfce4ui API change [1]
[1]
http://git.xfce.org/xfce/xfwm4/commit/settings-dialogs/xfwm4-settings.c?id=21ebbe4722b01763822157f9242fc865a9687c68
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../xfwm4/{xfwm4_4.10.1.bb = xfwm4_git.bb}| 17 ++---
1 files changed, 14 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.10.1.bb = xfwm4_git.bb} (70%)
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
similarity index 70%
rename from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
rename to meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
index 86ac20e..b72d44f 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
@@ -6,9 +6,20 @@ DEPENDS = virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui
xfconf libwnck dbu
inherit xfce update-alternatives
-SRC_URI[md5sum] = 10de50c79ed944cbb9c87741062c2a76
-SRC_URI[sha256sum] =
380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740
-SRC_URI +=
file://0001-don-t-block-display-events-when-time-is-set-backward.patch
+SRC_URI = \
+git://git.xfce.org/xfce/xfwm4;protocol=git \
+file://0001-don-t-block-display-events-when-time-is-set-backward.patch \
+
+
+SRCREV = bce3062d0879ab8504c446f99ad57c9fd76c5097
+S = ${WORKDIR}/git
+PV = 4.10.1+git${SRCPV}
+
+EXTRA_OECONF += --enable-maintainer-mode
+
+do_configure_prepend() {
+ NOCONFIGURE=yes ./autogen.sh
+}
python populate_packages_prepend () {
themedir = d.expand('${datadir}/themes')
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 9/9] packagegroup-xfce-extended: add xfce4-equake-plugin
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../packagegroups/packagegroup-xfce-extended.bb|1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index e2ed864..059d8c9 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -42,6 +42,7 @@ RRECOMMENDS_${PN} = \
xfce4-mount-plugin \
xfce4-brightness-plugin \
xfce4-closebutton-plugin \
+xfce4-equake-plugin \
\
thunar-media-tags-plugin \
thunar-archive-plugin \
--
1.7.6.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 7/9] xfce4-weather-plugin: update to 0.8.3
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- .../weather/files/port-to-libxfce4ui.patch | 104 .../weather/xfce4-weather-plugin_0.7.4.bb | 23 - .../weather/xfce4-weather-plugin_0.8.3.bb | 11 ++ 3 files changed, 11 insertions(+), 127 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/weather/files/port-to-libxfce4ui.patch delete mode 100644 meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb create mode 100644 meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb diff --git a/meta-xfce/recipes-panel-plugins/weather/files/port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/weather/files/port-to-libxfce4ui.patch deleted file mode 100644 index 968d84f..000 --- a/meta-xfce/recipes-panel-plugins/weather/files/port-to-libxfce4ui.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 24da1964f72429b0b4d20e0805cbd8346179527f Mon Sep 17 00:00:00 2001 -From: Matias De lellis mati8...@gmail.com -Date: Mon, 5 Sep 2011 14:17:29 -0300 -Subject: [PATCH] Port xfce4-weather-plugin to libxfce4ui - - configure.ac |2 +- - panel-plugin/Makefile.am |4 ++-- - panel-plugin/weather-config.c |2 +- - panel-plugin/weather-search.c |2 +- - panel-plugin/weather-summary.c |2 +- - panel-plugin/weather.c |2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 04f466a..d1bb58e 100644 a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ dnl *** - XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) - XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) - XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) --XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) -+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1]) - XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0]) - -diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am -index 50fc962..ed06da1 100644 a/panel-plugin/Makefile.am -+++ b/panel-plugin/Makefile.am -@@ -33,7 +33,7 @@ xfce4_weather_plugin_SOURCES = \ - - xfce4_weather_plugin_CFLAGS = \ - $(LIBXFCE4PANEL_CFLAGS) \ -- $(LIBXFCEGUI4_CFLAGS) \ -+ $(LIBXFCE4UI_CFLAGS)\ - $(LIBXFCE4UTIL_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBXML_CFLAGS) -@@ -41,7 +41,7 @@ xfce4_weather_plugin_CFLAGS = \ - xfce4_weather_plugin_LDADD = \ - $(LIBXFCE4PANEL_LIBS) \ - $(LIBXFCE4UTIL_LIBS)\ -- $(LIBXFCEGUI4_LIBS) \ -+ $(LIBXFCE4UI_LIBS) \ - $(GTK_LIBS) \ - $(LIBXML_LIBS) \ - $(LIBRESOLV) -diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c -index 3023e11..d183e75 100644 a/panel-plugin/weather-config.c -+++ b/panel-plugin/weather-config.c -@@ -20,7 +20,7 @@ - #endif - - #include string.h --#include libxfcegui4/libxfcegui4.h -+#include libxfce4ui/libxfce4ui.h - - #include weather-parsers.h - #include weather-data.h -diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c -index c43ad15..dba395f 100644 a/panel-plugin/weather-search.c -+++ b/panel-plugin/weather-search.c -@@ -21,7 +21,7 @@ - - #include string.h - --#include libxfcegui4/libxfcegui4.h -+#include libxfce4ui/libxfce4ui.h - - #include weather-parsers.h - #include weather-data.h -diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c -index 36eeb14..b584c7d 100644 a/panel-plugin/weather-summary.c -+++ b/panel-plugin/weather-summary.c -@@ -19,7 +19,7 @@ - #include config.h - #endif - --#include libxfcegui4/libxfcegui4.h -+#include libxfce4ui/libxfce4ui.h - - #include weather-parsers.h - #include weather-data.h -diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c -index cd341aa..c6c918d 100644 a/panel-plugin/weather.c -+++ b/panel-plugin/weather.c -@@ -23,7 +23,7 @@ - #include sys/stat.h - - #include libxfce4util/libxfce4util.h --#include libxfcegui4/libxfcegui4.h -+#include libxfce4ui/libxfce4ui.h - - #include weather-parsers.h - #include weather-data.h --- -1.7.6 - diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.7.4.bb b/meta-xfce/recipes-panel-plugins
[oe] Angstrom mailserver down?
Hi, yesterday I sent two patches to angstrom-devel. Today I get: This is an automatically generated Delivery Status Notification THIS IS A WARNING MESSAGE ONLY. YOU DO NOT NEED TO RESEND YOUR MESSAGE. Delivery to the following recipient has been delayed: angstrom-distro-de...@linuxtogo.org Message will be retried for 2 more day(s) Technical details of temporary failure: The recipient server did not accept our requests to connect. Learn more at http://support.google.com/mail/bin/answer.py?answer=7720 [(10) mail.linuxtogo.org. [188.40.83.200]:25: Connection refused] The mail was sent from a newly installed system so I am not quite sure if it is a problem on my side or on mail server side. Could somebody please check? Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 01/10] libxfce4ui: avoid dragging in gtk3
gtk3 support was introduced in b3a2a01b40affbedc2b0951f7180c1212d24d532 when we
moved to latest git
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...figure.ac.in-remove-optional-gtk3-support.patch | 37 ++
.../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644
meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
diff --git
a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
new file mode 100644
index 000..a93fabf
--- /dev/null
+++
b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch
@@ -0,0 +1,37 @@
+From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Wed, 18 Sep 2013 20:50:11 +0200
+Subject: [PATCH] configure.ac.in: remove optional gtk3 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+it drags in gtk3 if that was build before. This is not yet wanted
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ configure.ac.in | 6 --
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index e47df04..b6edab1 100644
+--- a/configure.ac.in
b/configure.ac.in
+@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0])
+ XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+
+-dnl ***
+-dnl *** Optional support for a GTK+3 version of the library ***
+-dnl ***
+-XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
+- [gtk+-3.0], [3.2.0], [gtk3],
+- [GTK+ 3 support])
+ AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test x$GTK3_FOUND = xyes])
+
+ dnl *
+--
+1.8.3.1
+
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index 594358d..1a2b58a 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -9,6 +9,7 @@ inherit xfce
SRC_URI = \
git://git.xfce.org/xfce/libxfce4ui;protocol=git \
file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
+file://0002-configure.ac.in-remove-optional-gtk3-support.patch \
SRCREV = 530b72f50fcbd8cb4b970fcc97be0321bf78183e
PV = 4.10.0+git${SRCPV}
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 00/10] new recipes / updates / fixes
The following changes since commit a83a588b4d096e89909e537b765d8988b4ca64b0: libao: add version 1.1.0 (2013-09-19 13:56:58 +0200) are available in the git repository at: git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git patches for you to fetch changes up to 65ec21e2e59f2ffbb6c67d4da4d78cac7d73c7cf: packagegroup-xfce-extended: add xfce4-taskmanager and xfce4-notes-plugin (2013-09-21 12:27:18 +0200) Andreas Müller (10): libxfce4ui: avoid dragging in gtk3 xfce4-vala: update to 4.10.3 xfce4-cpufreq-plugin: update to 1.1.0 sound-theme-freedesktop: initial add 0.8.0 libcanberra avoid gtk3 dragged in at gtk2 environments libcanberra: move libtool librarties for modules to dev package xfce4-settings: add PACKAGECONFIG for sound-settings xfce4-taskmanager: inital add git-version xfce4-notes-plugin: initial add 1.7.7 packagegroup-xfce-extended: add xfce4-taskmanager and xfce4-notes-plugin meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb | 13 ++ meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch | 92 + meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb | 15 --- meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch | 29 + meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb | 22 ++ meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch | 39 - meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb | 17 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb | 14 +++ meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch | 138 - meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb | 11 - meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb | 15 +++ meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch | 128 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch | 32 ++ meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb | 20 + meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch | 37 + meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 1 + meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 2 + meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++- 18 files changed, 421 insertions(+), 212 deletions(-) create mode 100644 meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb create mode 100644 meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/files/0001-do-not-build-documantation-Makefile-has-no-install-t.patch create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb delete mode 100644 meta-xfce/recipes-bindings/vala/files/0001-align-vapi-dir.patch delete mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.2.bb create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch create mode 100644 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac.in-remove-optional-gtk3-support.patch -- 1.8.3.1
[oe] [meta-oe/meta-xfce 03/10] xfce4-cpufreq-plugin: update to 1.1.0
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../cpufreq/files/port-to-libxfce4ui.patch | 138 -
.../cpufreq/xfce4-cpufreq-plugin_1.0.0.bb | 11 --
.../cpufreq/xfce4-cpufreq-plugin_1.1.0.bb | 15 +++
3 files changed, 15 insertions(+), 149 deletions(-)
delete mode 100644
meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
delete mode 100644
meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.0.0.bb
create mode 100644
meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.0.bb
diff --git
a/meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
b/meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
deleted file mode 100644
index 7afec61..000
--- a/meta-xfce/recipes-panel-plugins/cpufreq/files/port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 273bac3e85098f422036b5e5f7c803b8abaecb7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@gmx.de
-Date: Mon, 17 Oct 2011 23:14:29 +0200
-Subject: [PATCH] port to libxfce4ui
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Andreas Müller schnitzelt...@gmx.de
- configure.ac |6 +++---
- panel-plugin/Makefile.am |4 ++--
- panel-plugin/xfce4-cpufreq-configure.c |2 +-
- panel-plugin/xfce4-cpufreq-linux.c |4 ++--
- panel-plugin/xfce4-cpufreq-overview.c |2 +-
- panel-plugin/xfce4-cpufreq-plugin.c|6 +++---
- 6 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1856861..19672e0 100644
a/configure.ac
-+++ b/configure.ac
-@@ -30,9 +30,9 @@ XDT_I18N([@LINGUAS@])
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
--XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
--XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
-+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-
- dnl ***
- dnl *** Check for debugging support ***
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index d890f85..688402a 100644
a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -5,13 +5,13 @@ xfce4_cpufreq_plugin_CFLAGS =
\
- -I$(top_srcdir) \
- @LIBXFCE4PANEL_CFLAGS@ \
- @LIBXFCE4UTIL_CFLAGS@ \
-- @LIBXFCEGUI4_CFLAGS@\
-+ @LIBXFCE4UI_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\$(localedir)\
-
- xfce4_cpufreq_plugin_LDADD = \
- @LIBXFCE4PANEL_LIBS@\
- @LIBXFCE4UTIL_LIBS@ \
-- @LIBXFCEGUI4_LIBS@
-+ @LIBXFCE4UI_LIBS@
-
- xfce4_cpufreq_plugin_SOURCES =\
- xfce4-cpufreq-plugin.h \
-diff --git a/panel-plugin/xfce4-cpufreq-configure.c
b/panel-plugin/xfce4-cpufreq-configure.c
-index 3de12c8..60af8a7 100644
a/panel-plugin/xfce4-cpufreq-configure.c
-+++ b/panel-plugin/xfce4-cpufreq-configure.c
-@@ -23,7 +23,7 @@
- #include config.h
- #endif
-
--#include libxfcegui4/libxfcegui4.h
-+#include libxfce4ui/libxfce4ui.h
- #include xfce4-cpufreq-plugin.h
- #include xfce4-cpufreq-configure.h
-
-diff --git a/panel-plugin/xfce4-cpufreq-linux.c
b/panel-plugin/xfce4-cpufreq-linux.c
-index 9a27419..00c6dd4 100644
a/panel-plugin/xfce4-cpufreq-linux.c
-+++ b/panel-plugin/xfce4-cpufreq-linux.c
-@@ -27,7 +27,7 @@
- #include xfce4-cpufreq-plugin.h
- #include xfce4-cpufreq-linux.h
-
--#include libxfcegui4/libxfcegui4.h
-+#include libxfce4ui/libxfce4ui.h
-
- #ifndef _
- # include libintl.h
-@@ -410,7 +410,7 @@ cpufreq_linux_init (void)
- {
- if (cpuFreq-options-show_warning)
- {
-- xfce_warn (_(Your system does not support
cpufreq.\nThe applet only shows the current cpu frequency));
-+ xfce_dialog_show_warning (NULL, NULL, _(Your system
does not support cpufreq.\nThe applet only shows the current cpu frequency));
- cpuFreq-options-show_warning = FALSE;
- }
-
-diff --git a/panel-plugin/xfce4-cpufreq-overview.c
b/panel-plugin/xfce4-cpufreq-overview.c
-index a186f30..c4937bf 100644
a/panel-plugin/xfce4-cpufreq-overview.c
-+++ b/panel-plugin/xfce4-cpufreq-overview.c
-@@ -23,7 +23,7 @@
- #include config.h
[oe] [meta-oe/meta-xfce 09/10] xfce4-notes-plugin: initial add 1.7.7
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- .../files/0001-Bump-dependency-to-Xfce-4.10.patch | 128 + ...atus-icon.c-remove-deprecated-g_type_init.patch | 32 ++ .../notes/xfce4-notes-plugin_1.7.7.bb | 20 3 files changed, 180 insertions(+) create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch create mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0002-main-status-icon.c-remove-deprecated-g_type_init.patch create mode 100644 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.7.7.bb diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch b/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch new file mode 100644 index 000..4a3b1ce --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/notes/files/0001-Bump-dependency-to-Xfce-4.10.patch @@ -0,0 +1,128 @@ +From 26c4ad1765d0d59b3918363d38174c5f5bfe0dcd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com +Date: Fri, 20 Sep 2013 22:49:47 +0200 +Subject: [PATCH] Bump dependency to Xfce 4.10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Drop support for Xfce = 4.6. +Replace libxfcegui4 dependency against libxfce4ui. +Update to new libtool syntax (use LT_PREREQ.) + +Upstream-status: Backport [1] + +[1] http://git.xfce.org/panel-plugins/xfce4-notes-plugin/commit/?id=d11fe51fae95b5b4963847be76ae4a07409a6076 + +Signed-off-by: Andreas Müller schnitzelt...@googlemail.com +--- + configure.ac | 23 ++- + src/Makefile.am| 4 ++-- + src/xfce4-notes-settings.c | 6 +++--- + 3 files changed, 15 insertions(+), 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 20d27e5..8d4113f 100644 +--- a/configure.ac b/configure.ac +@@ -24,21 +24,17 @@ AC_INIT([Notes], [xfce4_notes_plugin_version], [http://bugzilla.xfce.org/], [xfc + AC_REVISION([xfce4_notes_plugin_version_build]) + AC_CANONICAL_TARGET() + ++LT_PREREQ([2.2.6]) ++LT_INIT([disable-static]) ++ + AM_INIT_AUTOMAKE([1.11 dist-bzip2]) + AM_CONFIG_HEADER([config.h]) + AM_MAINTAINER_MODE() + AM_SILENT_RULES([yes]) + +-dnl Avoid g77 and g++ checks +-m4_undefine([AC_PROG_CXX]) +-m4_defun([AC_PROG_CXX],[]) +-m4_undefine([AC_PROG_F77]) +-m4_defun([AC_PROG_F77],[]) +- + dnl Check for basic programs + AM_PROG_CC_C_O() + AC_PROG_LD() +-AC_PROG_LIBTOOL() + AC_PROG_INSTALL() + AC_PROG_INTLTOOL() + +@@ -51,12 +47,13 @@ AC_SUBST([MATH_LIBS], [ -lm]) + + dnl Check for required packages + XDT_CHECK_LIBX11_REQUIRE() +-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0]) +-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) ++XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) ++XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0]) ++XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) ++XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) + XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0]) + + dnl Check for libxfce4panel = 4.7 +diff --git a/src/Makefile.am b/src/Makefile.am +index f69ab0f..2d97b63 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -36,7 +36,7 @@ xfce4_notes_settings_SOURCES = \ + xfce4_notes_settings_CFLAGS = \ + @LIBX11_CFLAGS@ \ + @GTK_CFLAGS@\ +- @LIBXFCEGUI4_CFLAGS@\ ++ @LIBXFCE4UI_CFLAGS@ \ + @XFCONF_CFLAGS@ \ + @UNIQUE_CFLAGS@ + +@@ -44,7 +44,7 @@ xfce4_notes_settings_LDADD = \ + $(top_builddir)/lib/libnotes.la \ + @LIBX11_LIBS@ \ + @GTK_LIBS@ \ +- @LIBXFCEGUI4_LIBS@ \ ++ @LIBXFCE4UI_LIBS@ \ + @XFCONF_LIBS@ \ + @UNIQUE_LIBS@ + +diff --git a/src/xfce4-notes-settings.c b/src/xfce4-notes-settings.c +index f66bb13..1d7cc70 100644 +--- a/src/xfce4-notes-settings.c b/src/xfce4-notes-settings.c +@@ -25,7 +25,7 @@ + #include xfconf
[oe] [meta-oe/meta-xfce 05/10] libcanberra avoid gtk3 dragged in at gtk2 environments
* build two versions of canberra-gtk-play for gtk2 and gtk3.
* move canberra-gtk-play to libcanberra-gtk2 and canberra-gtk3-play to
libcanberra-gtk2.
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...tk-and-gtk3-version-for-canberra_gtk_play.patch | 92 ++
.../libcanberra/libcanberra_0.29.bb| 13 ++-
2 files changed, 101 insertions(+), 4 deletions(-)
create mode 100644
meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
diff --git
a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
new file mode 100644
index 000..4e0984f
--- /dev/null
+++
b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
@@ -0,0 +1,92 @@
+From 4a89ddffbb14d747adbe3365ace4db87de52ba39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Mon, 16 Sep 2013 16:08:28 +0200
+Subject: [PATCH] build gtk- and gtk3-version for canberra_gtk_play
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ src/Makefile.am | 25 +++--
+ 1 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 56ed96d..fc72e1f 100644
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -319,9 +319,6 @@ endif
+
+ if HAVE_GTK_ANY
+
+-bin_PROGRAMS += \
+- canberra-gtk-play
+-
+ include_HEADERS += \
+ canberra-gtk.h
+
+@@ -329,6 +326,9 @@ endif
+
+ if HAVE_GTK3
+
++bin_PROGRAMS += \
++ canberra-gtk3-play
++
+ lib_LTLIBRARIES += \
+ libcanberra-gtk3.la
+
+@@ -367,6 +367,9 @@ endif
+
+ if HAVE_GTK
+
++bin_PROGRAMS += \
++ canberra-gtk-play
++
+ lib_LTLIBRARIES += \
+ libcanberra-gtk.la
+
+@@ -399,14 +402,17 @@ endif
+
+ if HAVE_GTK3
+
+-canberra_gtk_play_LDADD = \
++canberra_gtk3_play_LDADD = \
+ $(GTK3_LIBS) \
+ libcanberra.la \
+ libcanberra-gtk3.la
+-canberra_gtk_play_CFLAGS = \
++canberra_gtk3_play_CFLAGS = \
+ $(GTK3_CFLAGS)
+
+-else
++canberra_gtk3_play_SOURCES = \
++ canberra-gtk-play.c
++
++endif
+ if HAVE_GTK
+
+ canberra_gtk_play_LDADD = \
+@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \
+ canberra_gtk_play_CFLAGS = \
+ $(GTK_CFLAGS)
+
+-endif
++canberra_gtk_play_SOURCES = \
++ canberra-gtk-play.c
++
+ endif
+
+ if HAVE_GTK_ANY
+@@ -424,9 +432,6 @@ if HAVE_GTK_ANY
+ dist_gsdgtkmodules_DATA = \
+ canberra-gtk-module.desktop
+
+-canberra_gtk_play_SOURCES = \
+- canberra-gtk-play.c
+-
+ EXTRA_DIST += \
+ libcanberra-login-sound.desktop.in \
+ libcanberra-ready-sound.desktop.in \
+--
+1.7.6.5
+
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index da94c20..8b771bf 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -8,7 +8,10 @@ DEPENDS = gstreamer gtk+ gtk+3 libtool libvorbis
inherit autotools
-SRC_URI = http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz;
+SRC_URI = \
+http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \
+file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
+
SRC_URI[md5sum] = 2594093a5d61047bd9cc87e955f86df8
SRC_URI[sha256sum] =
127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72
@@ -39,19 +42,21 @@ PACKAGES_DYNAMIC += ^libcanberra-.*
FILES_${PN} = ${bindir}/ ${libdir}/${BPN}.so.*
-FILES_${PN}-dev += ${datadir}/vala/vapi
+FILES_${PN}-dev += ${datadir}/vala/vapi ${libdir}/*/modules/*.la
${libdir}/*/*.la
FILES_${PN}-dbg += ${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug
FILES_${PN}-gtk2 = ${libdir}/${BPN}-gtk.so.* \
${libdir}/gtk-2.0/modules/*.la \
-${libdir}/gtk-2.0/modules/*.so
+${libdir}/gtk-2.0/modules/*.so \
+${bindir}/canberra-gtk-play
# -gtk3 ships a symlink to a .so
INSANE_SKIP_${PN}-gtk3 = dev-so
FILES_${PN}-gtk3 = ${libdir}/${BPN}-gtk3.so.* \
${libdir}/gtk-3.0/modules/*.la \
-${libdir}/gtk-3.0/modules/*.so
+${libdir}/gtk-3.0/modules/*.so \
+${bindir}/canberra-gtk3-play
FILES_${PN}-gnome = ${libdir}/gnome-settings-daemon-3.0/ \
${datadir}/gdm/ ${datadir}/gnome/
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 04/10] sound-theme-freedesktop: initial add 0.8.0
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../sound-themes/sound-theme-freedesktop_0.8.bb | 13 +
1 file changed, 13 insertions(+)
create mode 100644
meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
diff --git
a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
new file mode 100644
index 000..97a1dba
--- /dev/null
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = Freedesktop sound theme
+HOMEPAGE = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
+LICENSE = GPLv2+ CC-BY-3.0 CC-BY-SA-3.0
+LIC_FILES_CHKSUM = file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69
+
+inherit autotools gettext
+
+# with allarch.bbclass configure fails fo no compiler found
+PACKAGE_ARCH = all
+
+SRC_URI = http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2;
+SRC_URI[md5sum] = d7387912cfd275282d1ec94483cb2f62
+SRC_URI[sha256sum] =
cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings
defaults based upon DISTRO_FEATURES for alsa and pulseaudio
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
index 4b75dd7..227858a 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -23,9 +23,13 @@ PV = 4.10.0+git${SRCPV}
EXTRA_OECONF += --enable-maintainer-mode --disable-debug
-PACKAGECONFIG ??=
${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}
+PACKAGECONFIG ??= \
+${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \
+${@base_contains('DISTRO_FEATURES','alsa','sound-setter',
base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \
+
PACKAGECONFIG[datetime-setter] = --enable-datetime-settings,
--disable-datetime-settings,, tzdata
PACKAGECONFIG[notify] = --enable-libnotify,--disable-libnotify,libnotify
+PACKAGECONFIG[sound-setter] = --enable-sound-settings,
--disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop
do_configure_prepend() {
NOCONFIGURE=yes ./autogen.sh
@@ -43,3 +47,5 @@ do_install_prepend() {
}
RRECOMMENDS_${PN} += gnome-icon-theme
+RRECOMMENDS_${PN} +=
${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}
+RRECOMMENDS_${PN} +=
${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 10/10] packagegroup-xfce-extended: add xfce4-taskmanager and xfce4-notes-plugin
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 059d8c9..30fd138 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -43,6 +43,7 @@ RRECOMMENDS_${PN} = \
xfce4-brightness-plugin \
xfce4-closebutton-plugin \
xfce4-equake-plugin \
+xfce4-notes-plugin \
\
thunar-media-tags-plugin \
thunar-archive-plugin \
@@ -52,4 +53,5 @@ RRECOMMENDS_${PN} = \
xfce4-power-manager \
xfce4-mixer \
ristretto \
+xfce4-taskmanager \
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 06/10] libcanberra: move libtool librarties for modules to dev package
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index 8b771bf..332b62b 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -47,14 +47,12 @@ FILES_${PN}-dev += ${datadir}/vala/vapi
${libdir}/*/modules/*.la ${libdir}/*/*.
FILES_${PN}-dbg += ${libdir}/${P}/.debug ${libdir}/gtk-*/modules/.debug
FILES_${PN}-gtk2 = ${libdir}/${BPN}-gtk.so.* \
-${libdir}/gtk-2.0/modules/*.la \
${libdir}/gtk-2.0/modules/*.so \
${bindir}/canberra-gtk-play
# -gtk3 ships a symlink to a .so
INSANE_SKIP_${PN}-gtk3 = dev-so
FILES_${PN}-gtk3 = ${libdir}/${BPN}-gtk3.so.* \
-${libdir}/gtk-3.0/modules/*.la \
${libdir}/gtk-3.0/modules/*.so \
${bindir}/canberra-gtk3-play
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5] fix do_rootfs for images with dev-pkgs in IMAGE_FEATURES
| Collected errors:
| * satisfy_dependencies_for: Cannot satisfy the following dependencies for
qtquickcontrols-dev:
| * qtquickcontrols (= 5.1.0-r0) *
| * opkg_install_cmd: Cannot install package qtquickcontrols-dev.
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
recipes-qt/qt5/qtquickcontrols.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-qt/qt5/qtquickcontrols.inc
b/recipes-qt/qt5/qtquickcontrols.inc
index 63e884e..06b5350 100644
--- a/recipes-qt/qt5/qtquickcontrols.inc
+++ b/recipes-qt/qt5/qtquickcontrols.inc
@@ -1,3 +1,5 @@
require qt5.inc
DEPENDS += qtdeclarative
+
+ALLOW_EMPTY_${PN} = 1
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5] fix do_rootfs for images with dev-pkgs in IMAGE_FEATURES
On Thu, Sep 26, 2013 at 11:58 AM, Burton, Ross ross.bur...@intel.com wrote:
On 26 September 2013 10:51, Jack Mitchell m...@communistcode.co.uk wrote:
I ran into this problem the other day, and after speaking to Ross
Burton, he suggested that the better way to fix this is with:
RDEPENDS_${PN}-dev =
I'm starting to get the feeling that the dev-pkgs feature is also a
little broken, as it seems as though it doesn't handle cases where
sub-packages are installed, but the main package is not.
Well, the problem is the default dependency on the main package in the
-dev package, which happens whether or not the main package even
exists. That's why I prefer removing the dependency instead of
creating empty packages just for the bad dependency.
agreed :)
Andreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings
On Fri, Oct 4, 2013 at 4:18 PM, Martin Jansa martin.ja...@gmail.com wrote:
On Sat, Sep 21, 2013 at 12:41:38PM +0200, Andreas Müller wrote:
defaults based upon DISTRO_FEATURES for alsa and pulseaudio
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
index 4b75dd7..227858a 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -23,9 +23,13 @@ PV = 4.10.0+git${SRCPV}
Aargh - it is definitely a 4.11+git - I have seen this warning long
time ago but did not take enough attention...
Sorry that I haven't reported it on the commit which caused it :).
I will send a patch ontop of this series next week.
Nadreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 3/6] xfce4-settings: add exo-native to DEPENDS
fixes (found in Martin's world build) | /bin/bash: exo-csource: command not found | make[3]: *** [appearance-dialog_ui.h] Error 127 | make[3]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfce4-settings/4.10.0+gitAUTOINC+b7a0e1fd77-r0/git/dialogs/appearance-settings' | make[2]: *** [all-recursive] Error 1 | make[2]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfce4-settings/4.10.0+gitAUTOINC+b7a0e1fd77-r0/git/dialogs' | make[1]: *** [all-recursive] Error 1 | make[1]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfce4-settings/4.10.0+gitAUTOINC+b7a0e1fd77-r0/git' | make: *** [all] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfce4-settings Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index f3f5634..f7d5de3 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = Xfce4 settings SECTION = x11/wm LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f -DEPENDS = exo garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier +DEPENDS = exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier inherit xfce -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 0/6] minor (world) fixes
The following changes since commit 2a463dddcf76d7fa437e96f6cf0210143e97a904:
thunar-volman: Add PACKAGECONFIG for notify (2013-10-05 14:24:05 +0200)
are available in the git repository at:
git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git patches
for you to fetch changes up to 27173266bdfa868c3027ce3713bfd8bf48e02bae:
xfce4-icon-theme: add xfce4-dev-tools-native to DEPENDS (2013-10-08 00:57:05
+0200)
Andreas Müller (6):
qt-creator: add qt4-plugin-sqldriver-sqlite to RRECOMMENDS_${PN}
xfce4-settings: set correct version
xfce4-settings: add exo-native to DEPENDS
xfce4-weather-plugin: add libsoup-2.4 to DEPENDS
xfwm4: add exo-native to DEPENDS
xfce4-icon-theme: add xfce4-dev-tools-native to DEPENDS
meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb | 4 +++-
meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb | 2 +-
meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb | 2 ++
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 4 ++--
meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 1/6] qt-creator: add qt4-plugin-sqldriver-sqlite to RRECOMMENDS_${PN}
fix runtime message 'QSqlDatabase: QSQLITE driver not loaded'
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
index 3a29c3b..44eb672 100644
--- a/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
+++ b/meta-oe/recipes-qt/qt-creator/qt-creator_2.8.1.bb
@@ -29,4 +29,6 @@ FILES_${PN}-dbg += ${datadir}/qtcreator/*/*/*/*/.debug \
${libdir}/qtcreator/.debug \
${libdir}/qtcreator/*/*/.debug
RRECOMMENDS_${PN} += packagegroup-core-buildessential \
- packagegroup-qt-toolchain-target
+ packagegroup-qt-toolchain-target \
+ qt4-plugin-sqldriver-sqlite \
+
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 5/6] xfwm4: add exo-native to DEPENDS
fixes (detected in Martin's world build): | make[2]: Entering directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfwm4/4.10.1+gitAUTOINC+bce3062d08-r0/git/settings-dialogs' | gdk-pixbuf-csource --raw --build-list \ | monitor_icon_data ./monitor-icon.png monitor-icon.h | exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_ui xfwm4-dialog.glade xfwm4-dialog_ui.h | exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_ui xfwm4-tweaks-dialog.glade xfwm4-tweaks-dialog_ui.h | exo-csource --static --strip-comments --strip-content --name=workspace_dialog_ui xfwm4-workspace-dialog.glade xfwm4-workspace-dialog_ui.h | /bin/bash: exo-csource: command not found | /bin/bash: exo-csource: command not found | /bin/bash: exo-csource: command not found | make[2]: *** [xfwm4-dialog_ui.h] Error 127 | make[2]: *** Waiting for unfinished jobs | make[2]: *** [xfwm4-tweaks-dialog_ui.h] Error 127 | make[2]: *** [xfwm4-workspace-dialog_ui.h] Error 127 | make[2]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfwm4/4.10.1+gitAUTOINC+bce3062d08-r0/git/settings-dialogs' | make[1]: *** [all-recursive] Error 1 | make[1]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfwm4/4.10.1+gitAUTOINC+bce3062d08-r0/git' | make: *** [all] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfwm4 Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb index b72d44f..4799460 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb @@ -2,7 +2,7 @@ DESCRIPTION=Xfce4 Window Manager SECTION = x11/wm LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=d791728a073bc009b4ffaf00b7599855 -DEPENDS = virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification +DEPENDS = virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification exo-native inherit xfce update-alternatives -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 2/6] xfce4-settings: set correct version
fix commit 23f020f742aea622e5dd7aef81eb59c99f8ef000 which introduced wrong
version
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
index 227858a..f3f5634 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -19,7 +19,7 @@ SRC_URI =
git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-
SRCREV = b7a0e1fd77f5bb5c372223ff62aec7acf252f061
S = ${WORKDIR}/git
-PV = 4.10.0+git${SRCPV}
+PV = 4.11.0+git${SRCPV}
EXTRA_OECONF += --enable-maintainer-mode --disable-debug
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 6/6] xfce4-icon-theme: add xfce4-dev-tools-native to DEPENDS
fixes (detected in Martin's world build): | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfce4-icon-theme/4.4.3-r0/xfce4-icon-theme-4.4.3/configure: line 4836: syntax error near unexpected token `am' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xfce4-icon-theme/4.4.3-r0/xfce4-icon-theme-4.4.3/configure: line 4836: `XDT_I18N(am ar ca cs da de dz el en_GB eo et eu fi fr he hu id ja ka ko lt lv mk nb_NO pl pt_BR pt_PT ro ru si sk sq tr uk ur zh_CN zh_TW)' | Configure failed. The contents of all config.log files follows to aid debugging Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb b/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb index f6a9d2b..6777cec 100644 --- a/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb +++ b/meta-xfce/recipes-art/xfce4-icon-theme/xfce4-icon-theme_4.4.3.bb @@ -3,7 +3,7 @@ SECTION = x11/wm LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f -DEPENDS = intltool-native +DEPENDS = intltool-native xfce4-dev-tools-native inherit xfce -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 4/6] xfce4-weather-plugin: add libsoup-2.4 to DEPENDS
fixes (detected in Martin's) world build: | configure:14617: checking for libsoup-2.4 = 2.26.0 | configure:14659: result: not found Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb index 551faab..45c6d83 100644 --- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb +++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.3.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 inherit xfce-panel-plugin +DEPENDS += libsoup-2.4 + SRC_URI[md5sum] = 755b33089c02afe88abb39253003a7f3 SRC_URI[sha256sum] = 40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4 -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-systemd 2/2] connman: follow oe-core to 1.18
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../connman/{connman_1.17.bbappend = connman_1.18.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename
meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.17.bbappend =
connman_1.18.bbappend} (100%)
diff --git
a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.17.bbappend
b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.18.bbappend
similarity index 100%
rename from
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.17.bbappend
rename to
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.18.bbappend
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-systemd 0/2] fixes for latest oe-core
Andreas Müller (2):
orbit2: fix build after automake 1.13.4 update
connman: follow oe-core to 1.18
...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 ++
meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb | 1 +
...connman_1.17.bbappend = connman_1.18.bbappend} | 0
3 files changed, 43 insertions(+)
create mode 100644
meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
rename
meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.17.bbappend =
connman_1.18.bbappend} (100%)
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome/meta-systemd 1/2] orbit2: fix build after automake 1.13.4 update
fixes:
| test/everything/Makefile.am:81: error: using '$(srcdir)' in TESTS is
currently broken: '$(srcdir)/test.sh'
| test/inhibit/Makefile.am:4: warning: 'INCLUDES' is the old name for
'AM_CPPFLAGS' (or '*_CPPFLAGS')
| test/poa/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS'
(or '*_CPPFLAGS')
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
| WARNING:
/home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/run.do_configure.14800:1
exit 1 from
| exit 1
| ERROR: Function failed: do_configure (log file is located at
/home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/log.do_configure.14800)
ERROR: Task 6208
(virtual:native:/home/superandy/data/oe-core/sources/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb,
do_configure) failed with exit code '1'
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 ++
meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644
meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
diff --git
a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
new file mode 100644
index 000..7993abb
--- /dev/null
+++
b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
@@ -0,0 +1,42 @@
+From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001
+From: Kjartan Maraas kmar...@gnome.org
+Date: Tue, 14 May 2013 13:29:53 +0200
+Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1]
https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ test/everything/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
+index 32beb36..cb4b1d6 100644
+--- a/test/everything/Makefile.am
b/test/everything/Makefile.am
+@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \
+ $(EVERYTHING_BUILT) \
+ everything-imodule.c
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include\
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/src \
+@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared
+ BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
+ CLEANFILES = ${BUILT_SOURCES} iorfile
+
+-TESTS = $(srcdir)/test.sh
++TESTS = $(top_builddir)/test/everything/test.sh
+
+ EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
+
+--
+1.8.3.1
+
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
index 74b6c12..ba3982d 100644
--- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
@@ -9,6 +9,7 @@ SRC_URI = \
file://configure-lossage.patch \
file://pkgconfig-fix.patch \
file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \
+file://0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch \
SRC_URI[md5sum] = 7082d317a9573ab338302243082d10d1
SRC_URI[sha256sum] =
55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 1/2] lxdm: update to latest git version
fixes crashing after first log off
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...heck-only-for-ck-connector-in-case-consol.patch | 48 --
meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 6 +--
2 files changed, 2 insertions(+), 52 deletions(-)
delete mode 100644
meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
diff --git
a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
deleted file mode 100644
index e2ba52a..000
---
a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8657bfcfc5c26382989001e9b6d18295d740c709 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
-Date: Fri, 7 Jun 2013 14:13:41 +0200
-Subject: [PATCH] configure: check only for ck-connector in case consolekit is
- enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-it failed for --disable-consolekit with
-
-| lxdm.c:70:26: fatal error: ck-connector.h: No such file or directory
-| compilation terminated.
-| make[2]: *** [lxdm_binary-lxdm.o] Error 1
-
-Upstream-Status: submitted [1]
-
-[1] http://sourceforge.net/mailarchive/message.php?msg_id=31010893
-
-Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
- configure.ac |3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e21a22..49ba944 100644
a/configure.ac
-+++ b/configure.ac
-@@ -28,8 +28,6 @@ if test x$USE_PAM != xno ; then
-fi])
- fi
-
--AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
--
- # Checks for header files.
- AC_PATH_X
- AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
-@@ -102,6 +100,7 @@ if test x$enable_consolekit = xyes ; then
- AC_SUBST(CONSOLEKIT_LIBS)],[
- echo ConsoleKit devel package not found
- ])
-+ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
- fi
-
-
---
-1.7.6.5
-
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index 97bda4c..5f9d2f4 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -8,15 +8,13 @@ SRC_URI = \
file://lxdm-pam \
file://lxdm-pam-debug \
${@base_contains(DISTRO_TYPE, debug, ,
file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch,d)} \
-file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \
LXDM_PAM = ${@base_contains(DISTRO_TYPE, debug, lxdm-pam-debug,
lxdm-pam,d)}
-SRCREV = 65e7cc8fdc150c2b925eb348ce82de17dee5eb0b
-PV = 0.4.2+git${SRCPV}
+SRCREV = 07fb151a99ef99318b71f3de0afbba977b1e6267
+PV = 0.5.0+git${SRCPV}
PE = 1
-PR = r7
DEPENDS = cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango
DEPENDS += ${@base_contains(DISTRO_FEATURES, systemd, , consolekit,
d)}
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 2/2] xfconf: fix compile
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../xfconf/files/0001-Simplify-checks.patch| 112 +
meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb | 1 +
2 files changed, 113 insertions(+)
create mode 100644
meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
diff --git a/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
b/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
new file mode 100644
index 000..ef68f7a
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
@@ -0,0 +1,112 @@
+From 233f7d3a9b0f98b794548433cead77633aab5f7d Mon Sep 17 00:00:00 2001
+From: Nick Schermer n...@xfce.org
+Date: Sun, 6 Jan 2013 12:46:47 +0100
+Subject: [PATCH] Simplify checks.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: backport [1]
+
+[1]
http://git.xfce.org/xfce/xfconf/commit/?id=233f7d3a9b0f98b794548433cead77633aab5f7d
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ tests/Makefile.am | 1 -
+ tests/Makefile.inc| 9 +
+ tests/test-template.sh.in | 49 ---
+ 3 files changed, 1 insertion(+), 58 deletions(-)
+ delete mode 100644 tests/test-template.sh.in
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 57165d9..57ba7e8 100644
+--- a/tests/Makefile.am
b/tests/Makefile.am
+@@ -13,5 +13,4 @@ clean-local:
+
+ EXTRA_DIST = \
+ $(test_scripts) \
+- test-template.sh.in \
+ tests-common.h
+diff --git a/tests/Makefile.inc b/tests/Makefile.inc
+index 2ed3431..7a5a715 100644
+--- a/tests/Makefile.inc
b/tests/Makefile.inc
+@@ -13,9 +13,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+-check_SCRIPTS = $(addsuffix .sh,$(check_PROGRAMS))
+-
+-TESTS = $(check_SCRIPTS)
++TESTS = $(check_PROGRAMS)
+ TESTS_ENVIRONMENT =
XDG_CONFIG_HOME=$(top_builddir)/tests/test-xdg_config_home
XFCONFD=$(top_builddir)/xfconfd/xfconfd
+
+ AM_CFLAGS = \
+@@ -27,8 +25,3 @@ AM_CFLAGS = \
+ LIBS = \
+ $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
+
+-%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
$(top_srcdir)/tests/test-template.sh.in $@
+- chmod 755 $@
+-
+-CLEANFILES = $(check_SCRIPTS)
+diff --git a/tests/test-template.sh.in b/tests/test-template.sh.in
+deleted file mode 100644
+index 2e638a8..000
+--- a/tests/test-template.sh.in
/dev/null
+@@ -1,49 +0,0 @@
+-#!/bin/sh
+-
+-cleanup() {
+-if [ $XFCONFD_PID ]; then
+-kill -TERM $XFCONFD_PID 2/dev/null
+-sleep 1
+-kill -KILL $XFCONFD_PID 2/dev/null
+-fi
+-
+-kill -TERM $DBUS_SESSION_BUS_PID 2/dev/null
+-sleep 1
+-kill -KILL $DBUS_SESSION_BUS_PID 2/dev/null
+-}
+-
+-die() {
+-[ $1 ] echo $1 2
+-cleanup
+-exit 1
+-}
+-
+-# some buildbots have problems with the tests (dbus not
+-# working properly without an X11 server).
+-if [ -n $XFCONF_SKIP_TESTS ]; then
+- echo Warning: Tests disabled, skipping @TEST_NAME@ 2
+- exit 0
+-fi
+-
+-unset DBUS_SESSION_BUS_ADDRESS
+-unset DBUS_SESSION_BUS_PID
+-unset XFCONFD_PID
+-
+-eval `dbus-launch --sh-syntax`
+-export DBUS_SESSION_BUS_ADDRESS
+-export DBUS_SESSION_BUS_PID
+-
+-[ $DBUS_SESSION_BUS_PID ] || die DBus failed to start
+-
+-trap die Interrupted INT
+-
+-eval `$XFCONFD --daemon 2/dev/null` || die Failed to start xfconfd
+-
+-export XDG_CONFIG_HOME # make sure it's exported from the makefile
+-export XDG_CONFIG_DIRS=
+-
+-./@TEST_NAME@ || die Test Failed
+-
+-cleanup
+-
+-exit 0
+--
+1.8.3.1
+
diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
index 5dceb09..4ea2b88 100644
--- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
@@ -6,6 +6,7 @@ DEPENDS = dbus-glib libxfce4util perl-native
inherit xfce
+SRC_URI += file://0001-Simplify-checks.patch
SRC_URI[md5sum] = 4ed48150a03fb5f42b455494307b7f28
SRC_URI[sha256sum] =
175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][RFC] qtbase: fix build for gles2 enabled by PACKAGECONFIG
While playing around with QtQuick I needed gles2 support. Doing so I faced tons of error messages as mentionet in patch. It is caused by include chain: EGL/egl.h - EGL/eglplatform.h - X11/Xlib.h - X.h In X.h we find definitions like #ifndef None #define None 0L /* universal null resource or null atom */ #endif This causes building Qt to crash when using these kind of symbols. The patch was sent as RFC because: 1. I would like ro discuss this at inter...@qt-project.org and/or developm...@qt-project.org but it was not possible to subscribe. I sent a mail to listmaster but no response either. 2. qtbase_git might need same (and fails with the patch) 3. This is not a proper solution: It is fragile and will return for future changes. Proper soultion would be renaming the symbols Qt but I cannot discuss due to 1. 4. Nobody reported a build error for meta-qt5 so far. Andreas Müller (1): qtbase: fix build for gles2 enabled by PACKAGECONFIG ...-reorder-includes-to-fix-build-with-eglfs.patch | 238 + recipes-qt/qt5/qtbase.inc | 1 + 2 files changed, 239 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0027-reorder-includes-to-fix-build-with-eglfs.patch -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][RFC] qtbase: fix build for gles2 enabled by PACKAGECONFIG
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- ...-reorder-includes-to-fix-build-with-eglfs.patch | 238 + recipes-qt/qt5/qtbase.inc | 1 + 2 files changed, 239 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0027-reorder-includes-to-fix-build-with-eglfs.patch diff --git a/recipes-qt/qt5/qtbase-5.1.1/0027-reorder-includes-to-fix-build-with-eglfs.patch b/recipes-qt/qt5/qtbase-5.1.1/0027-reorder-includes-to-fix-build-with-eglfs.patch new file mode 100644 index 000..2c47bd2 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0027-reorder-includes-to-fix-build-with-eglfs.patch @@ -0,0 +1,238 @@ +From 8d810aaf46ff65452a53c3d4ab2c64a33187dba0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com +Date: Wed, 23 Oct 2013 19:27:15 +0200 +Subject: [PATCH] reorder includes to fix build with eglfs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fixes several errors as + +| In file included from /home/a.mueller/tmp/oe-core-eglibc/sysroots/colibri-t30/usr/include/X11/Xlib.h:44:0, +| from /home/a.mueller/tmp/oe-core-eglibc/sysroots/colibri-t30/usr/include/EGL/eglplatform.h:118, +| from /home/a.mueller/tmp/oe-core-eglibc/sysroots/colibri-t30/usr/include/EGL/egl.h:36, +| from /home/a.mueller/tmp/oe-core-eglibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/src/plugins/platforms/eglfs/qeglfsscreen.h:49, +| from /home/a.mueller/tmp/oe-core-eglibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/src/plugins/platforms/eglfs/qeglfsintegration.h:45, +| from /home/a.mueller/tmp/oe-core-eglibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/src/plugins/platforms/eglfs/qeglfsintegration.cpp:42: +| /home/a.mueller/tmp/oe-core-eglibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.1.1-r0/qtbase-opensource-src-5.1.1/include/QtCore/../../src/corelib/io/qurl.h:132:9: error: expected identifier before numeric constant +| None = 0x0, +| ^ +... and follow up error messages + +The error is caused by X.h (inluded by Xlib.h) + +| #ifndef None +| #define None 0L /* universal null resource or null atom */ +| #endif + +and other defines causing symbols used by Qt being replaced. + +Signed-off-by: Andreas Müller schnitzelt...@googlemail.com +--- + src/platformsupport/eglconvenience/qeglpbuffer_p.h | 2 +- + src/plugins/platforms/eglfs/qeglfscontext.cpp| 16 +++- + src/plugins/platforms/eglfs/qeglfscursor.cpp | 9 - + src/plugins/platforms/eglfs/qeglfscursor.h | 1 - + src/plugins/platforms/eglfs/qeglfshooks_stub.cpp | 8 +--- + src/plugins/platforms/eglfs/qeglfsintegration.cpp| 20 +++- + src/plugins/platforms/eglfs/qeglfswindow.cpp | 7 +-- + .../platforms/minimalegl/qminimaleglwindow.cpp | 6 -- + 8 files changed, 45 insertions(+), 24 deletions(-) + +diff --git a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h +index 1b4ac6f..1237950 100644 +--- a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h +@@ -42,8 +42,8 @@ + #ifndef QEGLPBUFFER_H + #define QEGLPBUFFER_H + +-#include EGL/egl.h + #include qpa/qplatformoffscreensurface.h ++#include EGL/egl.h + + QT_BEGIN_NAMESPACE + +diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp +index 5143964..c776371 100644 +--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp +@@ -39,15 +39,21 @@ + ** + / + +-#include qeglfscontext.h +-#include qeglfswindow.h ++#include QMetaType ++#include QTextStream ++#include QDataStream ++ ++#include QtGui/QSurface ++#include QtDebug ++ + #include qeglfscursor.h +-#include qeglfshooks.h + #include qeglfsintegration.h ++#include qeglfswindow.h ++#include qeglfshooks.h ++#include qeglfscontext.h ++ + + #include QtPlatformSupport/private/qeglpbuffer_p.h +-#include QtGui/QSurface +-#include QtDebug + + QT_BEGIN_NAMESPACE + +diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp +index 9dc836b..cfffe00 100644 +--- a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp +@@ -39,7 +39,6 @@ + ** + / + +-#include qeglfscursor.h + #include qpa/qwindowsysteminterface.h + #include QtGui/QOpenGLContext + #include QtCore/QJsonDocument +@@ -47,6 +46,14 @@ + #include QtCore/QJsonObject
Re: [oe] [meta-qt5][RFC] qtbase: fix build for gles2 enabled by PACKAGECONFIG
On Tue, Oct 29, 2013 at 8:07 AM, Martin Jansa martin.ja...@gmail.com wrote: On Tue, Oct 29, 2013 at 12:06:15AM +0100, Andreas Müller wrote: While playing around with QtQuick I needed gles2 support. Doing so I faced tons of error messages as mentionet in patch. It is caused by include chain: EGL/egl.h - EGL/eglplatform.h - X11/Xlib.h - X.h In X.h we find definitions like #ifndef None #define None 0L /* universal null resource or null atom */ #endif This causes building Qt to crash when using these kind of symbols. The patch was sent as RFC because: 1. I would like ro discuss this at inter...@qt-project.org and/or developm...@qt-project.org but it was not possible to subscribe. I sent a mail to listmaster but no response either. 2. qtbase_git might need same (and fails with the patch) 3. This is not a proper solution: It is fragile and will return for future changes. Proper soultion would be renaming the symbols Qt but I cannot discuss due to 1. 4. Nobody reported a build error for meta-qt5 so far. We had similar problem, but fixed gles2 provider instead, in our case we were using libhybris and the fix was to prevent loading X11 headers when we want to use just gles2 from it. Similar changes were added to mesa lately, can you do the same with gles2 provider on your platform? It is the egl part causing trouble and the headers we use are the latest from khronos. I don't understand what the workaround exactly looks like - could you provide further hints? I must admit that I haven't read the patch yet and haven't finished morning coffee :). Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] libmpd-11.8.17 gets 404 Not Found
On Thu, Nov 14, 2013 at 8:41 PM, Adam Lee adam.yh@gmail.com wrote: Thanks Otavio. Quick question - is there a reason not to use the upstream? - http://www.musicpd.org/download/mpd/stable/ Thanks, Adam patches welcome - but please check for xfce4-mpc-plugin and xfmpc are still building with mpc. Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/2] libmpd: sources have moved from sourceforge to musicpd.org
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
b/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
index b58a4fa..ec48b2c 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=751419260aa954499f7abaabaa882bbe
HOMEPAGE =http://sourceforge.net/projects/musicpd;
DEPENDS = glib-2.0
-SRC_URI = ${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.gz
+SRC_URI = http://www.musicpd.org/download/${PN}/${PV}/${PN}-${PV}.tar.gz;
SRC_URI[md5sum] = 5ae3d87467d52aef3345407adb0a2488
SRC_URI[sha256sum] =
fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] mpd: update to 0.18.4 and get sources from musicpd.org
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../musicpd/{mpd_0.17.1.bb = mpd_0.18.4.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.17.1.bb =
mpd_0.18.4.bb} (89%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb
similarity index 89%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb
index 6f2a912..b89eb0e 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb
@@ -5,15 +5,15 @@ HOMEPAGE =http://sourceforge.net/projects/musicpd;
DEPENDS = alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg
curl sqlite bzip2 pulseaudio
-PR = r4
-
SRC_URI = \
-${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \
+http://www.musicpd.org/download/${PN}/stable/${PN}-0.18.tar.xz \
file://mpd.conf.in \
-SRC_URI[md5sum] = da3f3d6617a877192db4c6f53504cd38
-SRC_URI[sha256sum] =
b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8
+SRC_URI[md5sum] = 0d881fb32f9d31afcdb0bb13cb78b9ab
+SRC_URI[sha256sum] =
6b171985f192603150c879d105dc4d05d701ac60a2db41630a4dce823e068388
+
+S = ${WORKDIR}/${PN}-0.18
inherit autotools useradd systemd
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 2/2] mpd: update to 0.18.4 and get sources from musicpd.org
On Mon, Nov 18, 2013 at 11:23 PM, Martin Jansa martin.ja...@gmail.com wrote:
On Fri, Nov 15, 2013 at 09:45:09PM +0100, Andreas Müller wrote:
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../musicpd/{mpd_0.17.1.bb = mpd_0.18.4.bb} | 10
+-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.17.1.bb =
mpd_0.18.4.bb} (89%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb
similarity index 89%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb
index 6f2a912..b89eb0e 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb
@@ -5,15 +5,15 @@ HOMEPAGE =http://sourceforge.net/projects/musicpd;
DEPENDS = alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2
ffmpeg curl sqlite bzip2 pulseaudio
-PR = r4
-
SRC_URI = \
-${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \
+http://www.musicpd.org/download/${PN}/stable/${PN}-0.18.tar.xz \
file://mpd.conf.in \
-SRC_URI[md5sum] = da3f3d6617a877192db4c6f53504cd38
-SRC_URI[sha256sum] =
b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8
+SRC_URI[md5sum] = 0d881fb32f9d31afcdb0bb13cb78b9ab
+SRC_URI[sha256sum] =
6b171985f192603150c879d105dc4d05d701ac60a2db41630a4dce823e068388
+
+S = ${WORKDIR}/${PN}-0.18
Can you please review/test
http://patchwork.openembedded.org/patch/56953/
thanks
OK - hope to find time for that next week. Could you take the
libmpd-patch meanwhile?
Andreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] State of bitbake world
On Tue, Nov 19, 2013 at 4:50 PM, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Oct 31, 2013 at 12:08:25AM +0100, Martin Jansa wrote: Starting now I'll use http://openembedded.org/wiki/Bitbake_World_Status to post results from my bitbake world buils. It was updated few times since this e-mail and I've received no feedback. Should I continue to post them or nobody except me is really interested? I am interested but would prefer some short information as mail like in the past because prefer events more than polling. Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-systemd] connman: follow oe-core to 1.20
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../connman/{connman_1.19.bbappend = connman_1.20.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename
meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.19.bbappend =
connman_1.20.bbappend} (100%)
diff --git
a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.19.bbappend
b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.20.bbappend
similarity index 100%
rename from
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.19.bbappend
rename to
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.20.bbappend
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gimp: Upgrade 2.8.2 - 2.8.10
On Sat, Dec 7, 2013 at 10:14 AM, Khem Raj raj.k...@gmail.com wrote:
Also fix build with freetype 2.5.1
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta-oe/recipes-graphics/gimp/gimp/freetype.patch | 30
.../gimp/{gimp_2.8.2.bb = gimp_2.8.10.bb} |9 --
2 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-graphics/gimp/gimp/freetype.patch
rename meta-oe/recipes-graphics/gimp/{gimp_2.8.2.bb = gimp_2.8.10.bb} (68%)
diff --git a/meta-oe/recipes-graphics/gimp/gimp/freetype.patch
b/meta-oe/recipes-graphics/gimp/gimp/freetype.patch
new file mode 100644
index 000..ed6c097
--- /dev/null
+++ b/meta-oe/recipes-graphics/gimp/gimp/freetype.patch
@@ -0,0 +1,30 @@
+Include the freetype headers via macros ( recommended way)
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+Upstream-Status: Backport
+
+From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001
+From: Michael Natterer mi...@gimp.org
+Date: Fri, 29 Nov 2013 20:57:46 +
+Subject: Bug 719560 - Build failure with freetype 2.5.1
+
+Apply patch from su-v that fixes the freetype include to
+the madness devised and recommended by freetype.
+---
+diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
+index 4045ca9..66c6e52 100644
+--- a/app/text/gimpfont.c
b/app/text/gimpfont.c
+@@ -28,7 +28,9 @@
+
+ #define PANGO_ENABLE_ENGINE 1 /* Argh */
+ #include pango/pango-ot.h
+-#include freetype/tttables.h
++
++#include ft2build.h
++#include FT_TRUETYPE_TABLES_H
+
+ #include text-types.h
+
+--
+cgit v0.9.2
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
similarity index 68%
rename from meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
rename to meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
index e9bbdcf..c747168 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
@@ -8,9 +8,11 @@ DEPENDS = babl gdk-pixbuf-native libart-lgpl gtk+ jpeg
libpng libexif tiff webk
inherit gnome
-SRC_URI = ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2;
-SRC_URI[md5sum] = b542138820ca3a41cbd63fc331907955
-SRC_URI[sha256sum] =
0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9
+SRC_URI = ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \
+ file://freetype.patch \
+
+SRC_URI[md5sum] = 84c964aab7044489af69f7319bb59b47
+SRC_URI[sha256sum] =
e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6
EXTRA_OECONF = --disable-python \
--without-wmf
@@ -21,3 +23,4 @@ do_configure_append() {
}
FILES_${PN}-dbg += ${libdir}/gimp/2.0/*/.debug
+FILES_${PN} += ${datadir}/appdata
--
1.7.10.4
Acked-by: Andreas Müller schnitzelt...@googlemail.com
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt / branch jansa/qt5-5.2.0][PATCH 1/1] qtbase: fix paths in packageconfig *.pc files
include- and lib-paths contained build-sysroot paths
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../0020-fix-paths-in-packageconfig-files.patch| 42 ++
recipes-qt/qt5/qtbase_git.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644
recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch
diff --git
a/recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch
b/recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch
new file mode 100644
index 000..8e7842b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch
@@ -0,0 +1,42 @@
+From c5768c394beac79f9e888f6afbd47c8dac37eb50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Thu, 19 Dec 2013 18:04:57 +0100
+Subject: [PATCH] fix paths in packageconfig files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts parts of:
+
+enable path replacement in installed prl files on all platforms
+
+Task-number: QTBUG-33794
+Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
+Reviewed-by: Joerg Bornemann joerg.bornem...@digia.com
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ mkspecs/features/qt_module.prf | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index f9dfb01..2f95684 100644
+--- a/mkspecs/features/qt_module.prf
b/mkspecs/features/qt_module.prf
+@@ -164,8 +164,11 @@ QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
+
+ unix|win32-g++* {
+CONFIG += create_pc
+- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
+- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
++ host_build: \
++ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
++ else: \
++ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
+QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
pkgconfig_lib_replace
+--
+1.8.3.1
+
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 07bf28a..5ca50e8 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,6 +26,7 @@ SRC_URI += \
file://0017-enables-tslib-device-to-be-read-from-env-variable.patch \
file://0018-qtbase-allow-build-of-examples.patch \
file://0019-QOpenGLPaintDevice-sub-area-support.patch \
+file://0020-fix-paths-in-packageconfig-files.patch \
SRCREV = 313a74cc4a9a5d200b2059d3d8767fe1a274c50d
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt / branch jansa/qt5-5.2.0][PATCH 0/1] qtbase: fix paths in packageconfig *.pc files
Note: Dependency tracking for packageconfig seems broken in oe-core (see package.bbclass and try to find a *.pcdeps in workdir) so currently this patch does not cause any effect. Andreas Müller (1): qtbase: fix paths in packageconfig *.pc files .../0020-fix-paths-in-packageconfig-files.patch| 42 ++ recipes-qt/qt5/qtbase_git.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-git/0020-fix-paths-in-packageconfig-files.patch -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] State of bitbake world, Failed tasks 2014-01-09
On Thu, Jan 9, 2014 at 4:23 PM, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Jan 09, 2014 at 04:12:52PM +0100, Andreas Müller wrote: On Thu, Jan 9, 2014 at 3:46 PM, Martin Jansa martin.ja...@gmail.com wrote: http://www.openembedded.org/wiki/Bitbake_World_Status == Failed tasks 2014-01-09 == === common (6) === * meta-openembedded/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb, do_configure * meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_fetch * meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb, do_compile * meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb, do_compile * meta-openembedded/meta-oe/recipes-navigation/monav/monav_0.3.bb, do_compile * meta-qt5/recipes-qt/qt5/qtwayland_git.bb, do_compile I have problems with qtwayland too and think that I am close to understand what's going on (on 5.2 branch). Where do I find logs for this error? Links for each machine are on the bottom of the e-mail: http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/... qtwayland builds for me fine with oe-core only and also in qt5-5.2.0 + webos-ports, so I haven't looked much into it yet. OK - I can't find that in the logs - but anyway: I am working also on 5.2.0 and my error for qtwayland showed up as tons of multiple defined GL data types as 'error: 'GLdouble' has a previous declaration as 'typedef GLfloat GLdouble'' Reason was that I had GL-headers in my sysroot but qtwayland was configured without wayland-egl / egl (it took me long to find out that that wayland-egl is supplied by mesa..). So qtwayland tried to build glx-compositor which does not work with GL/GLES headers in sysroot. After building egl and wayland-egl, qtwayland configured fine and the errors disappeared. Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5][jansa/qt5-5.2.0]] qtbase: fix typo in PATH_EXTERNAL_HOST_BINS-patch
I did not check if this error is in master branch - but hopefully 5.2 gets merged soon... Andreas Müller (1): qtbase: fix typo in PATH_EXTERNAL_HOST_BINS-patch .../0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 0/1] dconf: update to 0.18.0
tested with xfce and gnome image but world test will tell.. Andreas Müller (1): dconf: update to 0.18.0 meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 29 ++ meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb | 23 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/1] dconf: update to 0.18.0
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 29 ++
meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb | 23
2 files changed, 29 insertions(+), 23 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
new file mode 100644
index 000..ae9c809
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = configuation database system
+LICENSE = LGPLv2.1
+LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1
+
+SECTION = x11/gnome
+
+inherit gnome gsettings
+SRC_URI[archive.md5sum] = 69a12ed68893f2e1e81ac4e531bc1515
+SRC_URI[archive.sha256sum] =
109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955
+GNOME_COMPRESS_TYPE = xz
+
+DEPENDS = glib-2.0 gtk+3
+
+inherit vala gtk-doc
+
+EXTRA_OECONF += --disable-man
+
+PACKAGES =+ dconf-editor
+
+FILES_${PN} += \
+ ${datadir}/dbus-1 \
+ ${libdir}/gio/modules/*.so \
+
+FILES_dconf-editor = \
+ ${bindir}/dconf-editor \
+ ${datadir}/icons \
+ ${datadir}/bash-completion \
+
+FILES_${PN}-dbg += ${libdir}/gio/modules/.debug/libdconfsettings.so
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
b/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
deleted file mode 100644
index 7d11cf8..000
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = configuation database system
-LICENSE = LGPLv2.1
-LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1
-
-SECTION = x11/gnome
-
-inherit gnome gsettings
-SRC_URI[archive.md5sum] = d784f8afca04473d194a72047595c28e
-SRC_URI[archive.sha256sum] =
e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33
-
-DEPENDS = glib-2.0 gtk+3
-
-inherit vala
-
-PR = r2
-
-PACKAGES =+ dconf-editor
-
-FILES_dconf-editor = ${bindir}/dconf-editor ${datadir}/dconf-editor/
-FILES_${PN} += ${datadir}/dbus-1/ \
-${libdir}/gio/modules/*.so \
-
-FILES_${PN}-dbg += ${libdir}/gio/modules/.debug/libdconfsettings.so
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5][jansa/qt5-5.2.0]] qttools: add target build
this does not build much yet but I was looking for qdbus
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
recipes-qt/qt5/qttools.inc | 12
...t-help-fix-linking-of-dependent-libraries.patch | 32 ++
recipes-qt/qt5/qttools_5.2.0.bb| 5
3 files changed, 49 insertions(+)
create mode 100644 recipes-qt/qt5/qttools.inc
create mode 100644
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
create mode 100644 recipes-qt/qt5/qttools_5.2.0.bb
diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc
new file mode 100644
index 000..e96a678
--- /dev/null
+++ b/recipes-qt/qt5/qttools.inc
@@ -0,0 +1,12 @@
+DEPENDS += qtbase
+
+QT_MODULE = qttools
+
+require qt5.inc
+
+SRC_URI += \
+ file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
+
+
+FILES_${PN}-examples = ${datadir}/${QT_DIR_NAME}/examples
+
diff --git
a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
new file mode 100644
index 000..0f95333
--- /dev/null
+++
b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -0,0 +1,32 @@
+From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Fri, 17 Jan 2014 14:33:19 +0100
+Subject: [PATCH] assistant/help: fix linking of dependent libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+else we get:
+| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found
(try using -rpath or -rpath-link)
+| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ src/assistant/help/help.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
+index ed75c37..a2c55c7 100644
+--- a/src/assistant/help/help.pro
b/src/assistant/help/help.pro
+@@ -70,3 +70,5 @@ HEADERS += qhelpenginecore.h \
+ # access to clucene
+ HEADERS += qhelpsearchindexwriter_clucene_p.h \
+ qhelpsearchindexreader_clucene_p.h
++
++LIBS += -lQt5CLucene
+--
+1.8.3.1
+
diff --git a/recipes-qt/qt5/qttools_5.2.0.bb b/recipes-qt/qt5/qttools_5.2.0.bb
new file mode 100644
index 000..0effa1b
--- /dev/null
+++ b/recipes-qt/qt5/qttools_5.2.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = 76a0992967b6d02220ecb69a5ba04ef1
+SRC_URI[sha256sum] =
ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-qt5][jansa/qt5-5.2.0]] qttools: add target build
On Fri, Jan 17, 2014 at 4:33 PM, Martin Jansa martin.ja...@gmail.com wrote: On Fri, Jan 17, 2014 at 03:59:18PM +0100, Andreas Müller wrote: this does not build much yet but I was looking for qdbus Do you want me to merge it now or should I wait a bit more? For me 5.2 is building everything I need so far. With a little PACKAGECONFIG-appends here and there I was able to build all the stuff coming from hawaii-desktop (wayland-based). By merging we get out of secret corner and have a wider community - hopefully. build much means that it builds OK, but only some tools, right? yes - only few console tools (lconvert / lrelease / lupdate / qdbus / qdbusviewer / qtpaths) Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] meta-qt5: dependency loop for egl-library build by qmake
Hi, Found a libegl which is build by qmake. This turns into a dependency loop: * qtbase ships mkspec and depends on egl (if enabled by packageconfig) * the driver needs mkspec to build I see two possible way to get out: 1. in qmake5.bbclass set 'OE_QMAKE_PLATFORM ?= linux-oe-g++' Hereby the driver can ship and select a copy of linux-oe-g++ with a different name. Disadvantage: in case something is changed on mkspec the copy needs alignment. 2. Split out mkspec into a recipe. qmake5.bbclass can then depend on that recipe. Disadvantage: in case linux-oe-g++ finds it's way to mainline this won't work no more. What do you think? Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5 1/2] qtbase: eglfs: fix egl error for platforms only supporting one window/surface
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
recipes-qt/qt5/qtbase.inc | 1 +
...gl-error-for-platforms-only-supporting-on.patch | 63 ++
2 files changed, 64 insertions(+)
create mode 100644
recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 83ce25b..1fbe765 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -19,6 +19,7 @@ SRC_URI += \
file://0012-qtbase-allow-build-of-examples.patch \
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
+file://0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
DEPENDS += qtbase-native
diff --git
a/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
b/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
new file mode 100644
index 000..96d8281
--- /dev/null
+++
b/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -0,0 +1,63 @@
+From 093ae963179c237afae7844f67d226bc2f1f5a40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
+Date: Wed, 5 Feb 2014 18:35:08 +0100
+Subject: [PATCH] eglfs: fix egl error for platforms only supporting one
+ window/surface
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+running qmlscene -platform eglfs filename.qml
+
+caused
+
+EGL Error : Could not create the egl surface: error = 0x3003
+
+Rebased version of [1-2]
+
+Upstream-Status: unknown
+
+[1]
http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch
+[2]
https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ src/plugins/platforms/eglfs/qeglfswindow.cpp | 15 +++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp
b/src/plugins/platforms/eglfs/qeglfswindow.cpp
+index bba00da..567820c 100644
+--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
b/src/plugins/platforms/eglfs/qeglfswindow.cpp
+@@ -87,6 +87,16 @@ void QEglFSWindow::create()
+ if (m_flags.testFlag(Created))
+ return;
+
++static EGLSurface __singleWindowSurface;
++if(QEglFSHooks::hooks()
!QEglFSHooks::hooks()-hasCapability(QPlatformIntegration::MultipleWindows)
(__singleWindowSurface))
++{
++m_surface = __singleWindowSurface;
++#ifdef QEGL_EXTRA_DEBUG
++qWarning(Surface recreate request, re-using %x\n, m_surface);
++#endif
++ return;
++}
++
+ m_flags = Created;
+ m_wid = newWId();
+
+@@ -130,6 +140,11 @@ void QEglFSWindow::create()
+
+ resetSurface();
+
++if(QEglFSHooks::hooks()
!QEglFSHooks::hooks()-hasCapability(QPlatformIntegration::MultipleWindows))
++{
++__singleWindowSurface = m_surface;
++}
++
+ screen-setPrimarySurface(m_surface);
+
+ if (m_flags.testFlag(IsRaster)) {
+--
+1.8.3.1
+
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5 2/2] qtwayland: fix qml-compositor shader
running
| qmlcompositor -platform eglfs
| qmlscene -platform wayland foo.qml
causes
QOpenGLShader::compile(Fragment): Compile failed.
ERROR: 0:6: 'float' : No precision defined for this type
ERROR: 0:7: 'vec4' : No precision defined for this type
ERROR: 0:8: 'float' : No precision defined for this type
ERROR: 0:11: 'vec4' : No precision defined for this type
ERROR: 0:12: 'vec3' : No precision defined for this type
ERROR: 0:13: 'vec3' : No precision defined for this type
ERROR: 6 compilation errors. No code generated.
*** Problematic Fragment shader source code ***
uniform sampler2D source;
uniform float qt_Opacity;
uniform vec4 color;
uniform float blend;
varying highp vec2 qt_TexCoord0;
void main() {
vec4 sourceColor = texture2D(source, qt_TexCoord0);
vec3 delta = sourceColor.rgb - vec3(0.5);
vec3 lowerContrast = vec3(0.5) + 0.4 * delta;
gl_FragColor = qt_Opacity * mix(sourceColor, color * sourceColor.a *
dot(lowerContrast, vec3(11, 16, 5) * (1. / 32.)), blend);
}
***
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...002-Fix-ConstrastEffect-in-qml-compositor.patch | 48 ++
recipes-qt/qt5/qtwayland_git.bb| 4 ++
2 files changed, 52 insertions(+)
create mode 100644
recipes-qt/qt5/qtwayland/0002-Fix-ConstrastEffect-in-qml-compositor.patch
diff --git
a/recipes-qt/qt5/qtwayland/0002-Fix-ConstrastEffect-in-qml-compositor.patch
b/recipes-qt/qt5/qtwayland/0002-Fix-ConstrastEffect-in-qml-compositor.patch
new file mode 100644
index 000..1b40be6
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0002-Fix-ConstrastEffect-in-qml-compositor.patch
@@ -0,0 +1,48 @@
+From 309e9b03d24eb6b0b8fff04d883329c2f93a6a1c Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini pierluigi.fior...@gmail.com
+Date: Sun, 29 Dec 2013 14:15:41 +0100
+Subject: [PATCH] Fix ConstrastEffect in qml-compositor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Specify precision to make the shader working.
+
+Change-Id: I055fe47e1073403dc981274236fa82e091e0eca4
+Reviewed-by: Jørgen Lind jorgen.l...@digia.com
+Reviewed-by: Andy Nichols andy.nich...@digia.com
+Upstream-status: applied
+---
+ examples/qml-compositor/ContrastEffect.qml | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/examples/qml-compositor/ContrastEffect.qml
b/examples/qml-compositor/ContrastEffect.qml
+index 5159950..c284b29 100644
+--- a/examples/qml-compositor/ContrastEffect.qml
b/examples/qml-compositor/ContrastEffect.qml
+@@ -75,15 +75,15 @@ ShaderEffect {
+ vertexShader: source source.isYInverted ? vShaderInvertedY : vShader
+
+ fragmentShader:
+-uniform sampler2D source;
+-uniform float qt_Opacity;
+-uniform vec4 color;
+-uniform float blend;
++uniform lowp sampler2D source;
++uniform highp float qt_Opacity;
++uniform highp vec4 color;
++uniform highp float blend;
+ varying highp vec2 qt_TexCoord0;
+ void main() {
+-vec4 sourceColor = texture2D(source, qt_TexCoord0);
+-vec3 delta = sourceColor.rgb - vec3(0.5);
+-vec3 lowerContrast = vec3(0.5) + 0.4 * delta;
++highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
++highp vec3 delta = sourceColor.rgb - vec3(0.5);
++highp vec3 lowerContrast = vec3(0.5) + 0.4 * delta;
+ gl_FragColor = qt_Opacity * mix(sourceColor, color * sourceColor.a *
dot(lowerContrast, vec3(11, 16, 5) * (1. / 32.)), blend);
+ }
+
+--
+1.8.3.1
+
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 640373e..cf91908 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -5,3 +5,7 @@ require ${PN}.inc
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0
SRCREV = 3e9412e2fd91e64a565ed8ddbef76f57ca9413d5
+
+SRC_URI += \
+file://0002-Fix-ConstrastEffect-in-qml-compositor.patch \
+
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-qt5 2/2] qtwayland: fix qml-compositor shader
On Sat, Feb 8, 2014 at 7:46 PM, Martin Jansa martin.ja...@gmail.com wrote: +Change-Id: I055fe47e1073403dc981274236fa82e091e0eca4 +Reviewed-by: Jørgen Lind jorgen.l...@digia.com +Reviewed-by: Andy Nichols andy.nich...@digia.com +Upstream-status: applied This one should be Backport, but please check jansa/qt5-5.2.1 branch, I've updated all recipes for 5.2.1 release and newer qtwayland revision used there includes this patch already. Your qtbase patch still does apply, I'll add that to branch now. Will give 5.2.1 a test this week Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-qt5][jansa/qt5-5.2.0]] qtbase: fix typo in PATH_EXTERNAL_HOST_BINS-patch
On Thu, Jan 9, 2014 at 5:48 PM, Andreas Müller
schnitzelt...@googlemail.com wrote:
libraries based on cmake and depending on qt5qml failed to configure with:
| The imported target Qt5::DBus references the file
|
|
/home/a.mueller/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/qt5/qdbusxml2xml
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 2
+-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
b/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
index e3f1b72..ea3364e 100644
---
a/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
+++
b/recipes-qt/qt5/qtbase/0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -54,7 +54,7 @@ index 1d94715..617efa8 100644
set(imported_location
\${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\)
!!ELSE
-set(imported_location
\$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\)
-+set(imported_location
\${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2xml$$CMAKE_BIN_SUFFIX\)
++set(imported_location
\${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\)
!!ENDIF
_qt5_DBus_check_file_exists(${imported_location})
--
1.8.3.1
This one is back in 5.2.1. Shall I send a patch?
Andreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5][jansa/qt5-5.2.1] 1/2] libraries based on cmake and depending on qt5qml failed to configure with:
| The imported target Qt5::DBus references the file
|
|
/home/a.mueller/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/qt5/qdbusxml2xml
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
index d213252..23e22a8 100644
---
a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
+++
b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
@@ -54,7 +54,7 @@ index 1d94715..617efa8 100644
set(imported_location
\${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\)
!!ELSE
-set(imported_location \$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\)
-+set(imported_location
\${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2xml$$CMAKE_BIN_SUFFIX\)
++set(imported_location
\${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\)
!!ENDIF
_qt5_DBus_check_file_exists(${imported_location})
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5][jansa/qt5-5.2.1] 2/2] qtwayland.inc: fix QA warnings
WARNING: QA Issue: qtwayland: Files/directories were installed but not shipped
/usr/lib/qt5/plugins/wayland-graphics-integration
/usr/lib/qt5/plugins/wayland-graphics-integration/client
/usr/lib/qt5/plugins/wayland-graphics-integration/server
/usr/lib/qt5/plugins/wayland-graphics-integration/client/libwayland-egl.so
/usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug
/usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug/libwayland-egl.so
/usr/lib/qt5/plugins/wayland-graphics-integration/server/libwayland-egl.so
/usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug
/usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug/libwayland-egl.so
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
recipes-qt/qt5/qtwayland.inc | 8
1 file changed, 8 insertions(+)
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc
index 29c6b27..abeb15f 100644
--- a/recipes-qt/qt5/qtwayland.inc
+++ b/recipes-qt/qt5/qtwayland.inc
@@ -14,3 +14,11 @@ QT_WAYLAND_BUILD_PARTS ?= examples
EXTRA_QMAKEVARS_PRE += CONFIG+=${QT_WAYLAND_CONFIG}
EXTRA_QMAKEVARS_PRE += DEFINES+=${QT_WAYLAND_DEFINES}
EXTRA_QMAKEVARS_PRE += QT_BUILD_PARTS+=${QT_WAYLAND_BUILD_PARTS}
+
+FILES_${PN}-plugins += \
+${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \
+
+
+FILES_${PN}-plugins-dbg += \
+${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \
+
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] GDM alternative?
On Tue, Feb 18, 2014 at 10:24 PM, Adam Lee adam.yh@gmail.com wrote: Hello everyone, I am sure this has been asked before but I haven't found a solution. I am currently integrating GDM to my XFCE image. I was hoping that it's as easy as adding GDM as the graphical init manager (in local.conf), but it looks like PolicyKit, Console Kit, PAM, gconf, gconf-sanity (as per meta-angstrom) all need to be correctly configured for GDM to work. This integration of multiple frameworks is not what I had in mind. So I am now searching for alternative - something more lightweight and with less dependency. meta-oe contains another login manager 'slim', except it's no longer maintained and has been moved to nonworking directory within the tree. I don't see any other. Thank you, Adam I am using lxdm for my XFCE-image. Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] GDM alternative?
On Wed, Feb 19, 2014 at 5:15 PM, Adam Lee adam.yh@gmail.com wrote: Thank you Koen and Andreas. That has been really helped in clearing up my confusion and setting the path forward. I think I will try LXDM in meta-misc in meta-oe. Is there any special configuration that I should be aware of (other then setting it as the graphical init manager)? meta-misc is my personal playground - it might have dependencies to other layers and some things might not work as expected... Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5][jansa/qt5-5.2.1] qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]
* there is no kms around
* mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
* in configure we find:
| if [ $CFG_KMS = yes ]; then
| if [ $CFG_EGL = no ]; then
| echo The KMS plugin requires EGL support and cannot be built
| exit 101
| fi
| fi
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
recipes-qt/qt5/qtbase.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 116c86f..6c6ec5a 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] = -gtkstyle,-no-gtkstyle,gtk+
PACKAGECONFIG[directfb] = -directfb,-no-directfb,directfb
PACKAGECONFIG[linuxfb] = -linuxfb,-no-linuxfb
PACKAGECONFIG[mitshm] = -mitshm,-no-mitshm,mitshm
-PACKAGECONFIG[kms] = -kms,-no-kms,kms
+PACKAGECONFIG[kms] = -kms,-no-kms,virtual/mesa virtual/egl
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick
module without)
PACKAGECONFIG[icu] = -icu,-no-icu,${ICU}
PACKAGECONFIG[udev] = -libudev,-no-libudev,udev
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-qt5][jansa/qt5-5.2.1] qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]
should be same in master Andreas Müller (1): qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms] recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-qt5][jansa/qt5-5.2.1] qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]
On Tue, Feb 25, 2014 at 6:27 PM, Martin Jansa martin.ja...@gmail.com wrote: On Tue, Feb 25, 2014 at 06:16:54PM +0100, Andreas Müller wrote: * there is no kms around * mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms) * in configure we find: | if [ $CFG_KMS = yes ]; then | if [ $CFG_EGL = no ]; then | echo The KMS plugin requires EGL support and cannot be built | exit 101 | fi | fi Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 116c86f..6c6ec5a 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] = -gtkstyle,-no-gtkstyle,gtk+ PACKAGECONFIG[directfb] = -directfb,-no-directfb,directfb PACKAGECONFIG[linuxfb] = -linuxfb,-no-linuxfb PACKAGECONFIG[mitshm] = -mitshm,-no-mitshm,mitshm -PACKAGECONFIG[kms] = -kms,-no-kms,kms +PACKAGECONFIG[kms] = -kms,-no-kms,virtual/mesa virtual/egl Maybe we should introduce some virtual/gbm later, but I'm ok with virtual/mesa until we have it. virtual/mesa has different meanings gbm / wayland-egl - it took me a while to get mesa-free... Also there is no virtual/mesa in oe-core/dylan, but I guess that there is minimum user with dylan who also want kms. BTW: jansa/qt5-5.2.1 branch was already merged to master, so I plan to apply this only for master (jansa/qt5-5.2.1 is dead-end). I missed that - thanks Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-qt5][jansa/qt5-5.2.1] qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]
On Tue, Feb 25, 2014 at 8:06 PM, Andreas Müller schnitzelt...@googlemail.com wrote: On Tue, Feb 25, 2014 at 6:27 PM, Martin Jansa martin.ja...@gmail.com wrote: On Tue, Feb 25, 2014 at 06:16:54PM +0100, Andreas Müller wrote: * there is no kms around * mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms) * in configure we find: | if [ $CFG_KMS = yes ]; then | if [ $CFG_EGL = no ]; then | echo The KMS plugin requires EGL support and cannot be built | exit 101 | fi | fi Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 116c86f..6c6ec5a 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] = -gtkstyle,-no-gtkstyle,gtk+ PACKAGECONFIG[directfb] = -directfb,-no-directfb,directfb PACKAGECONFIG[linuxfb] = -linuxfb,-no-linuxfb PACKAGECONFIG[mitshm] = -mitshm,-no-mitshm,mitshm -PACKAGECONFIG[kms] = -kms,-no-kms,kms +PACKAGECONFIG[kms] = -kms,-no-kms,virtual/mesa virtual/egl Maybe we should introduce some virtual/gbm later, but I'm ok with virtual/mesa until we have it. virtual/mesa has different meanings gbm / wayland-egl - it took me a while to get mesa-free... Also there is no virtual/mesa in oe-core/dylan, but I guess that there is minimum user with dylan who also want kms. ping for master? Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce][PATCH v2 1/1] recipes-xfce/libxfce4ui: build fixes
On Mon, Mar 17, 2014 at 1:43 AM, Stephen Arnold
stephen.arnol...@gmail.com wrote:
From: Stephen Arnold stephen.arnol...@gmail.com
libxfce4ui build fixes:
- updated depends
- set SRCREV to 4.10.0 tag
AFAICR this will break xfce4-settings see commit
b3a2a01b40affbedc2b0951f7180c1212d24d532.
- added missing inherit
- added pre-config task
Signed-off-by: Stephen Arnold stephen.arnol...@gmail.com
---
.../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 23
++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index cc63a9f..b17ebc1 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -2,23 +2,28 @@ SUMMARY = Xfce4 Widget library and X Window System
interaction
SECTION = x11/libs
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=252890d9eee26aab7b432e8b8a616475
-DEPENDS = gtk+ intltool libxfce4util startup-notification xfconf glade3
+DEPENDS = perl-native glib-2.0 gtk+ intltool libxfce4util xfconf
xfce4-dev-tools virtual/libx11 libsm libice
-inherit xfce
+inherit autotools gettext xfce
SRC_URI = \
git://git.xfce.org/xfce/libxfce4ui;protocol=git \
file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
-file://0002-configure.ac.in-remove-optional-gtk3-support.patch \
-SRCREV = 530b72f50fcbd8cb4b970fcc97be0321bf78183e
-PV = 4.10.0+git${SRCPV}
+
+SRCREV = cf85eac7804e09b24f3e8fb4165f60b1c9f8cf49
+PV = 4.10.0
S = ${WORKDIR}/git
-EXTRA_OECONF += --enable-maintainer-mode --disable-debug
+PACKAGECONFIG ??=
+PACKAGECONFIG[gladeui] = --enable-gladeui,--disable-gladeui,glade3
+PACKAGECONFIG[startup-notification] =
--enable-startup-notification,--disable-startup-notification,startup-notification
+
+EXTRA_OECONF += --enable-maintainer-mode --disable-debug
--with-vendor-info=${DISTRO}
-do_configure_prepend() {
- NOCONFIGURE=yes ./autogen.sh
+do_patch_extra() {
+sed -i /GTK3/d ${S}/configure.ac.in
+NOCONFIGURE=yes ./autogen.sh
}
FILES_${PN}-dbg += ${libdir}/glade3/modules/.debug
@@ -27,3 +32,5 @@ FILES_${PN}-dev += ${libdir}/glade3/modules/*.la \
PACKAGES += ${PN}-glade
FILES_${PN}-glade = ${libdir}/glade3 \
${datadir}/glade3
+
+addtask do_patch_extra before do_configure after do_patch
why not do_configure_prepend?
You say 'build fixes'. Could you append a log showing why these
changes are necessary?
Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce][PATCH v3] recipes-xfce/libxfce4ui: depends and autotools fixes
On Tue, Mar 18, 2014 at 5:34 AM, Stephen Arnold
stephen.arnol...@gmail.com wrote:
Note: this patch (v3) obseletes previous versions
libxfce4ui_4.10.0.bb: Upstream changes required autotools and gettext (intl)
fixes, as well as moving the autogen stuff to a separate task. Full depends
were also added (2 were converted to PACKAGECONFIG options) along with a
vendor config option.
Signed-off-by: Stephen Arnold stephen.arnol...@gmail.com
---
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index cc63a9f..1e141c4 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -2,9 +2,9 @@ SUMMARY = Xfce4 Widget library and X Window System
interaction
SECTION = x11/libs
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=252890d9eee26aab7b432e8b8a616475
-DEPENDS = gtk+ intltool libxfce4util startup-notification xfconf glade3
+DEPENDS = perl-native glib-2.0 gtk+ intltool libxfce4util xfconf
xfce4-dev-tools virtual/libx11 libsm libice
-inherit xfce
+inherit autotools gettext xfce
SRC_URI = \
git://git.xfce.org/xfce/libxfce4ui;protocol=git \
@@ -15,9 +15,13 @@ SRCREV = 530b72f50fcbd8cb4b970fcc97be0321bf78183e
PV = 4.10.0+git${SRCPV}
S = ${WORKDIR}/git
-EXTRA_OECONF += --enable-maintainer-mode --disable-debug
+EXTRA_OECONF += --enable-maintainer-mode --disable-debug
--with-vendor-info=${DISTRO}
-do_configure_prepend() {
+PACKAGECONFIG ??=
+PACKAGECONFIG[gladeui] = --enable-gladeui,--disable-gladeui,glade3
+PACKAGECONFIG[startup-notification] =
--enable-startup-notification,--disable-startup-notification,startup-notification
+
+do_src_prepare() {
NOCONFIGURE=yes ./autogen.sh
}
@@ -27,3 +31,5 @@ FILES_${PN}-dev += ${libdir}/glade3/modules/*.la \
PACKAGES += ${PN}-glade
FILES_${PN}-glade = ${libdir}/glade3 \
${datadir}/glade3
+
+addtask do_src_prepare before do_configure after do_patch
--
I asked that for lxdm already - maybe I missed something: Why do you
create an extra task and do not use do_configure_prepend() ?
Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-graphics][PATCH v3] recipes-graphics/lxdm: autotools and config updates
On Tue, Mar 18, 2014 at 10:09 AM, Stephen Arnold
stephen.arnol...@gmail.com wrote:
lxdm_git.bb: Upstream changes required autotools and gettext (intl) updates;
the package autogen script doesn't create the makefile in po, but autotools
by itself is missing the input file (thus, the configure_prepend). There
were also missing depends (from upstream docs and configure checks) and
some configure options were added to ensure the desired X/gtk2 config and
enable (optional) auto-login.
For my interest since I have autologin working as expected (with
oe-core updated last in january - autotools not updated). What is
this --enable-password for?
Signed-off-by: Stephen Arnold stephen.arnol...@gmail.com
---
meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index c12eddf..c602ad3 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -16,17 +16,24 @@ SRCREV = 07fb151a99ef99318b71f3de0afbba977b1e6267
PV = 0.5.0+git${SRCPV}
PE = 1
-DEPENDS = cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango
+DEPENDS = virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0
gtk+ virtual/libx11 libxcb pango iso-codes
DEPENDS += ${@base_contains(DISTRO_FEATURES, systemd, , consolekit,
d)}
# combine oe-core way with angstrom DISTRO_TYPE
DISTRO_TYPE ?= ${@base_contains(IMAGE_FEATURES, debug-tweaks, debug,
,d)}
-inherit autotools gettext systemd
+inherit autotools pkgconfig gettext systemd
S = ${WORKDIR}/git
-EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'systemd',
'--with-systemdsystemunitdir=${systemd_unitdir}/system/
--disable-consolekit', '--without-systemdsystemunitdir', d)}
+CFLAGS_append = -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr
Why these extra flags - I found no hint in commit message.
+
+EXTRA_OECONF += --enable-gtk3=no --enable-password=yes --with-x
-with-xconn=xcb \
+${@base_contains('DISTRO_FEATURES', 'systemd',
'--with-systemdsystemunitdir=${systemd_unitdir}/system/
--disable-consolekit', '--without-systemdsystemunitdir', d)}
+
+do_configure_prepend() {
+cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
+}
do_compile_append() {
# default background configured not available / no password field
available / no default screensaver
--
regards
Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-graphics][PATCH v3] recipes-graphics/lxdm: autotools and config updates
On Wed, Mar 19, 2014 at 3:57 AM, Stephen Arnold stephen.arnol...@gmail.com wrote: On --enable-password=yes: The upstream docs say enable to load autologin password store at config file and it's part of the default config on my gentoo arm builds. I haven't actually tried it in oe yet, since I wanted a default user with a password in my rpi build. It sounds like the oe method doesn't need that option, so I can remove it if that's what you want. On the extra CFLAGS: I suppose they're not strictly necessary either, but they do help reduce configure warnings. Some of the build failures didn't really have any obvious errors (just a boat-load of warnings) so it helps in getting to the true error. But as I said, it should be okay to remove them now. Do you want a new version of the patch minus the above? Thanks for explanation taking care. I have not time for testing but I think patches are OK as they are. Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] State of bitbake world, Failed tasks 2014-03-29
On Sat, Mar 29, 2014 at 11:54 PM, Martin Jansa martin.ja...@gmail.com wrote: http://www.openembedded.org/wiki/Bitbake_World_Status == Failed tasks 2014-03-29 == === common (23) === * meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb, do_compile * meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb, do_configure * meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile * meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb, do_configure * meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb, do_compile * meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb, do_compile * meta-openembedded/meta-oe/recipes-connectivity/daq/daq_2.0.2.bb, do_install * meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb, do_compile * meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb, do_compile * meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb, do_compile * meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb, do_compile * meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb, do_configure * meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb, do_configure * meta-openembedded/meta-oe/recipes-navigation/monav/monav_0.3.bb, do_compile * meta-openembedded/meta-oe/recipes-support/asio/asio_1.4.1.bb, do_compile * meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb, do_install * meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.3.bb, do_configure * meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb, do_configure * meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb, do_configure * meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb, do_configure * meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb, do_configure * meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb, do_configure * meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb, do_configure Patches for xfce-receipes should go out today... Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 0/4] 'gtkmathview' fix for SOBBW (2014-03-29)
On Tue, Apr 1, 2014 at 5:39 AM, Trevor Woerner trevor.woer...@linaro.org wrote: Hi Martin, Here is a fix for your State of bitbake world, Failed tasks 2014-03-29. This patch set provides fixes and some clean-up for the gtkmathview package. Best regards, Trevor Trevor Woerner (4): gtkmathview: fix B!=S gtkmathview: fix qa issue gtkmathview: fix build error gtkmathview: run through oe-stylize.py .../mml-widget/gtkmathview/qualify-lookup.diff | 13 + meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb| 9 +++-- 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff -- 1.9.0 -- Tested 1-3 - thanks Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] asio: package bump
On Tue, Apr 1, 2014 at 4:10 AM, Trevor Woerner
trevor.woer...@linaro.org wrote:
This recipe had been failing to build, bumping to the latest stable release
resolves all build issues.
Signed-off-by: Trevor Woerner trevor.woer...@linaro.org
---
meta-oe/recipes-support/asio/asio.inc | 11 ++-
meta-oe/recipes-support/asio/asio_1.10.1.bb | 6 ++
meta-oe/recipes-support/asio/asio_1.4.1.bb | 8
3 files changed, 12 insertions(+), 13 deletions(-)
create mode 100644 meta-oe/recipes-support/asio/asio_1.10.1.bb
delete mode 100644 meta-oe/recipes-support/asio/asio_1.4.1.bb
diff --git a/meta-oe/recipes-support/asio/asio.inc
b/meta-oe/recipes-support/asio/asio.inc
index 49c236f..c2a6b1b 100644
--- a/meta-oe/recipes-support/asio/asio.inc
+++ b/meta-oe/recipes-support/asio/asio.inc
@@ -1,9 +1,10 @@
-DESCRIPTION = Asio
-HOMEPAGE = http://asio.sf.net/;
+DESCRIPTION = Asio is a cross-platform C++ library for network and
low-level \
+I/O programming that provides developers with a consistent
asynchronous \
+model using a modern C++ approach.
+AUTHOR = Christopher M. Kohlhoff (chris at kohlhoff dot com)
+HOMEPAGE = http://think-async.com/Asio;
SECTION = libs
-LICENSE = Boost Software License
-
-INC_PR = r0
+LICENSE = BSL-1.0
DEPENDS = boost
diff --git a/meta-oe/recipes-support/asio/asio_1.10.1.bb
b/meta-oe/recipes-support/asio/asio_1.10.1.bb
new file mode 100644
index 000..fdfaaf6
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio_1.10.1.bb
@@ -0,0 +1,6 @@
+require asio.inc
+
+LIC_FILES_CHKSUM = file://COPYING;md5=113f800aa522d9e38c3309c98ec53ade
+
+SRC_URI[md5sum] = 4d508c9947404fee40945375b8a5fd32
+SRC_URI[sha256sum] =
820a5dad3c56a4f3e937f2b9ae059ab2696c6058345d71b7a8b072a0f2fcbd99
diff --git a/meta-oe/recipes-support/asio/asio_1.4.1.bb
b/meta-oe/recipes-support/asio/asio_1.4.1.bb
deleted file mode 100644
index 396a553..000
--- a/meta-oe/recipes-support/asio/asio_1.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require asio.inc
-
-LIC_FILES_CHKSUM = file://COPYING;md5=b99840878263c0bfaa70ca7143624413
-
-PR = ${INC_PR}.0
-
-SRC_URI[md5sum] = 1879b246f9217d64bd3126aa16488bc2
-SRC_URI[sha256sum] =
aeb5c997940e6afd399c62316f03f480557f2b721354adff065d230183ff2782
--
1.9.0
--
You were faster than me :)
Acked-by: Andreas Müller schnitzelt...@googlemail.com
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-xfce/meta-gnome 00/10] world-fixes
mousepad seems already fixed in secret shr repo
The following changes since commit c04626475be6f0e52400552d5aed044062aac4dd:
exo: Add intltool-native as native dependency (2014-03-29 22:51:36 +0100)
are available in the git repository at:
git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
patches-for-world
for you to fetch changes up to 4972401d7133f07f732a06d47bc9bce664465493:
abiword: update to 3.0.0 to fix build (2014-04-01 17:12:30 +0200)
Andreas Müller (10):
xfce-git.bbclass initial add
xarchiver: fix configue
xfwm4: fix configue by inheriting xfce-git.bbclass
libxfce4ui: fix configue by inheriting xfce-git.bbclass
xfce4-taskmanager: fix configue by inheriting xfce-git.bbclass
xfce4-closebutton-plugin: fix configue by inheriting xfce-git.bbclass
xfce4-settings: fix configue by inheriting xfce-git.bbclass
xfce4-dev-tools: update to 4.11.0
sound-theme-freedesktop: fix configure
abiword: update to 3.0.0 to fix build
meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
| 12 -
meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
| 21
meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
| 32
meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
| 32
meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
| 104
meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
| 102
--
meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
| 12 -
meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb = abiword_3.0.0.bb}
| 39 +++--
meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
| 2 ++
meta-xfce/classes/xfce-git.bbclass
| 5
meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
| 8 ++
meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
| 6 +
meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
| 6 +
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
| 8 +-
meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb =
xfce4-dev-tools_4.11.0.bb} | 4 +--
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
| 6 +
meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
| 6 +
17 files changed, 63 insertions(+), 342 deletions(-)
delete mode 100644
meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
delete mode 100644
meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
delete mode 100755 meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
create mode 100644
meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
delete mode 100644
meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
rename meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb = abiword_3.0.0.bb}
(83%)
create mode 100644 meta-xfce/classes/xfce-git.bbclass
rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb =
xfce4-dev-tools_4.11.0.bb} (78%)
--
1.8.3.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
