Skip to contentSkip to conversation

CONSOLIDATED REQUEST

PATCH New Martin Jansa 1 participant 9 messages Aug 20, 2012 Arm/actions semi architecture

lore
Share & tools
lore
#0 lore raw

cover CONSOLIDATED REQUEST

The following changes since commit b64269b221774fe970382a62ae4b4d1b8e38edac:

Merge remote-tracking branch 'meta-oe-contrib/jansa/efl' (2012-08-20 20:04:32 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Andreas Müller (2):
pango: remove and use oe-core version 1.30
pulseaudio: remove bbappend

Khem Raj (1):
machine_kernel_pr.bbclass: provides MACHINE_KERNEL_PR functionality

Martin Jansa (2):
pixman: update bbappend to match 0.27.2
connman: rename bbappend to match new 1.4 version from oe-core

Ross Burton (3):
meta-gnome: add libical
meta-gnome: add evolution-data-server
meta-gnome: add Pimlico (contacts, dates, tasks)

 .../avoid_automake_errors.patch                    |   83 ++++++++
 .../eds/evolution-data-server/depbuildfix.patch    |   78 ++++++++
 .../fix_for_automake-1.12.x.patch                  |   28 +++
 .../eds/evolution-data-server/iconv-detect.h       |    5 +
 .../evolution-data-server/new-contact-fix.patch    |   23 +++
 .../eds/evolution-data-server/nossl.patch          |   70 +++++++
 .../eds/evolution-data-server/oh-contact.patch     |  203 ++++++++++++++++++++
 .../eds/evolution-data-server/old-gdk-api.patch    |   19 ++
 .../optional_imapx_provider.patch                  |   64 ++++++
 .../recipes-gnome/eds/evolution-data-server_git.bb |  111 +++++++++++
 meta-gnome/recipes-gnome/pimlico/contacts.inc      |   34 ++++
 .../contacts-conditionally-install-schema.patch    |   37 ++++
 .../contacts/contacts-owl-window-menu.patch        |   54 +++++
 .../recipes-gnome/pimlico/contacts/make-382.patch  |   16 ++
 .../pimlico/contacts/stock_contact.png             |  Bin 0 -> 2311 bytes
 .../pimlico/contacts/stock_person.png              |  Bin 0 -> 2280 bytes
 meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb   |   18 ++
 meta-gnome/recipes-gnome/pimlico/contacts_git.bb   |   19 ++
 meta-gnome/recipes-gnome/pimlico/dates.inc         |   20 ++
 .../pimlico/dates/dates-owl-window-menu.patch      |   67 +++++++
 .../dates/dso_linking_change_build_fix.patch       |   44 +++++
 .../recipes-gnome/pimlico/dates/make-382.patch     |   18 ++
 .../uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch      |   37 ++++
 meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb    |    5 +
 meta-gnome/recipes-gnome/pimlico/dates_git.bb      |   18 ++
 meta-gnome/recipes-gnome/pimlico/tasks.inc         |   16 ++
 .../recipes-gnome/pimlico/tasks/tasks-owl.diff     |   67 +++++++
 meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb     |   15 ++
 meta-gnome/recipes-gnome/pimlico/tasks_git.bb      |    9 +
 .../libical/files/pthread-fix.patch                |   52 +++++
 meta-gnome/recipes-support/libical/libical_0.48.bb |   17 ++
 meta-oe/classes/machine_kernel_pr.bbclass          |    8 +
 .../pango/pango-1.29.4/no-tests.patch              |   11 -
 meta-oe/recipes-graphics/pango/pango_1.29.4.bb     |   10 -
 ...lated-workarounds-in-cpu-features-detecti.patch |  122 +++++++-----
 ...plementation-of-pixman_blt-with-overlapp.patch} |   37 +++--
 ...xman_0.26.2.bbappend => pixman_0.27.2.bbappend} |    5 +-
 .../{connman_1.3.bbappend => connman_1.4.bbappend} |    0
 .../pulseaudio/pulseaudio-2.0-udev-symbols.patch   |   80 --------
 .../pulseaudio/pulseaudio_2.0.bbappend             |    5 -
 40 files changed, 1355 insertions(+), 170 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/avoid_automake_errors.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/depbuildfix.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/fix_for_automake-1.12.x.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/new-contact-fix.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/nossl.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/oh-contact.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/old-gdk-api.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/optional_imapx_provider.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts.inc
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts_git.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates.inc
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/make-382.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates_git.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks.inc
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks_git.bb
 create mode 100644 meta-gnome/recipes-support/libical/files/pthread-fix.patch
 create mode 100644 meta-gnome/recipes-support/libical/libical_0.48.bb
 create mode 100644 meta-oe/classes/machine_kernel_pr.bbclass
 delete mode 100644 meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
 delete mode 100644 meta-oe/recipes-graphics/pango/pango_1.29.4.bb
 rename meta-oe/recipes-graphics/xorg-lib/{pixman-0.26.2 => pixman-0.27.2}/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch (46%)
 rename meta-oe/recipes-graphics/xorg-lib/{pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch => pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch} (75%)
 rename meta-oe/recipes-graphics/xorg-lib/{pixman_0.26.2.bbappend => pixman_0.27.2.bbappend} (65%)
 rename meta-systemd/meta-oe/recipes-connectivity/connman/{connman_1.3.bbappend => connman_1.4.bbappend} (100%)
 delete mode 100644 meta-systemd/oe-core/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-2.0-udev-symbols.patch
 delete mode 100644 meta-systemd/oe-core/recipes-multimedia/pulseaudio/pulseaudio_2.0.bbappend
