From f38b3e7767534a13b125dd2b4ce3ea15c4e0a8e2 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 23 Jul 2015 13:57:01 +0200 Subject: libwnck: update to 2.31 / avoid conflicts with libwnck3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb | 15 --------------- meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb create mode 100644 meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb (limited to 'meta-gnome') 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} +} -- cgit 1.2.3-korg