* [PATCH 00/14] Updates and cleanups
@ 2018-01-17 8:34 Andreas Müller
2018-01-17 8:34 ` [PATCH 01/14] xfce4-panel: update 4.12.1 -> 4.12.2 Andreas Müller
` (13 more replies)
0 siblings, 14 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit 8cef6b38e62e6c79ec857510df454cefc868b0df:
meson: remove recipe and class (2018-01-16 21:41:26 -0800)
are available in the Git repository at:
https://github.com/schnitzeltony/meta-openembedded.git patches
for you to fetch changes up to f65bdf54ec9709f5d1e1bc4fbb1e43c393644725:
xfce-polkit: fix Name/Comment fields in desktop file (2018-01-17 09:24:28 +0100)
----------------------------------------------------------------
Andreas Müller (14):
xfce4-panel: update 4.12.1 -> 4.12.2
xfce4-power-manager: update 1.6.0 -> 1.6.1
xfce4-pulseaudio-plugin: update 0.3.3 -> 0.3.4
evolution-data-server: update 3.2.3 -> 3.26.3
pimlico/dates: remove recipe
remove gdm leftovers
remove gnome system-tools leftovers
remove libgnomecups leftovers
remove gnome tracker leftovers
jack: Update 1.9.12
fluidsynth: update 1.1.8 -> 1.1.9
gtksourceview3: initial add 3.24.6
gtksourceview-classic-light: initial add 1.0
xfce-polkit: fix Name/Comment fields in desktop file
meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch | 39 ++++++++
meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch | 33 -------
meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 53 +++++++++++
meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch | 32 -------
meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch | 97 -------------------
.../eds/evolution-data-server/{0001-contact-Replace-the-Novell-sample-contact-with-somet.patch => 0003-contact-Replace-the-Novell-sample-contact-with-somet.patch} | 21 +---
meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch | 39 --------
meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch | 77 ---------------
meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch | 34 -------
meta-gnome/recipes-gnome/eds/{evolution-data-server_git.bb => evolution-data-server_3.26.3.bb} | 84 +++++++++-------
meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml | 492 ----------------------------------------------------------------------------------------------
meta-gnome/recipes-gnome/gdm/gdm/Default | 96 -------------------
meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff | 96 -------------------
meta-gnome/recipes-gnome/gdm/gdm/gdm | 89 -----------------
meta-gnome/recipes-gnome/gdm/gdm/gdm-pam | 11 ---
meta-gnome/recipes-gnome/gdm/gdm/gdm.conf | 80 ----------------
meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in | 10 --
meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch | 288 -------------------------------------------------------
meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch | 42 --------
meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml | 131 +++++++++++++++++++++++++
meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb | 21 ++++
meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb | 21 ++++
meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png | Bin 2311 -> 0 bytes
meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png | Bin 2280 -> 0 bytes
meta-gnome/recipes-gnome/pimlico/dates.inc | 11 ---
meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch | 54 -----------
meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch | 44 ---------
meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch | 37 -------
meta-gnome/recipes-gnome/pimlico/dates_git.bb | 18 ----
meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends | 74 --------------
meta-gnome/recipes-support/tracker/files/90tracker | 4 -
meta-gnome/recipes-support/tracker/files/tracker-dbus.service | 15 ---
meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service | 12 ---
meta-gnome/recipes-support/tracker/files/tracker-store.service | 12 ---
.../recipes-multimedia/fluidsynth/files/{0002-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch => 0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch} | 0
meta-multimedia/recipes-multimedia/fluidsynth/files/0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch | 32 -------
meta-multimedia/recipes-multimedia/fluidsynth/{fluidsynth_1.1.8.bb => fluidsynth_1.1.9.bb} | 5 +-
meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch | 32 -------
meta-oe/recipes-multimedia/jack/jack_git.bb | 8 +-
meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch | 34 +++++++
meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb | 5 +-
meta-xfce/recipes-panel-plugins/pulseaudio/{xfce4-pulseaudio-plugin_0.3.3.bb => xfce4-pulseaudio-plugin_0.3.4.bb} | 4 +-
meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.12.1.bb => xfce4-panel_4.12.2.bb} | 4 +-
meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.0.bb => xfce4-power-manager_1.6.1.bb} | 4 +-
44 files changed, 366 insertions(+), 1929 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
rename meta-gnome/recipes-gnome/eds/evolution-data-server/{0001-contact-Replace-the-Novell-sample-contact-with-somet.patch => 0003-contact-Replace-the-Novell-sample-contact-with-somet.patch} (95%)
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
rename meta-gnome/recipes-gnome/eds/{evolution-data-server_git.bb => evolution-data-server_3.26.3.bb} (68%)
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
delete mode 100755 meta-gnome/recipes-gnome/gdm/gdm/Default
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
delete mode 100755 meta-gnome/recipes-gnome/gdm/gdm/gdm
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch
delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
delete mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
delete mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates.inc
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates_git.bb
delete mode 100644 meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends
delete mode 100644 meta-gnome/recipes-support/tracker/files/90tracker
delete mode 100644 meta-gnome/recipes-support/tracker/files/tracker-dbus.service
delete mode 100644 meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service
delete mode 100644 meta-gnome/recipes-support/tracker/files/tracker-store.service
rename meta-multimedia/recipes-multimedia/fluidsynth/files/{0002-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch => 0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch} (100%)
delete mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/files/0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch
rename meta-multimedia/recipes-multimedia/fluidsynth/{fluidsynth_1.1.8.bb => fluidsynth_1.1.9.bb} (83%)
delete mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch
create mode 100644 meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
rename meta-xfce/recipes-panel-plugins/pulseaudio/{xfce4-pulseaudio-plugin_0.3.3.bb => xfce4-pulseaudio-plugin_0.3.4.bb} (73%)
rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.12.1.bb => xfce4-panel_4.12.2.bb} (91%)
rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.0.bb => xfce4-power-manager_1.6.1.bb} (90%)
--
2.14.3
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 01/14] xfce4-panel: update 4.12.1 -> 4.12.2
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 02/14] xfce4-power-manager: update 1.6.0 -> 1.6.1 Andreas Müller
` (12 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../xfce4-panel/{xfce4-panel_4.12.1.bb => xfce4-panel_4.12.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.12.1.bb => xfce4-panel_4.12.2.bb} (91%)
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb
similarity index 91%
rename from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb
rename to meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb
index 80332cebe..75bcdd716 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb
@@ -8,8 +8,8 @@ inherit xfce gtk-doc distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[md5sum] = "0b943f2e72a3693dddb1af559826cb62"
-SRC_URI[sha256sum] = "93d58b80cca9c9eb58adb281bc75404df7cf6cae89f7f98bb9f38690009aa2e8"
+SRC_URI[md5sum] = "803c9aabc2925dc97f96de125c52ba2e"
+SRC_URI[sha256sum] = "42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9"
SRC_URI += " \
file://0001-clock-time-make-change-of-system-s-timezone-change-t.patch \
file://0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 02/14] xfce4-power-manager: update 1.6.0 -> 1.6.1
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
2018-01-17 8:34 ` [PATCH 01/14] xfce4-panel: update 4.12.1 -> 4.12.2 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 03/14] xfce4-pulseaudio-plugin: update 0.3.3 -> 0.3.4 Andreas Müller
` (11 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../{xfce4-power-manager_1.6.0.bb => xfce4-power-manager_1.6.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.0.bb => xfce4-power-manager_1.6.1.bb} (90%)
diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb
similarity index 90%
rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb
rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb
index 08d00df72..ed117b0a6 100644
--- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb
@@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \
libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver"
-SRC_URI[md5sum] = "2e2e24a1a22912d6a561ba6155887503"
-SRC_URI[sha256sum] = "bde3157e06ab31ff23648d163d53ee5095f7819544a9f48d3a96d57829857f2b"
+SRC_URI[md5sum] = "17f0e6464ad6b3bc6a657f595bf91430"
+SRC_URI[sha256sum] = "1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b"
EXTRA_OECONF = " \
--enable-network-manager \
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 03/14] xfce4-pulseaudio-plugin: update 0.3.3 -> 0.3.4
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
2018-01-17 8:34 ` [PATCH 01/14] xfce4-panel: update 4.12.1 -> 4.12.2 Andreas Müller
2018-01-17 8:34 ` [PATCH 02/14] xfce4-power-manager: update 1.6.0 -> 1.6.1 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3 Andreas Müller
` (10 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...e4-pulseaudio-plugin_0.3.3.bb => xfce4-pulseaudio-plugin_0.3.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-panel-plugins/pulseaudio/{xfce4-pulseaudio-plugin_0.3.3.bb => xfce4-pulseaudio-plugin_0.3.4.bb} (73%)
diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.3.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.4.bb
similarity index 73%
rename from meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.3.bb
rename to meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.4.bb
index c8eaa1c3b..32032a26a 100644
--- a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.3.bb
+++ b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.3.4.bb
@@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "pulseaudio x11"
DEPENDS += "pulseaudio"
-SRC_URI[md5sum] = "d3d3e012369af6d2302d4b70a7720a17"
-SRC_URI[sha256sum] = "d6aae9409714c5ddea975c350b4d517e078a5550190165b17ca062d0eb69f9a6"
+SRC_URI[md5sum] = "05633b8776dd3dcd4cda8580613644c3"
+SRC_URI[sha256sum] = "43fa39400eccab1f3980064f42dde76f5cf4546a6ea0a5dc5c4c5b9ed2a01220"
PACKAGECONFIG ??= ""
PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify"
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (2 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 03/14] xfce4-pulseaudio-plugin: update 0.3.3 -> 0.3.4 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-22 15:51 ` akuster808
2018-01-22 16:02 ` akuster808
2018-01-17 8:34 ` [PATCH 05/14] pimlico/dates: remove recipe Andreas Müller
` (9 subsequent siblings)
13 siblings, 2 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
In recent meta-universe 3.2.3 started to fail with:
| camel-enumtypes.c:42:7: error: expected expression at end of input
| { 512, "CAMEL_FOLDER_SHARED_BY_ME", "shared-by-me" },
| ^
Instead of cleaning I decided to update. The following changed:
* eds builds with cmake instead of autotools
* musl: I checked src/time/strftime.c and it seems strftime does not support
'%l' / '%k'. musl-case was added to be a good boy but was not tested.
* remove 0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch:
src/camel/providers/imapx/camel-imapx-tokens.txt has text-only format these days
* remove 0002-Fix-for-automake-1.12.x.patch: autotools was replaced by cmake
* remove 0003-Disable-Werror-for-automake.patch: autotools was replaced by cmake
* remove 0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch: autotools was replaced by cmake
* remove 0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch:
src/calendar/backends/caldav/e-cal-backend-caldav.c was reworked competely
* remove 0006-configure.ac-do-not-overwrite-localedir.patch: autotools was replaced by cmake
Tested: abiword build and run
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...1-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch | 39 +++++++++
...x-Fix-signature-for-imapx_tokenise_struct.patch | 33 --------
...ists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 53 ++++++++++++
.../0002-Fix-for-automake-1.12.x.patch | 32 -------
.../0003-Disable-Werror-for-automake.patch | 97 ----------------------
...ace-the-Novell-sample-contact-with-somet.patch} | 21 +----
...ix-libical-pkg-config-trying-to-use-host-.patch | 39 ---------
...-soup-adapt-to-new-libxml2-API-from-2.9.0.patch | 77 -----------------
...6-configure.ac-do-not-overwrite-localedir.patch | 34 --------
...rver_git.bb => evolution-data-server_3.26.3.bb} | 84 +++++++++++--------
10 files changed, 144 insertions(+), 365 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
rename meta-gnome/recipes-gnome/eds/evolution-data-server/{0001-contact-Replace-the-Novell-sample-contact-with-somet.patch => 0003-contact-Replace-the-Novell-sample-contact-with-somet.patch} (95%)
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
rename meta-gnome/recipes-gnome/eds/{evolution-data-server_git.bb => evolution-data-server_3.26.3.bb} (68%)
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
new file mode 100644
index 000000000..a821a14ab
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
@@ -0,0 +1,39 @@
+From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 19 Dec 2017 16:37:20 +0100
+Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
+| _correct_iconv_EXITCODE (advanced)
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d07772..a2396f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV)
+ endif(NOT HAVE_ICONV)
+
+ set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
+-CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
+ unset(CMAKE_REQUIRED_LIBRARIES)
+
+-if(NOT _correct_iconv)
+- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
+-endif(NOT _correct_iconv)
+-
+ # ******************************
+ # Backtraces for debugging
+ # ******************************
+--
+2.14.3
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
deleted file mode 100644
index f82a76df3..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0e10e976025b21d12df099e82951f759024ad649 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 24 Aug 2017 22:04:56 -0700
-Subject: [PATCH] imapx: Fix signature for imapx_tokenise_struct()
-
-clang complains about different signature for this patch
-
-Fixes
-camel/providers/imapx/camel-imapx-tokens.txt:56:1: error: conflicting types for 'imapx_tokenise_struct'
-| imapx_tokenise_struct (register const char *str, register size_t len)
-| ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- camel/providers/imapx/camel-imapx-tokens.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
-index d48501865..994c368c0 100644
---- a/camel/providers/imapx/camel-imapx-tokens.txt
-+++ b/camel/providers/imapx/camel-imapx-tokens.txt
-@@ -1,7 +1,7 @@
- /* This contains all of the keywords we care about. These
- can be converted to an id very efficiently */
- struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
--struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
-+struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len);
- %%
- ALERT, IMAPX_ALERT
- APPENDUID, IMAPX_APPENDUID
---
-2.14.1
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
new file mode 100644
index 000000000..c8dc7e12c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
@@ -0,0 +1,53 @@
+From 210b204d9edd71202454ff04013cc52b23c598e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 19 Dec 2017 16:55:13 +0100
+Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* TRY_RUN: does not work for OE
+* HAVE_LKSTRFTIME is set by recipe as configure option
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ CMakeLists.txt | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a2396f2..f3b271b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -573,29 +573,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
+ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
+ int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2)
+
+-# *******************************************************
+-# Check to see if strftime supports the use of %l and %k
+-# *******************************************************
+-
+-CHECK_C_SOURCE_RUNS("
+- #include <stdlib.h>
+- #include <string.h>
+- #include <time.h>
+- int main(int argc, char **argv) {
+- char buf[10];
+- time_t rawtime;
+- struct tm *timeinfo;
+-
+- time(&rawtime);
+- timeinfo=localtime(&rawtime);
+- buf[0] = 0;
+- strftime(buf, 10, \"%lx%k\", timeinfo);
+-
+- if (!buf[0] || buf[0] == 'x' || strstr(buf, \"l\") || strstr(buf, \"k\"))
+- return 1;
+- return 0;
+- }" HAVE_LKSTRFTIME)
+-
+ # ******************************
+ # system mail stuff
+ # ******************************
+--
+2.14.3
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
deleted file mode 100644
index 5f222aeaa..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f46423c9e4b8b19eda27b307456a717de79b75f3 Mon Sep 17 00:00:00 2001
-From: Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: Sun, 4 Aug 2013 09:15:43 +0200
-Subject: [PATCH 2/5] Fix for automake-1.12.x
-
-Fixed these kinds if warning-errors
-
-warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
-
-Upstream-Status: Pending
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 9bd97db..49d7506 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,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.28])
---
-1.8.3.2
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
deleted file mode 100644
index a182d4d5e..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 37b227cff78fd4c652651662dafd71537280824e Mon Sep 17 00:00:00 2001
-From: Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: Sun, 4 Aug 2013 09:16:59 +0200
-Subject: [PATCH 3/5] Disable Werror for automake
-
-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
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Conflicts:
- configure.ac
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 49d7506..1c802ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
- dnl Autoconf / Automake Initialization
- AC_PREREQ(2.62)
- AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
--AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability -Werror foreign])
-+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(README)
- AC_CONFIG_HEADERS(config.h)
---
-1.8.3.2
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
similarity index 95%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
rename to meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
index b77e7b9bd..3cdfa8b6f 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
@@ -7,26 +7,13 @@ Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- addressbook/backends/file/Makefile.am | 1 +
- addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
+ src/addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
2 files changed, 103 insertions(+), 77 deletions(-)
-diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
-index 08cf58f..17e7149 100644
---- a/addressbook/backends/file/Makefile.am
-+++ b/addressbook/backends/file/Makefile.am
-@@ -2,6 +2,7 @@ ebook_backend_LTLIBRARIES = libebookbackendfile.la
-
- libebookbackendfile_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
-+ -DCREATE_DEFAULT_VCARD \
- -DG_LOG_DOMAIN=\"libebookbackend\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
-diff --git a/addressbook/libedata-book/ximian-vcard.h b/addressbook/libedata-book/ximian-vcard.h
+diff --git a/src/addressbook/libedata-book/ximian-vcard.h b/src/addressbook/libedata-book/ximian-vcard.h
index 782d37b..5b0b250 100644
---- a/addressbook/libedata-book/ximian-vcard.h
-+++ b/addressbook/libedata-book/ximian-vcard.h
+--- a/src/addressbook/libedata-book/ximian-vcard.h
++++ b/src/addressbook/libedata-book/ximian-vcard.h
@@ -1,80 +1,105 @@
#define XIMIAN_VCARD \
"BEGIN:VCARD\n" \
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
deleted file mode 100644
index 138334798..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 4 Aug 2013 10:57:08 +0200
-Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host
- paths
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- calendar/libecal/libecal.pc.in | 2 +-
- configure.ac | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
-index fc6b359..d3435bb 100644
---- a/calendar/libecal/libecal.pc.in
-+++ b/calendar/libecal/libecal.pc.in
-@@ -12,4 +12,4 @@ Description: Client library for evolution calendars
- Version: @VERSION@
- Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0
- Libs: -L${libdir} -lecal-1.2
--Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
-+Cflags: -I${privincludedir}
-diff --git a/configure.ac b/configure.ac
-index 1c802ff..f1d4ce8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h>
- dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
- dnl libical is fixed, we have to work-around the buggy CFlags.
- dnl *****
-- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
-+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
-+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
- LIBICAL_EXTRA_LIBS=""
- AC_SUBST(LIBICAL_EXTRA_CFLAGS)
- AC_SUBST(LIBICAL_EXTRA_LIBS)
---
-1.8.3.2
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
deleted file mode 100644
index addf2ee8d..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From ac95e89749a01618f98b554a98e78d7c988bfc10 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 27 Nov 2012 08:46:51 +0100
-Subject: [PATCH 5/5] soup: adapt to new libxml2 API from 2.9.0
-
-* for more info see
- https://mail.gnome.org/archives/xml/2012-August/msg00005.html
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
-index 12f8f22..5555a3e 100644
---- a/calendar/backends/caldav/e-cal-backend-caldav.c
-+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
-@@ -1172,8 +1172,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-+#ifdef LIBXML2_NEW_BUFFER
-+ (gchar *) xmlOutputBufferGetContent(buf),
-+ xmlOutputBufferGetSize(buf));
-+#else
- (gchar *) buf->buffer->content,
- buf->buffer->use);
-+#endif
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
-@@ -1321,8 +1326,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-+#ifdef LIBXML2_NEW_BUFFER
-+ (gchar *) xmlOutputBufferGetContent(buf),
-+ xmlOutputBufferGetSize(buf));
-+#else
- (gchar *) buf->buffer->content,
- buf->buffer->use);
-+#endif
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
-@@ -1715,8 +1725,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-+#ifdef LIBXML2_NEW_BUFFER
-+ (gchar *) xmlOutputBufferGetContent(buf),
-+ xmlOutputBufferGetSize(buf));
-+#else
- (gchar *) buf->buffer->content,
- buf->buffer->use);
-+#endif
-+
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
-@@ -1765,8 +1781,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-+#ifdef LIBXML2_NEW_BUFFER
-+ (gchar *) xmlOutputBufferGetContent(buf),
-+ xmlOutputBufferGetSize(buf));
-+#else
- (gchar *) buf->buffer->content,
- buf->buffer->use);
-+#endif
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
---
-1.8.3.2
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
deleted file mode 100644
index 741e5e97d..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 3 Sep 2015 11:14:24 +0200
-Subject: [PATCH] configure.ac: do not overwrite localedir
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport [1]
-
-[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f1d4ce8..cee847f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
-
--localedir='$(prefix)/$(DATADIRNAME)/locale'
--AC_SUBST(localedir)
--
- dnl ******************************
- dnl Initialize libtool
- dnl ******************************
---
-2.1.0
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
similarity index 68%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
rename to meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
index aadc4b5e3..2d410e246 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
@@ -4,58 +4,70 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2 & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
- file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
- file://libedataserver/e-data-server-util.h;endline=20;md5=934502f03c84523aa059d4825887b380 \
- file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
-
-DEPENDS = "intltool-native glib-2.0 gtk+3 gconf dbus db virtual/libiconv zlib libsoup-2.4 libglade libical libgnome-keyring gperf-native libgdata nss"
-
-SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687"
-
-# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring
-PV = "3.2.3+git${SRCPV}"
-
-SRC_URI = "git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
- file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
- file://0002-Fix-for-automake-1.12.x.patch \
- file://0003-Disable-Werror-for-automake.patch \
- file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
- file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
- file://0006-configure.ac-do-not-overwrite-localedir.patch \
- file://iconv-detect.h \
- file://0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch \
- "
-
-S = "${WORKDIR}/git"
-
-inherit autotools gtk-doc pkgconfig gettext gobject-introspection
+ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
+ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
+ file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
+
+DEPENDS = " \
+ intltool-native gperf-native \
+ glib-2.0 gtk+3 gconf libgnome-keyring libgdata \
+ dbus db virtual/libiconv zlib libsoup-2.4 libglade libical nss libsecret \
+"
+
+inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative
+
+SRC_URI += " \
+ file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
+ file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
+ file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
+ file://iconv-detect.h \
+"
+SRC_URI[archive.md5sum] = "568a21a4df4e0ec985c849b38fc66908"
+SRC_URI[archive.sha256sum] = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"
+
+LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
+LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
+
+EXTRA_OECMAKE = " \
+ -DWITH_KRB5=OFF \
+ -DENABLE_GOA=OFF \
+ -DENABLE_UOA=OFF \
+ -DENABLE_GOOGLE_AUTH=OFF \
+ -DENABLE_WEATHER=OFF \
+ -D${LKSTRFTIME} \
+"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
+
+EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \
+ --disable-nntp --disable-gtk-doc"
# -ldb needs this on some platforms
LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
-# Parallel make shows many issues with this source code.
-# Current problems seem to be duplicate execution of the calander/backends
-# directories by make resulting in truncated/corrupt .la files
-#PARALLEL_MAKE = ""
-
do_configure_append () {
- cp ${WORKDIR}/iconv-detect.h ${S}
+ cp ${WORKDIR}/iconv-detect.h ${S}/src
+
+ # fix native perl shebang
+ sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard
}
do_compile_prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
+ export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
}
-EXTRA_OECONF = "--without-openldap \
- --with-libdb=${STAGING_DIR_HOST}${prefix} \
- --disable-nntp --disable-goa --disable-weather --disable-gtk-doc"
PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
libedataserver libedataserver-dev \
libedataserverui libedataserverui-dev"
-FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
+FILES_${PN} =+ "${systemd_user_unitdir} \
+ ${datadir}/dbus-1 \
+ ${datadir}/evolution-data-server-*/ui/"
+RDEPENDS_${PN} += "perl"
+
FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
${libdir}/evolution-data-server*/calendar-backends/.debug \
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 05/14] pimlico/dates: remove recipe
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (3 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 06/14] remove gdm leftovers Andreas Müller
` (8 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
* pimlico project is dead for long time
* the only commits seen here were fix build / blacklist / unblacklist - so drop
this maintenace burden
* it does not build with recent evolution-data-server
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../pimlico/contacts/stock_contact.png | Bin 2311 -> 0 bytes
.../pimlico/contacts/stock_person.png | Bin 2280 -> 0 bytes
meta-gnome/recipes-gnome/pimlico/dates.inc | 11 -----
.../dates/0001-Fix-format-security-warnings.patch | 54 ---------------------
.../dates/dso_linking_change_build_fix.patch | 44 -----------------
.../uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch | 37 --------------
meta-gnome/recipes-gnome/pimlico/dates_git.bb | 18 -------
7 files changed, 164 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
delete mode 100644 meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates.inc
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
delete mode 100644 meta-gnome/recipes-gnome/pimlico/dates_git.bb
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png b/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png
deleted file mode 100644
index 123b4485acaaaf665eb9dbff5e9f126a02e6e6d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2311
zcmV+i3HbJjP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(+LU-4I?2>rs@Cy026dY
zSad^gZEa<4bO2OnX>%ZQZ)0n7A!DIdwEzGJbxA})RCwC$nR|>E)fLA-cYe#VEDOk5
zL5m722yU|lyOz~P(`pP&nl_}ip=?2s#45|9s1Q<%eV8Uqtk{Uag4jn4wzfc<l$h|4
z<sr2$D<De<0;w$Wa9th?>+bKdGryU8`p4Xv-^`DFfQjiQ?hTXWcjwNX^F8N$&pG!D
z^pF10Kl(@i_#zM0!@TOFGK;yo6?}GNQD3{300RK4I|W;S96o$llF4@IOXJnrmjVza
zz(61YsDeE0CjcrcDsUVJ+wKGe&(ny2QUU^61Vp1n8)HiF50G#wwzUF8VvZn6!WWD9
zmohtO(PojLwSYLmlf^&=(16YdV8va{|D%-3y+{d4K%-E~@?R$kEHT7UaoM#*c2qgT
zD}QYOTv_-}8Xy)HVgM^klPD;N0&oE*-vUGdhzLbRgFZ9U+S)D$=yS?YJ=0K$574Lu
zL7@~_Vv(>C!Lk9yQ!Idj-UK;$V3$!*V0KWE-!c1{`LeqnKtvmR#N{UHX3@|R@kZaO
zQM(D2rJ_m>e{>7L^E3dCWBcpHx60{{n>qGj6UkJX;lqYeQ9h3AOG~koudQJ3!0ki=
zVO2b!C_)$U_g10aV?4PMZd50#ptl6!I1Zq&ZJYI*w(zelb)5P56Kp3-@t`8cmEFpt
z(;wpAs!EEA24V$#k(}XtAle8dp~@vtxeC?<me3(+AEbw6SzU@~b?-dJ0$GPtD#>5}
z`6kP1|HOZrPSI&QhzO~4hC@e=^W3skytV7!BvUCmZQBr!h((OX(LMmt2nuZ?jOS|q
z@;tP7Xsr>?L%UhDn<eXHyOq-FElJyUCx<>b&bkeox?S1ck>u6aH*)U$1v2SO#C0?%
z&DL$(dHnG?JpcR)Y~Qw>C+5sW#G|HW9$IT&SoR_{^X3~c9<Jw+^<4jQU0m0_b^w8U
z+MNz>zq^l1m)j^TP!uG5UspiFg2IHNFrjF@beX;T8|g?T4Tl8n37#ix-1raHtghw6
zi6&pW;@=-rHU=%i;>AycK;8B_L^M0zs^g~%o<zGE?RmaswC+;Q?xT=NGM#oOO{dOK
zam!$ynNq^Vl+e`blI+xs8kS)6aEtb|$Ff~18jl>Ka$>pRp9T@cytiiVJOJKrY^0^7
zg}UwA*}Qp+Nn$=#*Q{O3!N!9$HJxPY)bH`q^5s0Wa6vo)UM&DIZ?>IIJUhwcn=K}e
z8b~6MAd&EsjOS{ctjn2Jhp&uKeA?bYGL<qM)sg5Stf^f^&Aj>CIcX9b)^Fhb#zxA^
z@8I3~dTty!lCrWfw6wG^apG60uiwk2O>c7U+<83hAtGIoxMu*`gi+geD8i;{bfHP<
z#+(AK=izyp;sJ`PTMOBC&Lh*AG0#gF7FVxYffmi`+7*Zh4GsT^27N<p-x6AD?!W(A
zXd}3Ix`*1cM+=AnV3Sb7@FGRl@!~b0fM_xI{fTVW38R=Gu~<)7YUrFyBDv%&c?1+d
z`RlKl!~tp2nG~hNufugUuIpjj9_=ZQ_LR$~X%{=|;W!>yR~R<5giNM0rvUK<zHRIT
zCX`q3z=KoFd@eUn`r2e}8#jSz)2hSFRXyVoKv-G3+GJw&S;DA4(&;oMU%HXw=N&xP
zW9tWLUTf%J>(Ml?ywkyf)19Pk&AyLaMvW}RaSQ;HX+?yl505i+=unpa{AY~4{SNAO
z?BMQu?qf&YPJaL5?<gBnMorBV+*w)0!lxF|*4D<ZU3=KFWt(q|9!PBUM&e|;1C=OX
z*Qo+h8O@o?E;ke_ZXRNhP(pK?M`LrA6YWJP1luICunHC7htsB0QZksQ7cBu`>9fD2
zz5P=bEPRT!YyZHh)2Dg%7r$cApdyYQJ4SQ!C;a-k-*E9_E4$y`)1!jBC$SNrZqEVE
zC!uuA6#jB(D`{Kv(IuDtXM7j6fRpJGvZdqM-Ef5Ru{XtB5QL5E--whDrep|eB8l@(
zi$=6IfkMy{;n6ka0rSv^iYa{i8xL~+LMtt&Ch*a|%_J`z!_C^rfMSxv$1}2WGPhj+
zWv~()ZrDleloI2l#EVzSMW7sSB;=29MHzby7BEjusQe}w$7S%4p_JY<n!BEOh7kiZ
zBs)5=3JPg;i#c}UECmCLuo8t--anP2@9oHoJ`wHbY282BMCK${wxheOMz1oA8W;HO
z{D(eU>p<sDEq+}ju@X6Enn<|yf}>=Z2>n9P)84gb;+Ez!5i?8Vppoah5z+@Yw0N=L
zegy!@JKhB62Ax~)C(f?U*jJSYgtD>YIe)H&vEwH2o$pR%+qOEUe*Xu&@wdP8<f6q)
ztDb=t&5x>Q0K)Q@S2Df&VeY-}0nid^e))=3h``G$R#8237Krfj%34H(AJ3d+!Y!;=
zxf&78%vrN}WY%MVP`hR=VL^3GVbqvR%asSgfNVL!iSIIzwL$a<<G5(*_cn0P-Bn@7
zK^wtlK0F(Z4&SiuwLgX)*6`jwQ(|~m55RGp&?ln=3Zet~bAiCI^LlW+^20$uiM@Lp
za=?Js*ZnzkslZ~h9{mYbRbLOnRM>Lqt+i;GhEck;wUt!za_k7Gh#$J+ZhR%6(0A#A
zwBfzLid<3D`Iip&tAA%FkIh{IP!3!MIsm&%5}!SLmg|NU$K$vnN8r3pWz4m@=s?8D
zoYQvx+F<{jEprVqt);6TY1dI`Z~bnH3zc6vN^UbP`g860iqTZy?}5--H2dE_*i~~^
z^7$|bnA3-wyGw!Ffg6mhRz3#?0E2-cktV9uM_TP3U;|0x|0y6_kmpm{^c*umK<Xm^
z@?~?(Z^;MXnVXmfYNC&P?2tV99P@us-F%q|ny1!Pe$n~7g^zaIbRc|J0DAkx^#2CX
h>nEoE(LcUu<A3MUJ*&iSh7kY&002ovPDHLkV1m5bcBB9R
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png b/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png
deleted file mode 100644
index 2b1328b4e2cc6a131a7ff9df4722c6fa49b0a6f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2280
zcmV<E2p9K>P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2%SkpK~#9!?U`F_6xSKYe`jWP*1PK~7=ytWFse(HIwVdiE&)OWO;cLZ
zO1-3wgnD`CJt9&1P*r`Y)R(kUE45WGYSp4fY1O7}qzX`i8mgovPyr4NGUjG%jPcsU
zH|*W@Ugn(BhdH|*FKh4`3P@$7PcySSXZQdA?%x@>cicPvzYp<0{9RFWt&LE0eb*_(
z0=@zq07ebaQQ+^uH-HKtWS$du6L<^Q26P5ATuQotj{uPXk-Gx?CvO0}SUwL_0q&h9
zVF7JGx=aEYU@K64CoLfW2iRXG_`LiBSPE2{-w}60`&;J;UIPi>v%n$~+}3;m+-%1A
z)I8VcfGOZfAR35;vaI0TBmo=P1YB5J>$H4xdkuY~lHsHxKH>3tR|<glG=x}Q7ou%x
zh}ww7l1hv39T*Q?9+x@bAwwW(;zE^EBb-~{Lhk~rpK6b>eN7D8wy<o0Wm#CZg^~)T
z6iRBOR7fe2QuFX~m&@Z*^+2t0AJ-@(cRO9k1|Hhd8i`3|+*<oO)LNsYLTg>nsn!}P
z{byWT@PQR>$kc=Ie2bfP3$jpp>*_FTo7@6Or8Qb=lu~HvgZ89EdaAH+)k24L&0zp(
zz&m#$1_ZFAE+UB70<ASUDY2A5APOCjMkAF%X${JE@8&w2OJg3!igporG1oY7Zh-}e
zg#^_V0_kZKAkj1Rn1`aKZ^O1A;#|{ImR$#&TTlynZS+c|B%Ws>1R%t<__fA2fI=y#
zuoc4pCSHQ-ZHoa7{3nstSQ?a4NTtzIp_DF&mj35T`JYdvB{@%%&H`}0MC!aPX*6F=
z-`saL{juj7qDZ9?LUVG^;}0FFYZiR4HO!V47lkI{X*vdT04Gc!%V{UOeHKu_pAU4U
zC$paNHScMDe>{cOuzPciXEw#yy*Y+fnggfPNU0f1Dx`$hx-u!?Adm&Ta*No_5-=H`
zEU;(K@yxW#XiY;*kjwd`5@}U1*Hl)~Gb(xYTn1pTslHiLz{)0YvuU&*cm{a#m3O9C
zx6EOEvjbW)G%5M%q2x7-Mw5#8q-5`@48WtN4gYl@m_<2h)Sf5s5by%<r$x(FJ+l2X
zU#)%Q@lWuRmk-iZCFvQF{(}Ovfgv@dvKmjruZ{~gY~M-C{TnOC-;J+LrxIT<E%h5F
z7Iay8yiAw-Fz^d3tLbykzd+jq4{|v^%$0#lR7Rt`^4lK}O<iJPR1gdKb!*ClshlPw
zVU&8-J+^~zbpsXAO6-u!=*Sgb{oRiMH2^#d>@zNP!@w40g8w@3<1an?ZPsqsj_o*1
zB-02X7#^Eoc(9+wWy?8r>`e~6zL$}KK0Ggr?YPu6EM@)XZ7gnD#mGdGXsiZ=z;VM&
zC6m~01t$-`M(5!J0N(<BZsH?%Jrbe}@LvXg_WXB$$ja8W^u|XJmW5>rgzzPmN;1^n
z&r=_NoRzgOnMjb$WXWc;Xf&~g7WTZnpLA*p$8~WdF%UMwvP_pMIseYTIkNx7Jc(bL
znPFBE_8h@)1pc!7JKv|dwT<q}R|<`%)*4I$=Qs|@<Rsaw<U^a=iN&JS*DoXzjndY3
zKmR&$p5cip+(-<^4P!el8j$&xTPdm+Hd0YpL;OPLcHjumAIMI+Tmt!)`K717__gKl
zZQsQCOIHAGg3~{1t<l=Avazaa&YnHT`UlsrV)-&^Yifv9#;|Og7x%q|Hc3Wnfl{&n
zT&kHQCdWsa7>Tz6f4yFfu;xHu=awy7Hm-SiD`$EJkW%7#GH~{go;Q6hJsOrQX3rn@
z7BWyY65-&{uEIJgB}z#%;3%Y$DCv{P6S;5W4uE!Gr<oZ_4*k{~wEyXr_phV-@<`#&
zgW`G8@AdQ7o&+q8cAg`VNFbFWna*(T;^2&Rb=6Ux+w}xb@7Q3#OEbMmq*6F;n3e|~
z#Sn-ECN@zH0Sj1fS1*|cT!MrT-kWi62{>{3B4{|<8>cTmGGqO&k8YxIQ7x@28`-sU
zQ^5lH5mYM0lGSYhYv)TKU#Xj}rUUb=H&ffbcm)!k=b;gV!x6f=d(de5<D-mEBn#`e
zt-Ftg1=V!-4RNUB498FP(731uC8Z(Z$A%lN0$3avJFg+&%)tUeN{MAjlonV*o3kpU
zPay*Hh-m^sZUw!){iHKFJmtrS(i*Ka`~Uei``+j%1nrC<E|Bo=&Ed|rdv_xO0=PUm
zKGIyXpaG!;T4;n4s6hVDkB>psR8&?oa&?kaI>WKf3wTnZO{1r@LKo(PQY8GCNL?KR
z7%mz)MY-MR@rzx@%upVP0dHD7>G@~#eLj%;21hu0vYYO{!D-hk{+)oR{Iv<_!Jd-<
zr{~*F=L^T)bH@%cl}eaD@}{$n41ky3%ovd#N=im2CTBb^rB@;esDdbSPERH2?>r1}
zD9{sKQ_So+Y}^h2kM*29(wNI-5tfbRgb<cx=3HIyZKaf%d3_g2r<2sz)Y3mRTKK$>
zZHkJQRFX_O#rW_5183jn%v*m$D|H6=4R95hFl~hwBq45Kosil7UIsh?tOwo)v;fY6
z#un<ETBu&QglP2w+=>_>*G1S4LRjRoY1XV>L3iJv0V?sl9Jy?UOe#TYVvNMt5M%LP
z#)mFq!1V&>%!`s^zz}f7>;O&__eEk37N{`We+z&*las?h6VPn7#~Xl!hHRBddoJL#
zx3^mz9UaQJLB?n?VZe+SU~$v)44CIU^K23rGq0$wmTQ5a6(VNfs4^R|;XrD$4bgn2
zu!=H<C=plraWpS^(9&o)YY3!(Nkh0~S1RVv3t0xBYk=p$JBC0piD1gJX4weP0pP{p
zbLKuzB6Gc=znpo%3IHq?C-A*BTh1=BLQwlEK%$hW+2(<ACbHspzd?|t+(s0w)w8%#
zkWBGsH+-jjGw-BI?Pr#=$Ei!~!s+>LG2T1w)bU@VKEb!e^}Rs=0000<MNUMnLSTXm
CvpRJE
diff --git a/meta-gnome/recipes-gnome/pimlico/dates.inc b/meta-gnome/recipes-gnome/pimlico/dates.inc
deleted file mode 100644
index 12d2f83f9..000000000
--- a/meta-gnome/recipes-gnome/pimlico/dates.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-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 intltool-native"
-RDEPENDS_${PN} = "libedata-cal"
-
-inherit autotools gettext pkgconfig gtk-icon-cache
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch b/meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch
deleted file mode 100644
index 4f551a7d8..000000000
--- a/meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 687881c5fa342686c8724adcdac0f9d555a351c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 5 Apr 2017 18:10:57 -0700
-Subject: [PATCH] Fix format security warnings
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/dates_callbacks.c | 2 +-
- src/dates_gtk.c | 2 +-
- src/gconf-bridge.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/dates_callbacks.c b/src/dates_callbacks.c
-index d704c8f..46b8cb1 100644
---- a/src/dates_callbacks.c
-+++ b/src/dates_callbacks.c
-@@ -365,7 +365,7 @@ dates_about_cb (GtkWidget *widget, DatesData *d)
-
- if (!pixb) {
- g_assert (error);
-- g_warning (error->message);
-+ g_warning ("%s", error->message);
- g_clear_error (&error);
- }
-
-diff --git a/src/dates_gtk.c b/src/dates_gtk.c
-index 403bc25..fd691d2 100644
---- a/src/dates_gtk.c
-+++ b/src/dates_gtk.c
-@@ -1114,7 +1114,7 @@ calendar_do_edit_dialog_response_cb (GtkDialog *dialog, gint response_id, gpoint
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_NONE,
-- prompt);
-+ "%s", prompt);
-
- g_free (prompt);
-
-diff --git a/src/gconf-bridge.c b/src/gconf-bridge.c
-index 49754cf..67d3757 100644
---- a/src/gconf-bridge.c
-+++ b/src/gconf-bridge.c
-@@ -1220,7 +1220,7 @@ error_handler (GConfClient *client,
- dlg = gtk_message_dialog_new (NULL, 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
-- message);
-+ "%s", message);
- g_free (message);
-
- gtk_message_dialog_format_secondary_text
---
-2.12.2
-
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch b/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
deleted file mode 100644
index 649d59d91..000000000
--- a/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-after gcc linking has changed, all the libraries must be explicitely specified
-This patch avoids these linking errors:
-
-
-| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/dates-0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4-r2/git/src'^M
-...
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: e: invalid DSO for symbol `pow@@GLIBC_2.0' definition^M
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libm.so: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[2]: *** [dates] Error 1
-
-
-
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: z: invalid DSO for symbol `pango_layout_get_extents' definition
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[2]: *** [dates] Error 1
-
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Update:
-This is identified as a libtool issue. While creating the libgtkdatesview.la
-file, libtool should have added these needed libraries in there.
- A bug has been created for this issue:
- http://bugzilla.pokylinux.org/show_bug.cgi?id=664
-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
-+++ git/src/Makefile.am
-@@ -34,6 +34,6 @@ dates_SOURCES = $(platform) \
- gconf-bridge.h \
- gconf-bridge.c
-
--dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la
-+dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la -lm -lpango-1.0
-
- MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch b/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
deleted file mode 100644
index 6ade4708f..000000000
--- a/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 <raj.khem@gmail.com>
-
-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;
diff --git a/meta-gnome/recipes-gnome/pimlico/dates_git.bb b/meta-gnome/recipes-gnome/pimlico/dates_git.bb
deleted file mode 100644
index 14965e94f..000000000
--- a/meta-gnome/recipes-gnome/pimlico/dates_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-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 = "c8e30fa3211dcdfcda48184f4c57746a552b9c7a"
-PV = "0.4.11+git${SRCPV}"
-PR = "r9"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://git.gnome.org/${BPN} \
- file://dso_linking_change_build_fix.patch \
- file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
- file://0001-Fix-format-security-warnings.patch \
- "
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 06/14] remove gdm leftovers
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (4 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 05/14] pimlico/dates: remove recipe Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 07/14] remove gnome system-tools leftovers Andreas Müller
` (7 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml | 492 ---------------------
meta-gnome/recipes-gnome/gdm/gdm/Default | 96 ----
.../recipes-gnome/gdm/gdm/cross-xdetection.diff | 96 ----
meta-gnome/recipes-gnome/gdm/gdm/gdm | 89 ----
meta-gnome/recipes-gnome/gdm/gdm/gdm-pam | 11 -
meta-gnome/recipes-gnome/gdm/gdm/gdm.conf | 80 ----
meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in | 10 -
7 files changed, 874 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
delete mode 100755 meta-gnome/recipes-gnome/gdm/gdm/Default
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
delete mode 100755 meta-gnome/recipes-gnome/gdm/gdm/gdm
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
deleted file mode 100644
index f8c2e9cc2..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
+++ /dev/null
@@ -1,492 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
- <dir name="desktop">
- <dir name="gnome">
- <dir name="url-handlers">
- <dir name="ymsgr">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="xmpp">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="webcal">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="uvox">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="trash">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="sip">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="rtsp">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="rtp">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="pnm">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="note">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="net">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="msnim">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="mmsh">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="mms">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="man">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="mailto">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="lastfm">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="itpc">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="itms">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="irc">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="info">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="icyx">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="icy">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="icq">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="https">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="http">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="h323">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="ghelp">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="gg">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="ftp">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="file">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="feed">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="cdda">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="callto">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="aim">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- <dir name="about">
- <entry name="command" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- </dir>
- <dir name="lockdown">
- <entry name="disable_url_handlers" mtime="1227173197" type="bool" value="true">
- </entry>
- <entry name="disable_save_to_disk" mtime="1227173197" type="bool" value="true">
- </entry>
- <entry name="disable_print_setup" mtime="1227173197" type="bool" value="true">
- </entry>
- <entry name="disable_printing" mtime="1227173197" type="bool" value="true">
- </entry>
- <entry name="disable_lock_screen" mtime="1227173197" type="bool" value="true">
- </entry>
- <entry name="disable_command_line" mtime="1227173197" type="bool" value="true">
- </entry>
- </dir>
- <dir name="applications">
- <dir name="terminal">
- <entry name="exec" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- </dir>
- </dir>
- <dir name="accessibility">
- <dir name="keyboard">
- <entry name="enable" mtime="1227173197" type="bool" value="true">
- </entry>
- </dir>
- </dir>
- </dir>
- </dir>
- <dir name="apps">
- <dir name="gnome_settings_daemon">
- <dir name="keybindings">
- <entry name="www" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="stop" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="sleep" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="search" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="screensaver" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="previous" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="power" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="play" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="pause" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="next" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="media" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="home" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="help" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="email" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="calculator" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="eject" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- </dir>
- </dir>
- <dir name="metacity">
- <dir name="keybinding_commands">
- <entry name="command_window_screenshot" mtime="1227173197" type="string">
- <stringvalue>/bin/true</stringvalue>
- </entry>
- <entry name="command_screenshot" mtime="1227173197" type="string">
- <stringvalue>gdm-screenshot</stringvalue>
- </entry>
- </dir>
- <dir name="global_keybindings">
- <entry name="switch_to_workspace_up" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="switch_to_workspace_right" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="switch_to_workspace_left" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="switch_to_workspace_down" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="switch_group" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="show_desktop" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="run_command_window_screenshot" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="run_command_screenshot" mtime="1227173197" type="string">
- <stringvalue>Print</stringvalue>
- </entry>
- <entry name="panel_run_dialog" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- <entry name="panel_main_menu" mtime="1227173197" type="string">
- <stringvalue>disabled</stringvalue>
- </entry>
- </dir>
- <dir name="general">
- <entry name="num_workspaces" mtime="1227173197" type="int" value="1">
- </entry>
- </dir>
- </dir>
- <dir name="compiz">
- <dir name="general">
- <dir name="allscreens">
- <dir name="options">
- <entry name="run_command11_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command11_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command10_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command10_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command8_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command8_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command7_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command7_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command6_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command6_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command5_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command5_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command4_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command4_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command3_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command3_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command2_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command2_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command1_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command1_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command0_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_command0_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="run_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="main_menu_key" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="main_menu_button" mtime="1227173197" type="string">
- <stringvalue>Disabled</stringvalue>
- </entry>
- <entry name="command_window_screenshot" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command11" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command10" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command9" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command8" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command7" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command6" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command5" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command4" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command3" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command2" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command1" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command0" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command_terminal" mtime="1227173197" type="string">
- <stringvalue></stringvalue>
- </entry>
- <entry name="command_screenshot" mtime="1227173197" type="string">
- <stringvalue>gdm-screenshot</stringvalue>
- </entry>
- <entry name="active_plugins" mtime="1227173197" type="list" ltype="string">
- <li type="string">
- <stringvalue>cube</stringvalue>
- </li>
- <li type="string">
- <stringvalue>decoration</stringvalue>
- </li>
- <li type="string">
- <stringvalue>gconf</stringvalue>
- </li>
- <li type="string">
- <stringvalue>glib</stringvalue>
- </li>
- <li type="string">
- <stringvalue>move</stringvalue>
- </li>
- <li type="string">
- <stringvalue>place</stringvalue>
- </li>
- <li type="string">
- <stringvalue>resize</stringvalue>
- </li>
- <li type="string">
- <stringvalue>screenshot</stringvalue>
- </li>
- <li type="string">
- <stringvalue>wobbly</stringvalue>
- </li>
- </entry>
- </dir>
- </dir>
- </dir>
- </dir>
- <dir name="gnome-power-manager">
- <dir name="ui">
- <entry name="show_context_menu" mtime="1227173197" type="bool" value="false">
- </entry>
- </dir>
- </dir>
- <dir name="gnome-screensaver">
- <entry name="power_management_delay" mtime="1227173197" type="int" value="30">
- </entry>
- </dir>
- <dir name="nautilus">
- <dir name="preferences">
- <entry name="show_desktop" mtime="1227173197" type="bool" value="false">
- </entry>
- </dir>
- </dir>
- </dir>
-</gconf>
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/Default b/meta-gnome/recipes-gnome/gdm/gdm/Default
deleted file mode 100755
index a7a7fcf7f..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/Default
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# Stolen from the debian kdm setup, aren't I sneaky
-# Plus a lot of fun stuff added
-# -George
-
-PATH="/usr/bin:$PATH"
-OLD_IFS=$IFS
-
-gdmwhich () {
- COMMAND="$1"
- OUTPUT=
- IFS=:
- for dir in $PATH
- do
- if test -x "$dir/$COMMAND" ; then
- if test "x$OUTPUT" = "x" ; then
- OUTPUT="$dir/$COMMAND"
- fi
- fi
- done
- IFS=$OLD_IFS
- echo "$OUTPUT"
-}
-
-sysresources=/etc/X11/Xresources
-
-# merge in defaults
-if [ -f "$sysresources" ]; then
- xrdb -merge "$sysresources"
-fi
-
-sysmodmap=/etc/X11/Xmodmap
-
-XMODMAP=`gdmwhich xmodmap`
-if [ "x$XMODMAP" != "x" ] ; then
- if [ "x$GDM_PARENT_DISPLAY" = "x" ]; then
- if [ -f $sysmodmap ]; then
- $XMODMAP $sysmodmap
- fi
- else
- ( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $XMODMAP -pke ) | $XMODMAP -
- fi
-
- #
- # Switch Sun's Alt and Meta mod mappings
- #
-
- UNAME=`gdmwhich uname`
- PROCESSOR=`$UNAME -p`
- if [ "x$PROCESSOR" = "xsparc" ]; then
- if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null
- then
- $XMODMAP -e "clear Mod1" \
- -e "clear Mod4" \
- -e "add Mod1 = Alt_L" \
- -e "add Mod1 = Alt_R" \
- -e "add Mod4 = Meta_L" \
- -e "add Mod4 = Meta_R"
- fi
- fi
-fi
-
-SETXKBMAP=`gdmwhich setxkbmap`
-if [ "x$SETXKBMAP" != "x" ] ; then
- # FIXME: is this all right? Is this completely on crack?
- # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
- # FIXME: This should be done in code. Or there must be an easier way ...
- if [ -n "$GDM_PARENT_DISPLAY" ]; then
- XKBSETUP=`( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $SETXKBMAP -v )`
- if [ -n "$XKBSETUP" ]; then
- XKBKEYMAP=`echo "$XKBSETUP" | grep '^keymap' | awk '{ print $2 }'`
- XKBTYPES=`echo "$XKBSETUP" | grep '^types' | awk '{ print $2 }'`
- XKBCOMPAT=`echo "$XKBSETUP" | grep '^compat' | awk '{ print $2 }'`
- XKBSYMBOLS=`echo "$XKBSETUP" | grep '^symbols' | awk '{ print $2 }'`
- XKBGEOMETRY=`echo "$XKBSETUP" | grep '^geometry' | awk '{ print $2 }'`
- if [ -n "$XKBKEYMAP" ]; then
- $SETXKBMAP -keymap "$XKBKEYMAP"
- elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" -a -n "$XKBGEOMETRY" ]; then
- $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" -geometry "$XKBGEOMETRY"
- elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" ]; then
- $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS"
- elif [ -n "$XKBSYMBOLS" ]; then
- $SETXKBMAP -symbols "$XKBSYMBOLS"
- fi
- fi
- fi
-fi
-
-# FIXME: the housekeeping below really should be moved to the postinst of packages that require it
-# brute force approach for now
-update-desktop-database
-glib-compile-schemas /usr/share/glib-2.0/schemas/
-
-#x11vnc -q -bg -display :0 -forever -avahi -xkb
-
-exit 0
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
deleted file mode 100644
index bee35116e..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Thu, 9 Jun 2011 18:12:45 +0200
-Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- configure.ac | 72 ++++-----------------------------------------------------
- 1 files changed, 5 insertions(+), 67 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index eeaf3dc..841efe0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1101,73 +1101,11 @@ dnl ---------------------------------------------------------------------------
- dnl - Check for X Server location
- dnl ---------------------------------------------------------------------------
-
--# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
--# symlink to each other, and configure should use the more stable
--# location (the real directory) if possible.
--#
--# On Solaris, the /usr/bin/Xserver script is used to decide whether to
--# use Xsun or Xorg, so this is used on Solaris.
--#
--# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
--# and /usr/X11 since they often symlink to each other, and configure
--# should use the more stable location (the real directory) if possible.
--#
--if test -x /usr/X11/bin/Xserver; then
-- X_PATH="/usr/X11/bin"
-- X_SERVER_PATH="/usr/X11/bin"
-- X_SERVER="/usr/X11/bin/Xserver"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-- X_PATH="/usr/X11R6/bin"
-- X_SERVER_PATH="/usr/X11R6/bin"
-- X_SERVER="/usr/X11R6/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
-- X_PATH="/usr/X11/bin"
-- X_SERVER_PATH="/usr/X11/bin"
-- X_SERVER="/usr/X11/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/X11R6/bin/X; then
-- X_PATH="/usr/X11R6/bin"
-- X_SERVER_PATH="/usr/X11R6/bin"
-- X_SERVER="/usr/X11R6/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/bin/Xorg; then
-- X_PATH="/usr/bin"
-- X_SERVER_PATH="/usr/bin"
-- X_SERVER="/usr/bin/Xorg"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/X11/bin/X; then
-- X_PATH="/usr/X11/bin"
-- X_SERVER_PATH="/usr/X11/bin"
-- X_SERVER="/usr/X11/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/openwin/bin/Xsun; then
-- # Do not add /usr/openwin/bin here because on Solaris you need
-- # /usr/openwin/bin in your PATH even if you are using the Xorg
-- # Xserver. We add this to the path below.
-- X_PATH="/usr/openwin/bin"
-- X_SERVER_PATH="/usr/openwin/bin"
-- X_SERVER="/usr/openwin/bin/Xsun"
-- X_CONFIG_OPTIONS="-audit 0 -nobanner"
--elif test -x /opt/X11R6/bin/X; then
-- X_PATH="/opt/X11R6/bin"
-- X_SERVER_PATH="/opt/X11R6/bin"
-- X_SERVER="/opt/X11R6/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/bin/X; then
-- X_PATH="/usr/bin"
-- X_SERVER_PATH="/usr/bin"
-- X_SERVER="/usr/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--else
-- # what to do, what to do, this is wrong, but this just sets the
-- # defaults, perhaps this user is cross compiling or some such
-- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
-- X_SERVER_PATH="/usr/bin"
-- X_SERVER="/usr/bin/X"
-- X_CONFIG_OPTIONS="-audit 0"
--fi
-+# We hardcode the X paths since we know where it will be in the OE univers
-+X_PATH="/usr/bin"
-+X_SERVER_PATH="/usr/bin"
-+X_SERVER="/usr/bin/X"
-+X_CONFIG_OPTIONS="-audit 0"
-
- dnl ---------------------------------------------------------------------------
- dnl - Check for Xnest / Xephyr support
---
-1.6.6.1
-
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm b/meta-gnome/recipes-gnome/gdm/gdm/gdm
deleted file mode 100755
index bb5b41864..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: gdm
-# Should-Start: console-screen acpid dbus hal network-manager
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 5
-# Default-Stop: 0 1 2 3 6
-# Short-Description: GNOME Display Manager
-# Description: Debian init script for the GNOME Display Manager
-### END INIT INFO
-#
-# Author: Ryan Murray <rmurray@debian.org>
-#
-set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/gdm
-
-test -x $DAEMON || exit 0
-
-if [ -r /etc/default/locale ]; then
- . /etc/default/locale
- export LANG LANGUAGE
-fi
-
-# To start gdm even if it is not the default display manager, change
-# HEED_DEFAULT_DISPLAY_MANAGER to "false."
-HEED_DEFAULT_DISPLAY_MANAGER=true
-DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
-case "$1" in
- start)
- # make needed directories in volatile
-
- if [ -e /var/log/gdm ] ; then
- rm -rf /var/log/gdm
- fi
-
- mkdir -m 01770 /var/log/gdm
- chown gdm:gdm /var/log/gdm
-
- if [ -e /tmp/.ICE-unix ] ; then
- rm -rf /tmp/.ICE-unix
- fi
-
- mkdir -m 01777 /tmp/.ICE-unix
- chown root:root /tmp/.ICE-unix
-
- CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
- if grep -wqs text /proc/cmdline; then
- echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
- elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
- [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
- [ "$CONFIGURED_DAEMON" != gdm ] ; then
- echo "Not starting GNOME Display Manager; it is not the default display manager"
- else
- echo "Starting GNOME Display Manager" "gdm"
- start-stop-daemon --start -b --exec $DAEMON
- fi
- ;;
- stop)
- echo "Stopping GNOME Display Manager" "gdm"
- set +e
- start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \
- --name gdm --retry 5
- set -e
- ;;
- reload)
- echo "Scheduling reload of GNOME Display Manager configuration" "gdm"
- set +e
- start-stop-daemon --stop --signal USR1 --quiet --pidfile \
- /var/run/gdm.pid --name gdm
- set -e
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $?
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- *)
- echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}"
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam b/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
deleted file mode 100644
index f9fafed9d..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# default; standard UN*X access
-#
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-
-auth optional pam_gnome_keyring.so
-session optional pam_gnome_keyring.so auto_start
-
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
deleted file mode 100644
index 559823b86..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# GDM Custom Configuration file.
-#
-# This file is the appropriate place for specifying your customizations to the
-# GDM configuration. If you run gdmsetup, it will automatically edit this
-# file for you and will cause the daemon and any running GDM GUI programs to
-# automatically update with the new configuration. Not all configuration
-# options are supported by gdmsetup, so to modify some values it may be
-# necessary to modify this file directly by hand.
-#
-# This file overrides the default configuration settings. These settings
-# are stored in the GDM System Defaults configuration file, which is found
-# at the following location.
-#
-# /usr/share/gdm/defaults.conf.
-#
-# This file contains comments about the meaning of each configuration option,
-# so is also a useful reference. Also refer to the documentation links at
-# the end of this comment for further information. In short, to hand-edit
-# this file, simply add or modify the key=value combination in the
-# appropriate section in the template below this comment section.
-#
-# For example, if you want to specify a different value for the Enable key
-# in the "[debug]" section of your GDM System Defaults configuration file,
-# then add "Enable=true" in the "[debug]" section of this file. If the
-# key already exists in this file, then simply modify it.
-#
-# Older versions of GDM used the "gdm.conf" file for configuration. If your
-# system has an old gdm.conf file on the system, it will be used instead of
-# this file - so changes made to this file will not take effect. Consider
-# migrating your configuration to this file and removing the gdm.conf file.
-#
-# If you hand edit a GDM configuration file, you can run the following
-# command and the GDM daemon will immediately reflect the change. Any
-# running GDM GUI programs will also be notified to update with the new
-# configuration.
-#
-# gdmflexiserver --command="UPDATE_CONFIG <configuration key>"
-#
-# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
-#
-# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and
-# re-read the new configuration settings. You can also restart GDM by sending
-# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes
-# any user session started by GDM to exit immediately while USR1 behaves like
-# gdm-safe-restart and will wait until all users log out before restarting GDM.
-#
-# For full reference documentation see the gnome help browser under
-# GNOME|System category. You can also find the docs in HTML form on
-# http://www.gnome.org/projects/gdm/
-#
-# NOTE: Lines that begin with "#" are considered comments.
-#
-# Have fun!
-
-[daemon]
-
-[security]
-
-[xdmcp]
-
-[gui]
-
-[greeter]
-
-[chooser]
-
-[debug]
-
-# Note that to disable servers defined in the GDM System Defaults
-# configuration file (such as 0=Standard, you must put a line in this file
-# that says 0=inactive, as described in the Configuration section of the GDM
-# documentation.
-#
-[servers]
-
-# Also note, that if you redefine a [server-foo] section, then GDM will
-# use the definition in this file, not the GDM System Defaults configuration
-# file. It is currently not possible to disable a [server-foo] section
-# defined in the GDM System Defaults configuration file.
-#
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
deleted file mode 100644
index 3e1556ae0..000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=%sbindir%/gdm -nodaemon
-StandardOutput=syslog
-
-[Install]
-Alias=display-manager.service
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 07/14] remove gnome system-tools leftovers
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (5 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 06/14] remove gdm leftovers Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 08/14] remove libgnomecups leftovers Andreas Müller
` (6 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../system-tools-backends | 74 ----------------------
1 file changed, 74 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends
diff --git a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends b/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends
deleted file mode 100644
index 704c36dbf..000000000
--- a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: system-tools-backends
-# Required-Start: $local_fs dbus
-# Required-Stop: $local_fs dbus
-# Should-Start: $syslog
-# Should-Stop: $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 1
-# Short-Description: Gnome System Tools Backends
-# Description: The Gnome System Tools Backends daemon handles root-needed
-# operations to configure your machine with the Gnome System
-# Tools.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/system-tools-backends
-PIDDIR=/var/run
-PIDFILE=$PIDDIR/system-tools-backends.pid
-NAME=system-tools-backends
-DESC="System Tools Backends"
-
-test -x $DAEMON || exit 0
-
-set -e
-
-do_start() {
- echo "Starting $DESC"
- start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE
-}
-
-do_stop() {
- echo "Stopping $DESC"
- start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON
-}
-
-case "$1" in
- start)
- do_start
- ;;
- stop)
- do_stop
- ;;
- #reload)
- #
- # If the daemon can reload its config files on the fly
- # for example by sending it SIGHUP, do it here.
- #
- # If the daemon responds to changes in its config file
- # directly anyway, make this a do-nothing entry.
- #
- # echo "Reloading $DESC configuration files."
- # start-stop-daemon --stop --signal 1 --quiet --pidfile \
- # /var/run/$NAME.pid --exec $DAEMON
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart".
- #
- do_stop
- sleep 5
- do_start
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 08/14] remove libgnomecups leftovers
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (6 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 07/14] remove gnome system-tools leftovers Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 09/14] remove gnome tracker leftovers Andreas Müller
` (5 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../libgnomecups/libgnomecups-0.2.3-cups-1.6.patch | 288 ---------------------
.../libgnomecups/libgnomecups-0.2.3-glib.h.patch | 42 ---
2 files changed, 330 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch
delete mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch
deleted file mode 100644
index dba60ca69..000000000
--- a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-Imported from gentoo:
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch
-
-From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 7 Aug 2012 06:53:09 -0400
-Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions
-
-CUPS 1.6 makes various structures private and introduces these ippGet
-and ippSet functions for all of the fields in these structures.
-http://www.cups.org/str.php?L3928
-
-We define our own accessors when building against CUPS < 1.6.
-
-Based on work by Jiri Popelka <jpopelka@redhat.com> at
-https://bugzilla.gnome.org/show_bug.cgi?id=679759
----
- libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++-------
- libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------
- libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++-----
- 3 files changed, 110 insertions(+), 25 deletions(-)
-
-diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
-index c924af0..f5e1ef7 100644
---- a/libgnomecups/gnome-cups-printer.c
-+++ b/libgnomecups/gnome-cups-printer.c
-@@ -37,6 +37,34 @@
-
- #define UPDATE_TIMEOUT 5000
-
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetCount(attr) attr->num_values
-+#define ippGetName(attr) attr->name
-+#define ippGetInteger(attr, element) attr->values[element].integer
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t *
-+ippFirstAttribute(ipp_t *ipp)
-+{
-+ if (!ipp)
-+ return (NULL);
-+ return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t *
-+ippNextAttribute(ipp_t *ipp)
-+{
-+ if (!ipp || !ipp->current)
-+ return (NULL);
-+ return (ipp->current = ipp->current->next);
-+}
-+#endif
-+
-+
- struct _GnomeCupsPPDFile {
- char name[1];
- };
-@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer,
- printer->details->state_reasons = NULL;
-
- /* cf. RFC2911 4.4.12 */
-- for (i = 0; i < attr->num_values; i++) {
-+ for (i = 0; i < ippGetCount (attr); i++) {
- const char *p;
-- const char *keyword = attr->values [i].string.text;
-+ const char *keyword = ippGetString (attr, i, NULL);
-
- reason = g_new (GnomeCupsPrinterReason, 1);
-
-@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer)
- return printer->details->info;
- }
-
--#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }}
--#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}}
-+#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }}
-+#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}}
-
- static void
- attributes_update_cb (guint id,
-@@ -243,14 +271,14 @@ attributes_update_cb (guint id,
- changed = FALSE;
-
- if (!error && response) {
-- for (attr = response->attrs; attr != NULL; attr = attr->next) {
-- if (!attr->name) {
-+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
-+ if (!ippGetName (attr)) {
- continue;
- }
-- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) {
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) {
- continue;
- }
-- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) {
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) {
- map_reasons (printer, attr);
- }
- MAP_INT (printer->details->state, "printer-state");
-@@ -570,7 +598,7 @@ get_default (void)
-
- attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
- if (attr) {
-- name = g_strdup (attr->values[0].string.text);
-+ name = g_strdup (ippGetString (attr, 0, NULL));
- } else {
- name = NULL;
- }
-@@ -698,7 +726,7 @@ get_printer_names (void)
- attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
- while (attr) {
- ret = g_list_prepend (ret,
-- g_strdup (attr->values[0].string.text));
-+ g_strdup (ippGetString (attr, 0, NULL)));
-
- attr = ippFindNextAttribute (response,
- "printer-name",
-diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
-index 9f98ed9..298db42 100644
---- a/libgnomecups/gnome-cups-queue.c
-+++ b/libgnomecups/gnome-cups-queue.c
-@@ -15,6 +15,33 @@
-
- #define UPDATE_TIMEOUT 3000
-
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetName(attr) attr->name
-+#define ippGetInteger(attr, element) attr->values[element].integer
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t *
-+ippFirstAttribute(ipp_t *ipp)
-+{
-+ if (!ipp)
-+ return (NULL);
-+ return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t *
-+ippNextAttribute(ipp_t *ipp)
-+{
-+ if (!ipp || !ipp->current)
-+ return (NULL);
-+ return (ipp->current = ipp->current->next);
-+}
-+#endif
-+
-+
- struct _GnomeCupsQueueDetails {
- char *queue_name;
- GList *jobs;
-@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job)
- job->size = job->size * 1024;
- }
-
--#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}}
--#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } }
-+#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}}
-+#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } }
-
- static void
- get_jobs_cb (guint id,
-@@ -231,8 +258,8 @@ get_jobs_cb (guint id,
-
- if (response) {
- job = g_new0 (GnomeCupsJob, 1);
-- for (attr = response->attrs; attr != NULL; attr = attr->next) {
-- if (attr->name == NULL) {
-+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
-+ if (ippGetName (attr) == NULL) {
- if (job->name) {
- finish_job (job);
- jobs = g_list_prepend (jobs, job);
-@@ -244,7 +271,7 @@ get_jobs_cb (guint id,
- continue;
- }
-
-- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
- continue;
-
- }
-@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
-
- if (response) {
- job = g_new0 (GnomeCupsJob, 1);
-- for (attr = response->attrs; attr != NULL; attr = attr->next) {
-- if (attr->name == NULL) {
-+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
-+ if (ippGetName (attr) == NULL) {
- if (job->name) {
- finish_job (job);
- } else {
-@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
- break;
- }
-
-- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
- continue;
- }
-
-diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
-index c94f623..13f0948 100644
---- a/libgnomecups/gnome-cups-request.c
-+++ b/libgnomecups/gnome-cups-request.c
-@@ -19,6 +19,36 @@
- #define STOP_UNUSED_THREADS_TIMEOUT 60
- #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30
-
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetCount(attr) attr->num_values
-+#define ippGetValueTag(attr) attr->value_tag
-+#define ippGetName(attr) attr->name
-+#define ippGetBoolean(attr, element) attr->values[element].boolean
-+#define ippGetInteger(attr, element) attr->values[element].integer
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t *
-+ippFirstAttribute(ipp_t *ipp)
-+{
-+ if (!ipp)
-+ return (NULL);
-+ return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t *
-+ippNextAttribute(ipp_t *ipp)
-+{
-+ if (!ipp || !ipp->current)
-+ return (NULL);
-+ return (ipp->current = ipp->current->next);
-+}
-+#endif
-+
-+
- typedef struct
- {
- GMutex *mutex;
-@@ -276,14 +306,14 @@ dump_request (ipp_t const *req)
- unsigned i;
- ipp_attribute_t *attr;
-
-- for (attr = req->attrs; attr != NULL; attr = attr->next) {
-- g_print ("%s", attr->name);
-- for (i = 0 ; i < attr->num_values ; i++) {
-+ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) {
-+ g_print ("%s", ippGetName (attr));
-+ for (i = 0 ; i < ippGetCount (attr) ; i++) {
- g_print ("\t[%d] = ", i);
-- switch (attr->value_tag & ~IPP_TAG_COPY) {
-+ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) {
- case IPP_TAG_INTEGER:
- case IPP_TAG_ENUM:
-- g_print ("%d\n", attr->values[i].integer);
-+ g_print ("%d\n", ippGetInteger (attr, i));
- break;
-
- case IPP_TAG_STRING:
-@@ -294,11 +324,11 @@ dump_request (ipp_t const *req)
- case IPP_TAG_CHARSET:
- case IPP_TAG_LANGUAGE:
- case IPP_TAG_MIMETYPE:
-- g_print ("'%s'\n", attr->values[i].string.text);
-+ g_print ("'%s'\n", ippGetString (attr, i, NULL));
- break;
-
- case IPP_TAG_BOOLEAN:
-- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false");
-+ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false");
- break;
-
- default:
---
-1.7.8.6
-
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
deleted file mode 100644
index c7b616578..000000000
--- a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Imported from gentoo:
-
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
-
-From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Sun, 27 Nov 2011 21:36:41 +0100
-Subject: [PATCH] Fix: Only glib.h can be included
-
----
- libgnomecups/gnome-cups-i18n.c | 2 +-
- libgnomecups/gnome-cups-init.h | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
-index 8987c5c..127756d 100644
---- a/libgnomecups/gnome-cups-i18n.c
-+++ b/libgnomecups/gnome-cups-i18n.c
-@@ -1,5 +1,5 @@
- #include <config.h>
--#include <glib/gmacros.h>
-+#include <glib.h>
- #include "gnome-cups-i18n.h"
-
- #ifdef ENABLE_NLS
-diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
-index 22b682a..c4600fc 100644
---- a/libgnomecups/gnome-cups-init.h
-+++ b/libgnomecups/gnome-cups-init.h
-@@ -1,8 +1,7 @@
- #ifndef GNOME_CUPS_INIT
- #define GNOME_CUPS_INIT
-
--#include <glib/gtypes.h>
--#include <glib/gmacros.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
---
-1.7.7
-
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 09/14] remove gnome tracker leftovers
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (7 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 08/14] remove libgnomecups leftovers Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 10/14] jack: Update 1.9.12 Andreas Müller
` (4 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
meta-gnome/recipes-support/tracker/files/90tracker | 4 ----
.../recipes-support/tracker/files/tracker-dbus.service | 15 ---------------
.../tracker/files/tracker-miner-fs.service | 12 ------------
.../recipes-support/tracker/files/tracker-store.service | 12 ------------
4 files changed, 43 deletions(-)
delete mode 100644 meta-gnome/recipes-support/tracker/files/90tracker
delete mode 100644 meta-gnome/recipes-support/tracker/files/tracker-dbus.service
delete mode 100644 meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service
delete mode 100644 meta-gnome/recipes-support/tracker/files/tracker-store.service
diff --git a/meta-gnome/recipes-support/tracker/files/90tracker b/meta-gnome/recipes-support/tracker/files/90tracker
deleted file mode 100644
index 9594b9168..000000000
--- a/meta-gnome/recipes-support/tracker/files/90tracker
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/trackerd -m &
-
diff --git a/meta-gnome/recipes-support/tracker/files/tracker-dbus.service b/meta-gnome/recipes-support/tracker/files/tracker-dbus.service
deleted file mode 100644
index c97f49a89..000000000
--- a/meta-gnome/recipes-support/tracker/files/tracker-dbus.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=tracker DBus session bus handler
-Before=tracker-store.service
-After=dbus.service
-Requires=dbus.service
-BindTo=tracker-store.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/tmp/tracker.env
-ExecStartPre=@BASE_BINDIR@/rm -rf /tmp/tracker.env
-ExecStart=/bin/sh -c 'echo "DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --session --print-address`" > /tmp/tracker.env'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service b/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service
deleted file mode 100644
index 34d9a1e68..000000000
--- a/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=tracker-miner-fs
-After=syslog.target local-fs.target udev.service dbus.service tracker-store.service
-Requires=tracker-store.service
-
-[Service]
-Environment=HOME=/home/root
-EnvironmentFile=-/tmp/tracker.env
-ExecStart=@LIBEXECDIR@/tracker-miner-fs
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-gnome/recipes-support/tracker/files/tracker-store.service b/meta-gnome/recipes-support/tracker/files/tracker-store.service
deleted file mode 100644
index c5037f3ab..000000000
--- a/meta-gnome/recipes-support/tracker/files/tracker-store.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=tracker-store
-After=syslog.target local-fs.target dbus.service
-Requires=dbus.service tracker-dbus.service
-BindTo=tracker-dbus.service
-
-[Service]
-EnvironmentFile=-/tmp/tracker.env
-ExecStart=@LIBEXECDIR@/tracker-store
-
-[Install]
-WantedBy=multi-user.target
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 10/14] jack: Update 1.9.12
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (8 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 09/14] remove gnome tracker leftovers Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 11/14] fluidsynth: update 1.1.8 -> 1.1.9 Andreas Müller
` (3 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
gcc7 build was fixed upstream [1]
[1] https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...1-typecast-input-parameter-to-int-for-abs.patch | 32 ----------------------
meta-oe/recipes-multimedia/jack/jack_git.bb | 8 ++----
2 files changed, 3 insertions(+), 37 deletions(-)
delete mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch
diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch b/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch
deleted file mode 100644
index c119f1981..000000000
--- a/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8ec6f75bf7a318a3a1e352df7c97630cfaba537a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 21 Apr 2017 16:18:39 -0700
-Subject: [PATCH] typecast input parameter to int for abs()
-
-Fixes
-../tests/test.cpp:482:73: error: call of overloaded 'abs(jack_nframes_t)' is ambiguous
-
-because the signature is int abs(int) and its passing
-unsigned int to it.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests/test.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test.cpp b/tests/test.cpp
-index 8a8a8117..9655742e 100644
---- a/tests/test.cpp
-+++ b/tests/test.cpp
-@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
- jack_nframes_t delta_time = cur_time - last_time;
-
- Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
-- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
-+ if (delta_time > 0 && (jack_nframes_t)abs(int(delta_time - cur_buffer_size)) > tolerance) {
- printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
- }
-
---
-2.12.2
-
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
index b85ba8a02..11da6b1be 100644
--- a/meta-oe/recipes-multimedia/jack/jack_git.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_git.bb
@@ -14,11 +14,9 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "libsamplerate0 libsndfile1 readline"
-SRC_URI = "git://github.com/jackaudio/jack2.git \
- file://0001-typecast-input-parameter-to-int-for-abs.patch \
- "
-SRCREV = "2d1d323505585d406a7e64fb932953baefc5945e"
-PV = "1.9.10+git${SRCPV}"
+SRC_URI = "git://github.com/jackaudio/jack2.git"
+SRCREV = "c1647819eed6d11f94b21981d9c869629299f357"
+PV = "1.9.12"
S = "${WORKDIR}/git"
inherit waf pkgconfig
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 11/14] fluidsynth: update 1.1.8 -> 1.1.9
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (9 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 10/14] jack: Update 1.9.12 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 12/14] gtksourceview3: initial add 3.24.6 Andreas Müller
` (2 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
* 0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch was applied upstream
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...-accelaration-for-float-multithreaded-se.patch} | 0
...uffer-overrun-in-fluid_synth_nwrite_float.patch | 32 ----------------------
.../{fluidsynth_1.1.8.bb => fluidsynth_1.1.9.bb} | 5 ++--
3 files changed, 2 insertions(+), 35 deletions(-)
rename meta-multimedia/recipes-multimedia/fluidsynth/files/{0002-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch => 0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch} (100%)
delete mode 100644 meta-multimedia/recipes-multimedia/fluidsynth/files/0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch
rename meta-multimedia/recipes-multimedia/fluidsynth/{fluidsynth_1.1.8.bb => fluidsynth_1.1.9.bb} (83%)
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/files/0002-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch b/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch
similarity index 100%
rename from meta-multimedia/recipes-multimedia/fluidsynth/files/0002-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch
rename to meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch b/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch
deleted file mode 100644
index dda76cfee..000000000
--- a/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a13cb63103aa56b5e8bad816c7d13d6e01c0cd9f Mon Sep 17 00:00:00 2001
-From: derselbst <tom.mbrt@googlemail.com>
-Date: Sun, 26 Nov 2017 22:12:12 +0100
-Subject: [PATCH 1/2] avoid buffer overrun in fluid_synth_nwrite_float()
-
-Upstream-Status: Backport [1]
-
-[1] https://github.com/FluidSynth/fluidsynth/commit/a13cb63103aa56b5e8bad816c7d13d6e01c0cd9f
----
- src/synth/fluid_synth.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
-index 266d759..14f6b21 100644
---- a/src/synth/fluid_synth.c
-+++ b/src/synth/fluid_synth.c
-@@ -2752,10 +2752,10 @@ fluid_synth_nwrite_float(fluid_synth_t* synth, int len,
- {
- #ifdef WITH_FLOAT
- if(fx_left != NULL)
-- FLUID_MEMCPY(fx_left[i + count], fx_left_in[i], bytes);
-+ FLUID_MEMCPY(fx_left[i] + count, fx_left_in[i], bytes);
-
- if(fx_right != NULL)
-- FLUID_MEMCPY(fx_right[i + count], fx_right_in[i], bytes);
-+ FLUID_MEMCPY(fx_right[i] + count, fx_right_in[i], bytes);
- #else //WITH_FLOAT
- int j;
- if(fx_left != NULL) {
---
-2.9.5
-
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.8.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.9.bb
similarity index 83%
rename from meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.8.bb
rename to meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.9.bb
index 406bbf768..fffbf0cae 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.8.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.9.bb
@@ -8,10 +8,9 @@ DEPENDS = "alsa-lib ncurses glib-2.0"
SRC_URI = " \
git://github.com/FluidSynth/fluidsynth.git;branch=1.1.x \
- file://0001-avoid-buffer-overrun-in-fluid_synth_nwrite_float.patch \
- file://0002-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \
+ file://0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \
"
-SRCREV = "12e7afe3a806a6b397f28e0ca4bc6bab9ebe7047"
+SRCREV = "fe37923393d6a76f42ed044aa56dadc66ec909ce"
S = "${WORKDIR}/git"
inherit cmake pkgconfig lib_package
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 12/14] gtksourceview3: initial add 3.24.6
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (10 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 11/14] fluidsynth: update 1.1.8 -> 1.1.9 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 13/14] gtksourceview-classic-light: initial add 1.0 Andreas Müller
2018-01-17 8:34 ` [PATCH 14/14] xfce-polkit: fix Name/Comment fields in desktop file Andreas Müller
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gtksourceview/gtksourceview3_3.24.6.bb | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
new file mode 100644
index 000000000..87e48ed3c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Portable C library for multiline text editing"
+HOMEPAGE = "http://projects.gnome.org/gtksourceview/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native"
+
+PNAME = "gtksourceview"
+
+S = "${WORKDIR}/${PNAME}-${PV}"
+
+inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c09ccfc80f78083841f8fe266c1ac52a"
+SRC_URI[sha256sum] = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"
+
+FILES_${PN} += " ${datadir}/gtksourceview-3.0"
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 13/14] gtksourceview-classic-light: initial add 1.0
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (11 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 12/14] gtksourceview3: initial add 3.24.6 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
2018-01-17 8:34 ` [PATCH 14/14] xfce-polkit: fix Name/Comment fields in desktop file Andreas Müller
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
This theme is helpful when using dark themes as it keeps white background.
Tested with:
* oe-build gedit based on GTK2
* fedora's gedit based on GTK3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gtksourceview-classic-light/classic-light.xml | 131 +++++++++++++++++++++
.../gtksourceview-classic-light_1.0.bb | 21 ++++
2 files changed, 152 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
new file mode 100644
index 000000000..23b4b9a22
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Based on gtksourceview 'classic'
+
+ This file is part of GtkSourceView
+
+ Copyright (C) 2006-2007 GtkSourceView team
+ Author: Yevgen Muntyan <muntyan@tamu.edu>
+
+ GtkSourceView is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ GtkSourceView is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+-->
+<style-scheme id="classic-light" _name="Classic-Light" version="1.0">
+ <author>GtkSourceView team</author>
+ <_description>Classic color scheme light</_description>
+
+ <!-- The scheme tries to look like the default GVim scheme,
+ since it is also what the hardwired GtkSourceView 1 color
+ scheme did -->
+
+ <!-- Palette -->
+ <color name="black" value="#000000"/>
+ <color name="white" value="#FFFFFF"/>
+ <color name="blue" value="#0000FF"/>
+ <color name="magenta" value="#FF00FF"/>
+ <color name="violet" value="#6A5ACD"/>
+ <color name="cyan" value="#008A8C"/>
+ <color name="gray" value="#BEBEBE"/>
+ <color name="lightgray" value="#E0E0E0"/>
+ <color name="green" value="#2E8B57"/>
+ <color name="bordeaux" value="#A52A2A"/>
+ <color name="red" value="#FF0000"/>
+ <color name="yellow" value="#FFFF00"/>
+ <color name="purple" value="#A020F0"/>
+
+ <!-- Global Settings -->
+ <style name="current-line" background="#eeeeec"/>
+ <style name="current-line-number" background="#eeeeec"/>
+ <style name="draw-spaces" foreground="#babdb6"/>
+ <style name="background-pattern" background="#f3f3f3"/>
+ <style name="text" foreground="black" background="white"/>
+ <style name="selection" background="gray"/>
+ <style name="cursor" foreground="black"/>
+ <style name="line-numbers" foreground="black" background="gray"/>
+
+ <!-- Bracket Matching -->
+ <style name="bracket-match" foreground="white" background="gray"/>
+ <style name="bracket-mismatch" foreground="white" background="red"/>
+
+ <!-- Right Margin -->
+ <style name="right-margin" foreground="#000000" background="#000000"/>
+
+ <!-- Search Matching -->
+ <style name="search-match" background="yellow"/>
+
+ <!-- Comments -->
+ <style name="def:comment" foreground="blue"/>
+ <style name="def:shebang" foreground="blue" bold="true"/>
+ <style name="def:doc-comment-element" italic="true"/>
+
+ <!-- Constants -->
+ <style name="def:constant" foreground="magenta"/>
+ <style name="def:special-char" foreground="violet"/>
+
+ <!-- Identifiers -->
+ <style name="def:identifier" foreground="cyan"/>
+
+ <!-- Statements -->
+ <style name="def:statement" foreground="bordeaux" bold="true"/>
+
+ <!-- Types -->
+ <style name="def:type" foreground="green" bold="true"/>
+
+ <!-- Others -->
+ <style name="def:preprocessor" foreground="purple"/>
+ <style name="def:error" background="red" bold="true"/>
+ <style name="def:warning" background="yellow"/>
+ <style name="def:note" foreground="blue" background="yellow" bold="true"/>
+ <style name="def:underlined" italic="true" underline="single"/>
+
+ <!-- Heading styles, uncomment to enable -->
+ <!--
+ <style name="def:heading0" scale="5.0"/>
+ <style name="def:heading1" scale="2.5"/>
+ <style name="def:heading2" scale="2.0"/>
+ <style name="def:heading3" scale="1.7"/>
+ <style name="def:heading4" scale="1.5"/>
+ <style name="def:heading5" scale="1.3"/>
+ <style name="def:heading6" scale="1.2"/>
+ -->
+
+ <!-- Language specific styles -->
+ <style name="diff:added-line" foreground="#008B8B"/>
+ <style name="diff:removed-line" foreground="#6A5ACD"/>
+ <style name="diff:changed-line" use-style="def:preprocessor"/>
+ <style name="diff:special-case" use-style="def:constant"/>
+ <style name="diff:location" use-style="def:statement"/>
+ <style name="diff:diff-file" use-style="def:type"/>
+
+ <style name="xml:tags" foreground="cyan"/>
+ <style name="xml:attribute-name" foreground="violet"/>
+ <style name="xml:namespace" foreground="green" bold="true"/>
+
+ <style name="js:object" foreground="#2E8B57" bold="true"/>
+ <style name="js:constructors" foreground="#008B8B"/>
+
+ <style name="latex:display-math" foreground="#6A5ACD"/>
+ <style name="latex:command" foreground="#2E8B57" bold="true"/>
+ <style name="latex:include" use-style="def:preprocessor"/>
+
+ <style name="sh:variable" foreground="#6A5ACD"/>
+
+ <!-- legacy styles for old lang files -->
+ <style name="Others" foreground="#2E8B57" bold="true"/>
+ <style name="Others 2" foreground="#008B8B"/>
+ <style name="Others 3" foreground="#6A5ACD"/>
+
+</style-scheme>
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
new file mode 100644
index 000000000..e7dc0f865
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Gtksourceview Classic-Light theme"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://classic-light.xml;beginline=6;endline=23;md5=2b4f75364fad00a4d752214dcbd7d7c3"
+
+inherit allarch
+
+SRC_URI = "file://classic-light.xml"
+
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}${datadir}/gtksourceview-2.0/styles
+ install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-2.0/styles/
+ install -d ${D}${datadir}/gtksourceview-3.0/styles
+ install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/
+}
+
+FILES_${PN} = " \
+ ${datadir}/gtksourceview-2.0/styles \
+ ${datadir}/gtksourceview-3.0/styles \
+"
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 14/14] xfce-polkit: fix Name/Comment fields in desktop file
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
` (12 preceding siblings ...)
2018-01-17 8:34 ` [PATCH 13/14] gtksourceview-classic-light: initial add 1.0 Andreas Müller
@ 2018-01-17 8:34 ` Andreas Müller
13 siblings, 0 replies; 17+ messages in thread
From: Andreas Müller @ 2018-01-17 8:34 UTC (permalink / raw)
To: openembedded-devel
Without this xfce-polkit is displayed ad 'null' in autosatart dialog of
xfce4-settings.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
| 34 ++++++++++++++++++++++
.../recipes-apps/xfce-polkit/xfce-polkit_0.2.bb | 5 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
--git a/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
new file mode 100644
index 000000000..e872249d5
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
@@ -0,0 +1,34 @@
+From fb1f83c04dd5262897b09e60fa8b39090d0d4619 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Thu, 12 Nov 2015 13:53:03 -0600
+Subject: [PATCH] fix Name/Comment fields
+
+Validate as a valid .desktop file per
+http://standards.freedesktop.org/desktop-entry-spec/latest/
+
+See also issue #2
+
+Upstream-Status: Applied [1]
+
+[1] https://github.com/ncopa/xfce-polkit/commit/fb1f83c04dd5262897b09e60fa8b39090d0d4619
+---
+ xfce-polkit.desktop.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xfce-polkit.desktop.in b/xfce-polkit.desktop.in
+index 8575896..dd9f09c 100644
+--- a/xfce-polkit.desktop.in
++++ b/xfce-polkit.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+-_Name=XFCE PolKit
+-_Comment=Policykit Authentication Agent
++Name=XFCE PolKit
++Comment=Policykit Authentication Agent
+ Exec=@xfce_polkit_libexecdir@/xfce-polkit
+ Icon=gtk-dialog-authentication
+ NotShowIn=GNOME;KDE;
+--
+2.14.3
+
diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
index 1fb4a5be2..54bf7c752 100644
--- a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
+++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
@@ -6,6 +6,9 @@ DEPENDS = "libxfce4ui polkit"
inherit xfce-app
-SRC_URI = "git://github.com/ncopa/${BPN}.git"
+SRC_URI = " \
+ git://github.com/ncopa/${BPN}.git \
+ file://0001-fix-Name-Comment-fields.patch \
+"
SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283"
S = "${WORKDIR}/git"
--
2.14.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3
2018-01-17 8:34 ` [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3 Andreas Müller
@ 2018-01-22 15:51 ` akuster808
2018-01-22 16:02 ` akuster808
1 sibling, 0 replies; 17+ messages in thread
From: akuster808 @ 2018-01-22 15:51 UTC (permalink / raw)
To: Andreas Müller, openembedded-devel
On 01/17/2018 12:34 AM, Andreas Müller wrote:
> In recent meta-universe 3.2.3 started to fail with:
>
> | camel-enumtypes.c:42:7: error: expected expression at end of input
> | { 512, "CAMEL_FOLDER_SHARED_BY_ME", "shared-by-me" },
This is failing on x86-64.
please see http://errors.yoctoproject.org/Errors/Details/164257/
Also , the PV is still 3.2.3
- armin
> | ^
>
> Instead of cleaning I decided to update. The following changed:
>
> * eds builds with cmake instead of autotools
> * musl: I checked src/time/strftime.c and it seems strftime does not support
> '%l' / '%k'. musl-case was added to be a good boy but was not tested.
> * remove 0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch:
> src/camel/providers/imapx/camel-imapx-tokens.txt has text-only format these days
> * remove 0002-Fix-for-automake-1.12.x.patch: autotools was replaced by cmake
> * remove 0003-Disable-Werror-for-automake.patch: autotools was replaced by cmake
> * remove 0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch: autotools was replaced by cmake
> * remove 0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch:
> src/calendar/backends/caldav/e-cal-backend-caldav.c was reworked competely
> * remove 0006-configure.ac-do-not-overwrite-localedir.patch: autotools was replaced by cmake
>
> Tested: abiword build and run
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...1-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch | 39 +++++++++
> ...x-Fix-signature-for-imapx_tokenise_struct.patch | 33 --------
> ...ists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 53 ++++++++++++
> .../0002-Fix-for-automake-1.12.x.patch | 32 -------
> .../0003-Disable-Werror-for-automake.patch | 97 ----------------------
> ...ace-the-Novell-sample-contact-with-somet.patch} | 21 +----
> ...ix-libical-pkg-config-trying-to-use-host-.patch | 39 ---------
> ...-soup-adapt-to-new-libxml2-API-from-2.9.0.patch | 77 -----------------
> ...6-configure.ac-do-not-overwrite-localedir.patch | 34 --------
> ...rver_git.bb => evolution-data-server_3.26.3.bb} | 84 +++++++++++--------
> 10 files changed, 144 insertions(+), 365 deletions(-)
> create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
> create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
> rename meta-gnome/recipes-gnome/eds/evolution-data-server/{0001-contact-Replace-the-Novell-sample-contact-with-somet.patch => 0003-contact-Replace-the-Novell-sample-contact-with-somet.patch} (95%)
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
> rename meta-gnome/recipes-gnome/eds/{evolution-data-server_git.bb => evolution-data-server_3.26.3.bb} (68%)
>
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> new file mode 100644
> index 000000000..a821a14ab
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> @@ -0,0 +1,39 @@
> +From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Tue, 19 Dec 2017 16:37:20 +0100
> +Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +| CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
> +| _correct_iconv_EXITCODE (advanced)
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + CMakeLists.txt | 5 -----
> + 1 file changed, 5 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 8d07772..a2396f2 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV)
> + endif(NOT HAVE_ICONV)
> +
> + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
> +-CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
> + unset(CMAKE_REQUIRED_LIBRARIES)
> +
> +-if(NOT _correct_iconv)
> +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
> +-endif(NOT _correct_iconv)
> +-
> + # ******************************
> + # Backtraces for debugging
> + # ******************************
> +--
> +2.14.3
> +
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
> deleted file mode 100644
> index f82a76df3..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 0e10e976025b21d12df099e82951f759024ad649 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Thu, 24 Aug 2017 22:04:56 -0700
> -Subject: [PATCH] imapx: Fix signature for imapx_tokenise_struct()
> -
> -clang complains about different signature for this patch
> -
> -Fixes
> -camel/providers/imapx/camel-imapx-tokens.txt:56:1: error: conflicting types for 'imapx_tokenise_struct'
> -| imapx_tokenise_struct (register const char *str, register size_t len)
> -| ^
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - camel/providers/imapx/camel-imapx-tokens.txt | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
> -index d48501865..994c368c0 100644
> ---- a/camel/providers/imapx/camel-imapx-tokens.txt
> -+++ b/camel/providers/imapx/camel-imapx-tokens.txt
> -@@ -1,7 +1,7 @@
> - /* This contains all of the keywords we care about. These
> - can be converted to an id very efficiently */
> - struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
> --struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
> -+struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len);
> - %%
> - ALERT, IMAPX_ALERT
> - APPENDUID, IMAPX_APPENDUID
> ---
> -2.14.1
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> new file mode 100644
> index 000000000..c8dc7e12c
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> @@ -0,0 +1,53 @@
> +From 210b204d9edd71202454ff04013cc52b23c598e4 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Tue, 19 Dec 2017 16:55:13 +0100
> +Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +* TRY_RUN: does not work for OE
> +* HAVE_LKSTRFTIME is set by recipe as configure option
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + CMakeLists.txt | 23 -----------------------
> + 1 file changed, 23 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index a2396f2..f3b271b 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -573,29 +573,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
> + CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
> + int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2)
> +
> +-# *******************************************************
> +-# Check to see if strftime supports the use of %l and %k
> +-# *******************************************************
> +-
> +-CHECK_C_SOURCE_RUNS("
> +- #include <stdlib.h>
> +- #include <string.h>
> +- #include <time.h>
> +- int main(int argc, char **argv) {
> +- char buf[10];
> +- time_t rawtime;
> +- struct tm *timeinfo;
> +-
> +- time(&rawtime);
> +- timeinfo=localtime(&rawtime);
> +- buf[0] = 0;
> +- strftime(buf, 10, \"%lx%k\", timeinfo);
> +-
> +- if (!buf[0] || buf[0] == 'x' || strstr(buf, \"l\") || strstr(buf, \"k\"))
> +- return 1;
> +- return 0;
> +- }" HAVE_LKSTRFTIME)
> +-
> + # ******************************
> + # system mail stuff
> + # ******************************
> +--
> +2.14.3
> +
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
> deleted file mode 100644
> index 5f222aeaa..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From f46423c9e4b8b19eda27b307456a717de79b75f3 Mon Sep 17 00:00:00 2001
> -From: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Date: Sun, 4 Aug 2013 09:15:43 +0200
> -Subject: [PATCH 2/5] Fix for automake-1.12.x
> -
> -Fixed these kinds if warning-errors
> -
> -warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
> -
> -Upstream-Status: Pending
> -
> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - configure.ac | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 9bd97db..49d7506 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -31,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.28])
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
> deleted file mode 100644
> index a182d4d5e..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
> +++ /dev/null
> @@ -1,97 +0,0 @@
> -From 37b227cff78fd4c652651662dafd71537280824e Mon Sep 17 00:00:00 2001
> -From: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Date: Sun, 4 Aug 2013 09:16:59 +0200
> -Subject: [PATCH 3/5] Disable Werror for automake
> -
> -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
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> -
> -Conflicts:
> - configure.ac
> ----
> - configure.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 49d7506..1c802ff 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
> - dnl Autoconf / Automake Initialization
> - AC_PREREQ(2.62)
> - AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
> --AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability -Werror foreign])
> -+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign])
> - AC_CONFIG_MACRO_DIR([m4])
> - AC_CONFIG_SRCDIR(README)
> - AC_CONFIG_HEADERS(config.h)
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> similarity index 95%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
> rename to meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> index b77e7b9bd..3cdfa8b6f 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> @@ -7,26 +7,13 @@ Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something
> Upstream-Status: Inappropriate [configuration]
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> - addressbook/backends/file/Makefile.am | 1 +
> - addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
> + src/addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
> 2 files changed, 103 insertions(+), 77 deletions(-)
>
> -diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
> -index 08cf58f..17e7149 100644
> ---- a/addressbook/backends/file/Makefile.am
> -+++ b/addressbook/backends/file/Makefile.am
> -@@ -2,6 +2,7 @@ ebook_backend_LTLIBRARIES = libebookbackendfile.la
> -
> - libebookbackendfile_la_CPPFLAGS = \
> - $(AM_CPPFLAGS) \
> -+ -DCREATE_DEFAULT_VCARD \
> - -DG_LOG_DOMAIN=\"libebookbackend\" \
> - -I$(top_srcdir) \
> - -I$(top_builddir) \
> -diff --git a/addressbook/libedata-book/ximian-vcard.h b/addressbook/libedata-book/ximian-vcard.h
> +diff --git a/src/addressbook/libedata-book/ximian-vcard.h b/src/addressbook/libedata-book/ximian-vcard.h
> index 782d37b..5b0b250 100644
> ---- a/addressbook/libedata-book/ximian-vcard.h
> -+++ b/addressbook/libedata-book/ximian-vcard.h
> +--- a/src/addressbook/libedata-book/ximian-vcard.h
> ++++ b/src/addressbook/libedata-book/ximian-vcard.h
> @@ -1,80 +1,105 @@
> #define XIMIAN_VCARD \
> "BEGIN:VCARD\n" \
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
> deleted file mode 100644
> index 138334798..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Sun, 4 Aug 2013 10:57:08 +0200
> -Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host
> - paths
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - calendar/libecal/libecal.pc.in | 2 +-
> - configure.ac | 3 ++-
> - 2 files changed, 3 insertions(+), 2 deletions(-)
> -
> -diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
> -index fc6b359..d3435bb 100644
> ---- a/calendar/libecal/libecal.pc.in
> -+++ b/calendar/libecal/libecal.pc.in
> -@@ -12,4 +12,4 @@ Description: Client library for evolution calendars
> - Version: @VERSION@
> - Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0
> - Libs: -L${libdir} -lecal-1.2
> --Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
> -+Cflags: -I${privincludedir}
> -diff --git a/configure.ac b/configure.ac
> -index 1c802ff..f1d4ce8 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h>
> - dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
> - dnl libical is fixed, we have to work-around the buggy CFlags.
> - dnl *****
> -- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
> -+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
> -+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
> - LIBICAL_EXTRA_LIBS=""
> - AC_SUBST(LIBICAL_EXTRA_CFLAGS)
> - AC_SUBST(LIBICAL_EXTRA_LIBS)
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
> deleted file mode 100644
> index addf2ee8d..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -From ac95e89749a01618f98b554a98e78d7c988bfc10 Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Tue, 27 Nov 2012 08:46:51 +0100
> -Subject: [PATCH 5/5] soup: adapt to new libxml2 API from 2.9.0
> -
> -* for more info see
> - https://mail.gnome.org/archives/xml/2012-August/msg00005.html
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++
> - 1 file changed, 21 insertions(+)
> -
> -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
> -index 12f8f22..5555a3e 100644
> ---- a/calendar/backends/caldav/e-cal-backend-caldav.c
> -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
> -@@ -1172,8 +1172,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> -@@ -1321,8 +1326,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> -@@ -1715,8 +1725,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -+
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> -@@ -1765,8 +1781,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
> deleted file mode 100644
> index 741e5e97d..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Thu, 3 Sep 2015 11:14:24 +0200
> -Subject: [PATCH] configure.ac: do not overwrite localedir
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Backport [1]
> -
> -[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - configure.ac | 3 ---
> - 1 file changed, 3 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index f1d4ce8..cee847f 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
> - AC_SUBST(GETTEXT_PACKAGE)
> - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
> -
> --localedir='$(prefix)/$(DATADIRNAME)/locale'
> --AC_SUBST(localedir)
> --
> - dnl ******************************
> - dnl Initialize libtool
> - dnl ******************************
> ---
> -2.1.0
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
> similarity index 68%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
> rename to meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
> index aadc4b5e3..2d410e246 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
> @@ -4,58 +4,70 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
>
> LICENSE = "LGPLv2 & LGPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
> - file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
> - file://libedataserver/e-data-server-util.h;endline=20;md5=934502f03c84523aa059d4825887b380 \
> - file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
> -
> -DEPENDS = "intltool-native glib-2.0 gtk+3 gconf dbus db virtual/libiconv zlib libsoup-2.4 libglade libical libgnome-keyring gperf-native libgdata nss"
> -
> -SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687"
> -
> -# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring
> -PV = "3.2.3+git${SRCPV}"
> -
> -SRC_URI = "git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
> - file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
> - file://0002-Fix-for-automake-1.12.x.patch \
> - file://0003-Disable-Werror-for-automake.patch \
> - file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
> - file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
> - file://0006-configure.ac-do-not-overwrite-localedir.patch \
> - file://iconv-detect.h \
> - file://0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch \
> - "
> -
> -S = "${WORKDIR}/git"
> -
> -inherit autotools gtk-doc pkgconfig gettext gobject-introspection
> + file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
> + file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
> + file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
> +
> +DEPENDS = " \
> + intltool-native gperf-native \
> + glib-2.0 gtk+3 gconf libgnome-keyring libgdata \
> + dbus db virtual/libiconv zlib libsoup-2.4 libglade libical nss libsecret \
> +"
> +
> +inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative
> +
> +SRC_URI += " \
> + file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
> + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
> + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
> + file://iconv-detect.h \
> +"
> +SRC_URI[archive.md5sum] = "568a21a4df4e0ec985c849b38fc66908"
> +SRC_URI[archive.sha256sum] = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"
> +
> +LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
> +LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
> +
> +EXTRA_OECMAKE = " \
> + -DWITH_KRB5=OFF \
> + -DENABLE_GOA=OFF \
> + -DENABLE_UOA=OFF \
> + -DENABLE_GOOGLE_AUTH=OFF \
> + -DENABLE_WEATHER=OFF \
> + -D${LKSTRFTIME} \
> +"
> +
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
> +
> +EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \
> + --disable-nntp --disable-gtk-doc"
>
> # -ldb needs this on some platforms
> LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
>
> -# Parallel make shows many issues with this source code.
> -# Current problems seem to be duplicate execution of the calander/backends
> -# directories by make resulting in truncated/corrupt .la files
> -#PARALLEL_MAKE = ""
> -
> do_configure_append () {
> - cp ${WORKDIR}/iconv-detect.h ${S}
> + cp ${WORKDIR}/iconv-detect.h ${S}/src
> +
> + # fix native perl shebang
> + sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard
> }
>
> do_compile_prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
> + export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
> }
>
> -EXTRA_OECONF = "--without-openldap \
> - --with-libdb=${STAGING_DIR_HOST}${prefix} \
> - --disable-nntp --disable-goa --disable-weather --disable-gtk-doc"
>
> PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
> libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
> libedataserver libedataserver-dev \
> libedataserverui libedataserverui-dev"
>
> -FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
> +FILES_${PN} =+ "${systemd_user_unitdir} \
> + ${datadir}/dbus-1 \
> + ${datadir}/evolution-data-server-*/ui/"
> +RDEPENDS_${PN} += "perl"
> +
> FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
> FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
> ${libdir}/evolution-data-server*/calendar-backends/.debug \
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3
2018-01-17 8:34 ` [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3 Andreas Müller
2018-01-22 15:51 ` akuster808
@ 2018-01-22 16:02 ` akuster808
1 sibling, 0 replies; 17+ messages in thread
From: akuster808 @ 2018-01-22 16:02 UTC (permalink / raw)
To: Andreas Müller, openembedded-devel
ignore the last email I was looking at the prior build results.
- armin
On 01/17/2018 12:34 AM, Andreas Müller wrote:
> In recent meta-universe 3.2.3 started to fail with:
>
> | camel-enumtypes.c:42:7: error: expected expression at end of input
> | { 512, "CAMEL_FOLDER_SHARED_BY_ME", "shared-by-me" },
> | ^
>
> Instead of cleaning I decided to update. The following changed:
>
> * eds builds with cmake instead of autotools
> * musl: I checked src/time/strftime.c and it seems strftime does not support
> '%l' / '%k'. musl-case was added to be a good boy but was not tested.
> * remove 0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch:
> src/camel/providers/imapx/camel-imapx-tokens.txt has text-only format these days
> * remove 0002-Fix-for-automake-1.12.x.patch: autotools was replaced by cmake
> * remove 0003-Disable-Werror-for-automake.patch: autotools was replaced by cmake
> * remove 0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch: autotools was replaced by cmake
> * remove 0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch:
> src/calendar/backends/caldav/e-cal-backend-caldav.c was reworked competely
> * remove 0006-configure.ac-do-not-overwrite-localedir.patch: autotools was replaced by cmake
>
> Tested: abiword build and run
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...1-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch | 39 +++++++++
> ...x-Fix-signature-for-imapx_tokenise_struct.patch | 33 --------
> ...ists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 53 ++++++++++++
> .../0002-Fix-for-automake-1.12.x.patch | 32 -------
> .../0003-Disable-Werror-for-automake.patch | 97 ----------------------
> ...ace-the-Novell-sample-contact-with-somet.patch} | 21 +----
> ...ix-libical-pkg-config-trying-to-use-host-.patch | 39 ---------
> ...-soup-adapt-to-new-libxml2-API-from-2.9.0.patch | 77 -----------------
> ...6-configure.ac-do-not-overwrite-localedir.patch | 34 --------
> ...rver_git.bb => evolution-data-server_3.26.3.bb} | 84 +++++++++++--------
> 10 files changed, 144 insertions(+), 365 deletions(-)
> create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
> create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
> rename meta-gnome/recipes-gnome/eds/evolution-data-server/{0001-contact-Replace-the-Novell-sample-contact-with-somet.patch => 0003-contact-Replace-the-Novell-sample-contact-with-somet.patch} (95%)
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
> rename meta-gnome/recipes-gnome/eds/{evolution-data-server_git.bb => evolution-data-server_3.26.3.bb} (68%)
>
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> new file mode 100644
> index 000000000..a821a14ab
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> @@ -0,0 +1,39 @@
> +From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Tue, 19 Dec 2017 16:37:20 +0100
> +Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +| CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
> +| _correct_iconv_EXITCODE (advanced)
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + CMakeLists.txt | 5 -----
> + 1 file changed, 5 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 8d07772..a2396f2 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV)
> + endif(NOT HAVE_ICONV)
> +
> + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
> +-CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
> + unset(CMAKE_REQUIRED_LIBRARIES)
> +
> +-if(NOT _correct_iconv)
> +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
> +-endif(NOT _correct_iconv)
> +-
> + # ******************************
> + # Backtraces for debugging
> + # ******************************
> +--
> +2.14.3
> +
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
> deleted file mode 100644
> index f82a76df3..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 0e10e976025b21d12df099e82951f759024ad649 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Thu, 24 Aug 2017 22:04:56 -0700
> -Subject: [PATCH] imapx: Fix signature for imapx_tokenise_struct()
> -
> -clang complains about different signature for this patch
> -
> -Fixes
> -camel/providers/imapx/camel-imapx-tokens.txt:56:1: error: conflicting types for 'imapx_tokenise_struct'
> -| imapx_tokenise_struct (register const char *str, register size_t len)
> -| ^
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - camel/providers/imapx/camel-imapx-tokens.txt | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
> -index d48501865..994c368c0 100644
> ---- a/camel/providers/imapx/camel-imapx-tokens.txt
> -+++ b/camel/providers/imapx/camel-imapx-tokens.txt
> -@@ -1,7 +1,7 @@
> - /* This contains all of the keywords we care about. These
> - can be converted to an id very efficiently */
> - struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
> --struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
> -+struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len);
> - %%
> - ALERT, IMAPX_ALERT
> - APPENDUID, IMAPX_APPENDUID
> ---
> -2.14.1
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> new file mode 100644
> index 000000000..c8dc7e12c
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> @@ -0,0 +1,53 @@
> +From 210b204d9edd71202454ff04013cc52b23c598e4 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Tue, 19 Dec 2017 16:55:13 +0100
> +Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +* TRY_RUN: does not work for OE
> +* HAVE_LKSTRFTIME is set by recipe as configure option
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + CMakeLists.txt | 23 -----------------------
> + 1 file changed, 23 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index a2396f2..f3b271b 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -573,29 +573,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
> + CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
> + int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2)
> +
> +-# *******************************************************
> +-# Check to see if strftime supports the use of %l and %k
> +-# *******************************************************
> +-
> +-CHECK_C_SOURCE_RUNS("
> +- #include <stdlib.h>
> +- #include <string.h>
> +- #include <time.h>
> +- int main(int argc, char **argv) {
> +- char buf[10];
> +- time_t rawtime;
> +- struct tm *timeinfo;
> +-
> +- time(&rawtime);
> +- timeinfo=localtime(&rawtime);
> +- buf[0] = 0;
> +- strftime(buf, 10, \"%lx%k\", timeinfo);
> +-
> +- if (!buf[0] || buf[0] == 'x' || strstr(buf, \"l\") || strstr(buf, \"k\"))
> +- return 1;
> +- return 0;
> +- }" HAVE_LKSTRFTIME)
> +-
> + # ******************************
> + # system mail stuff
> + # ******************************
> +--
> +2.14.3
> +
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
> deleted file mode 100644
> index 5f222aeaa..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From f46423c9e4b8b19eda27b307456a717de79b75f3 Mon Sep 17 00:00:00 2001
> -From: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Date: Sun, 4 Aug 2013 09:15:43 +0200
> -Subject: [PATCH 2/5] Fix for automake-1.12.x
> -
> -Fixed these kinds if warning-errors
> -
> -warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
> -
> -Upstream-Status: Pending
> -
> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - configure.ac | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 9bd97db..49d7506 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -31,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.28])
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
> deleted file mode 100644
> index a182d4d5e..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch
> +++ /dev/null
> @@ -1,97 +0,0 @@
> -From 37b227cff78fd4c652651662dafd71537280824e Mon Sep 17 00:00:00 2001
> -From: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Date: Sun, 4 Aug 2013 09:16:59 +0200
> -Subject: [PATCH 3/5] Disable Werror for automake
> -
> -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
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> -
> -Conflicts:
> - configure.ac
> ----
> - configure.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 49d7506..1c802ff 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
> - dnl Autoconf / Automake Initialization
> - AC_PREREQ(2.62)
> - AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
> --AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability -Werror foreign])
> -+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign])
> - AC_CONFIG_MACRO_DIR([m4])
> - AC_CONFIG_SRCDIR(README)
> - AC_CONFIG_HEADERS(config.h)
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> similarity index 95%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
> rename to meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> index b77e7b9bd..3cdfa8b6f 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> @@ -7,26 +7,13 @@ Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something
> Upstream-Status: Inappropriate [configuration]
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> - addressbook/backends/file/Makefile.am | 1 +
> - addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
> + src/addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++-------------
> 2 files changed, 103 insertions(+), 77 deletions(-)
>
> -diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
> -index 08cf58f..17e7149 100644
> ---- a/addressbook/backends/file/Makefile.am
> -+++ b/addressbook/backends/file/Makefile.am
> -@@ -2,6 +2,7 @@ ebook_backend_LTLIBRARIES = libebookbackendfile.la
> -
> - libebookbackendfile_la_CPPFLAGS = \
> - $(AM_CPPFLAGS) \
> -+ -DCREATE_DEFAULT_VCARD \
> - -DG_LOG_DOMAIN=\"libebookbackend\" \
> - -I$(top_srcdir) \
> - -I$(top_builddir) \
> -diff --git a/addressbook/libedata-book/ximian-vcard.h b/addressbook/libedata-book/ximian-vcard.h
> +diff --git a/src/addressbook/libedata-book/ximian-vcard.h b/src/addressbook/libedata-book/ximian-vcard.h
> index 782d37b..5b0b250 100644
> ---- a/addressbook/libedata-book/ximian-vcard.h
> -+++ b/addressbook/libedata-book/ximian-vcard.h
> +--- a/src/addressbook/libedata-book/ximian-vcard.h
> ++++ b/src/addressbook/libedata-book/ximian-vcard.h
> @@ -1,80 +1,105 @@
> #define XIMIAN_VCARD \
> "BEGIN:VCARD\n" \
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
> deleted file mode 100644
> index 138334798..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Sun, 4 Aug 2013 10:57:08 +0200
> -Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host
> - paths
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - calendar/libecal/libecal.pc.in | 2 +-
> - configure.ac | 3 ++-
> - 2 files changed, 3 insertions(+), 2 deletions(-)
> -
> -diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
> -index fc6b359..d3435bb 100644
> ---- a/calendar/libecal/libecal.pc.in
> -+++ b/calendar/libecal/libecal.pc.in
> -@@ -12,4 +12,4 @@ Description: Client library for evolution calendars
> - Version: @VERSION@
> - Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0
> - Libs: -L${libdir} -lecal-1.2
> --Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
> -+Cflags: -I${privincludedir}
> -diff --git a/configure.ac b/configure.ac
> -index 1c802ff..f1d4ce8 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h>
> - dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
> - dnl libical is fixed, we have to work-around the buggy CFlags.
> - dnl *****
> -- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
> -+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
> -+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
> - LIBICAL_EXTRA_LIBS=""
> - AC_SUBST(LIBICAL_EXTRA_CFLAGS)
> - AC_SUBST(LIBICAL_EXTRA_LIBS)
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
> deleted file mode 100644
> index addf2ee8d..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -From ac95e89749a01618f98b554a98e78d7c988bfc10 Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Tue, 27 Nov 2012 08:46:51 +0100
> -Subject: [PATCH 5/5] soup: adapt to new libxml2 API from 2.9.0
> -
> -* for more info see
> - https://mail.gnome.org/archives/xml/2012-August/msg00005.html
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++
> - 1 file changed, 21 insertions(+)
> -
> -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
> -index 12f8f22..5555a3e 100644
> ---- a/calendar/backends/caldav/e-cal-backend-caldav.c
> -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
> -@@ -1172,8 +1172,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> -@@ -1321,8 +1326,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> -@@ -1715,8 +1725,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -+
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> -@@ -1765,8 +1781,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
> - soup_message_set_request (message,
> - "application/xml",
> - SOUP_MEMORY_COPY,
> -+#ifdef LIBXML2_NEW_BUFFER
> -+ (gchar *) xmlOutputBufferGetContent(buf),
> -+ xmlOutputBufferGetSize(buf));
> -+#else
> - (gchar *) buf->buffer->content,
> - buf->buffer->use);
> -+#endif
> -
> - /* Send the request now */
> - send_and_handle_redirection (priv->session, message, NULL);
> ---
> -1.8.3.2
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
> deleted file mode 100644
> index 741e5e97d..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Thu, 3 Sep 2015 11:14:24 +0200
> -Subject: [PATCH] configure.ac: do not overwrite localedir
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Backport [1]
> -
> -[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - configure.ac | 3 ---
> - 1 file changed, 3 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index f1d4ce8..cee847f 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
> - AC_SUBST(GETTEXT_PACKAGE)
> - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
> -
> --localedir='$(prefix)/$(DATADIRNAME)/locale'
> --AC_SUBST(localedir)
> --
> - dnl ******************************
> - dnl Initialize libtool
> - dnl ******************************
> ---
> -2.1.0
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
> similarity index 68%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
> rename to meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
> index aadc4b5e3..2d410e246 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
> +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
> @@ -4,58 +4,70 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
>
> LICENSE = "LGPLv2 & LGPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
> - file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \
> - file://libedataserver/e-data-server-util.h;endline=20;md5=934502f03c84523aa059d4825887b380 \
> - file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0"
> -
> -DEPENDS = "intltool-native glib-2.0 gtk+3 gconf dbus db virtual/libiconv zlib libsoup-2.4 libglade libical libgnome-keyring gperf-native libgdata nss"
> -
> -SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687"
> -
> -# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring
> -PV = "3.2.3+git${SRCPV}"
> -
> -SRC_URI = "git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \
> - file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \
> - file://0002-Fix-for-automake-1.12.x.patch \
> - file://0003-Disable-Werror-for-automake.patch \
> - file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
> - file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
> - file://0006-configure.ac-do-not-overwrite-localedir.patch \
> - file://iconv-detect.h \
> - file://0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch \
> - "
> -
> -S = "${WORKDIR}/git"
> -
> -inherit autotools gtk-doc pkgconfig gettext gobject-introspection
> + file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
> + file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
> + file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
> +
> +DEPENDS = " \
> + intltool-native gperf-native \
> + glib-2.0 gtk+3 gconf libgnome-keyring libgdata \
> + dbus db virtual/libiconv zlib libsoup-2.4 libglade libical nss libsecret \
> +"
> +
> +inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative
> +
> +SRC_URI += " \
> + file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
> + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
> + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
> + file://iconv-detect.h \
> +"
> +SRC_URI[archive.md5sum] = "568a21a4df4e0ec985c849b38fc66908"
> +SRC_URI[archive.sha256sum] = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"
> +
> +LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
> +LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
> +
> +EXTRA_OECMAKE = " \
> + -DWITH_KRB5=OFF \
> + -DENABLE_GOA=OFF \
> + -DENABLE_UOA=OFF \
> + -DENABLE_GOOGLE_AUTH=OFF \
> + -DENABLE_WEATHER=OFF \
> + -D${LKSTRFTIME} \
> +"
> +
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
> +
> +EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \
> + --disable-nntp --disable-gtk-doc"
>
> # -ldb needs this on some platforms
> LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
>
> -# Parallel make shows many issues with this source code.
> -# Current problems seem to be duplicate execution of the calander/backends
> -# directories by make resulting in truncated/corrupt .la files
> -#PARALLEL_MAKE = ""
> -
> do_configure_append () {
> - cp ${WORKDIR}/iconv-detect.h ${S}
> + cp ${WORKDIR}/iconv-detect.h ${S}/src
> +
> + # fix native perl shebang
> + sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard
> }
>
> do_compile_prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
> + export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
> }
>
> -EXTRA_OECONF = "--without-openldap \
> - --with-libdb=${STAGING_DIR_HOST}${prefix} \
> - --disable-nntp --disable-goa --disable-weather --disable-gtk-doc"
>
> PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
> libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
> libedataserver libedataserver-dev \
> libedataserverui libedataserverui-dev"
>
> -FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/"
> +FILES_${PN} =+ "${systemd_user_unitdir} \
> + ${datadir}/dbus-1 \
> + ${datadir}/evolution-data-server-*/ui/"
> +RDEPENDS_${PN} += "perl"
> +
> FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
> FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
> ${libdir}/evolution-data-server*/calendar-backends/.debug \
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2018-01-22 16:02 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-17 8:34 [PATCH 00/14] Updates and cleanups Andreas Müller
2018-01-17 8:34 ` [PATCH 01/14] xfce4-panel: update 4.12.1 -> 4.12.2 Andreas Müller
2018-01-17 8:34 ` [PATCH 02/14] xfce4-power-manager: update 1.6.0 -> 1.6.1 Andreas Müller
2018-01-17 8:34 ` [PATCH 03/14] xfce4-pulseaudio-plugin: update 0.3.3 -> 0.3.4 Andreas Müller
2018-01-17 8:34 ` [PATCH 04/14] evolution-data-server: update 3.2.3 -> 3.26.3 Andreas Müller
2018-01-22 15:51 ` akuster808
2018-01-22 16:02 ` akuster808
2018-01-17 8:34 ` [PATCH 05/14] pimlico/dates: remove recipe Andreas Müller
2018-01-17 8:34 ` [PATCH 06/14] remove gdm leftovers Andreas Müller
2018-01-17 8:34 ` [PATCH 07/14] remove gnome system-tools leftovers Andreas Müller
2018-01-17 8:34 ` [PATCH 08/14] remove libgnomecups leftovers Andreas Müller
2018-01-17 8:34 ` [PATCH 09/14] remove gnome tracker leftovers Andreas Müller
2018-01-17 8:34 ` [PATCH 10/14] jack: Update 1.9.12 Andreas Müller
2018-01-17 8:34 ` [PATCH 11/14] fluidsynth: update 1.1.8 -> 1.1.9 Andreas Müller
2018-01-17 8:34 ` [PATCH 12/14] gtksourceview3: initial add 3.24.6 Andreas Müller
2018-01-17 8:34 ` [PATCH 13/14] gtksourceview-classic-light: initial add 1.0 Andreas Müller
2018-01-17 8:34 ` [PATCH 14/14] xfce-polkit: fix Name/Comment fields in desktop file Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.