Signature · 1 line
1.7.8.6
#1 lore raw

PATCH 1/8 machine_kernel_pr.bbclass: provides MACHINE_KERNEL_PR functionality

From: Khem Raj <[email protected]>

Diffing with the OE-Core's kernel.bbclass only difference is setting of machine kernel pr. So lets convert it to a separate class which provides the added functionality and let everyone use kernel.bbclass from kernel

It needs the dependent layers to inherit this class in addition to kernel.bbclass.

After dependent layers are updated we can remove meta-oe copy of kernel.bbclass, it leaves up with one less conflict with OE-Core.

---
 meta-oe/classes/machine_kernel_pr.bbclass |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/classes/machine_kernel_pr.bbclass
meta-oe/classes/machine_kernel_pr.bbclass new file +8 -0
new file mode 100644
index 0000000..463b64d
@@ -0,0 +1,8 @@
+python __anonymous () {
+
+    machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True)
+
+    if machine_kernel_pr:
+        d.setVar('PR', machine_kernel_pr)
+}
+
Signature · 1 line
1.7.8.6
#2 lore raw

PATCH 2/8 pango: remove and use oe-core version 1.30

In reply to Martin Jansa

From: Andreas Müller <[email protected]>

---
 .../pango/pango-1.29.4/no-tests.patch              |   11 -----------
 meta-oe/recipes-graphics/pango/pango_1.29.4.bb     |   10 ----------
 2 files changed, 0 insertions(+), 21 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch
 delete mode 100644 meta-oe/recipes-graphics/pango/pango_1.29.4.bb
meta-oe/recipes-graphics/pango/pango-1.29.4/no-tests.patch deleted +0 -11
deleted file mode 100644
index ce64db1..0000000
@@ -1,11 +0,0 @@
-diff -uNr pango-1.29.4.orig/Makefile.am pango-1.29.4/Makefile.am
---- pango-1.29.4.orig/Makefile.am	2011-08-16 03:11:08.000000000 +0200
-+++ pango-1.29.4/Makefile.am	2011-09-30 16:11:53.792567952 +0200
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
- 
--SUBDIRS= pango modules pango-view examples docs tools tests build
-+SUBDIRS= pango modules pango-view examples docs tools build
- 
- EXTRA_DIST = 			\
- 	autogen.sh		\
meta-oe/recipes-graphics/pango/pango_1.29.4.bb deleted +0 -10
deleted file mode 100644
index ea79a63..0000000
@@ -1,10 +0,0 @@
-require recipes-graphics/pango/pango.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-SRC_URI[archive.md5sum] = "a5ee785f4f31d6bdd8625a09ea3f8b4b"
-SRC_URI[archive.sha256sum] = "f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b"
-
-SRC_URI += "file://no-tests.patch"
-
-PR = "r4"
Signature · 1 line
1.7.8.6
#3 lore raw

PATCH 3/8 pulseaudio: remove bbappend

In reply to Martin Jansa

From: Andreas Müller <[email protected]>

oe-core has updated to 2.1 which includes the appended patch

---
 .../pulseaudio/pulseaudio-2.0-udev-symbols.patch   |   80 --------------------
 .../pulseaudio/pulseaudio_2.0.bbappend             |    5 -
 2 files changed, 0 insertions(+), 85 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-2.0-udev-symbols.patch
 delete mode 100644 meta-systemd/oe-core/recipes-multimedia/pulseaudio/pulseaudio_2.0.bbappend
meta-systemd/oe-core/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-2.0-udev-symbols.patch deleted +0 -80
deleted file mode 100644
index 1ad720b..0000000
@@ -1,80 +0,0 @@
-From 2e64edbd3e12145950ccd952bb7984a4420b8c02 Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <[email protected]>
-Date: Thu, 17 May 2012 22:50:22 +0200
-Subject: [PATCH] udev: Don't use deprecated udev_get_*_path() functions
-
-[These symbols were removed in libudev.so.1.0.0. Replace them with
-hardcoded strings. -- heftig]
-
-Signed-off-by: Marc-Antoine Perennou <[email protected]>
----
- src/modules/module-udev-detect.c |    9 +++------
- src/modules/udev-util.c          |    4 ++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
-index 1192194..31416bd 100644
---- a/src/modules/module-udev-detect.c
-+++ b/src/modules/module-udev-detect.c
-@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
-     pa_assert(u);
-     pa_assert(d);
- 
--    cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path));
-+    cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path));
-     accessible = access(cd, R_OK|W_OK) >= 0;
-     pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
- 
-@@ -621,7 +621,6 @@ fail:
- }
- 
- static int setup_inotify(struct userdata *u) {
--    char *dev_snd;
-     int r;
- 
-     if (u->inotify_fd >= 0)
-@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) {
-         return -1;
-     }
- 
--    dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev));
--    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
--    pa_xfree(dev_snd);
-+    r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
- 
-     if (r < 0) {
-         int saved_errno = errno;
-diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
-index 2f18bc4..b0bb17d 100644
---- a/src/modules/udev-util.c
-+++ b/src/modules/udev-util.c
-@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
--- 
-1.7.8.6
-
meta-systemd/oe-core/recipes-multimedia/pulseaudio/pulseaudio_2.0.bbappend deleted +0 -5
deleted file mode 100644
index 3e81365..0000000
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://pulseaudio-2.0-udev-symbols.patch"
-
-PRINC := "${@int(PRINC) + 1}"
Signature · 1 line
1.7.8.6
#4 lore raw

PATCH 4/8 pixman: update bbappend to match 0.27.2

In reply to Martin Jansa

* when [1] is applied in oe-core this could be dropped completely (that's why I've removed PRINC here)
* [1] http://patches.openembedded.org/patch/34885/

---
 ...lated-workarounds-in-cpu-features-detecti.patch |  122 ++++++++++++--------
 ...plementation-of-pixman_blt-with-overlapp.patch} |   37 ++++--
 ...xman_0.26.2.bbappend => pixman_0.27.2.bbappend} |    5 +-
 3 files changed, 100 insertions(+), 64 deletions(-)
 rename meta-oe/recipes-graphics/xorg-lib/{pixman-0.26.2 => pixman-0.27.2}/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch (46%)
 rename meta-oe/recipes-graphics/xorg-lib/{pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch => pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch} (75%)
 rename meta-oe/recipes-graphics/xorg-lib/{pixman_0.26.2.bbappend => pixman_0.27.2.bbappend} (65%)
meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch renamed from meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +73 -49
similarity index 46%
rename from meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
rename to meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
index b56e690..8a1c524 100644
@@ -1,18 +1,28 @@
-From dad8537110c27b45795f8879a3e0a54aa77546b9 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <[email protected]>
-Date: Tue, 11 Jan 2011 18:10:39 +0200
-Subject: [PATCH] ARM: qemu related workarounds in cpu features detection code
+From d140e69c1d76ed61d1feb53b79820951707ee5a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Sun, 19 Aug 2012 15:15:45 +0200
+Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection
+ code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-Signed-off-by: Martin Jansa <[email protected]>
+This was ported from meta-oe's patch [1]
+
+[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
+
+Upstream-Status: Inappropriate [other] qemu fix
+
+Signed-off-by: Andreas Müller <[email protected]>
 ---
- pixman/pixman-cpu.c |   67 +++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 55 insertions(+), 12 deletions(-)
+ pixman/pixman-arm.c |   74 +++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 69 insertions(+), 5 deletions(-)
 
-diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
-index aa9036f..a8f2494 100644
---- a/pixman/pixman-cpu.c
-+++ b/pixman/pixman-cpu.c
-@@ -333,15 +333,30 @@ pixman_arm_read_auxv_or_cpu_features ()
+diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
+index 23374e4..d0771fd 100644
+--- a/pixman/pixman-arm.c
++++ b/pixman/pixman-arm.c
+@@ -129,16 +129,35 @@ detect_cpu_features (void)
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/mman.h>
@@ -32,40 +42,55 @@ index aa9036f..a8f2494 100644
 + * and it has non-zero value (this is still not totally reliable for a big
 + * endian 64-bit host system running qemu and may theoretically fail).
 + */
- static void
- pixman_arm_read_auxv_or_cpu_features ()
++#define ARM_HWCAP_VFP 64
++#define ARM_HWCAP_IWMMXT 512
++#define ARM_HWCAP_NEON 4096
++
+ static arm_cpu_features_t
+ detect_cpu_features (void)
  {
-     int fd;
+     arm_cpu_features_t features = 0;
      Elf32_auxv_t aux;
+     int fd;
 +    uint32_t hwcap = 0;
 +    const char *plat = NULL;
 +    int plat_cnt = 0;
  
      fd = open ("/proc/self/auxv", O_RDONLY);
      if (fd >= 0)
-@@ -350,32 +365,60 @@ pixman_arm_read_auxv_or_cpu_features ()
+@@ -147,22 +166,23 @@ detect_cpu_features (void)
  	{
  	    if (aux.a_type == AT_HWCAP)
  	    {
 -		uint32_t hwcap = aux.a_un.a_val;
--		/* hardcode these values to avoid depending on specific
--		 * versions of the hwcap header, e.g. HWCAP_NEON
--		 */
--		arm_has_vfp = (hwcap & 64) != 0;
--		arm_has_iwmmxt = (hwcap & 512) != 0;
--		/* this flag is only present on kernel 2.6.29 */
--		arm_has_neon = (hwcap & 4096) != 0;
 +		hwcap = aux.a_un.a_val;
+ 
+ 		/* hardcode these values to avoid depending on specific
+ 		 * versions of the hwcap header, e.g. HWCAP_NEON
+ 		 */
+-		if ((hwcap & 64) != 0)
++		if ((hwcap & ARM_HWCAP_VFP) != 0)
+ 		    features |= ARM_VFP;
+-		if ((hwcap & 512) != 0)
++		if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
+ 		    features |= ARM_IWMMXT;
+ 		/* this flag is only present on kernel 2.6.29 */
+-		if ((hwcap & 4096) != 0)
++		if ((hwcap & ARM_HWCAP_NEON) != 0)
+ 		    features |= ARM_NEON;
  	    }
  	    else if (aux.a_type == AT_PLATFORM)
  	    {
 -		const char *plat = (const char*) aux.a_un.a_val;
--		if (strncmp (plat, "v7l", 3) == 0)
 +		plat = (const char*) aux.a_un.a_val;
 +		plat_cnt++;
-+	    }
-+	}
-+	close (fd);
+ 
+ 		if (strncmp (plat, "v7l", 3) == 0)
+ 		    features |= (ARM_V7 | ARM_V6);
+@@ -171,8 +191,52 @@ detect_cpu_features (void)
+ 	    }
+ 	}
+ 	close (fd);
 +
 +	if (plat == NULL || plat_cnt != 1 || *plat != 'v')
 +	{
@@ -80,42 +105,41 @@ index aa9036f..a8f2494 100644
 +	    if (uname (&u) == 0)
 +	    {
 +		if (strcmp (u.machine, "armv7l") == 0)
- 		{
- 		    arm_has_v7 = TRUE;
- 		    arm_has_v6 = TRUE;
-+		    hwcap |= 64; /* qemu is supposed to emulate vfp */
-+		    hwcap |= 4096; /* qemu is supposed to emulate neon */
- 		}
--		else if (strncmp (plat, "v6l", 3) == 0)
++		{
++		    features |= (ARM_V7 | ARM_V6);
++		    hwcap |= ARM_HWCAP_VFP;  /* qemu is supposed to emulate vfp */
++		    hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */
++		}
 +		else if (strcmp (u.machine, "armv6l") == 0)
- 		{
- 		    arm_has_v6 = TRUE;
-+		    hwcap |= 64; /* qemu is supposed to emulate vfp */
- 		}
- 	    }
- 	}
--	close (fd);
++		{
++		    features |= ARM_V6;
++		    hwcap |= ARM_HWCAP_VFP;  /* qemu is supposed to emulate vfp */
++		}
++	    }
++	}
 +	else if (strncmp (plat, "v7l", 3) == 0)
 +	{
-+	    arm_has_v7 = TRUE;
-+	    arm_has_v6 = TRUE;
++	    features |= (ARM_V7 | ARM_V6);
 +	}
 +	else if (strncmp (plat, "v6l", 3) == 0)
 +	{
-+	    arm_has_v6 = TRUE;
++	    features |= ARM_V6;
 +	}
      }
  
 +    /* hardcode these values to avoid depending on specific
 +     * versions of the hwcap header, e.g. HWCAP_NEON
 +     */
