From 243b67457a142aa0ba1111ff7163098434927a7e Mon Sep 17 00:00:00 2001
From: Andreas Müller <schnitzeltony@googlemail.com>
Date: Mon, 16 Sep 2013 09:04:16 +0000
Subject: xfwm4: move to git repo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb | 29 --------------------
 meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb    | 40 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 29 deletions(-)
 delete mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
 create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb

diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
deleted file mode 100644
index 86ac20edbc..0000000000
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-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"
-
-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')
-    do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
-
-PACKAGES_DYNAMIC += "^xfwm4-theme-.*"
-
-ALTERNATIVE_${PN} = "x-window-manager"
-ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4"
-ALTERNATIVE_PRIORITY[x-window-manager] = "30"
-
-RDEPENDS_${PN} = "xfwm4-theme-default"
-FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \
-                ${datadir}/xfwm4/defaults \
-"
-FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*"
-
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
new file mode 100644
index 0000000000..b72d44f799
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
@@ -0,0 +1,40 @@
+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"
+
+inherit xfce update-alternatives
+
+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')
+    do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
+
+PACKAGES_DYNAMIC += "^xfwm4-theme-.*"
+
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4"
+ALTERNATIVE_PRIORITY[x-window-manager] = "30"
+
+RDEPENDS_${PN} = "xfwm4-theme-default"
+FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \
+                ${datadir}/xfwm4/defaults \
+"
+FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*"
+
-- 
cgit 1.2.3-korg