* [PATCH 00/16] Next gnome batch
@ 2019-11-14 19:49 Andreas Müller
2019-11-14 19:49 ` [PATCH 01/16] gedit: upgrade 2.30.4 -> 3.34.0 Andreas Müller
` (15 more replies)
0 siblings, 16 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
Waiting for review / autobuilder :)
Andreas Müller (16):
gedit: upgrade 2.30.4 -> 3.34.0
gtksourceview2: remove
evolution-data-server: give up fine grained -dev/-dbg packages
evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework
gnome-terminal: re-add 3.34.2
gnome-font-viewer: initial add 3.34.0
evince: upgrade 3.28.2 -> 3.34.1
file-roller: inital add 3.32.2
gexiv2: initial add 0.12.0
gnome-autoar: inital add 0.2.3
tracker: initial add 2.3.1
nautilus: upgrade 3.18.5 -> 3.34.1
geocode-glib: initial add 3.26.1
libgweather: initial add 3.34.0
libwacom: initial add 0.33
gnome-settings-daemon: initial add 3.34.1
...for-address-localization-when-LC_ADD.patch | 33 ----
...-to-LDFLAGS-when-linking-libphonenum.patch | 36 ----
...ntrispection-support-to-work-with-OE.patch | 75 ---------
.../eds/evolution-data-server_3.32.4.bb | 155 ------------------
...-format-attribute-to-_synctex_malloc.patch | 12 +-
.../evince/0001-help-remove-YELP-macro.patch | 24 ---
...vDocumentModel-get-type-function-dec.patch | 33 ----
...02-add-a-formatting-attribute-check.patch} | 0
.../recipes-gnome/evince/evince_3.28.2.bb | 65 --------
.../recipes-gnome/evince/evince_3.34.1.bb | 52 ++++++
.../evolution-data-server-native.bb | 23 +++
.../evolution-data-server.bb | 70 ++++++++
.../evolution-data-server.inc | 15 ++
...keLists.txt-Remove-TRY_RUN-for-iconv.patch | 28 ++--
...txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 0
...the-Novell-sample-contact-with-somet.patch | 0
.../0004-call-native-helpers.patch} | 33 ++--
.../evolution-data-server/iconv-detect.h | 0
.../file-roller/file-roller_3.32.2.bb | 26 +++
...001-Remove-help-directory-from-build.patch | 29 ----
...ify-handle_builder_error-with-format.patch | 31 ----
...aver.c-Define-ACCESSPERMS-if-not-def.patch | 31 ----
...1-workaround-void-pointer-arithmetic.patch | 57 -------
...format-literal-warning-to-fix-build-.patch | 38 -----
.../recipes-gnome/gedit/gedit_2.30.4.bb | 33 ----
.../recipes-gnome/gedit/gedit_3.34.0.bb | 44 +++++
.../geocode-glib/geocode-glib_3.26.1.bb | 20 +++
.../recipes-gnome/gexiv2/gexiv2_0.12.0.bb | 19 +++
.../gnome-autoar/gnome-autoar_0.2.3.bb | 18 ++
.../gnome-font-viewer_3.34.0.bb | 25 +++
.../gnome-settings-daemon_3.34.1.bb | 59 +++++++
.../gnome-terminal/gnome-terminal_3.34.2.bb | 36 ++++
.../gtksourceview-classic-light_1.0.bb | 3 -
.../gtksourceview/gtksourceview2_2.10.5.bb | 32 ----
.../libgweather/libgweather_3.34.0.bb | 24 +++
...ome-desktop-thumbnail-API-with-new-g.patch | 40 -----
.../recipes-gnome/nautilus/nautilus_3.18.5.bb | 33 ----
.../recipes-gnome/nautilus/nautilus_3.34.1.bb | 32 ++++
.../recipes-gnome/tracker/tracker_2.3.1.bb | 50 ++++++
.../recipes-support/libwacom/libwacom_0.33.bb | 14 ++
40 files changed, 562 insertions(+), 786 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
rename meta-gnome/recipes-gnome/evince/evince/{0001-add-a-formatting-attribute-check.patch => 0002-add-a-formatting-attribute-check.patch} (100%)
delete mode 100644 meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
create mode 100644 meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (60%)
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
rename meta-gnome/recipes-gnome/{eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch => evolution-data-server/evolution-data-server/0004-call-native-helpers.patch} (52%)
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)
create mode 100644 meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb
create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
create mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
create mode 100644 meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb
create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb
create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
delete mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
create mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb
delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb
create mode 100644 meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb
create mode 100644 meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
--
2.21.0
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 01/16] gedit: upgrade 2.30.4 -> 3.34.0
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 02/16] gtksourceview2: remove Andreas Müller
` (14 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
* rewrite from scratch and get rid of this dinosaur
* for those (like me) not happy with immediate search on weak machines: check
xfce's mousepad
* first use-case for gnome-help.bbclass
* add upstream-version-is-even
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...001-Remove-help-directory-from-build.patch | 29 ----------
...ify-handle_builder_error-with-format.patch | 31 ----------
...aver.c-Define-ACCESSPERMS-if-not-def.patch | 31 ----------
...1-workaround-void-pointer-arithmetic.patch | 57 -------------------
...format-literal-warning-to-fix-build-.patch | 38 -------------
.../recipes-gnome/gedit/gedit_2.30.4.bb | 33 -----------
.../recipes-gnome/gedit/gedit_3.34.0.bb | 44 ++++++++++++++
7 files changed, 44 insertions(+), 219 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
delete mode 100644 meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
deleted file mode 100644
index 4ad57effe..000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 17 May 2016 14:14:03 +0300
-Subject: [PATCH] Remove help directory from build
-
-It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- Makefile.am | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e57b203..a88152d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx
-
--if !OS_OSX
--SUBDIRS += help
--endif
-
- distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
-
---
-2.8.1
-
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch b/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
deleted file mode 100644
index 4885c4511..000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 623ffac1f6e7725041b386e0f2933fe36809b5a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 26 Aug 2017 09:04:30 -0700
-Subject: [PATCH] gedit-utils: qualify handle_builder_error() with format
- string parameters
-
-gedit-utils.c:1063:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
- msg_plain = g_strdup_vprintf (message, args);
- ^~~~~~~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gedit/gedit-utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c
-index 41a5afd..c800828 100644
---- a/gedit/gedit-utils.c
-+++ b/gedit/gedit-utils.c
-@@ -1051,7 +1051,7 @@ gedit_utils_is_valid_uri (const gchar *uri)
- return TRUE;
- }
-
--static GtkWidget *
-+static G_GNUC_PRINTF(1, 2) GtkWidget *
- handle_builder_error (const gchar *message, ...)
- {
- GtkWidget *label;
---
-2.14.1
-
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
deleted file mode 100644
index 11afe75ce..000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 13 Jul 2017 06:53:35 -0700
-Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined
- already
-
-Helps compile with musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests/document-saver.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/document-saver.c b/tests/document-saver.c
-index 9f44d5a..811ade6 100644
---- a/tests/document-saver.c
-+++ b/tests/document-saver.c
-@@ -41,6 +41,10 @@
- #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt"
- #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt"
-
-+#if !defined(ACCESSPERMS)
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-+#endif
-+
- static gboolean test_completed;
- static gboolean mount_completed;
- static gboolean mount_success;
---
-2.13.2
-
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
deleted file mode 100644
index a28808b8d..000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sat, 9 Mar 2013 12:47:06 +0100
-Subject: [PATCH] workaround void pointer arithmetic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fixes errors like:
-error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith]
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- gedit/gedit-document-input-stream.c | 4 ++--
- gedit/gedit-smart-charset-converter.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c
-index 5a1f961..38316e7 100644
---- a/gedit/gedit-document-input-stream.c
-+++ b/gedit/gedit-document-input-stream.c
-@@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream *stream,
-
- do
- {
-- n = read_line (dstream, buffer + read, space_left);
-+ n = read_line (dstream, ((char*)buffer) + read, space_left);
- read += n;
- space_left -= n;
- } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0);
-@@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream *stream,
-
- newline = get_new_line (dstream);
-
-- memcpy (buffer + read, newline, newline_size);
-+ memcpy (((char*)buffer) + read, newline, newline_size);
-
- read += newline_size;
- dstream->priv->newline_added = TRUE;
-diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c
-index e32b0b1..6745ce3 100644
---- a/gedit/gedit-smart-charset-converter.c
-+++ b/gedit/gedit-smart-charset-converter.c
-@@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter,
- do
- {
- res = g_converter_convert (G_CONVERTER (converter),
-- inbuf + nread,
-+ ((const char*)inbuf) + nread,
- inbuf_size - nread,
- out + nwritten,
- out_size - nwritten,
---
-1.7.4.4
-
diff --git a/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
deleted file mode 100644
index a5d231012..000000000
--- a/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 29 Jul 2016 23:19:40 +0200
-Subject: [PATCH] suppress string format literal warning to fix build with gcc6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- plugins/time/gedit-time-plugin.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c
-index d2ffdb9..441d9f9 100644
---- a/plugins/time/gedit-time-plugin.c
-+++ b/plugins/time/gedit-time-plugin.c
-@@ -473,12 +473,15 @@ get_time (const gchar* format)
- clock = time (NULL);
- now = localtime (&clock);
-
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- do
- {
- out_length += 255;
- out = g_realloc (out, out_length);
- }
- while (strftime (out, out_length, locale_format, now) == 0);
-+#pragma GCC diagnostic pop
-
- g_free (locale_format);
-
---
-2.5.5
-
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
deleted file mode 100644
index 6e0720888..000000000
--- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "GNOME editor"
-SECTION = "x11/gnome"
-LICENSE = "GPLv2+"
-PR = "r2"
-
-DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \
- gtksourceview2 iso-codes intltool-native gnome-common-native \
- libice python3-six-native"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-inherit distro_features_check gnomebase gconf gettext python3native
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
- file://0001-workaround-void-pointer-arithmetic.patch \
- file://0001-Remove-help-directory-from-build.patch \
- file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \
- file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \
- file://0001-gedit-utils-qualify-handle_builder_error-with-format.patch \
- "
-SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b"
-SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c"
-GNOME_COMPRESS_TYPE="bz2"
-
-EXTRA_OECONF = "--disable-scrollkeeper \
- --enable-gvfs-metadata"
-
-LDFLAGS += "-lgmodule-2.0 -lICE"
-
-FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
-FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb b/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb
new file mode 100644
index 000000000..9679a1ce6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb
@@ -0,0 +1,44 @@
+SUMMARY = "GNOME editor"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = " \
+ yelp-tools-native \
+ libxml2-native \
+ gdk-pixbuf-native \
+ iso-codes \
+ gtk+3 \
+ gsettings-desktop-schemas \
+ gtksourceview4 \
+ libpeas \
+ libsoup-2.4 \
+ gspell \
+ gtksourceview4 \
+"
+
+inherit gnomebase itstool gnome-help gobject-introspection gtk-doc vala gettext distro_features_check upstream-version-is-even
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "ec6632fa73d9ea6c817e74a98d16eab6"
+SRC_URI[archive.sha256sum] = "3e95e51d3ccb495a9ac95aa3ed7fe8fe37ccde7c678f37fa3cea684bc71d507e"
+
+GTKDOC_MESON_OPTION = "documentation"
+
+PACKAGECONFIG ??= "gvfs"
+PACKAGECONFIG[gvfs] = "-Denable-gvfs-metadata=yes,-Denable-gvfs-metadata=no,,gvfs"
+
+PACKAGES += "${PN}-python"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/metainfo \
+"
+
+FILES_${PN}-python += " \
+ ${PYTHON_SITEPACKAGES_DIR} \
+"
+
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 02/16] gtksourceview2: remove
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
2019-11-14 19:49 ` [PATCH 01/16] gedit: upgrade 2.30.4 -> 3.34.0 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 03/16] evolution-data-server: give up fine grained -dev/-dbg packages Andreas Müller
` (13 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
gedit 2.x was the only recipe using it
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gtksourceview-classic-light_1.0.bb | 3 --
.../gtksourceview/gtksourceview2_2.10.5.bb | 32 -------------------
2 files changed, 35 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
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
index 7dabd1e39..bcc3106d9 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
@@ -9,8 +9,6 @@ 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/
install -d ${D}${datadir}/gtksourceview-4/styles
@@ -18,7 +16,6 @@ do_install() {
}
FILES_${PN} = " \
- ${datadir}/gtksourceview-2.0/styles \
${datadir}/gtksourceview-3.0/styles \
${datadir}/gtksourceview-4/styles \
"
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
deleted file mode 100644
index 012f8e3bc..000000000
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Portable C library for multiline text editing"
-HOMEPAGE = "http://projects.gnome.org/gtksourceview/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "gtk+ libxml2 intltool-native gnome-common-native glib-2.0-native"
-
-PNAME = "gtksourceview"
-
-S = "${WORKDIR}/${PNAME}-${PV}"
-
-inherit gnomebase lib_package gettext distro_features_check
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-# overrule SRC_URI from gnome.conf
-SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive \
- file://gtk-doc.make \
- file://suppress-string-format-literal-warning.patch \
- file://0001-test-widget.c-fix-non-literal-format-string-issues.patch \
- "
-SRC_URI[archive.md5sum] = "1219ad1694df136f126507466aeb41aa"
-SRC_URI[archive.sha256sum] = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"
-
-do_configure_prepend() {
- cp ${WORKDIR}/gtk-doc.make ${S}/
- sed -i -e s:docs::g ${S}/Makefile.am
- echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
-}
-
-FILES_${PN} += " ${datadir}/gtksourceview-2.0"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 03/16] evolution-data-server: give up fine grained -dev/-dbg packages
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
2019-11-14 19:49 ` [PATCH 01/16] gedit: upgrade 2.30.4 -> 3.34.0 Andreas Müller
2019-11-14 19:49 ` [PATCH 02/16] gtksourceview2: remove Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework Andreas Müller
` (12 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
It is common practice to create only one -dev/-dbg package
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../eds/evolution-data-server_3.32.4.bb | 42 -------------------
1 file changed, 42 deletions(-)
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
index 429dd53d8..b4174cbb0 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
@@ -82,74 +82,32 @@ FILES_${PN} =+ "${systemd_user_unitdir} \
${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 \
- ${libdir}/evolution-data-server*/addressbook-backends/.debug \
- ${libdir}/evolution-data-server*/extensions/.debug/"
-
-RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
-
FILES_libcamel = "${libdir}/libcamel-*.so.* \
${libdir}/libcamel-provider-*.so.* \
${libdir}/girepository-*/Camel-*.typelib \
${libdir}/evolution-data-server*/camel-providers/*.so \
${libdir}/evolution-data-server*/camel-providers/*.urls"
-FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
- ${libdir}/pkgconfig/camel*pc \
- ${includedir}/evolution-data-server*/camel \
- ${datadir}/vala/vapi/camel-* \
- ${datadir}/gir-*/Camel-*.gir"
-
FILES_libebook = "${libdir}/libebook-*.so.* \
${libdir}/girepository-*/EBook-*.typelib"
-FILES_libebook-dev = "${libdir}/libebook-*.so \
- ${libdir}/pkgconfig/libebook-*.pc \
- ${datadir}/gir-*/EBook-*.gir \
- ${datadir}/vala/vapi/libebook-*.* \
- ${includedir}/evolution-data-server*/libebook/*.h"
RRECOMMENDS_libebook = "libedata-book"
FILES_libebook-contacts = "${libdir}/libebook-contacts-*.so.* \
${libdir}/girepository-*/EBookContacts-*.typelib"
-FILES_libebook-contacts-dev = "${libdir}/libebook-contacts-*.so \
- ${libdir}/pkgconfig/libebook-contacts-*.pc \
- ${datadir}/gir-*/EBookContacts-*.gir \
- ${datadir}/vala/vapi/libebook-contacts-* \
- ${includedir}/evolution-data-server*/libebook-contacts/*.h"
FILES_libecal = "${libdir}/libecal-*.so.*"
-FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
- ${includedir}/evolution-data-server*/libecal/*.h \
- ${includedir}/evolution-data-server*/libical/*.h"
RRECOMMENDS_libecal = "libedata-cal tzdata"
FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
${datadir}/dbus-1/services/*.AddressBook.service \
${libdir}/libedata-book-*.so.* \
${libdir}/evolution-data-server-*/extensions/libebook*.so"
-FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
- ${libdir}/pkgconfig/libedata-book-*.pc \
- ${includedir}/evolution-data-server-*/libedata-book"
FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
${datadir}/dbus-1/services/*.Calendar.service \
${libdir}/libedata-cal-*.so.* \
${libdir}/evolution-data-server-*/extensions/libecal*.so"
-FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
- ${libdir}/pkgconfig/libedata-cal-*.pc \
- ${includedir}/evolution-data-server-*/libedata-cal"
FILES_libedataserver = "${libdir}/libedataserver-*.so.* \
${libdir}/girepository-*/EDataServer-*.typelib"
-FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
- ${libdir}/pkgconfig/libedataserver-*.pc \
- ${datadir}/vala/vapi/libedataserver-* \
- ${includedir}/evolution-data-server-*/libedataserver/*.h"
FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*"
-FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
- ${libdir}/pkgconfig/libedataserverui-*.pc \
- ${datadir}/gir-*/EDataServerUI-*.gir \
- ${datadir}/vala/vapi/libedataserverui-* \
- ${includedir}/evolution-data-server-*/libedataserverui/*.h"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (2 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 03/16] evolution-data-server: give up fine grained -dev/-dbg packages Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 22:10 ` Khem Raj
2019-11-14 19:49 ` [PATCH 05/16] gnome-terminal: re-add 3.34.2 Andreas Müller
` (11 subsequent siblings)
15 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
* a native variant had to be introduced for code-generator tools
* gobject-introspection builds theoretically :) Unfortunataelly qemu runs
with 100% CPU load and never returns -> disable introspection for now
* add PACKAGECONFIGs for new dependencies - disabled by default
* give up fine grained packaging: It was broken over the years completely
and nobody seemed to take care.
* ICU-patch does not apply anymore and it seems upstream has fixed issues
with ICU
* add upstream-version-is-even to inherit
* rename folder containing recipe
* get rid of gconf dependency
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...for-address-localization-when-LC_ADD.patch | 33 -----
...-to-LDFLAGS-when-linking-libphonenum.patch | 36 ------
...ntrispection-support-to-work-with-OE.patch | 75 ------------
.../eds/evolution-data-server_3.32.4.bb | 113 ------------------
.../evolution-data-server-native.bb | 23 ++++
.../evolution-data-server.bb | 70 +++++++++++
.../evolution-data-server.inc | 15 +++
...keLists.txt-Remove-TRY_RUN-for-iconv.patch | 28 +++--
...txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 0
...the-Novell-sample-contact-with-somet.patch | 0
.../0004-call-native-helpers.patch} | 33 +++--
.../evolution-data-server/iconv-detect.h | 0
12 files changed, 137 insertions(+), 289 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (60%)
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
rename meta-gnome/recipes-gnome/{eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch => evolution-data-server/evolution-data-server/0004-call-native-helpers.patch} (52%)
rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
deleted file mode 100644
index 55ab5a7fc..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 95425206e7317e59b7ca06d7f838ad357cdd200c Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <tworaz@tworaz.net>
-Date: Wed, 14 Aug 2019 00:31:54 +0200
-Subject: [PATCH 5/7] Use LC_MESSAGES for address localization when LC_ADDRESS
- is not available.
-
-Musl does not define LC_ADDRESS unfortunately.
-
-Upstream-Status: Inappropriate [musl specific]
-
-Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
----
- src/addressbook/libebook-contacts/e-phone-number-private.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/addressbook/libebook-contacts/e-phone-number-private.cpp b/src/addressbook/libebook-contacts/e-phone-number-private.cpp
-index 4c5aebb..9abcebd 100644
---- a/src/addressbook/libebook-contacts/e-phone-number-private.cpp
-+++ b/src/addressbook/libebook-contacts/e-phone-number-private.cpp
-@@ -36,6 +36,10 @@
- #include <phonenumbers/logger.h>
- #include <phonenumbers/phonenumberutil.h>
-
-+#ifndef LC_ADDRESS
-+#define LC_ADDRESS LC_MESSAGES
-+#endif
-+
- using i18n::phonenumbers::PhoneNumber;
- using i18n::phonenumbers::PhoneNumberUtil;
-
---
-2.21.0
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
deleted file mode 100644
index c0c1427fd..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fb9164bbca5b425f1cf1bb3cac51d06afe81938a Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <tworaz@tworaz.net>
-Date: Wed, 14 Aug 2019 00:47:59 +0200
-Subject: [PATCH 6/7] Dont add /usr/lib to LDFLAGS when linking libphonenumber.
-
-This will refer to host lib dir which is not what we want.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
----
- cmake/modules/FindPhonenumber.cmake | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/FindPhonenumber.cmake b/cmake/modules/FindPhonenumber.cmake
-index 04d1056..70c0c41 100644
---- a/cmake/modules/FindPhonenumber.cmake
-+++ b/cmake/modules/FindPhonenumber.cmake
-@@ -37,12 +37,10 @@ string(TOUPPER "${WITH_PHONENUMBER}" optupper)
- if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
- set(WITH_PHONENUMBER "ON")
- set(PHONENUMBER_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}")
-- set(PHONENUMBER_LIB_DIRS ${LIB_INSTALL_DIR})
-- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS})
-+ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS})
- else(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
- set(PHONENUMBER_INCLUDE_DIRS "${WITH_PHONENUMBER}/include")
-- set(PHONENUMBER_LIB_DIRS ${WITH_PHONENUMBER}/lib${LIB_SUFFIX})
-- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS})
-+ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS})
- endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
-
- unset(bindirlen)
---
-2.21.0
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
deleted file mode 100644
index c00082a2c..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d84f4fd68441e934b37be2a6917abad52c5d1bda Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <tworaz@tworaz.net>
-Date: Fri, 16 Aug 2019 21:22:16 +0200
-Subject: [PATCH 7/7] Modify gobject-intrispection support to work with OE.
-
-1. Use tools provided by the recipe sysroot instread of host ones.
-2. Make sure all the required dirs make it into g-ir-scanner via
- LDFLAGS.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
----
- cmake/modules/GObjectIntrospection.cmake | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
-index 5be5042..67c035a 100644
---- a/cmake/modules/GObjectIntrospection.cmake
-+++ b/cmake/modules/GObjectIntrospection.cmake
-@@ -20,6 +20,9 @@ if(ENABLE_INTROSPECTION)
- pkg_check_variable(G_IR_SCANNER gobject-introspection-1.0 g_ir_scanner)
- pkg_check_variable(G_IR_COMPILER gobject-introspection-1.0 g_ir_compiler)
-
-+ string(CONCAT G_IR_SCANNER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_SCANNER}")
-+ string(CONCAT G_IR_COMPILER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_COMPILER}")
-+
- if(NOT G_IR_SCANNER)
- message(FATAL_ERROR "g-ir-scanner not provided by gobject-introspection-1.0, you can disable GObject introspection by -DENABLE_INTROSPECTION=OFF")
- endif(NOT G_IR_SCANNER)
-@@ -116,7 +119,7 @@ macro(gir_add_introspection gir)
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
-
- add_custom_command(
-- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
-+ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=${INTROSPECTION_SCANNER_LDFLAGS}
- ${INTROSPECTION_SCANNER_ENV}
- ${G_IR_SCANNER}
- ${INTROSPECTION_SCANNER_ARGS}
-@@ -186,6 +189,7 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
- unset(INTROSPECTION_SCANNER_ARGS)
- unset(INTROSPECTION_SCANNER_ENV)
- unset(INTROSPECTION_COMPILER_ARGS)
-+ unset(INTROSPECTION_SCANNER_LDFLAGS)
-
- set(${gir_vars_prefix} ${gir_library})
- set(${gir_vars_prefix}_SCANNERFLAGS "--warn-all")
-@@ -223,12 +227,12 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
- --add-include-path=${CMAKE_CURRENT_SOURCE_DIR}
- --library-path=${CMAKE_BINARY_DIR}
- --library-path=${CMAKE_BINARY_DIR}/src
-+ --library-path=${CMAKE_BINARY_DIR}/src/private
- --library-path=${CMAKE_CURRENT_BINARY_DIR}
- ${_gir_extra_libdirs}
- ${_gir_identifies_prefixes}
- ${_gir_deps}
- --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0
-- --library-path=${LIB_INSTALL_DIR}
- ${_extra_library_path}
- --pkg-export ${pkg_export_prefix}-${gir_library_version}
- --c-include=${c_include}
-@@ -279,6 +283,10 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
- )
- endif(UNIX)
-
-+ _gir_list_prefix(_gir_scanner_ldflags ${gir_extra_libdirs_var} "-Wl,-rpath-link=")
-+ string(REPLACE ";" " " _gir_scanner_ldflags "${_gir_scanner_ldflags}")
-+ set(INTROSPECTION_SCANNER_LDFLAGS "${_gir_scanner_ldflags}")
-+
- set(INTROSPECTION_SCANNER_ENV
- ${_loader_library_path_var}="${_extra_loader_library_path_native}"
- )
---
-2.21.0
-
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
deleted file mode 100644
index b4174cbb0..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
+++ /dev/null
@@ -1,113 +0,0 @@
-SUMMARY = "Evolution database backend server"
-HOMEPAGE = "http://www.gnome.org/projects/evolution/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
- 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-native \
- glib-2.0 gtk+3 libgnome-keyring libgdata libcanberra icu \
- dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
-"
-
-inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative upstream-version-is-even vala
-
-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://0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch \
- file://0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch \
- file://0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch \
- file://0007-Modify-gobject-intrispection-support-to-work-with-OE.patch \
- file://iconv-detect.h \
- "
-SRC_URI[archive.md5sum] = "57820f3f88fc554e1a58665a52e12c05"
-SRC_URI[archive.sha256sum] = "83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f"
-
-LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
-LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
-
-EXTRA_OECMAKE = " \
- -D${LKSTRFTIME} \
- -DSYSCONF_INSTALL_DIR=${sysconfdir} \
- -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection', '', d)}"
-PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
-PACKAGECONFIG[oauth2] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,json-glib webkitgtk"
-PACKAGECONFIG[mitkrb5] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
-PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
-PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather"
-PACKAGECONFIG[phonenumber] = "-DWITH_PHONENUMBER=ON,-DWITH_PHONENUMBER=OFF,libphonenumber"
-PACKAGECONFIG[introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF"
-PACKAGECONFIG[vala] = "-DENABLE_VALA_BINDINGS=ON -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen,-DENABLE_VALA_BINDINGS=OFF"
-
-# -ldb needs this on some platforms
-LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
-
-do_configure_append () {
- 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() {
- # CMake does not support building native binaries when cross compiling. As result
- # it always cross compiles them for the target and then aborts when they fail to run.
- # To work around this manually build required tools and patch cmake targets to use
- # those native binaries we built here.
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} ${S}/src/camel/camel-gen-tables.c \
- -o ${B}/src/camel/camel-gen-tables-native
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} $(pkg-config-native --cflags glib-2.0) \
- ${S}/src/addressbook/libebook-contacts/gen-western-table.c \
- -o ${B}/src/addressbook/libebook-contacts/gen-western-table-native \
- $(pkg-config-native --libs glib-2.0)
-}
-
-
-PACKAGES =+ "libebook-contacts libebook-contacts-dev \
- 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} =+ "${systemd_user_unitdir} \
- ${datadir}/dbus-1 \
- ${datadir}/evolution-data-server-*/ui/"
-RDEPENDS_${PN} += "perl"
-
-FILES_libcamel = "${libdir}/libcamel-*.so.* \
- ${libdir}/libcamel-provider-*.so.* \
- ${libdir}/girepository-*/Camel-*.typelib \
- ${libdir}/evolution-data-server*/camel-providers/*.so \
- ${libdir}/evolution-data-server*/camel-providers/*.urls"
-FILES_libebook = "${libdir}/libebook-*.so.* \
- ${libdir}/girepository-*/EBook-*.typelib"
-RRECOMMENDS_libebook = "libedata-book"
-
-FILES_libebook-contacts = "${libdir}/libebook-contacts-*.so.* \
- ${libdir}/girepository-*/EBookContacts-*.typelib"
-
-FILES_libecal = "${libdir}/libecal-*.so.*"
-RRECOMMENDS_libecal = "libedata-cal tzdata"
-
-FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
- ${datadir}/dbus-1/services/*.AddressBook.service \
- ${libdir}/libedata-book-*.so.* \
- ${libdir}/evolution-data-server-*/extensions/libebook*.so"
-
-FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
- ${datadir}/dbus-1/services/*.Calendar.service \
- ${libdir}/libedata-cal-*.so.* \
- ${libdir}/evolution-data-server-*/extensions/libecal*.so"
-
-FILES_libedataserver = "${libdir}/libedataserver-*.so.* \
- ${libdir}/girepository-*/EDataServer-*.typelib"
-
-FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
new file mode 100644
index 000000000..681a61c33
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
@@ -0,0 +1,23 @@
+require ${BPN}.inc
+
+inherit native
+
+DEPENDS = "glib-2.0-native"
+
+# build native helpers
+do_compile() {
+ cd ${S}/src/camel
+ sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c
+ ${CC} -o ${B}/camel-gen-tables camel-gen-tables.c ${CFLAGS} ${LDFLAGS}
+
+ LDFLAGS_glib=`pkg-config glib-2.0 --libs`
+ CFLAGS_glib=`pkg-config glib-2.0 --cflags`
+ cd ${S}/src/addressbook/libebook-contacts
+ sed -i 's:#include "evolution-data-server-config.h"::g' gen-western-table.c
+ ${CC} -o ${B}/gen-western-table gen-western-table.c ${CFLAGS} ${CFLAGS_glib} ${LDFLAGS} ${LDFLAGS_glib}
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 755 ${B}/* ${D}${bindir}
+}
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
new file mode 100644
index 000000000..a8bb69f00
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -0,0 +1,70 @@
+require ${BPN}.inc
+
+DEPENDS = " \
+ ${BPN}-native intltool-native gperf-native \
+ glib-2.0 gtk+3 libgdata \
+ dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
+"
+
+inherit distro_features_check cmake gtk-doc gettext gobject-introspection perlnative pythonnative
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+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://0004-call-native-helpers.patch \
+ file://iconv-detect.h \
+"
+
+LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
+LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
+
+# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now
+GI_DATA_ENABLED="False"
+
+EXTRA_OECMAKE = " \
+ -DSYSCONF_INSTALL_DIR=${sysconfdir} \
+ -DWITH_KRB5=OFF \
+ -DENABLE_GOA=OFF \
+ -DENABLE_UOA=OFF \
+ -DENABLE_GOOGLE_AUTH=OFF \
+ -DENABLE_WEATHER=OFF \
+ -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \
+ -D${LKSTRFTIME} \
+ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
+"
+
+PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
+PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
+
+# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
+# searching for openldap-libs
+PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
+
+# -ldb needs this on some platforms
+LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
+
+do_configure_append () {
+ 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
+
+ # fix abs path for g-ir-scanner-wrapper
+ sed -i ${B}/build.ninja \
+ -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g'
+}
+
+do_compile_prepend() {
+ export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
+}
+
+FILES_${PN} =+ " \
+ ${datadir}/dbus-1 \
+ ${datadir}/evolution-data-server-*/ui/ \
+ ${systemd_user_unitdir} \
+"
+
+RDEPENDS_${PN} += "perl"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
new file mode 100644
index 000000000..2e5176ce7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -0,0 +1,15 @@
+SUMMARY = "Evolution database backend server"
+HOMEPAGE = "http://www.gnome.org/projects/evolution/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2 & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
+ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
+ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543"
+
+inherit gnomebase
+
+SRC_URI[archive.md5sum] = "d1701875bbac80d6d62e9acfc6c43bea"
+SRC_URI[archive.sha256sum] = "6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe"
+PV = "3.34.1"
+
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/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
similarity index 60%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
index cc9dca4ea..e8c6d6a76 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
@@ -1,7 +1,7 @@
-From e32075119803f9fffbba01a31083e416cb213011 Mon Sep 17 00:00:00 2001
+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 1/7] CMakeLists.txt: Remove TRY_RUN for iconv
+Date: Sun, 31 Mar 2019 18:11:55 +0200
+Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -13,22 +13,24 @@ Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
+ CMakeLists.txt | 11 -----------
+ 1 file changed, 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9d72db..ed99904 100644
+index 1672daf..0b3e4e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -526,15 +526,9 @@ endif(NOT HAVE_ICONV)
+@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
+ message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
+ endif(NOT HAVE_ICONV)
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
- file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
+-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
+-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
-CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\"
- #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
- unset(_binary_dir_with_separator)
- unset(CMAKE_REQUIRED_LIBRARIES)
-
+-unset(_binary_dir_with_separator)
+-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)
@@ -37,5 +39,5 @@ index f9d72db..ed99904 100644
# Backtraces for debugging
# ******************************
--
-2.21.0
+2.20.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/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
similarity index 52%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
index 67023df2c..e320f6342 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
@@ -1,26 +1,21 @@
-From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <tworaz@tworaz.net>
-Date: Mon, 12 Aug 2019 14:13:52 +0200
-Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during
- build process.
+From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 31 Mar 2019 19:11:31 +0200
+Subject: [PATCH] call native helpers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-CMake can't build tools for the host system when cross compiling. As
-result eds currently fails to build in OE due to some programs being
-cross compiled for the target and run on the host. To work around this
-limitation modify existing targets using build time generated binaries
-to invoke binaries suffixed with -native. We can inject such binaries
-into expected locations prior to invoking ninja in do_compile.
+Upstream-Status: Inappropriate[oe-specific]
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/addressbook/libebook-contacts/CMakeLists.txt | 2 +-
src/camel/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
-index e9e3259..2ae72a8 100644
+index e9e3259..e749d1b 100644
--- a/src/addressbook/libebook-contacts/CMakeLists.txt
+++ b/src/addressbook/libebook-contacts/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(gen-western-table
@@ -28,12 +23,12 @@ index e9e3259..2ae72a8 100644
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
-+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table-native "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
++ COMMAND gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
DEPENDS gen-western-table e-name-western-tables.h.in
)
diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
-index be626a8..9226b2b 100644
+index be626a8..14ac8b8 100644
--- a/src/camel/CMakeLists.txt
+++ b/src/camel/CMakeLists.txt
@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC
@@ -41,10 +36,10 @@ index be626a8..9226b2b 100644
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
-+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
++ COMMAND camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
DEPENDS camel-gen-tables
)
--
-2.21.0
+2.20.1
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
similarity index 100%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 05/16] gnome-terminal: re-add 3.34.2
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (3 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 22:42 ` Khem Raj
2019-11-14 19:49 ` [PATCH 06/16] gnome-font-viewer: initial add 3.34.0 Andreas Müller
` (10 subsequent siblings)
15 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gnome-terminal/gnome-terminal_3.34.2.bb | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
new file mode 100644
index 000000000..d688176d5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
@@ -0,0 +1,36 @@
+SUMMARY = "GNOME terminal"
+LICENSE = "GPLv3 & GFDL-1.3"
+LIC_FILES_CHKSUM = " \
+ file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+"
+
+inherit gnomebase gnome-help gettext itstool upstream-version-is-even
+
+DEPENDS = " \
+ glib-2.0-native \
+ intltool-native \
+ yelp-tools-native \
+ desktop-file-utils-native \
+ gtk+3 \
+ gsettings-desktop-schemas \
+ vte \
+ dconf \
+ libpcre2 \
+"
+
+SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16"
+SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d"
+
+EXTRA_OECONF += " \
+ --disable-search-provider \
+ --without-nautilus-extension \
+"
+
+FILES_${PN} += " \
+ ${datadir}/metainfo \
+ ${datadir}/dbus-1 \
+ ${systemd_user_unitdir} \
+"
+
+RRECOMMENDS_${PN} += "vte-prompt gsettings-desktop-schemas"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 06/16] gnome-font-viewer: initial add 3.34.0
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (4 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 05/16] gnome-terminal: re-add 3.34.2 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 07/16] evince: upgrade 3.28.2 -> 3.34.1 Andreas Müller
` (9 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gnome-font-viewer_3.34.0.bb | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb
new file mode 100644
index 000000000..95140ff88
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "GNOME bluetooth manager"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SECTION = "x11/gnome"
+
+DEPENDS = " \
+ gtk+3 \
+ gnome-desktop3 \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gtk-icon-cache gettext distro_features_check upstream-version-is-even
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "76004a8986ea622b09c408b01a6f42e5"
+SRC_URI[archive.sha256sum] = "aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/metainfo \
+ ${datadir}/thumbnailers \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 07/16] evince: upgrade 3.28.2 -> 3.34.1
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (5 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 06/16] gnome-font-viewer: initial add 3.34.0 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-15 15:35 ` Khem Raj
2019-11-14 19:49 ` [PATCH 08/16] file-roller: inital add 3.32.2 Andreas Müller
` (8 subsequent siblings)
15 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
* remove unnecessary or upstreamed patches
* add upstream-version-is-even to inherit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...-format-attribute-to-_synctex_malloc.patch | 12 ++--
.../evince/0001-help-remove-YELP-macro.patch | 24 -------
...vDocumentModel-get-type-function-dec.patch | 33 ----------
...02-add-a-formatting-attribute-check.patch} | 0
.../recipes-gnome/evince/evince_3.28.2.bb | 65 -------------------
.../recipes-gnome/evince/evince_3.34.1.bb | 52 +++++++++++++++
6 files changed, 58 insertions(+), 128 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
rename meta-gnome/recipes-gnome/evince/evince/{0001-add-a-formatting-attribute-check.patch => 0002-add-a-formatting-attribute-check.patch} (100%)
delete mode 100644 meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
create mode 100644 meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
index de739c5b3..32ca073f9 100644
--- a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
+++ b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
@@ -11,17 +11,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/cut-n-paste/synctex/synctex_parser_utils.c b/cut-n-paste/synctex/synctex_parser_utils.c
-index f8a9f6f..9459b2d 100644
+index 08053f0..0519b38 100644
--- a/cut-n-paste/synctex/synctex_parser_utils.c
+++ b/cut-n-paste/synctex/synctex_parser_utils.c
-@@ -78,6 +78,7 @@ void *_synctex_malloc(size_t size) {
- return (void *)ptr;
+@@ -136,6 +136,7 @@ int _synctex_log(int level, const char * prompt, const char * reason,va_list arg
+ return result;
}
+__attribute__((__format__ (__printf__, 1, 0)))
int _synctex_error(const char * reason,...) {
- va_list arg;
- int result;
+ va_list arg;
+ int result;
--
-2.12.2
+2.20.1
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch b/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
deleted file mode 100644
index 592f46606..000000000
--- a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 40921037d8e7205a3889d529fb4e06f79e1e88b0 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 19 Feb 2016 16:52:18 +0200
-Subject: [PATCH] help: remove YELP macro
-
-Upstream-Status: Inappropriate [embedded-specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- help/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/help/Makefile.am b/help/Makefile.am
-index 7835810..37c88ce 100644
---- a/help/Makefile.am
-+++ b/help/Makefile.am
-@@ -1,5 +1,3 @@
--@YELP_HELP_RULES@
--
- SUBDIRS = reference
-
- HELP_ID = evince
---
-2.7.0
-
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch b/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
deleted file mode 100644
index dcc4a4e9c..000000000
--- a/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
-Date: Fri, 7 Sep 2018 22:34:29 +0200
-Subject: [PATCH] libview: Remove EvDocumentModel get type function declaration
-
-The EvDocumentModel class declares the `ev_document_model_get_type`
-function as part of the `GObject` boilerplate code.
-
-However, this declaration is not necessary and also causes a warning
-when introspection data file, `EvinceView-3.0.gir`, is generated.
-
-Upstream-Status: Applied [1]
-
-
----
- libview/ev-document-model.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h
-index 784e27d6..6a99e43a 100644
---- a/libview/ev-document-model.h
-+++ b/libview/ev-document-model.h
-@@ -54,7 +54,6 @@ typedef enum {
- EV_PAGE_LAYOUT_AUTOMATIC
- } EvPageLayout;
-
--GType ev_document_model_get_type (void) G_GNUC_CONST;
- EvDocumentModel *ev_document_model_new (void);
- EvDocumentModel *ev_document_model_new_with_document (EvDocument *document);
-
---
-2.20.1
-
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch b/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch
rename to meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch
diff --git a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
deleted file mode 100644
index f45180e79..000000000
--- a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
-SECTION = "x11/office"
-DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native"
-
-inherit gnomebase pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd
-
-SRC_URI = " \
- ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
- file://0001-help-remove-YELP-macro.patch \
- file://0001-Add-format-attribute-to-_synctex_malloc.patch \
- file://0001-add-a-formatting-attribute-check.patch \
- file://0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch \
-"
-SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3"
-SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1"
-
-EXTRA_OECONF = "--enable-thumbnailer"
-
-do_compile_prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs"
-}
-
-
-do_install_append() {
- install -d ${D}${datadir}/pixmaps
- install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}
- then
- install -d ${D}${systemd_unitdir}/system
- mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service
- else
- rm -rf ${D}${libdir}/systemd/user/evince.service
- fi
- rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir}
- rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd
- rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}
-}
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
-PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin,"
-
-SYSTEMD_SERVICE_${PN} = "evince.service"
-
-RDEPENDS_${PN} += "glib-2.0-utils"
-RRECOMMMENDS_${PN} = "adwaita-icon-theme"
-
-PACKAGES =+ "${PN}-nautilus-extension"
-PACKAGES =+ "${PN}-browser-plugin"
-
-FILES_${PN} += "${datadir}/dbus-1 \
- ${datadir}/metainfo \
- ${datadir}/thumbnailers \
- ${systemd_unitdir}/systemd/user/evince.service \
- "
-FILES_${PN}-dbg += "${libdir}/*/*/.debug \
- ${libdir}/*/*/*/.debug"
-FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
- ${libdir}/evince/*/backends/*.la"
-FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
- ${libdir}/evince/*/backends/*.a"
-FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
-FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
diff --git a/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb b/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
new file mode 100644
index 000000000..6f0392d27
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
@@ -0,0 +1,52 @@
+SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
+SECTION = "x11/office"
+DEPENDS = " \
+ gnome-common-native \
+ yelp-tools-native \
+ appstream-glib \
+ gtk+3 \
+ gspell \
+ libsecret \
+ poppler \
+ gstreamer1.0-plugins-base \
+ orc \
+ adwaita-icon-theme \
+ ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \
+"
+
+inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext distro_features_check
+
+SRC_URI[archive.md5sum] = "77b38b625008f5940e9bd4b3d38e8cf8"
+SRC_URI[archive.sha256sum] = "85e407cde396147b249120d816c7715fb6df191ca561cf65ff3554a5d67626df"
+SRC_URI += " \
+ file://0001-Add-format-attribute-to-_synctex_malloc.patch \
+ file://0002-add-a-formatting-attribute-check.patch \
+"
+
+EXTRA_OECONF = " \
+ --enable-thumbnailer \
+ --without-systemduserunitdir \
+"
+
+do_compile_prepend() {
+ export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs"
+}
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
+PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin,"
+
+RDEPENDS_${PN} += "glib-2.0-utils"
+RRECOMMMENDS_${PN} = "adwaita-icon-theme"
+
+PACKAGES =+ "${PN}-nautilus-extension"
+PACKAGES =+ "${PN}-browser-plugin"
+
+FILES_${PN} += "${datadir}/dbus-1 \
+ ${datadir}/metainfo \
+ ${datadir}/thumbnailers \
+"
+FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
+FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 08/16] file-roller: inital add 3.32.2
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (6 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 07/16] evince: upgrade 3.28.2 -> 3.34.1 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 09/16] gexiv2: initial add 0.12.0 Andreas Müller
` (7 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../file-roller/file-roller_3.32.2.bb | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb
diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb
new file mode 100644
index 000000000..8350189a5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.2.bb
@@ -0,0 +1,26 @@
+SUMMARY = "An archive manager utility for the GNOME Environment"
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = " \
+ glib-2.0-native \
+ gtk+3 \
+ nautilus \
+ libarchive \
+ libnotify \
+"
+
+inherit gnomebase itstool gnome-help gettext upstream-version-is-even
+
+SRC_URI[archive.md5sum] = "e79715bb2400df83c0f67cc0cce2b655"
+SRC_URI[archive.sha256sum] = "c60a79e0baf74cb1c09a1c8f5ffe0d6e311227ca14ecc5b1156beb3715341a71"
+
+PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/metainfo \
+ ${libdir}/nautilus \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 09/16] gexiv2: initial add 0.12.0
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (7 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 08/16] file-roller: inital add 3.32.2 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 10/16] gnome-autoar: inital add 0.2.3 Andreas Müller
` (6 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
This is an optional dependecy for upcoming nautils 3.34.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-gnome/gexiv2/gexiv2_0.12.0.bb | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
new file mode 100644
index 000000000..458eaeaa1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "A GObject-based Exiv2 wrapper"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
+
+DEPENDS = "exiv2"
+
+GNOMEBASEBUILDCLASS = "meson"
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+inherit gnomebase gobject-introspection gtk-doc
+
+SRC_URI[archive.md5sum] = "0a618c5b053106d1801d89cc77385419"
+SRC_URI[archive.sha256sum] = "58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a"
+
+EXTRA_OEMESON = " \
+ -Dvapi=false \
+ -Dpython2_girdir=no \
+ -Dpython3_girdir=no \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 10/16] gnome-autoar: inital add 0.2.3
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (8 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 09/16] gexiv2: initial add 0.12.0 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 11/16] tracker: initial add 2.3.1 Andreas Müller
` (5 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
This is a dependency for upcoming nautilus 3.34.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gnome-autoar/gnome-autoar_0.2.3.bb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
new file mode 100644
index 000000000..16a9213cb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
@@ -0,0 +1,18 @@
+SUMMARY = "GNOME archive library"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = " \
+ gnome-common-native \
+ gtk+3 \
+ libarchive \
+"
+
+inherit gnomebase gobject-introspection gtk-doc vala
+
+SRC_URI[archive.md5sum] = "39b13fb2fc7752fa3b80616244dc4ef8"
+SRC_URI[archive.sha256sum] = "5de9db0db028cd6cab7c2fec46ba90965474ecf9cd68cfd681a6488cf1fb240a"
+
+do_compile_prepend() {
+ export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs"
+}
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 11/16] tracker: initial add 2.3.1
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (9 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 10/16] gnome-autoar: inital add 0.2.3 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 12/16] nautilus: upgrade 3.18.5 -> 3.34.1 Andreas Müller
` (4 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
This is a dependenccy for upcoming nautilus 3.34
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-gnome/tracker/tracker_2.3.1.bb | 50 +++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb
diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb b/meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb
new file mode 100644
index 000000000..ad65630c1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/tracker/tracker_2.3.1.bb
@@ -0,0 +1,50 @@
+SUMMARY = "Tracker is a file search engine"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+ file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \
+ file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+DEPENDS = " \
+ libxml2-native \
+ dbus-native \
+ glib-2.0 \
+ sqlite3 \
+ libarchive \
+ dbus \
+ icu \
+ json-glib \
+ libsoup-2.4 \
+ libstemmer \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gobject-introspection vala gtk-doc manpages bash-completion distro_features_check
+
+SRC_URI[archive.md5sum] = "5e75b611b190c4cebf53e3de15266429"
+SRC_URI[archive.sha256sum] = "b6748726e465ad2f4d991560634b1fd0df8841f3d981b3b837c4162abedf08a1"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+PACKAGECONFIG ??= "fts"
+PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger"
+# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set
+PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false"
+
+# set required cross property sqlite3_has_fts5
+do_write_config[vardeps] += "PACKAGECONFIG"
+do_write_config_append() {
+ echo "[properties]" > ${WORKDIR}/meson-tracker.cross
+ echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross
+}
+
+EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${libdir}/tracker-2.0 \
+ ${systemd_user_unitdir} \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 12/16] nautilus: upgrade 3.18.5 -> 3.34.1
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (10 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 11/16] tracker: initial add 2.3.1 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 13/16] geocode-glib: initial add 3.26.1 Andreas Müller
` (3 subsequent siblings)
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
bumping high requires rewrite from scratch almost:
* meson-build
* remove backported patch
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...ome-desktop-thumbnail-API-with-new-g.patch | 40 -------------------
.../recipes-gnome/nautilus/nautilus_3.18.5.bb | 33 ---------------
.../recipes-gnome/nautilus/nautilus_3.34.1.bb | 32 +++++++++++++++
3 files changed, 32 insertions(+), 73 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
deleted file mode 100644
index f19eb4979..000000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a4ed38e95cbe07f02028249b8b315565a5ac1e43 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 May 2018 22:32:45 -0700
-Subject: [PATCH] nautilus: drop gnome-desktop thumbnail API with new
- gdk-pixbuf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If gdk-pixbuf >= 2.36.5 is available, its scaling API can do what we
-want, so we don’t need to use the deprecated gnome-desktop one.
-
-Also fixes compile errors seen on master
-nautilus-properties-window.c:5101: undefined reference to `gnome_desktop_thumbnail_scale_down_pixbuf'
-
-Upstream-Status: Backport
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/nautilus-properties-window.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
-index dea8b0f..fad9bd1 100644
---- a/src/nautilus-properties-window.c
-+++ b/src/nautilus-properties-window.c
-@@ -5098,10 +5098,11 @@ update_preview_callback (GtkFileChooser *icon_chooser,
- scale = (double)gdk_pixbuf_get_height (pixbuf) /
- gdk_pixbuf_get_width (pixbuf);
-
-- scaled_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf
-+ scaled_pixbuf = gdk_pixbuf_scale_simple
- (pixbuf,
- PREVIEW_IMAGE_WIDTH,
-- scale * PREVIEW_IMAGE_WIDTH);
-+ scale * PREVIEW_IMAGE_WIDTH,
-+ GDK_INTERP_HYPER);
- g_object_unref (pixbuf);
- pixbuf = scaled_pixbuf;
- }
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
deleted file mode 100644
index bdb2f3c88..000000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "File manager for GNOME"
-SECTION = "x11/gnome"
-
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=36cf660aea2b8beffba7945f44a7e748 \
- file://COPYING.EXTENSIONS;md5=7579d6678402a1868631bf82c93ff0d4 \
- file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
-
-inherit distro_features_check autotools pkgconfig gobject-introspection
-
-MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/${MAJ_VER}/nautilus-${PV}.tar.xz \
- file://0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch \
- "
-
-SRC_URI[md5sum] = "0f578bda5655c0ce204befafca5803d7"
-SRC_URI[sha256sum] = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15"
-
-DEPENDS = "gtk+3 gnome-desktop3 gsettings-desktop-schemas glib-2.0-native intltool-native pango"
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OECONF = " \
- --disable-gtk-doc \
- --disable-update-mimedb \
- --disable-nst-extension \
- --enable-tracker=no \
- --disable-schemas-compile \
- --enable-xmp=no \
- --enable-libexif=no \
-"
-
-FILES_${PN} += "${datadir}/*"
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb
new file mode 100644
index 000000000..342c59d6d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.1.bb
@@ -0,0 +1,32 @@
+SUMMARY = "File manager for GNOME"
+SECTION = "x11/gnome"
+
+LICENSE="GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = " \
+ fontconfig \
+ gtk+3 \
+ gnome-desktop3 \
+ gsettings-desktop-schemas \
+ gnome-autoar \
+ tracker \
+"
+
+inherit gnomebase gobject-introspection gtk-doc gettext distro_features_check
+
+SRC_URI[archive.md5sum] = "19e4f1d89fb9d0ff135d5b1974ce43b5"
+SRC_URI[archive.sha256sum] = "37ce2c16a610c589dcc7660f9092446465568e38e29bce6ed8c24f2e8e0077f3"
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+PACKAGECONFIG = "extensions"
+PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base"
+
+FILES_${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/metainfo \
+ ${datadir}/gnome-shell \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 13/16] geocode-glib: initial add 3.26.1
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (11 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 12/16] nautilus: upgrade 3.18.5 -> 3.34.1 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 22:13 ` Khem Raj
2019-11-14 19:49 ` [PATCH 14/16] libgweather: initial add 3.34.0 Andreas Müller
` (2 subsequent siblings)
15 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
It is a dependency for upcoming gnome-settings-daemon
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../geocode-glib/geocode-glib_3.26.1.bb | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
new file mode 100644
index 000000000..dc218f3a3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
@@ -0,0 +1,20 @@
+SUMMARY = "A convenience library for the geocoding"
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+GNOMEBASEBUILDCLASS = "meson"
+GIR_MESON_OPTION = "enable-introspection"
+GTKDOC_MESON_OPTION = "enable-gtk-doc"
+
+inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even
+
+DEPENDS = " \
+ json-glib \
+ libsoup-2.4 \
+"
+
+SRC_URI[archive.md5sum] = "21094494e66c86368add6a55bf480049"
+SRC_URI[archive.sha256sum] = "5baa6ab76a76c9fc567e4c32c3af2cd1d1784934c255bc5a62c512e6af6bde1c"
+
+EXTRA_OEMESON = "-Denable-installed-tests=false"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 14/16] libgweather: initial add 3.34.0
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (12 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 13/16] geocode-glib: initial add 3.26.1 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 19:49 ` [PATCH 15/16] libwacom: initial add 0.33 Andreas Müller
2019-11-14 19:49 ` [PATCH 16/16] gnome-settings-daemon: initial add 3.34.1 Andreas Müller
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
It is a dependency for upcoming gnome-settings-daemon
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../libgweather/libgweather_3.34.0.bb | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb
new file mode 100644
index 000000000..2d31be08d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "A library to access weather information from online services"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gobject-introspection gettext gtk-doc vala distro_features_check
+
+SRC_URI[archive.md5sum] = "52c3b1e27887fc88f862c92c42d930c1"
+SRC_URI[archive.sha256sum] = "02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+DEPENDS = " \
+ gtk+3 \
+ json-glib \
+ libsoup-2.4 \
+ geocode-glib \
+"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 15/16] libwacom: initial add 0.33
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (13 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 14/16] libgweather: initial add 3.34.0 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
2019-11-14 21:39 ` Khem Raj
2019-11-14 19:49 ` [PATCH 16/16] gnome-settings-daemon: initial add 3.34.1 Andreas Müller
15 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
* it is a dependency for upcoming gnome-settings-daemon
* there are later versions of libwacom availabvle but due to genaration of
udev-rule at build time these versions open nasty native dependencies:
libgudev-native -> udev-native
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../recipes-support/libwacom/libwacom_0.33.bb | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
diff --git a/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
new file mode 100644
index 000000000..6fb3b82ef
--- /dev/null
+++ b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
@@ -0,0 +1,14 @@
+SUMMARY = "A tablet description library"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
+
+DEPENDS = " \
+ libxml2-native \
+ libgudev \
+"
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/linuxwacom/libwacom.git"
+SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658"
+S = "${WORKDIR}/git"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 16/16] gnome-settings-daemon: initial add 3.34.1
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
` (14 preceding siblings ...)
2019-11-14 19:49 ` [PATCH 15/16] libwacom: initial add 0.33 Andreas Müller
@ 2019-11-14 19:49 ` Andreas Müller
15 siblings, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 19:49 UTC (permalink / raw)
To: openembedded-devel
It is a dependency for upcoming mutter
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../gnome-settings-daemon_3.34.1.bb | 59 +++++++++++++++++++
1 file changed, 59 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb
new file mode 100644
index 000000000..d6af7a72e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.1.bb
@@ -0,0 +1,59 @@
+SUMMARY = "Window navigation construction toolkit"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gobject-introspection gettext distro_features_check upstream-version-is-even
+
+SRC_URI[archive.md5sum] = "528b0b7cc2dd22c6026a9c8739c71fa7"
+SRC_URI[archive.sha256sum] = "7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337"
+
+DEPENDS = " \
+ colord \
+ geocode-glib \
+ gcr \
+ gnome-desktop3 \
+ libgweather \
+ lcms \
+ libcanberra \
+ geoclue \
+ libnotify \
+ upower \
+ libwacom \
+ virtual/libx11 \
+"
+
+# all these are mandatory
+REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+SRC_URI[archive.md5sum] = "cdd0d0c8664056deb78aa40c88ec24d1"
+SRC_URI[archive.sha256sum] = "9981a20babf8da7744b7fbe175b9e36078bf08f3bf65fe5aedeb82cfe27ac11f"
+
+# allow cross build mixed with build of native tools
+do_write_config_append() {
+ cat >${WORKDIR}/meson.native <<EOF
+[binaries]
+pkgconfig = 'pkg-config-native'
+EOF
+}
+EXTRA_OEMESON = "--native-file ${WORKDIR}/meson.native"
+
+PACKAGECONFIG ??= " \
+ cups nm \
+ alsa gudev \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
+"
+PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib"
+PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups"
+PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev"
+PACKAGECONFIG[nm] = "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager"
+PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland"
+
+FILES_${PN} += " \
+ ${systemd_user_unitdir} \
+ ${libdir}/gnome-settings-daemon-3.0/libgsd.so \
+"
+
+RDEPEND_${PN} += "gdbus"
--
2.21.0
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH 15/16] libwacom: initial add 0.33
2019-11-14 19:49 ` [PATCH 15/16] libwacom: initial add 0.33 Andreas Müller
@ 2019-11-14 21:39 ` Khem Raj
2019-11-14 22:50 ` Andreas Müller
2019-11-14 23:51 ` Adrian Bunk
0 siblings, 2 replies; 31+ messages in thread
From: Khem Raj @ 2019-11-14 21:39 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * it is a dependency for upcoming gnome-settings-daemon
> * there are later versions of libwacom availabvle but due to genaration of
> udev-rule at build time these versions open nasty native dependencies:
> libgudev-native -> udev-native
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../recipes-support/libwacom/libwacom_0.33.bb | 14 ++++++++++++++
the latest release is 1.1, any specific reasons to not use that ?
> 1 file changed, 14 insertions(+)
> create mode 100644 meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
>
> diff --git a/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
> new file mode 100644
> index 000000000..6fb3b82ef
> --- /dev/null
> +++ b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
> @@ -0,0 +1,14 @@
> +SUMMARY = "A tablet description library"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
> +
> +DEPENDS = " \
> + libxml2-native \
> + libgudev \
> +"
> +
> +inherit autotools pkgconfig
> +
> +SRC_URI = "git://github.com/linuxwacom/libwacom.git"
> +SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658"
> +S = "${WORKDIR}/git"
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework
2019-11-14 19:49 ` [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework Andreas Müller
@ 2019-11-14 22:10 ` Khem Raj
2019-11-14 22:38 ` Andreas Müller
0 siblings, 1 reply; 31+ messages in thread
From: Khem Raj @ 2019-11-14 22:10 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:50 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * a native variant had to be introduced for code-generator tools
> * gobject-introspection builds theoretically :) Unfortunataelly qemu runs
> with 100% CPU load and never returns -> disable introspection for now
> * add PACKAGECONFIGs for new dependencies - disabled by default
> * give up fine grained packaging: It was broken over the years completely
> and nobody seemed to take care.
> * ICU-patch does not apply anymore and it seems upstream has fixed issues
> with ICU
> * add upstream-version-is-even to inherit
> * rename folder containing recipe
> * get rid of gconf dependency
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...for-address-localization-when-LC_ADD.patch | 33 -----
> ...-to-LDFLAGS-when-linking-libphonenum.patch | 36 ------
> ...ntrispection-support-to-work-with-OE.patch | 75 ------------
> .../eds/evolution-data-server_3.32.4.bb | 113 ------------------
> .../evolution-data-server-native.bb | 23 ++++
> .../evolution-data-server.bb | 70 +++++++++++
> .../evolution-data-server.inc | 15 +++
> ...keLists.txt-Remove-TRY_RUN-for-iconv.patch | 28 +++--
> ...txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 0
> ...the-Novell-sample-contact-with-somet.patch | 0
> .../0004-call-native-helpers.patch} | 33 +++--
> .../evolution-data-server/iconv-detect.h | 0
> 12 files changed, 137 insertions(+), 289 deletions(-)
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
this patch was needed for musl build, and it was marked not upstream
worthy, so I wonder
if we drop it then will it fail musl build.
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
> delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
> create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
> create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
> create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
> rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (60%)
> rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
> rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
> rename meta-gnome/recipes-gnome/{eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch => evolution-data-server/evolution-data-server/0004-call-native-helpers.patch} (52%)
> rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)
>
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
> deleted file mode 100644
> index 55ab5a7fc..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 95425206e7317e59b7ca06d7f838ad357cdd200c Mon Sep 17 00:00:00 2001
> -From: Piotr Tworek <tworaz@tworaz.net>
> -Date: Wed, 14 Aug 2019 00:31:54 +0200
> -Subject: [PATCH 5/7] Use LC_MESSAGES for address localization when LC_ADDRESS
> - is not available.
> -
> -Musl does not define LC_ADDRESS unfortunately.
> -
> -Upstream-Status: Inappropriate [musl specific]
> -
> -Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
> ----
> - src/addressbook/libebook-contacts/e-phone-number-private.cpp | 4 ++++
> - 1 file changed, 4 insertions(+)
> -
> -diff --git a/src/addressbook/libebook-contacts/e-phone-number-private.cpp b/src/addressbook/libebook-contacts/e-phone-number-private.cpp
> -index 4c5aebb..9abcebd 100644
> ---- a/src/addressbook/libebook-contacts/e-phone-number-private.cpp
> -+++ b/src/addressbook/libebook-contacts/e-phone-number-private.cpp
> -@@ -36,6 +36,10 @@
> - #include <phonenumbers/logger.h>
> - #include <phonenumbers/phonenumberutil.h>
> -
> -+#ifndef LC_ADDRESS
> -+#define LC_ADDRESS LC_MESSAGES
> -+#endif
> -+
> - using i18n::phonenumbers::PhoneNumber;
> - using i18n::phonenumbers::PhoneNumberUtil;
> -
> ---
> -2.21.0
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
> deleted file mode 100644
> index c0c1427fd..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From fb9164bbca5b425f1cf1bb3cac51d06afe81938a Mon Sep 17 00:00:00 2001
> -From: Piotr Tworek <tworaz@tworaz.net>
> -Date: Wed, 14 Aug 2019 00:47:59 +0200
> -Subject: [PATCH 6/7] Dont add /usr/lib to LDFLAGS when linking libphonenumber.
> -
> -This will refer to host lib dir which is not what we want.
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
> ----
> - cmake/modules/FindPhonenumber.cmake | 6 ++----
> - 1 file changed, 2 insertions(+), 4 deletions(-)
> -
> -diff --git a/cmake/modules/FindPhonenumber.cmake b/cmake/modules/FindPhonenumber.cmake
> -index 04d1056..70c0c41 100644
> ---- a/cmake/modules/FindPhonenumber.cmake
> -+++ b/cmake/modules/FindPhonenumber.cmake
> -@@ -37,12 +37,10 @@ string(TOUPPER "${WITH_PHONENUMBER}" optupper)
> - if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
> - set(WITH_PHONENUMBER "ON")
> - set(PHONENUMBER_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}")
> -- set(PHONENUMBER_LIB_DIRS ${LIB_INSTALL_DIR})
> -- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS})
> -+ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS})
> - else(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
> - set(PHONENUMBER_INCLUDE_DIRS "${WITH_PHONENUMBER}/include")
> -- set(PHONENUMBER_LIB_DIRS ${WITH_PHONENUMBER}/lib${LIB_SUFFIX})
> -- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS})
> -+ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS})
> - endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
> -
> - unset(bindirlen)
> ---
> -2.21.0
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
> deleted file mode 100644
> index c00082a2c..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch
> +++ /dev/null
> @@ -1,75 +0,0 @@
> -From d84f4fd68441e934b37be2a6917abad52c5d1bda Mon Sep 17 00:00:00 2001
> -From: Piotr Tworek <tworaz@tworaz.net>
> -Date: Fri, 16 Aug 2019 21:22:16 +0200
> -Subject: [PATCH 7/7] Modify gobject-intrispection support to work with OE.
> -
> -1. Use tools provided by the recipe sysroot instread of host ones.
> -2. Make sure all the required dirs make it into g-ir-scanner via
> - LDFLAGS.
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
> ----
> - cmake/modules/GObjectIntrospection.cmake | 12 ++++++++++--
> - 1 file changed, 10 insertions(+), 2 deletions(-)
> -
> -diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
> -index 5be5042..67c035a 100644
> ---- a/cmake/modules/GObjectIntrospection.cmake
> -+++ b/cmake/modules/GObjectIntrospection.cmake
> -@@ -20,6 +20,9 @@ if(ENABLE_INTROSPECTION)
> - pkg_check_variable(G_IR_SCANNER gobject-introspection-1.0 g_ir_scanner)
> - pkg_check_variable(G_IR_COMPILER gobject-introspection-1.0 g_ir_compiler)
> -
> -+ string(CONCAT G_IR_SCANNER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_SCANNER}")
> -+ string(CONCAT G_IR_COMPILER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_COMPILER}")
> -+
> - if(NOT G_IR_SCANNER)
> - message(FATAL_ERROR "g-ir-scanner not provided by gobject-introspection-1.0, you can disable GObject introspection by -DENABLE_INTROSPECTION=OFF")
> - endif(NOT G_IR_SCANNER)
> -@@ -116,7 +119,7 @@ macro(gir_add_introspection gir)
> - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
> -
> - add_custom_command(
> -- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
> -+ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=${INTROSPECTION_SCANNER_LDFLAGS}
> - ${INTROSPECTION_SCANNER_ENV}
> - ${G_IR_SCANNER}
> - ${INTROSPECTION_SCANNER_ARGS}
> -@@ -186,6 +189,7 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
> - unset(INTROSPECTION_SCANNER_ARGS)
> - unset(INTROSPECTION_SCANNER_ENV)
> - unset(INTROSPECTION_COMPILER_ARGS)
> -+ unset(INTROSPECTION_SCANNER_LDFLAGS)
> -
> - set(${gir_vars_prefix} ${gir_library})
> - set(${gir_vars_prefix}_SCANNERFLAGS "--warn-all")
> -@@ -223,12 +227,12 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
> - --add-include-path=${CMAKE_CURRENT_SOURCE_DIR}
> - --library-path=${CMAKE_BINARY_DIR}
> - --library-path=${CMAKE_BINARY_DIR}/src
> -+ --library-path=${CMAKE_BINARY_DIR}/src/private
> - --library-path=${CMAKE_CURRENT_BINARY_DIR}
> - ${_gir_extra_libdirs}
> - ${_gir_identifies_prefixes}
> - ${_gir_deps}
> - --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0
> -- --library-path=${LIB_INSTALL_DIR}
> - ${_extra_library_path}
> - --pkg-export ${pkg_export_prefix}-${gir_library_version}
> - --c-include=${c_include}
> -@@ -279,6 +283,10 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
> - )
> - endif(UNIX)
> -
> -+ _gir_list_prefix(_gir_scanner_ldflags ${gir_extra_libdirs_var} "-Wl,-rpath-link=")
> -+ string(REPLACE ";" " " _gir_scanner_ldflags "${_gir_scanner_ldflags}")
> -+ set(INTROSPECTION_SCANNER_LDFLAGS "${_gir_scanner_ldflags}")
> -+
> - set(INTROSPECTION_SCANNER_ENV
> - ${_loader_library_path_var}="${_extra_loader_library_path_native}"
> - )
> ---
> -2.21.0
> -
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
> deleted file mode 100644
> index b4174cbb0..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb
> +++ /dev/null
> @@ -1,113 +0,0 @@
> -SUMMARY = "Evolution database backend server"
> -HOMEPAGE = "http://www.gnome.org/projects/evolution/"
> -BUGTRACKER = "https://bugzilla.gnome.org/"
> -
> -LICENSE = "LGPLv2 & LGPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
> - 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-native \
> - glib-2.0 gtk+3 libgnome-keyring libgdata libcanberra icu \
> - dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
> -"
> -
> -inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative upstream-version-is-even vala
> -
> -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://0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch \
> - file://0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch \
> - file://0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch \
> - file://0007-Modify-gobject-intrispection-support-to-work-with-OE.patch \
> - file://iconv-detect.h \
> - "
> -SRC_URI[archive.md5sum] = "57820f3f88fc554e1a58665a52e12c05"
> -SRC_URI[archive.sha256sum] = "83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f"
> -
> -LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
> -LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
> -
> -EXTRA_OECMAKE = " \
> - -D${LKSTRFTIME} \
> - -DSYSCONF_INSTALL_DIR=${sysconfdir} \
> - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
> -"
> -
> -PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection', '', d)}"
> -PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
> -PACKAGECONFIG[oauth2] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,json-glib webkitgtk"
> -PACKAGECONFIG[mitkrb5] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
> -PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
> -PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather"
> -PACKAGECONFIG[phonenumber] = "-DWITH_PHONENUMBER=ON,-DWITH_PHONENUMBER=OFF,libphonenumber"
> -PACKAGECONFIG[introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF"
> -PACKAGECONFIG[vala] = "-DENABLE_VALA_BINDINGS=ON -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen,-DENABLE_VALA_BINDINGS=OFF"
> -
> -# -ldb needs this on some platforms
> -LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
> -
> -do_configure_append () {
> - 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() {
> - # CMake does not support building native binaries when cross compiling. As result
> - # it always cross compiles them for the target and then aborts when they fail to run.
> - # To work around this manually build required tools and patch cmake targets to use
> - # those native binaries we built here.
> - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} ${S}/src/camel/camel-gen-tables.c \
> - -o ${B}/src/camel/camel-gen-tables-native
> - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} $(pkg-config-native --cflags glib-2.0) \
> - ${S}/src/addressbook/libebook-contacts/gen-western-table.c \
> - -o ${B}/src/addressbook/libebook-contacts/gen-western-table-native \
> - $(pkg-config-native --libs glib-2.0)
> -}
> -
> -
> -PACKAGES =+ "libebook-contacts libebook-contacts-dev \
> - 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} =+ "${systemd_user_unitdir} \
> - ${datadir}/dbus-1 \
> - ${datadir}/evolution-data-server-*/ui/"
> -RDEPENDS_${PN} += "perl"
> -
> -FILES_libcamel = "${libdir}/libcamel-*.so.* \
> - ${libdir}/libcamel-provider-*.so.* \
> - ${libdir}/girepository-*/Camel-*.typelib \
> - ${libdir}/evolution-data-server*/camel-providers/*.so \
> - ${libdir}/evolution-data-server*/camel-providers/*.urls"
> -FILES_libebook = "${libdir}/libebook-*.so.* \
> - ${libdir}/girepository-*/EBook-*.typelib"
> -RRECOMMENDS_libebook = "libedata-book"
> -
> -FILES_libebook-contacts = "${libdir}/libebook-contacts-*.so.* \
> - ${libdir}/girepository-*/EBookContacts-*.typelib"
> -
> -FILES_libecal = "${libdir}/libecal-*.so.*"
> -RRECOMMENDS_libecal = "libedata-cal tzdata"
> -
> -FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
> - ${datadir}/dbus-1/services/*.AddressBook.service \
> - ${libdir}/libedata-book-*.so.* \
> - ${libdir}/evolution-data-server-*/extensions/libebook*.so"
> -
> -FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
> - ${datadir}/dbus-1/services/*.Calendar.service \
> - ${libdir}/libedata-cal-*.so.* \
> - ${libdir}/evolution-data-server-*/extensions/libecal*.so"
> -
> -FILES_libedataserver = "${libdir}/libedataserver-*.so.* \
> - ${libdir}/girepository-*/EDataServer-*.typelib"
> -
> -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*"
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
> new file mode 100644
> index 000000000..681a61c33
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
> @@ -0,0 +1,23 @@
> +require ${BPN}.inc
> +
> +inherit native
> +
> +DEPENDS = "glib-2.0-native"
> +
> +# build native helpers
> +do_compile() {
> + cd ${S}/src/camel
> + sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c
> + ${CC} -o ${B}/camel-gen-tables camel-gen-tables.c ${CFLAGS} ${LDFLAGS}
> +
> + LDFLAGS_glib=`pkg-config glib-2.0 --libs`
> + CFLAGS_glib=`pkg-config glib-2.0 --cflags`
> + cd ${S}/src/addressbook/libebook-contacts
> + sed -i 's:#include "evolution-data-server-config.h"::g' gen-western-table.c
> + ${CC} -o ${B}/gen-western-table gen-western-table.c ${CFLAGS} ${CFLAGS_glib} ${LDFLAGS} ${LDFLAGS_glib}
> +}
> +
> +do_install() {
> + install -d ${D}${bindir}
> + install -m 755 ${B}/* ${D}${bindir}
> +}
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
> new file mode 100644
> index 000000000..a8bb69f00
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
> @@ -0,0 +1,70 @@
> +require ${BPN}.inc
> +
> +DEPENDS = " \
> + ${BPN}-native intltool-native gperf-native \
> + glib-2.0 gtk+3 libgdata \
> + dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
> +"
> +
> +inherit distro_features_check cmake gtk-doc gettext gobject-introspection perlnative pythonnative
> +
> +REQUIRED_DISTRO_FEATURES = "x11"
> +
> +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://0004-call-native-helpers.patch \
> + file://iconv-detect.h \
> +"
> +
> +LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
> +LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
> +
> +# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now
> +GI_DATA_ENABLED="False"
> +
> +EXTRA_OECMAKE = " \
> + -DSYSCONF_INSTALL_DIR=${sysconfdir} \
> + -DWITH_KRB5=OFF \
> + -DENABLE_GOA=OFF \
> + -DENABLE_UOA=OFF \
> + -DENABLE_GOOGLE_AUTH=OFF \
> + -DENABLE_WEATHER=OFF \
> + -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \
> + -D${LKSTRFTIME} \
> + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
> +"
> +
> +PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
> +PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
> +
> +# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
> +# searching for openldap-libs
> +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
> +
> +# -ldb needs this on some platforms
> +LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
> +
> +do_configure_append () {
> + 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
> +
> + # fix abs path for g-ir-scanner-wrapper
> + sed -i ${B}/build.ninja \
> + -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g'
> +}
> +
> +do_compile_prepend() {
> + export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
> +}
> +
> +FILES_${PN} =+ " \
> + ${datadir}/dbus-1 \
> + ${datadir}/evolution-data-server-*/ui/ \
> + ${systemd_user_unitdir} \
> +"
> +
> +RDEPENDS_${PN} += "perl"
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
> new file mode 100644
> index 000000000..2e5176ce7
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
> @@ -0,0 +1,15 @@
> +SUMMARY = "Evolution database backend server"
> +HOMEPAGE = "http://www.gnome.org/projects/evolution/"
> +BUGTRACKER = "https://bugzilla.gnome.org/"
> +
> +LICENSE = "LGPLv2 & LGPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
> + file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
> + file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543"
> +
> +inherit gnomebase
> +
> +SRC_URI[archive.md5sum] = "d1701875bbac80d6d62e9acfc6c43bea"
> +SRC_URI[archive.sha256sum] = "6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe"
> +PV = "3.34.1"
> +
> 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/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> similarity index 60%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> index cc9dca4ea..e8c6d6a76 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> @@ -1,7 +1,7 @@
> -From e32075119803f9fffbba01a31083e416cb213011 Mon Sep 17 00:00:00 2001
> +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 1/7] CMakeLists.txt: Remove TRY_RUN for iconv
> +Date: Sun, 31 Mar 2019 18:11:55 +0200
> +Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> @@ -13,22 +13,24 @@ Upstream-Status: Inappropriate [OE specific]
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> - CMakeLists.txt | 6 ------
> - 1 file changed, 6 deletions(-)
> + CMakeLists.txt | 11 -----------
> + 1 file changed, 11 deletions(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index f9d72db..ed99904 100644
> +index 1672daf..0b3e4e0 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> -@@ -526,15 +526,9 @@ endif(NOT HAVE_ICONV)
> +@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
> + message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
> + endif(NOT HAVE_ICONV)
>
> - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
> - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
> +-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
> +-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
> -CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\"
> - #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
> - unset(_binary_dir_with_separator)
> - unset(CMAKE_REQUIRED_LIBRARIES)
> -
> +-unset(_binary_dir_with_separator)
> +-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)
> @@ -37,5 +39,5 @@ index f9d72db..ed99904 100644
> # Backtraces for debugging
> # ******************************
> --
> -2.21.0
> +2.20.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/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> similarity index 100%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> similarity index 100%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
> similarity index 52%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
> index 67023df2c..e320f6342 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
> @@ -1,26 +1,21 @@
> -From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001
> -From: Piotr Tworek <tworaz@tworaz.net>
> -Date: Mon, 12 Aug 2019 14:13:52 +0200
> -Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during
> - build process.
> +From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 31 Mar 2019 19:11:31 +0200
> +Subject: [PATCH] call native helpers
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
>
> -CMake can't build tools for the host system when cross compiling. As
> -result eds currently fails to build in OE due to some programs being
> -cross compiled for the target and run on the host. To work around this
> -limitation modify existing targets using build time generated binaries
> -to invoke binaries suffixed with -native. We can inject such binaries
> -into expected locations prior to invoking ninja in do_compile.
> +Upstream-Status: Inappropriate[oe-specific]
>
> -Upstream-Status: Inappropriate [OE specific]
> -
> -Signed-off-by: Piotr Tworek <tworaz@tworaz.net>
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> src/addressbook/libebook-contacts/CMakeLists.txt | 2 +-
> src/camel/CMakeLists.txt | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
> -index e9e3259..2ae72a8 100644
> +index e9e3259..e749d1b 100644
> --- a/src/addressbook/libebook-contacts/CMakeLists.txt
> +++ b/src/addressbook/libebook-contacts/CMakeLists.txt
> @@ -25,7 +25,7 @@ target_link_libraries(gen-western-table
> @@ -28,12 +23,12 @@ index e9e3259..2ae72a8 100644
> add_custom_command(
> OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> -+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table-native "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> ++ COMMAND gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> DEPENDS gen-western-table e-name-western-tables.h.in
> )
>
> diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
> -index be626a8..9226b2b 100644
> +index be626a8..14ac8b8 100644
> --- a/src/camel/CMakeLists.txt
> +++ b/src/camel/CMakeLists.txt
> @@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC
> @@ -41,10 +36,10 @@ index be626a8..9226b2b 100644
> add_custom_command(
> OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> -+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> ++ COMMAND camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> DEPENDS camel-gen-tables
> )
>
> --
> -2.21.0
> +2.20.1
>
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
> similarity index 100%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 13/16] geocode-glib: initial add 3.26.1
2019-11-14 19:49 ` [PATCH 13/16] geocode-glib: initial add 3.26.1 Andreas Müller
@ 2019-11-14 22:13 ` Khem Raj
2019-11-14 22:51 ` Andreas Müller
0 siblings, 1 reply; 31+ messages in thread
From: Khem Raj @ 2019-11-14 22:13 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> It is a dependency for upcoming gnome-settings-daemon
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../geocode-glib/geocode-glib_3.26.1.bb | 20 +++++++++++++++++++
> 1 file changed, 20 insertions(+)
> create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
>
> diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> new file mode 100644
> index 000000000..dc218f3a3
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> @@ -0,0 +1,20 @@
> +SUMMARY = "A convenience library for the geocoding"
> +
> +LICENSE = "LGPLv2"
still at 2.0 and not 2.1 interesting.
> +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
> +
> +GNOMEBASEBUILDCLASS = "meson"
> +GIR_MESON_OPTION = "enable-introspection"
> +GTKDOC_MESON_OPTION = "enable-gtk-doc"
> +
> +inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even
> +
> +DEPENDS = " \
> + json-glib \
> + libsoup-2.4 \
> +"
> +
> +SRC_URI[archive.md5sum] = "21094494e66c86368add6a55bf480049"
> +SRC_URI[archive.sha256sum] = "5baa6ab76a76c9fc567e4c32c3af2cd1d1784934c255bc5a62c512e6af6bde1c"
> +
> +EXTRA_OEMESON = "-Denable-installed-tests=false"
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework
2019-11-14 22:10 ` Khem Raj
@ 2019-11-14 22:38 ` Andreas Müller
2019-11-14 22:44 ` Khem Raj
0 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 22:38 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:10 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> this patch was needed for musl build, and it was marked not upstream
> worthy, so I wonder
> if we drop it then will it fail musl build.
Thanks for review
Honestly: I don't remember exactly - base of this patch was May this year...
But I think musl-patch did not apply any more and at that time I was a
good boy and tested musl (and in case I am still :)...
Whatever - could you give autobuilder a try because the story is
simple: A 'it works for me' is not enough. In case of fallout: I'll
take care - remember gnome related dances we had recently...
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 05/16] gnome-terminal: re-add 3.34.2
2019-11-14 19:49 ` [PATCH 05/16] gnome-terminal: re-add 3.34.2 Andreas Müller
@ 2019-11-14 22:42 ` Khem Raj
2019-11-14 22:53 ` Andreas Müller
0 siblings, 1 reply; 31+ messages in thread
From: Khem Raj @ 2019-11-14 22:42 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
This fails on musl
https://errors.yoctoproject.org/Errors/Details/275786/
perhaps a patch proposed here will help us ?
https://gitlab.gnome.org/GNOME/vte/issues/72
On Thu, Nov 14, 2019 at 11:50 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> .../gnome-terminal/gnome-terminal_3.34.2.bb | 36 +++++++++++++++++++
> 1 file changed, 36 insertions(+)
> create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
>
> diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
> new file mode 100644
> index 000000000..d688176d5
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
> @@ -0,0 +1,36 @@
> +SUMMARY = "GNOME terminal"
> +LICENSE = "GPLv3 & GFDL-1.3"
> +LIC_FILES_CHKSUM = " \
> + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
> + file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
> +"
> +
> +inherit gnomebase gnome-help gettext itstool upstream-version-is-even
> +
> +DEPENDS = " \
> + glib-2.0-native \
> + intltool-native \
> + yelp-tools-native \
> + desktop-file-utils-native \
> + gtk+3 \
> + gsettings-desktop-schemas \
> + vte \
> + dconf \
> + libpcre2 \
> +"
> +
> +SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16"
> +SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d"
> +
> +EXTRA_OECONF += " \
> + --disable-search-provider \
> + --without-nautilus-extension \
> +"
> +
> +FILES_${PN} += " \
> + ${datadir}/metainfo \
> + ${datadir}/dbus-1 \
> + ${systemd_user_unitdir} \
> +"
> +
> +RRECOMMENDS_${PN} += "vte-prompt gsettings-desktop-schemas"
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework
2019-11-14 22:38 ` Andreas Müller
@ 2019-11-14 22:44 ` Khem Raj
0 siblings, 0 replies; 31+ messages in thread
From: Khem Raj @ 2019-11-14 22:44 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 2:38 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Nov 14, 2019 at 11:10 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > this patch was needed for musl build, and it was marked not upstream
> > worthy, so I wonder
> > if we drop it then will it fail musl build.
> Thanks for review
>
> Honestly: I don't remember exactly - base of this patch was May this year...
>
> But I think musl-patch did not apply any more and at that time I was a
> good boy and tested musl (and in case I am still :)...
>
> Whatever - could you give autobuilder a try because the story is
> simple: A 'it works for me' is not enough. In case of fallout: I'll
> take care - remember gnome related dances we had recently...
>
No problems, I am patient, and thanks for GNOME 3 recipe
contributions, I can then use gnome3 images instead of xfce for my
tests.
> Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 15/16] libwacom: initial add 0.33
2019-11-14 21:39 ` Khem Raj
@ 2019-11-14 22:50 ` Andreas Müller
2019-11-14 23:51 ` Adrian Bunk
1 sibling, 0 replies; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 22:50 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 10:39 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > * it is a dependency for upcoming gnome-settings-daemon
> > * there are later versions of libwacom availabvle but due to genaration of
> > udev-rule at build time these versions open nasty native dependencies:
> > libgudev-native -> udev-native
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> > .../recipes-support/libwacom/libwacom_0.33.bb | 14 ++++++++++++++
>
> the latest release is 1.1, any specific reasons to not use that ?
Same: long time ago: The only thing I remember is that libwacom was
not my friend exactly (anybody out there with wacom devices - gnome
seems to rely on them..)
Will look into and why I chose to use old version. Maybe there is a
chance to disable wacom in gnome-settings-daemon these days so we
don't need it at all..
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 13/16] geocode-glib: initial add 3.26.1
2019-11-14 22:13 ` Khem Raj
@ 2019-11-14 22:51 ` Andreas Müller
2019-11-17 15:17 ` Andreas Müller
0 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 22:51 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:13 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > It is a dependency for upcoming gnome-settings-daemon
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> > .../geocode-glib/geocode-glib_3.26.1.bb | 20 +++++++++++++++++++
> > 1 file changed, 20 insertions(+)
> > create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> >
> > diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> > new file mode 100644
> > index 000000000..dc218f3a3
> > --- /dev/null
> > +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> > @@ -0,0 +1,20 @@
> > +SUMMARY = "A convenience library for the geocoding"
> > +
> > +LICENSE = "LGPLv2"
>
> still at 2.0 and not 2.1 interesting.
will check
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 05/16] gnome-terminal: re-add 3.34.2
2019-11-14 22:42 ` Khem Raj
@ 2019-11-14 22:53 ` Andreas Müller
2019-11-14 22:54 ` Khem Raj
0 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-14 22:53 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:43 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> This fails on musl
>
> https://errors.yoctoproject.org/Errors/Details/275786/
>
> perhaps a patch proposed here will help us ?
> https://gitlab.gnome.org/GNOME/vte/issues/72
Wow that was fast - will look into
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 05/16] gnome-terminal: re-add 3.34.2
2019-11-14 22:53 ` Andreas Müller
@ 2019-11-14 22:54 ` Khem Raj
0 siblings, 0 replies; 31+ messages in thread
From: Khem Raj @ 2019-11-14 22:54 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 2:53 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Nov 14, 2019 at 11:43 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > This fails on musl
> >
> > https://errors.yoctoproject.org/Errors/Details/275786/
> >
> > perhaps a patch proposed here will help us ?
> > https://gitlab.gnome.org/GNOME/vte/issues/72
> Wow that was fast - will look into
>
I have already destroyed one SSD on my home box :)
> Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 15/16] libwacom: initial add 0.33
2019-11-14 21:39 ` Khem Raj
2019-11-14 22:50 ` Andreas Müller
@ 2019-11-14 23:51 ` Adrian Bunk
1 sibling, 0 replies; 31+ messages in thread
From: Adrian Bunk @ 2019-11-14 23:51 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 01:39:01PM -0800, Khem Raj wrote:
> On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > * it is a dependency for upcoming gnome-settings-daemon
> > * there are later versions of libwacom availabvle but due to genaration of
> > udev-rule at build time these versions open nasty native dependencies:
> > libgudev-native -> udev-native
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> > .../recipes-support/libwacom/libwacom_0.33.bb | 14 ++++++++++++++
>
> the latest release is 1.1, any specific reasons to not use that ?
>...
You missed the second bullet point above.
cu
Adrian
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 07/16] evince: upgrade 3.28.2 -> 3.34.1
2019-11-14 19:49 ` [PATCH 07/16] evince: upgrade 3.28.2 -> 3.34.1 Andreas Müller
@ 2019-11-15 15:35 ` Khem Raj
0 siblings, 0 replies; 31+ messages in thread
From: Khem Raj @ 2019-11-15 15:35 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:50 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * remove unnecessary or upstreamed patches
> * add upstream-version-is-even to inherit
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> ...-format-attribute-to-_synctex_malloc.patch | 12 ++--
> .../evince/0001-help-remove-YELP-macro.patch | 24 -------
> ...vDocumentModel-get-type-function-dec.patch | 33 ----------
> ...02-add-a-formatting-attribute-check.patch} | 0
> .../recipes-gnome/evince/evince_3.28.2.bb | 65 -------------------
> .../recipes-gnome/evince/evince_3.34.1.bb | 52 +++++++++++++++
> 6 files changed, 58 insertions(+), 128 deletions(-)
> delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
> delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
> rename meta-gnome/recipes-gnome/evince/evince/{0001-add-a-formatting-attribute-check.patch => 0002-add-a-formatting-attribute-check.patch} (100%)
> delete mode 100644 meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
> create mode 100644 meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
>
> diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
> index de739c5b3..32ca073f9 100644
> --- a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
> +++ b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
> @@ -11,17 +11,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 1 insertion(+)
>
> diff --git a/cut-n-paste/synctex/synctex_parser_utils.c b/cut-n-paste/synctex/synctex_parser_utils.c
> -index f8a9f6f..9459b2d 100644
> +index 08053f0..0519b38 100644
> --- a/cut-n-paste/synctex/synctex_parser_utils.c
> +++ b/cut-n-paste/synctex/synctex_parser_utils.c
> -@@ -78,6 +78,7 @@ void *_synctex_malloc(size_t size) {
> - return (void *)ptr;
> +@@ -136,6 +136,7 @@ int _synctex_log(int level, const char * prompt, const char * reason,va_list arg
> + return result;
> }
this patch needs enahncements since clang build is failing like this
https://errors.yoctoproject.org/Errors/Details/275798/
_synctex_log also needs format attribute like below
I will see if I can fix it here
>
> +__attribute__((__format__ (__printf__, 1, 0)))
> int _synctex_error(const char * reason,...) {
> - va_list arg;
> - int result;
> + va_list arg;
> + int result;
> --
> -2.12.2
> +2.20.1
>
> diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch b/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
> deleted file mode 100644
> index 592f46606..000000000
> --- a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From 40921037d8e7205a3889d529fb4e06f79e1e88b0 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Fri, 19 Feb 2016 16:52:18 +0200
> -Subject: [PATCH] help: remove YELP macro
> -
> -Upstream-Status: Inappropriate [embedded-specific]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - help/Makefile.am | 2 --
> - 1 file changed, 2 deletions(-)
> -
> -diff --git a/help/Makefile.am b/help/Makefile.am
> -index 7835810..37c88ce 100644
> ---- a/help/Makefile.am
> -+++ b/help/Makefile.am
> -@@ -1,5 +1,3 @@
> --@YELP_HELP_RULES@
> --
> - SUBDIRS = reference
> -
> - HELP_ID = evince
> ---
> -2.7.0
> -
> diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch b/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
> deleted file mode 100644
> index dcc4a4e9c..000000000
> --- a/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
> -Date: Fri, 7 Sep 2018 22:34:29 +0200
> -Subject: [PATCH] libview: Remove EvDocumentModel get type function declaration
> -
> -The EvDocumentModel class declares the `ev_document_model_get_type`
> -function as part of the `GObject` boilerplate code.
> -
> -However, this declaration is not necessary and also causes a warning
> -when introspection data file, `EvinceView-3.0.gir`, is generated.
> -
> -Upstream-Status: Applied [1]
> -
> -
> ----
> - libview/ev-document-model.h | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h
> -index 784e27d6..6a99e43a 100644
> ---- a/libview/ev-document-model.h
> -+++ b/libview/ev-document-model.h
> -@@ -54,7 +54,6 @@ typedef enum {
> - EV_PAGE_LAYOUT_AUTOMATIC
> - } EvPageLayout;
> -
> --GType ev_document_model_get_type (void) G_GNUC_CONST;
> - EvDocumentModel *ev_document_model_new (void);
> - EvDocumentModel *ev_document_model_new_with_document (EvDocument *document);
> -
> ---
> -2.20.1
> -
> diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch b/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch
> similarity index 100%
> rename from meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch
> rename to meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch
> diff --git a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
> deleted file mode 100644
> index f45180e79..000000000
> --- a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
> -SECTION = "x11/office"
> -DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native"
> -
> -inherit gnomebase pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd
> -
> -SRC_URI = " \
> - ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> - file://0001-help-remove-YELP-macro.patch \
> - file://0001-Add-format-attribute-to-_synctex_malloc.patch \
> - file://0001-add-a-formatting-attribute-check.patch \
> - file://0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch \
> -"
> -SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3"
> -SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1"
> -
> -EXTRA_OECONF = "--enable-thumbnailer"
> -
> -do_compile_prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs"
> -}
> -
> -
> -do_install_append() {
> - install -d ${D}${datadir}/pixmaps
> - install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
> - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}
> - then
> - install -d ${D}${systemd_unitdir}/system
> - mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service
> - else
> - rm -rf ${D}${libdir}/systemd/user/evince.service
> - fi
> - rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir}
> - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd
> - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}
> -}
> -
> -PACKAGECONFIG ??= ""
> -PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
> -PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin,"
> -
> -SYSTEMD_SERVICE_${PN} = "evince.service"
> -
> -RDEPENDS_${PN} += "glib-2.0-utils"
> -RRECOMMMENDS_${PN} = "adwaita-icon-theme"
> -
> -PACKAGES =+ "${PN}-nautilus-extension"
> -PACKAGES =+ "${PN}-browser-plugin"
> -
> -FILES_${PN} += "${datadir}/dbus-1 \
> - ${datadir}/metainfo \
> - ${datadir}/thumbnailers \
> - ${systemd_unitdir}/systemd/user/evince.service \
> - "
> -FILES_${PN}-dbg += "${libdir}/*/*/.debug \
> - ${libdir}/*/*/*/.debug"
> -FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
> - ${libdir}/evince/*/backends/*.la"
> -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
> - ${libdir}/evince/*/backends/*.a"
> -FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
> -FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
> diff --git a/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb b/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
> new file mode 100644
> index 000000000..6f0392d27
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evince/evince_3.34.1.bb
> @@ -0,0 +1,52 @@
> +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
> +SECTION = "x11/office"
> +DEPENDS = " \
> + gnome-common-native \
> + yelp-tools-native \
> + appstream-glib \
> + gtk+3 \
> + gspell \
> + libsecret \
> + poppler \
> + gstreamer1.0-plugins-base \
> + orc \
> + adwaita-icon-theme \
> + ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \
> +"
> +
> +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext distro_features_check
> +
> +SRC_URI[archive.md5sum] = "77b38b625008f5940e9bd4b3d38e8cf8"
> +SRC_URI[archive.sha256sum] = "85e407cde396147b249120d816c7715fb6df191ca561cf65ff3554a5d67626df"
> +SRC_URI += " \
> + file://0001-Add-format-attribute-to-_synctex_malloc.patch \
> + file://0002-add-a-formatting-attribute-check.patch \
> +"
> +
> +EXTRA_OECONF = " \
> + --enable-thumbnailer \
> + --without-systemduserunitdir \
> +"
> +
> +do_compile_prepend() {
> + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs"
> +}
> +
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
> +PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin,"
> +
> +RDEPENDS_${PN} += "glib-2.0-utils"
> +RRECOMMMENDS_${PN} = "adwaita-icon-theme"
> +
> +PACKAGES =+ "${PN}-nautilus-extension"
> +PACKAGES =+ "${PN}-browser-plugin"
> +
> +FILES_${PN} += "${datadir}/dbus-1 \
> + ${datadir}/metainfo \
> + ${datadir}/thumbnailers \
> +"
> +FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
> +FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 13/16] geocode-glib: initial add 3.26.1
2019-11-14 22:51 ` Andreas Müller
@ 2019-11-17 15:17 ` Andreas Müller
2019-11-17 18:16 ` Khem Raj
0 siblings, 1 reply; 31+ messages in thread
From: Andreas Müller @ 2019-11-17 15:17 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Nov 14, 2019 at 11:51 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Nov 14, 2019 at 11:13 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
> > >
> > > It is a dependency for upcoming gnome-settings-daemon
> > >
> > > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > > ---
> > > .../geocode-glib/geocode-glib_3.26.1.bb | 20 +++++++++++++++++++
> > > 1 file changed, 20 insertions(+)
> > > create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> > >
> > > diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> > > new file mode 100644
> > > index 000000000..dc218f3a3
> > > --- /dev/null
> > > +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> > > @@ -0,0 +1,20 @@
> > > +SUMMARY = "A convenience library for the geocoding"
> > > +
> > > +LICENSE = "LGPLv2"
> >
> > still at 2.0 and not 2.1 interesting.
>
> will check
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
That is LGPLv2 - right?
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 13/16] geocode-glib: initial add 3.26.1
2019-11-17 15:17 ` Andreas Müller
@ 2019-11-17 18:16 ` Khem Raj
0 siblings, 0 replies; 31+ messages in thread
From: Khem Raj @ 2019-11-17 18:16 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembeded-devel
On Sun, Nov 17, 2019 at 7:18 AM Andreas Müller <schnitzeltony@gmail.com>
wrote:
> On Thu, Nov 14, 2019 at 11:51 PM Andreas Müller <schnitzeltony@gmail.com>
> wrote:
> >
> > On Thu, Nov 14, 2019 at 11:13 PM Khem Raj <raj.khem@gmail.com> wrote:
> > >
> > > On Thu, Nov 14, 2019 at 11:51 AM Andreas Müller <
> schnitzeltony@gmail.com> wrote:
> > > >
> > > > It is a dependency for upcoming gnome-settings-daemon
> > > >
> > > > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > > > ---
> > > > .../geocode-glib/geocode-glib_3.26.1.bb | 20
> +++++++++++++++++++
> > > > 1 file changed, 20 insertions(+)
> > > > create mode 100644 meta-gnome/recipes-gnome/geocode-glib/
> geocode-glib_3.26.1.bb
> > > >
> > > > diff --git a/meta-gnome/recipes-gnome/geocode-glib/
> geocode-glib_3.26.1.bb b/meta-gnome/recipes-gnome/geocode-glib/
> geocode-glib_3.26.1.bb
> > > > new file mode 100644
> > > > index 000000000..dc218f3a3
> > > > --- /dev/null
> > > > +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
> > > > @@ -0,0 +1,20 @@
> > > > +SUMMARY = "A convenience library for the geocoding"
> > > > +
> > > > +LICENSE = "LGPLv2"
> > >
> > > still at 2.0 and not 2.1 interesting.
> >
> > will check
> GNU LIBRARY GENERAL PUBLIC LICENSE
> Version 2, June 1991
>
> That is LGPLv2 - right?
Yes
>
> Andreas
>
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2019-11-17 18:16 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-14 19:49 [PATCH 00/16] Next gnome batch Andreas Müller
2019-11-14 19:49 ` [PATCH 01/16] gedit: upgrade 2.30.4 -> 3.34.0 Andreas Müller
2019-11-14 19:49 ` [PATCH 02/16] gtksourceview2: remove Andreas Müller
2019-11-14 19:49 ` [PATCH 03/16] evolution-data-server: give up fine grained -dev/-dbg packages Andreas Müller
2019-11-14 19:49 ` [PATCH 04/16] evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework Andreas Müller
2019-11-14 22:10 ` Khem Raj
2019-11-14 22:38 ` Andreas Müller
2019-11-14 22:44 ` Khem Raj
2019-11-14 19:49 ` [PATCH 05/16] gnome-terminal: re-add 3.34.2 Andreas Müller
2019-11-14 22:42 ` Khem Raj
2019-11-14 22:53 ` Andreas Müller
2019-11-14 22:54 ` Khem Raj
2019-11-14 19:49 ` [PATCH 06/16] gnome-font-viewer: initial add 3.34.0 Andreas Müller
2019-11-14 19:49 ` [PATCH 07/16] evince: upgrade 3.28.2 -> 3.34.1 Andreas Müller
2019-11-15 15:35 ` Khem Raj
2019-11-14 19:49 ` [PATCH 08/16] file-roller: inital add 3.32.2 Andreas Müller
2019-11-14 19:49 ` [PATCH 09/16] gexiv2: initial add 0.12.0 Andreas Müller
2019-11-14 19:49 ` [PATCH 10/16] gnome-autoar: inital add 0.2.3 Andreas Müller
2019-11-14 19:49 ` [PATCH 11/16] tracker: initial add 2.3.1 Andreas Müller
2019-11-14 19:49 ` [PATCH 12/16] nautilus: upgrade 3.18.5 -> 3.34.1 Andreas Müller
2019-11-14 19:49 ` [PATCH 13/16] geocode-glib: initial add 3.26.1 Andreas Müller
2019-11-14 22:13 ` Khem Raj
2019-11-14 22:51 ` Andreas Müller
2019-11-17 15:17 ` Andreas Müller
2019-11-17 18:16 ` Khem Raj
2019-11-14 19:49 ` [PATCH 14/16] libgweather: initial add 3.34.0 Andreas Müller
2019-11-14 19:49 ` [PATCH 15/16] libwacom: initial add 0.33 Andreas Müller
2019-11-14 21:39 ` Khem Raj
2019-11-14 22:50 ` Andreas Müller
2019-11-14 23:51 ` Adrian Bunk
2019-11-14 19:49 ` [PATCH 16/16] gnome-settings-daemon: initial add 3.34.1 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.