summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/pimlico
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato/pimlico')
-rw-r--r--meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch2
-rw-r--r--meta/recipes-sato/pimlico/contacts/make-382.patch2
-rw-r--r--meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch2
-rw-r--r--meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch2
-rw-r--r--meta/recipes-sato/pimlico/dates/make-382.patch2
5 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
index 4b9238b43a..532387667b 100644
--- a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: contacts-0.9/src/contacts-gtk.c
===================================================================
--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
diff --git a/meta/recipes-sato/pimlico/contacts/make-382.patch b/meta/recipes-sato/pimlico/contacts/make-382.patch
index f85d6b24fa..a7cfee3a00 100644
--- a/meta/recipes-sato/pimlico/contacts/make-382.patch
+++ b/meta/recipes-sato/pimlico/contacts/make-382.patch
@@ -2,6 +2,8 @@ Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
JL - 15/12/10
+Upstream-Status: Accepted
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
diff --git a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
index d5901658be..714623efe6 100644
--- a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
@@ -4,6 +4,8 @@
src/dates_platform.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
+Upstream-Status: Inappropriate [enable feature]
+
Index: git/src/dates_gtk.c
===================================================================
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
diff --git a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
index 07a0264c14..eccc782e4b 100644
--- a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
@@ -30,6 +30,8 @@ file, libtool should have added these needed libraries in there.
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/19
+Upstream-Status: Pending
+
Index: git/src/Makefile.am
===================================================================
--- git.orig/src/Makefile.am
diff --git a/meta/recipes-sato/pimlico/dates/make-382.patch b/meta/recipes-sato/pimlico/dates/make-382.patch
index 9147361261..fad3c5826e 100644
--- a/meta/recipes-sato/pimlico/dates/make-382.patch
+++ b/meta/recipes-sato/pimlico/dates/make-382.patch
@@ -3,6 +3,8 @@ in upstream git.
JL - 15/12/10
+Upstream-Status: Accepted
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am