From f8b4dad61381d7e4abb9fd9fa9394137fa7796a6 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sat, 22 Nov 2014 15:19:57 +0100
Subject: lxpanel: update to 0.8.0

Add a libkeybinder recipe, as lxpanel now depends on it.

While at it, remove old recipes.
---
 recipes-lxde/lxpanel/keybinder_0.3.0.bb            | 19 +++++++++++++++++
 .../lxpanel-0.5.12/lxpanel-0.5.6-broken-apps.patch | 20 ------------------
 .../lxpanel-0.5.8/lxpanel-0.5.6-broken-apps.patch  | 20 ------------------
 .../lxpanel-0.5.8/lxpanel_missing_am_prog_ar.patch | 10 ---------
 recipes-lxde/lxpanel/lxpanel_0.5.12.bb             | 23 ---------------------
 recipes-lxde/lxpanel/lxpanel_0.5.8.bb              | 24 ----------------------
 recipes-lxde/lxpanel/lxpanel_0.6.1.bb              | 23 ---------------------
 recipes-lxde/lxpanel/lxpanel_0.8.0.bb              | 23 +++++++++++++++++++++
 8 files changed, 42 insertions(+), 120 deletions(-)
 create mode 100644 recipes-lxde/lxpanel/keybinder_0.3.0.bb
 delete mode 100644 recipes-lxde/lxpanel/lxpanel-0.5.12/lxpanel-0.5.6-broken-apps.patch
 delete mode 100644 recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel-0.5.6-broken-apps.patch
 delete mode 100644 recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel_missing_am_prog_ar.patch
 delete mode 100644 recipes-lxde/lxpanel/lxpanel_0.5.12.bb
 delete mode 100644 recipes-lxde/lxpanel/lxpanel_0.5.8.bb
 delete mode 100644 recipes-lxde/lxpanel/lxpanel_0.6.1.bb
 create mode 100644 recipes-lxde/lxpanel/lxpanel_0.8.0.bb