-+    arm_has_vfp = (hwcap & 64) != 0;
-+    arm_has_iwmmxt = (hwcap & 512) != 0;
-+    arm_has_neon = (hwcap & 4096) != 0;
++    if ((hwcap & ARM_HWCAP_VFP) != 0)
++        features |= ARM_VFP;
++    if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
++        features |= ARM_IWMMXT;
++    if ((hwcap & ARM_HWCAP_NEON) != 0)
++        features |= ARM_NEON;
 +
-     arm_tests_initialized = TRUE;
+     return features;
  }
  
 -- 
-1.7.8.6
+1.7.4.4
 
meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch renamed from meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch +25 -12
similarity index 75%
rename from meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
rename to meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
index 34f96ed..abd501a 100644
@@ -1,8 +1,13 @@
-From 0c7aa6a3ebc29d7986d2417371df210f3e9a65b4 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <[email protected]>
-Date: Tue, 16 Mar 2010 16:55:28 +0100
-Subject: [PATCH 8/8] Generic C implementation of pixman_blt with overlapping support
+From 211b2bcdb19f86f3868a18520df7dcb4fd122f05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Sun, 19 Aug 2012 14:48:00 +0200
+Subject: [PATCH 2/2] Generic C implementation of pixman_blt with overlapping
+ support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
+This was ported from meta-oe's patch [1]:
 Uses memcpy/memmove functions to copy pixels, can handle the
 case when both source and destination areas are in the same
 image (this is useful for scrolling).
@@ -13,16 +18,22 @@ src_stride == dst_stride). Copying direction is undefined
 for the images with different source and destination stride
 which happen to be in the overlapped areas (but this is an
 unrealistic case anyway).
