From d8869f3ac30fd3640d8f9b27d7c1c922ef160216 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 18 Aug 2009 13:10:47 +0100
Subject: [PATCH] pimlico: Convert recipes to gnome git

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../distro/include/moblin-fixed-revisions.inc |   3 +++
 .../include/moblin-floating-revisions.inc     |   3 +++
 .../distro/include/poky-fixed-revisions.inc   |   9 ++++++---
 meta/packages/pimlico/contacts.inc            |   7 ++++++-
 .../contacts-owl-window-menu.patch            |   0
 .../{files => contacts}/stock_contact.png     | Bin
 .../{files => contacts}/stock_person.png      | Bin
 meta/packages/pimlico/contacts_0.9.bb         |   6 +-----
 meta/packages/pimlico/contacts_git.bb         |  10 +++++++++
 meta/packages/pimlico/contacts_svn.bb         |  19 ------------------
 meta/packages/pimlico/dates.inc               |  14 ++++---------
 .../dates-owl-window-menu.patch               |   0
 .../{dates_0.4.6.bb => dates_0.4.8.bb}        |   0
 meta/packages/pimlico/dates_git.bb            |   8 ++++++++
 meta/packages/pimlico/dates_svn.bb            |  10 ---------
 meta/packages/pimlico/tasks.inc               |   4 +++-
 .../pimlico/{files => tasks}/tasks-owl.diff   |   0
 meta/packages/pimlico/tasks_0.13.bb           |   3 +--
 meta/packages/pimlico/tasks_git.bb            |   6 ++++++
 meta/packages/pimlico/tasks_svn.bb            |   9 ---------
 20 files changed, 51 insertions(+), 60 deletions(-)
 rename meta/packages/pimlico/{files => contacts}/contacts-owl-window-menu.patch (100%)
 rename meta/packages/pimlico/{files => contacts}/stock_contact.png (100%)
 rename meta/packages/pimlico/{files => contacts}/stock_person.png (100%)
 create mode 100644 meta/packages/pimlico/contacts_git.bb
 delete mode 100644 meta/packages/pimlico/contacts_svn.bb
 rename meta/packages/pimlico/{files => dates}/dates-owl-window-menu.patch (100%)
 rename meta/packages/pimlico/{dates_0.4.6.bb => dates_0.4.8.bb} (100%)
 create mode 100644 meta/packages/pimlico/dates_git.bb
 delete mode 100644 meta/packages/pimlico/dates_svn.bb
 rename meta/packages/pimlico/{files => tasks}/tasks-owl.diff (100%)
 create mode 100644 meta/packages/pimlico/tasks_git.bb
 delete mode 100644 meta/packages/pimlico/tasks_svn.bb

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index d016791536..4b0cb26525 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -35,7 +35,9 @@ SRCREV_pn-clutter-imcontext ?= "69cae7b2b9f863fe1e0d392825508e63b8a107a4"
 SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165"
 SRCREV_pn-connman ?= "6af0b24817b8712c755ef24ed0ee4c5e84550657"
 SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
+SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
 SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
+SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
 SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
 SRCREV_pn-hornsey ?= "72ff7b1703436e2cdb8061eac7bb9f56d3ba02de"
 SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
@@ -63,6 +65,7 @@ SRCREV_pn-nbtk ?= "8c2521c8a16c52a0e28ddaf9b9f212852f2b8490"
 SRCREV_pn-mtpfs = "17"
 SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
 SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
+SRCREV_pn-tasks ?= "a3c6109973c2f39190f554b49dacda7ec5231ef4"
 SRCREV_pn-twitter-glib ?= "9dfca7cf38e3dddbda6dc82d0164f65814b8783e"
 
 SRCREVMOZILLAHEADLESS ?= "1a622cb7c384"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 3f0006f3bc..4dd04958f3 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -14,7 +14,9 @@ SRCREV_pn-clutter-imcontext ?= "${AUTOREV}"
 SRCREV_pn-clutter-mozembed ?= "${AUTOREV}"
 SRCREV_pn-connman ?= "${AUTOREV}"
 SRCREV_pn-connman-gnome ?= "${AUTOREV}"
+SRCREV_pn-contacts ?= "${AUTOREV}"
 SRCREV_pn-dalston ?= "${AUTOREV}"
+SRCREV_pn-dates ?= "${AUTOREV}"
 SRCREV_pn-gconnman ?= "${AUTOREV}"
 SRCREV_pn-hornsey ?= "${AUTOREV}"
 SRCREV_pn-json-glib ?= "${AUTOREV}"