diff --git a/recipes-lxde/lxpanel/keybinder_0.3.0.bb b/recipes-lxde/lxpanel/keybinder_0.3.0.bb
new file mode 100644
index 0000000..089d733
--- /dev/null
+++ b/recipes-lxde/lxpanel/keybinder_0.3.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Library for registering global key bindings, for gtk-based applications"
+SECTION = "x11"
+
+PR = "r0"
+
+LICENSE = "X11"
+LIC_FILES_CHKSUM = "file://libkeybinder/bind.c;md5=2d2071c3f1c7563111ad40b6be7b0db6"
+
+DEPENDS = "gtk+"
+
+SRC_URI = "http://gentoo.inode.at/distfiles/${PN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "2a0aed62ba14d1bf5c79707e20cb4059"
+SRC_URI[sha256sum] = "42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb"
+
+inherit autotools gettext pkgconfig
+
+EXTRA_OECONF += " --disable-lua --disable-python"
+
+FILES_${PN}-dbg += "${libdir}/lxpanel/plugins/.debug"
diff --git a/recipes-lxde/lxpanel/lxpanel-0.5.12/lxpanel-0.5.6-broken-apps.patch b/recipes-lxde/lxpanel/lxpanel-0.5.12/lxpanel-0.5.6-broken-apps.patch
deleted file mode 100644
index 16cda10..0000000
--- a/recipes-lxde/lxpanel/lxpanel-0.5.12/lxpanel-0.5.6-broken-apps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -NrU5 lxpanel-0.5.6.original/data/default/panels/panel.in lxpanel-0.5.6/data/default/panels/panel.in
---- lxpanel-0.5.6.original/data/default/panels/panel.in	2010-02-08 00:37:52.000000000 -0600
-+++ lxpanel-0.5.6/data/default/panels/panel.in	2010-12-26 12:49:42.000000000 -0600
-@@ -50,16 +50,10 @@
-     type = launchbar
-     Config {
-         Button {
-             id=pcmanfm.desktop
-         }
--        Button {
--            id=gnome-terminal.desktop
--        }
--        Button {
--            id=firefox.desktop
--        }
-     }
- }
- 
- Plugin {
-     type = space
diff --git a/recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel-0.5.6-broken-apps.patch b/recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel-0.5.6-broken-apps.patch
deleted file mode 100644
index 16cda10..0000000
--- a/recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel-0.5.6-broken-apps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -NrU5 lxpanel-0.5.6.original/data/default/panels/panel.in lxpanel-0.5.6/data/default/panels/panel.in
---- lxpanel-0.5.6.original/data/default/panels/panel.in	2010-02-08 00:37:52.000000000 -0600
-+++ lxpanel-0.5.6/data/default/panels/panel.in	2010-12-26 12:49:42.000000000 -0600
-@@ -50,16 +50,10 @@
-     type = launchbar
-     Config {
-         Button {
-             id=pcmanfm.desktop
-         }
--        Button {
--            id=gnome-terminal.desktop
--        }
--        Button {
--            id=firefox.desktop
--        }
-     }
- }
- 
- Plugin {
-     type = space
diff --git a/recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel_missing_am_prog_ar.patch b/recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel_missing_am_prog_ar.patch
deleted file mode 100644
index 0a360a8..0000000
--- a/recipes-lxde/lxpanel/lxpanel-0.5.8/lxpanel_missing_am_prog_ar.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lxpanel-0.5.8/configure.ac~	2011-07-29 14:37:01.000000000 +0200
-+++ lxpanel-0.5.8/configure.ac	2012-08-12 16:48:31.000000000 +0200
-@@ -16,6 +16,7 @@
- AC_PROG_LN_S
- AC_PROG_INTLTOOL(, [no-xml])
- AM_PROG_CC_C_O
-+AM_PROG_AR
- 
- #Initialize libtool
- LT_PREREQ([2.2])
diff --git a/recipes-lxde/lxpanel/lxpanel_0.5.12.bb b/recipes-lxde/lxpanel/lxpanel_0.5.12.bb
deleted file mode 100644
index 3e6fcc8..0000000
--- a/recipes-lxde/lxpanel/lxpanel_0.5.12.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "LXDE Panel"
-HOMEPAGE = "http://lxde.org/"
-SECTION = "x11"
-
-PR = "r0"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183"
-
-RDEPENDS_{PN} = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib libwnck wireless-tools"
-DEPENDS = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib libwnck wireless-tools"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \
-           file://lxpanel-0.5.6-broken-apps.patch \
-"
-SRC_URI[md5sum] = "30def9a0aa3c517e102295e8a7bc17fd"
-SRC_URI[sha256sum] = "11cfe76f6241bbac556e57a6efc079b6e10dceea76a8bdaf4c749afdb81d15ab"
-
-inherit autotools gettext pkgconfig
-
-EXTRA_OECONF += "--enable-alsa --with-x --with-plugins=all"
-
-FILES_${PN}-dbg += "${libdir}/lxpanel/plugins/.debug"
diff --git a/recipes-lxde/lxpanel/lxpanel_0.5.8.bb b/recipes-lxde/lxpanel/lxpanel_0.5.8.bb
deleted file mode 100644
index dbcd76b..0000000
--- a/recipes-lxde/lxpanel/lxpanel_0.5.8.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "LXDE Panel"
-HOMEPAGE = "http://lxde.org/"
-SECTION = "x11"
-
-PR = "r2"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183"
-
-RDEPENDS_{PN} = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib"
-DEPENDS = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \
-           file://lxpanel-0.5.6-broken-apps.patch \
-           file://lxpanel_missing_am_prog_ar.patch \
-"
-SRC_URI[md5sum] = "129fae75d1cd3983fd94542c573a70a1"
-SRC_URI[sha256sum] = "6a3579d6f384c03a33a03e4d32016428c84eb0f2bc421704f724fe2cc015cddd"
-
-inherit autotools gettext pkgconfig
-
-EXTRA_OECONF += "--enable-alsa --with-x --with-plugins=all"
-
-FILES_${PN}-dbg += "${libdir}/lxpanel/plugins/.debug"
diff --git a/recipes-lxde/lxpanel/lxpanel_0.6.1.bb b/recipes-lxde/lxpanel/lxpanel_0.6.1.bb
deleted file mode 100644
index 1954bf4..0000000
--- a/recipes-lxde/lxpanel/lxpanel_0.6.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "LXDE Panel"
-HOMEPAGE = "http://lxde.org/"
-SECTION = "x11"
-
-PR = "r0"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183"
-
-RDEPENDS_{PN} = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib libwnck wireless-tools"
-DEPENDS = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib libwnck wireless-tools"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \
-           file://lxpanel-broken-apps.patch \
-"
-SRC_URI[md5sum] = "e96e191c4ffb7b475a6ba06455ecf7fa"
-SRC_URI[sha256sum] = "a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb"
-
-inherit autotools gettext pkgconfig
-
-EXTRA_OECONF += "--enable-alsa --with-x --with-plugins=all"
-
-FILES_${PN}-dbg += "${libdir}/lxpanel/plugins/.debug"
diff --git a/recipes-lxde/lxpanel/lxpanel_0.8.0.bb b/recipes-lxde/lxpanel/lxpanel_0.8.0.bb
new file mode 100644
index 0000000..b34ab3e
--- /dev/null
+++ b/recipes-lxde/lxpanel/lxpanel_0.8.0.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "LXDE Panel"
+HOMEPAGE = "http://lxde.org/"
+SECTION = "x11"
+
+PR = "r0"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183"
+
+DEPENDS = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib libwnck wireless-tools pcmanfm keybinder"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz \
+           file://lxpanel-broken-apps.patch \
+"
+SRC_URI[md5sum] = "aa5bc73f4fe1d8006248a1f45f0a8a21"
+SRC_URI[sha256sum] = "94dd664ed6c7c001ca83959cdeadaa386ba0d2c91f113c2e6d318a5f33604415"
+
+inherit autotools gettext pkgconfig
+
+EXTRA_OECONF += "--enable-alsa --with-x --with-plugins=all"
+
+FILES_${PN}-dbg += "${libdir}/lxpanel/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/lxpanel/*.so"
-- 
cgit v1.2.3