+
+[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch
+
+Upstream-Status: Unknown - this patch is in meta-oe for a while
+
+Signed-off-by: Andreas Müller <[email protected]>
 ---
  pixman/pixman-general.c |   21 ++++++++++++++++++---
  pixman/pixman-private.h |   43 +++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 61 insertions(+), 3 deletions(-)
 
 diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
-index 2ccdfcd..90461b6 100644
+index d4b2daa..a86b206 100644
 --- a/pixman/pixman-general.c
 +++ b/pixman/pixman-general.c
-@@ -227,9 +227,24 @@ general_blt (pixman_implementation_t *imp,
+@@ -215,9 +215,24 @@ general_blt (pixman_implementation_t *imp,
               int                      width,
               int                      height)
  {
@@ -51,10 +62,10 @@ index 2ccdfcd..90461b6 100644
  
  static pixman_bool_t
 diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index cbd48f3..c20d9f0 100644
+index d5e6a72..c77d256 100644
 --- a/pixman/pixman-private.h
 +++ b/pixman/pixman-private.h
-@@ -10,6 +10,7 @@
+@@ -24,6 +24,7 @@
  
  #include "pixman.h"
  #include <time.h>
@@ -62,9 +73,9 @@ index cbd48f3..c20d9f0 100644
  #include <assert.h>
  #include <stdio.h>
  #include <string.h>
-@@ -998,4 +999,46 @@ void pixman_timer_register (pixman_timer_t *timer);
- 
- #endif /* PIXMAN_TIMERS */
+@@ -1096,6 +1097,48 @@ void pixman_timer_register (pixman_timer_t *timer);
+ extern const uint8_t linear_to_srgb[4096];
+ extern const uint16_t srgb_to_linear[256];
  
 +/* a helper function, can blit 8-bit images with src/dst overlapping support */
 +static inline void
@@ -108,7 +119,9 @@ index cbd48f3..c20d9f0 100644
 +    }
 +}
 +
+ #endif /* __ASSEMBLER__ */
+ 
  #endif /* PIXMAN_PRIVATE_H */
 -- 
-1.6.6.1
+1.7.4.4
 
meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend renamed from meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend +2 -3
similarity index 65%
rename from meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend
rename to meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
index b5be2b5..a04a549 100644
@@ -1,9 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PRINC := "${@int(PRINC) + 10}"
-
-SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+SRC_URI += " \
   file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
+  file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
 "
 
 NEON = " --disable-arm-neon "
Signature · 1 line
1.7.8.6
#5 lore raw

PATCH 5/8 connman: rename bbappend to match new 1.4 version from oe-core

In reply to Martin Jansa
---
 .../{connman_1.3.bbappend => connman_1.4.bbappend} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/meta-oe/recipes-connectivity/connman/{connman_1.3.bbappend => connman_1.4.bbappend} (100%)
meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.4.bbappend renamed from meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.3.bbappend +0 -0
similarity index 100%
rename from meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.3.bbappend
rename to meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.4.bbappend
Signature · 1 line
1.7.8.6
#6 lore raw

PATCH 6/8 meta-gnome: add libical

In reply to Martin Jansa

From: Ross Burton <[email protected]>

---
 .../libical/files/pthread-fix.patch                |   52 ++++++++++++++++++++
 meta-gnome/recipes-support/libical/libical_0.48.bb |   17 ++++++
 2 files changed, 69 insertions(+), 0 deletions(-)
 create mode 100644 meta-gnome/recipes-support/libical/files/pthread-fix.patch
 create mode 100644 meta-gnome/recipes-support/libical/libical_0.48.bb
meta-gnome/recipes-support/libical/files/pthread-fix.patch new file +52 -0
new file mode 100644
index 0000000..aa7767f
@@ -0,0 +1,52 @@
+New added pthread feathre leads some deadlock with some unlock code missing.
+This patch fix it.
+
+Signed-off-by: Zhai Edwin <[email protected]>
+
+Upstream-Status: Pending
+
+Index: libical-0.47/src/libical/icaltimezone.c
+===================================================================
+--- libical-0.47.orig/src/libical/icaltimezone.c	2011-12-16 13:42:25.000000000 +0800
++++ libical-0.47/src/libical/icaltimezone.c	2011-12-16 14:16:25.000000000 +0800
+@@ -1773,7 +1773,7 @@
+     filename = (char*) malloc (filename_len);
+     if (!filename) {
+ 	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
+-	return;
++	goto out;
+     }
+ 
+     snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
+@@ -1783,7 +1783,7 @@
+     free (filename);
+     if (!fp) {
+ 	icalerror_set_errno(ICAL_FILE_ERROR);
+-	return;
++	goto out;
+     }
+ 
+ 	
+@@ -1807,7 +1807,7 @@
+ 
+     if (!subcomp) {
+ 	icalerror_set_errno(ICAL_PARSE_ERROR);
+-	return;
++	goto out;
+     }
+ 
+     icaltimezone_get_vtimezone_properties (zone, subcomp);
+@@ -1817,10 +1817,12 @@
+     icalcomponent_free(comp);
+     }
+ #endif 
+-#ifdef HAVE_PTHREAD
++
+  out:
++#ifdef HAVE_PTHREAD
+     pthread_mutex_unlock(&builtin_mutex);
+ #endif
++    return;
+ }
+ 
+ 
meta-gnome/recipes-support/libical/libical_0.48.bb new file +17 -0
new file mode 100644
index 0000000..80f629c
@@ -0,0 +1,17 @@
+DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library"
+HOMEPAGE = "http://sourceforge.net/projects/freeassociation/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=16077&atid=116077"
+LICENSE = "LGPLv2.1 | MPL-1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
+                    file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
+SECTION = "libs"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/freeassociation/${BPN}/${P}/${BPN}-${PV}.tar.gz\
+           file://pthread-fix.patch"
+
+SRC_URI[md5sum] = "e549f434d5fbf9cd156c60ed4943618f"
+SRC_URI[sha256sum] = "2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0"
+
+inherit autotools
Signature · 1 line
1.7.8.6
#7 lore raw

PATCH 7/8 meta-gnome: add evolution-data-server

In reply to Martin Jansa

From: Ross Burton <[email protected]>

