diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2015-07-23 13:57:01 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-30 21:11:05 +0200 |
| commit | f38b3e7767534a13b125dd2b4ce3ea15c4e0a8e2 (patch) | |
| tree | c5fce0b47317d7e285b4d82c4c1fae76d680dbc4 | |
| parent | 70251cdb6137eb7be6b10113c27e5e4547abc689 (diff) | |
| download | meta-openembedded-contrib-f38b3e7767534a13b125dd2b4ce3ea15c4e0a8e2.tar.gz | |
libwnck: update to 2.31 / avoid conflicts with libwnck3
Both libwnck and libwnck3 install the commandline tools 'wnck-urgency-monitor'
and 'wnckprop' to bindir. The packages depending on libwnck were checked: In
none of them there is a trace for these tools.
To avoid conflicts the tools are installed by libwnck3 only. If something
requires 'wnck-urgency-monitor' or 'wnckprop' it needs to install libwnck3.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb | 15 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 22 |
2 files changed, 22 insertions, 15 deletions
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb deleted file mode 100644 index 61836d260c..0000000000 --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -PR = "r2" - -SECTION = "x11/libs" -DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native libxres" - -PACKAGECONFIG ??= "startup-notification" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -inherit gnomebase -SRC_URI[archive.md5sum] = "4162d5b96151e6d24ec02ae3a822203c" -SRC_URI[archive.sha256sum] = "56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1" diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb new file mode 100644 index 0000000000..3e5370db54 --- /dev/null +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Window navigation construction toolkit" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +SECTION = "x11/libs" +DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native libxres" + +PACKAGECONFIG ??= "startup-notification" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +inherit gnomebase +GNOME_COMPRESS_TYPE = "xz" +SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" +SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" + +do_install_append() { + # to avoid conflicts with libwnck3 remove cmdline tools + # if the tools are requrired add libwnck3 to your image + rm ${D}${bindir}/wnckprop + rm ${D}${bindir}/wnck-urgency-monitor + rmdir ${D}${bindir} +} |