@@ -43,6 +45,7 @@ SRCREV_pn-nbtk ?= "${AUTOREV}"
 SRCREV_pn-qemugl ?= "${AUTOREV}"
 SRCREV_pn-sample-media ?= "${AUTOREV}"
 SRCREV_pn-syncevolution ?= "${AUTOREV}"
+SRCREV_pn-tasks ?= "${AUTOREV}"
 SRCREV_pn-twitter-glib ?= "${AUTOREV}"
 SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}"
 
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 80a120aa8f..5476a752bf 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -114,10 +114,13 @@ SRCREV_pn-networkmanager ?= "2984"
 SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
 SRCREV_pn-ubootchart ?= "10"
 
-SRCREV_pn-dfu-util-native = "3139"
-SRCREV_pn-dfu-util = "3139"
+SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
+SRCREV_pn-tasks ?= "a3c6109973c2f39190f554b49dacda7ec5231ef4"
+SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
+SRCREV_pn-dfu-util-native ?= "3139"
+SRCREV_pn-dfu-util ?= "3139"
 SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libjana = "749"
+SRCREV_pn-libjana ?= "749"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "3349"
diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc
index 250342243c..240540f6af 100644
--- a/meta/packages/pimlico/contacts.inc
+++ b/meta/packages/pimlico/contacts.inc
@@ -4,7 +4,7 @@ SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
 RDEPENDS = "libedata-book"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF += "--disable-gnome-vfs"
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
@@ -17,3 +17,8 @@ do_install_append () {
 
 FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
 		${datadir}/pixmaps/stock_person.png"
+
+SRC_URI = "file://stock_contact.png \
+           file://stock_person.png"
+
+SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;patch=1 "
diff --git a/meta/packages/pimlico/files/contacts-owl-window-menu.patch b/meta/packages/pimlico/contacts/contacts-owl-window-menu.patch
similarity index 100%
rename from meta/packages/pimlico/files/contacts-owl-window-menu.patch
rename to meta/packages/pimlico/contacts/contacts-owl-window-menu.patch
diff --git a/meta/packages/pimlico/files/stock_contact.png b/meta/packages/pimlico/contacts/stock_contact.png
similarity index 100%
rename from meta/packages/pimlico/files/stock_contact.png
rename to meta/packages/pimlico/contacts/stock_contact.png
diff --git a/meta/packages/pimlico/files/stock_person.png b/meta/packages/pimlico/contacts/stock_person.png
similarity index 100%
rename from meta/packages/pimlico/files/stock_person.png
rename to meta/packages/pimlico/contacts/stock_person.png
diff --git a/meta/packages/pimlico/contacts_0.9.bb b/meta/packages/pimlico/contacts_0.9.bb
index d00752b9c4..fa2aa74dc0 100644
--- a/meta/packages/pimlico/contacts_0.9.bb
+++ b/meta/packages/pimlico/contacts_0.9.bb
@@ -2,8 +2,4 @@ require contacts.inc
 
 PR="r1"
 
-SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
-	   file://stock_contact.png \
-	   file://stock_person.png  \
-	   file://contacts-owl-window-menu.patch;patch=1 \
-	  "
+SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
diff --git a/meta/packages/pimlico/contacts_git.bb b/meta/packages/pimlico/contacts_git.bb
new file mode 100644
index 0000000000..8f3bc23b03
--- /dev/null
+++ b/meta/packages/pimlico/contacts_git.bb
@@ -0,0 +1,10 @@
+require contacts.inc
+
+PV = "0.9+git${SRCPV}"
+
+
+SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+
diff --git a/meta/packages/pimlico/contacts_svn.bb b/meta/packages/pimlico/contacts_svn.bb
deleted file mode 100644
index 58ff64e614..0000000000
--- a/meta/packages/pimlico/contacts_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require contacts.inc
-
-#DEPENDS += "gnome-vfs"
-#RDEPENDS += "gnome-vfs-plugin-file"
-#RRECOMMENDS += "gnome-vfs-plugin-http"
-
-PV = "0.9+svnr${SRCREV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;proto=http \
-	   file://stock_contact.png \
-	   file://stock_person.png \
-	   file://contacts-owl-window-menu.patch;patch=1 \
-	  "
-
-S = "${WORKDIR}/trunk"
-
-#EXTRA_OECONF = "--enable-gnome-vfs"
diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc
index 40a88ea5c0..f36d260520 100644
--- a/meta/packages/pimlico/dates.inc
+++ b/meta/packages/pimlico/dates.inc
@@ -4,15 +4,9 @@ SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl"
 RDEPENDS = "libedata-cal"
 
-inherit autotools pkgconfig gtk-icon-cache
+inherit autotools_stage pkgconfig gtk-icon-cache
 
-# EXTRA_OECONF = "--disable-debug"
-EXTRA_OECONF = "--enable-owl=true --disable-dnd"
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
-
-do_install_append () {
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
-}
+# Poky/Sato specific enhancements
+EXTRA_OECONF_append_poky = " --enable-owl=true --disable-dnd"
+SRC_URI_append_poky = " file://dates-owl-window-menu.patch;patch=1 "
 
diff --git a/meta/packages/pimlico/files/dates-owl-window-menu.patch b/meta/packages/pimlico/dates/dates-owl-window-menu.patch
similarity index 100%
rename from meta/packages/pimlico/files/dates-owl-window-menu.patch
rename to meta/packages/pimlico/dates/dates-owl-window-menu.patch
diff --git a/meta/packages/pimlico/dates_0.4.6.bb b/meta/packages/pimlico/dates_0.4.8.bb
similarity index 100%
rename from meta/packages/pimlico/dates_0.4.6.bb
rename to meta/packages/pimlico/dates_0.4.8.bb
diff --git a/meta/packages/pimlico/dates_git.bb b/meta/packages/pimlico/dates_git.bb
new file mode 100644
index 0000000000..849af2a4fc
--- /dev/null
+++ b/meta/packages/pimlico/dates_git.bb
@@ -0,0 +1,8 @@
+require dates.inc
+
+PV = "0.4.9+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://git.gnome.org/${PN};protocol=git"
+
+SRC_URI_append_poky += "file://dates-owl-window-menu.patch;patch=1"
diff --git a/meta/packages/pimlico/dates_svn.bb b/meta/packages/pimlico/dates_svn.bb
deleted file mode 100644
index eb23742118..0000000000
--- a/meta/packages/pimlico/dates_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require dates.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.4.5+svnr${SRCREV}"
-S = "${WORKDIR}/trunk"
-
-SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;proto=http \
-	   file://dates-owl-window-menu.patch;patch=1 \
-	  "
diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc
index 2bb1c9265a..3564218e4a 100644
--- a/meta/packages/pimlico/tasks.inc
+++ b/meta/packages/pimlico/tasks.inc
@@ -3,4 +3,6 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
 
-inherit autotools pkgconfig gtk-icon-cache
+inherit autotools_stage pkgconfig gtk-icon-cache
+
+SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 "
\ No newline at end of file
diff --git a/meta/packages/pimlico/files/tasks-owl.diff b/meta/packages/pimlico/tasks/tasks-owl.diff
similarity index 100%
rename from meta/packages/pimlico/files/tasks-owl.diff
rename to meta/packages/pimlico/tasks/tasks-owl.diff
diff --git a/meta/packages/pimlico/tasks_0.13.bb b/meta/packages/pimlico/tasks_0.13.bb
index 5d41222944..de92a21178 100644
--- a/meta/packages/pimlico/tasks_0.13.bb
+++ b/meta/packages/pimlico/tasks_0.13.bb
@@ -1,7 +1,6 @@
 require tasks.inc
 
 SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
-           file://fix_configure.patch;patch=1;status=merged \
-           file://tasks-owl.diff;patch=1;pnum=0"
+           file://fix_configure.patch;patch=1;status=merged"
 
 PR = "r2"
diff --git a/meta/packages/pimlico/tasks_git.bb b/meta/packages/pimlico/tasks_git.bb
new file mode 100644
index 0000000000..c80639e671
--- /dev/null
+++ b/meta/packages/pimlico/tasks_git.bb
@@ -0,0 +1,6 @@
+require tasks.inc
+
+SRC_URI = "git://git.gnome.org/${PN};protocol=git"
+
+PV = "0.13+git${SRCPV}"
+S = "${WORKDIR}/git"
diff --git a/meta/packages/pimlico/tasks_svn.bb b/meta/packages/pimlico/tasks_svn.bb
deleted file mode 100644
index 00dcae0f27..0000000000
--- a/meta/packages/pimlico/tasks_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require tasks.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.13+svnr${SRCREV}"
-S = "${WORKDIR}/trunk"
-
-SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;proto=http \
-        file://tasks-owl.diff;patch=1"