---
 .../avoid_automake_errors.patch                    |   83 ++++++++
 .../eds/evolution-data-server/depbuildfix.patch    |   78 ++++++++
 .../fix_for_automake-1.12.x.patch                  |   28 +++
 .../eds/evolution-data-server/iconv-detect.h       |    5 +
 .../evolution-data-server/new-contact-fix.patch    |   23 +++
 .../eds/evolution-data-server/nossl.patch          |   70 +++++++
 .../eds/evolution-data-server/oh-contact.patch     |  203 ++++++++++++++++++++
 .../eds/evolution-data-server/old-gdk-api.patch    |   19 ++
 .../optional_imapx_provider.patch                  |   64 ++++++
 .../recipes-gnome/eds/evolution-data-server_git.bb |  111 +++++++++++
 10 files changed, 684 insertions(+), 0 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/avoid_automake_errors.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/depbuildfix.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/fix_for_automake-1.12.x.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/new-contact-fix.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/nossl.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/oh-contact.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/old-gdk-api.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/optional_imapx_provider.patch
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
meta-gnome/recipes-gnome/eds/evolution-data-server/avoid_automake_errors.patch new file +83 -0
new file mode 100644
index 0000000..ebf00c3
@@ -0,0 +1,83 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Avoid these warning-errors
+
+automake: warnings are treated as errors
+Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension
+Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+addressbook/backends/file/Makefile.am: installing './depcomp'
+addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name
+addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
+addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name
+addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension)
+glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:5:   'glib-gen.mak' included from here
+addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension
+addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension
+calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name
+calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name
+calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension)
+glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:8:   'glib-gen.mak' included from here
+calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension
+calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension
+libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension
+libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension
+libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension
+libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension
+servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension
+servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension
+servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+autoreconf: automake failed with exit status: 1
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/07/09
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
+ dnl Autoconf / Automake Initialization
+ AC_PREREQ(2.58)
+ AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+-AM_INIT_AUTOMAKE([gnu 1.9 tar-ustar -Wall -Werror foreign])
++AM_INIT_AUTOMAKE([gnu 1.9 tar-ustar -Wall foreign])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(README)
+ AC_CONFIG_HEADERS(config.h)
meta-gnome/recipes-gnome/eds/evolution-data-server/depbuildfix.patch new file +78 -0

78 lines not on this page · raw message

meta-gnome/recipes-gnome/eds/evolution-data-server/fix_for_automake-1.12.x.patch new file +28 -0
new file mode 100644
index 0000000..ac77a6d
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+Fixed these kinds if warning-errors
+
+warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/07/09
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -17,6 +17,7 @@ dnl This number is meaningless, but we'r
+ dnl library names for backward compatibility.
+ m4_define([api_version], [1.2])
+ 
++
+ dnl Autoconf / Automake Initialization
+ AC_PREREQ(2.58)
+ AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+@@ -30,6 +31,7 @@ AC_LANG(C)
+ 
+ dnl Automake 1.11 - Silent Build Rules
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
+ 
+ dnl Required Package Versions
+ m4_define([glib_minimum_version], [2.16.1])
meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h new file +5 -0
new file mode 100644
index 0000000..46f476d
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_D_FORMAT "iso-%d-%d"
+#define ICONV_ISO_S_FORMAT "iso-%d-%s"
+#define ICONV_10646 "iso-10646"
meta-gnome/recipes-gnome/eds/evolution-data-server/new-contact-fix.patch new file +23 -0
new file mode 100644
index 0000000..22c293d
@@ -0,0 +1,23 @@
+When contacts called for the 1st time, adding new contact always failed but
+worked after restart. The reason is e-addressbook-factory used to handle
+addressbook leads a segmentation fault. Root cause is that factory would create
+the data base if not exist, but use it without proper initialization.
+
+This patch fix it.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Edwin Zhai <[email protected]>
+Index: git/addressbook/backends/file/e-book-backend-file.c
+===================================================================
+--- git.orig/addressbook/backends/file/e-book-backend-file.c	2010-10-20 16:14:31.000000000 +0800
++++ git/addressbook/backends/file/e-book-backend-file.c	2010-10-22 14:11:47.000000000 +0800
+@@ -1217,6 +1217,8 @@
+ 				EContact *contact = NULL;
+ 				EBookBackendSyncStatus status;
+ 
++				/* Initialize file_db, or else following do_create cause seg fault */
++				bf->priv->file_db = db;
+ 				status = do_create (bf, XIMIAN_VCARD, &contact);
+ 				if (status != GNOME_Evolution_Addressbook_Success)
+ 					g_warning ("Cannot create default contact: %d", status);
meta-gnome/recipes-gnome/eds/evolution-data-server/nossl.patch new file +70 -0

70 lines not on this page · raw message

meta-gnome/recipes-gnome/eds/evolution-data-server/oh-contact.patch new file +203 -0

203 lines not on this page · raw message

meta-gnome/recipes-gnome/eds/evolution-data-server/old-gdk-api.patch new file +19 -0
new file mode 100644
index 0000000..7ef2956
@@ -0,0 +1,19 @@
+Do not disable old API after upgrading gtk+.
+This avoid build error due to defination missing.
+
+Signed-off-by: Zhai Edwin <[email protected]>
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2010-12-16 10:25:24.000000000 +0800
++++ git/configure.ac	2010-12-16 10:25:58.000000000 +0800
+@@ -147,7 +147,6 @@
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+ 	"-DG_DISABLE_DEPRECATED
+ 	-DPANGO_DISABLE_DEPRECATED
+-	-DGDK_DISABLE_DEPRECATED
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED
+ 	-DG_DISABLE_SINGLE_INCLUDES
+ 	-DGTK_DISABLE_SINGLE_INCLUDES
meta-gnome/recipes-gnome/eds/evolution-data-server/optional_imapx_provider.patch new file +64 -0

64 lines not on this page · raw message

meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb new file +111 -0

111 lines not on this page · raw message

Signature · 1 line
1.7.8.6
#8 lore raw

PATCH 8/8 meta-gnome: add Pimlico (contacts, dates, tasks)

In reply to Martin Jansa

From: Ross Burton <[email protected]>

This has just been removed from oe-core and some people are still using the applications.

---
 meta-gnome/recipes-gnome/pimlico/contacts.inc      |   34 ++++++++++
 .../contacts-conditionally-install-schema.patch    |   37 +++++++++++
 .../contacts/contacts-owl-window-menu.patch        |   54 ++++++++++++++++
 .../recipes-gnome/pimlico/contacts/make-382.patch  |   16 +++++
 .../pimlico/contacts/stock_contact.png             |  Bin 0 -> 2311 bytes
 .../pimlico/contacts/stock_person.png              |  Bin 0 -> 2280 bytes
 meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb   |   18 +++++
 meta-gnome/recipes-gnome/pimlico/contacts_git.bb   |   19 ++++++
 meta-gnome/recipes-gnome/pimlico/dates.inc         |   20 ++++++
 .../pimlico/dates/dates-owl-window-menu.patch      |   67 ++++++++++++++++++++
 .../dates/dso_linking_change_build_fix.patch       |   44 +++++++++++++
 .../recipes-gnome/pimlico/dates/make-382.patch     |   18 +++++
 .../uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch      |   37 +++++++++++
 meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb    |    5 ++
 meta-gnome/recipes-gnome/pimlico/dates_git.bb      |   18 +++++
 meta-gnome/recipes-gnome/pimlico/tasks.inc         |   16 +++++
 .../recipes-gnome/pimlico/tasks/tasks-owl.diff     |   67 ++++++++++++++++++++
 meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb     |   15 +++++
 meta-gnome/recipes-gnome/pimlico/tasks_git.bb      |    9 +++
 19 files changed, 494 insertions(+), 0 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts.inc
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/contacts_git.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates.inc
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/make-382.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/dates_git.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks.inc
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb
 create mode 100644 meta-gnome/recipes-gnome/pimlico/tasks_git.bb
meta-gnome/recipes-gnome/pimlico/contacts.inc new file +34 -0
new file mode 100644
index 0000000..9798985
@@ -0,0 +1,34 @@
+DESCRIPTION = "Address-book application."
+HOMEPAGE = "http://pimlico-project.org/contacts.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ evolution-data-server"
+DEPENDS_append_poky = " libowl"
+RDEPENDS_${PN} = "libedata-book"
+
+inherit autotools pkgconfig
+
+OWL = "--disable-owl"
+OWL_poky = "--enable-owl"
+
+EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
+EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+
+do_install_append () {
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+		${datadir}/pixmaps/stock_person.png \
+		${datadir}/icons/hicolor"
+
+SRC_URI = "file://stock_contact.png \
+           file://stock_person.png \
+           file://contacts-conditionally-install-schema.patch \
+          "
+
+SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "
meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch new file +37 -0
new file mode 100644
index 0000000..2ab7882
@@ -0,0 +1,37 @@
+Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
+be installed.
+
+Signed-off-by: Robert Yang <[email protected]>
+
+Upstream-Status: Pending
+---
+ data/Makefile.am |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index f790823..b6fd643 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1
+ 
+ if HAVE_GCONF
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
++	if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \
++		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+ 		$(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \
+ 		(echo ;\
+ 		echo "*****************************************************"; \
+ 		echo "Installation of schemas failed, install them manually"; \
+-		echo "*****************************************************";)
+-		@true
++		echo "*****************************************************";); \
++	fi
+ endif
+ 
+ CLEANFILES = $(desktop_DATA)
+-- 
+1.7.7.6
+
meta-gnome/recipes-gnome/pimlico/contacts/contacts-owl-window-menu.patch new file +54 -0

54 lines not on this page · raw message

meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch new file +16 -0
new file mode 100644
index 0000000..a7cfee3
@@ -0,0 +1,16 @@
+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
++++ git/Makefile.am
+@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT)
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..123b4485acaaaf665eb9dbff5e9f126a02e6e6d4
GIT binary patch
meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..2b1328b4e2cc6a131a7ff9df4722c6fa49b0a6f1
GIT binary patch
meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb new file +18 -0
new file mode 100644
index 0000000..251bbe1
@@ -0,0 +1,18 @@
+require contacts.inc
+
+PR = "r7"
+
+SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0"
+SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \
+                    file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \
+                    file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee"
+
+do_configure_prepend () {
+	# It used 8 spaces to instead of a tab, but it doesn't work for us
+	sed -i 's/^        $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am
+}
meta-gnome/recipes-gnome/pimlico/contacts_git.bb new file +19 -0
new file mode 100644
index 0000000..45a6a0d
@@ -0,0 +1,19 @@
+require contacts.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
+                    file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
+                    file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
+
+SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933"
+PV = "0.12+git${SRCPV}"
+PR = "r4"
+
+S = "${WORKDIR}/git"
+
+SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \
+	    file://make-382.patch"
+
+S = "${WORKDIR}/git"
+
+
meta-gnome/recipes-gnome/pimlico/dates.inc new file +20 -0
new file mode 100644
index 0000000..9b338fd
@@ -0,0 +1,20 @@
+DESCRIPTION = "Dates is a calendar application."
+HOMEPAGE = "http://pimlico-project.org/dates.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
+
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server"
+RDEPENDS_${PN} = "libedata-cal"
+
+inherit autotools gettext pkgconfig gtk-icon-cache
+
+# Poky/Sato specific enhancements
+OWL = "--disable-owl"
+OWL_poky = "--enable-owl --disable-dnd"
+
+EXTRA_OECONF += "${OWL}"
+DEPENDS_append_poky = " libowl"
+SRC_URI_append_poky = " file://dates-owl-window-menu.patch;apply=yes "
+
meta-gnome/recipes-gnome/pimlico/dates/dates-owl-window-menu.patch new file +67 -0

67 lines not on this page · raw message

meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch new file +44 -0

44 lines not on this page · raw message

meta-gnome/recipes-gnome/pimlico/dates/make-382.patch new file +18 -0
new file mode 100644
index 0000000..fad3c58
@@ -0,0 +1,18 @@
+Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
+in upstream git.
+
+JL - 15/12/10
+
+Upstream-Status: Accepted
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
+ MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch new file +37 -0
new file mode 100644
index 0000000..6ade470
@@ -0,0 +1,37 @@
+uclibc has langinfo.h but it does not define _NL_TIME_FIRST_WEEKDAY
+therefore we introduce a check in configure for the this define
+and then we make sure that we use it when it really exists
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Upstream-Status: Pending
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2011-07-18 10:34:15.000000000 -0700
++++ git/configure.ac	2011-07-18 10:54:26.403798188 -0700
+@@ -98,6 +98,8 @@
+ 		src/libgtkdatesview.pc
+ ])
+ 
++AC_CHECK_DECLS([_NL_TIME_FIRST_WEEKDAY],[],[],[[#include <langinfo.h>]])
++
+ AC_OUTPUT
+ 
+ echo " "
+Index: git/src/dates_view.c
+===================================================================
+--- git.orig/src/dates_view.c	2011-07-18 10:34:15.000000000 -0700
++++ git/src/dates_view.c	2011-07-18 10:58:46.093798136 -0700
+@@ -1505,7 +1505,11 @@
+ 	priv->days = 1;
+ 	priv->months = 0;
+ 	priv->months_in_row = 4;
++#if HAVE_DECL__NL_TIME_FIRST_WEEKDAY
+ 	priv->week_start = *nl_langinfo (_NL_TIME_FIRST_WEEKDAY) - 1;
++#else
++	priv->week_start = 0;
++#endif
+ 	priv->dragbox = TRUE;
+ 	priv->single_click = TRUE;
+ 	priv->double_click = FALSE;
meta-gnome/recipes-gnome/pimlico/dates_0.4.8.bb new file +5 -0
new file mode 100644
index 0000000..da3f273
@@ -0,0 +1,5 @@
+require dates.inc
+
+PR = "r6"
+
+SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
meta-gnome/recipes-gnome/pimlico/dates_git.bb new file +18 -0
new file mode 100644
index 0000000..9ee0105
@@ -0,0 +1,18 @@
+require dates.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+                    file://src/dates_view.h;endline=22;md5=29f934f356eb970309cdeb6693b3123a \
+                    file://src/dates_hildon.c;endline=19;md5=63938904198b25de429abb65fbdbdb8a \
+                    file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
+
+SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
+PV = "0.4.11+git${SRCPV}"
+PR = "r8"
+
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
+	   file://make-382.patch \
+	   file://dso_linking_change_build_fix.patch \
+	   file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
+          "
meta-gnome/recipes-gnome/pimlico/tasks.inc new file +16 -0
new file mode 100644
index 0000000..9cd5259
@@ -0,0 +1,16 @@
+DESCRIPTION = "Task list application"
+HOMEPAGE = "http://pimlico-project.org/tasks.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+"
+
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ evolution-data-server"
+DEPENDS_append_poky = " libowl"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+OWL ?= "--disable-owl"
+OWL_poky ?= "--enable-owl"
+
+EXTRA_OECONF += "${OWL}"
meta-gnome/recipes-gnome/pimlico/tasks/tasks-owl.diff new file +67 -0

67 lines not on this page · raw message

meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb new file +15 -0
new file mode 100644
index 0000000..f0d9542
@@ -0,0 +1,15 @@
+require tasks.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \
+                    file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
+                    file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
+
+SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
+SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
+
+OWL_poky = "--with-owl"
+
+PR = "r2"
meta-gnome/recipes-gnome/pimlico/tasks_git.bb new file +9 -0
new file mode 100644
index 0000000..16c0430
@@ -0,0 +1,9 @@
+require tasks.inc
+
+SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
+
+SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65"
+PV = "0.13+git${SRCPV}"
+PR = "r3"
+
+S = "${WORKDIR}/git"
Signature · 1 line
1.7.8.6