[PATCH 0/4] Remove gnome-common

[PATCH 0/4] Remove gnome-common

[Jussi Kukkonen]

Patchset should preferably only be merged once "gnome-common: Add
recipe (from oe-core)" (2017-07-06) patch has been merged in meta-oe.
I can ping the thread once it happens.

This set removes gnome-common, an obsolete collection of m4-macros
that partially conflicts with autoconf-archive. The plan is to fix the
hacks between autoconf-archive and gnome-common once they're in the
same repo.

Thanks, 
 Jussi

The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628:

  yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/gnome-common
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gnome-common

Jussi Kukkonen (4):
  matchbox-desktop: Upgrade to 2.2
  python3-pygobject: Don't use gnome-common
  gnome-desktop: Don't use gnome-common
  gnome-common: Remove as deprecated

 ...onfigure.ac-Don-t-use-gnome-common-macros.patch | 33 ++++++++++++++++++++++
 .../python/python3-pygobject_3.24.1.bb             |  3 +-
 ...figure.ac-Remove-gnome-common-macro-calls.patch | 33 ++++++++++++++++++++++
 .../gnome-desktop/gnome-desktop3_3.24.2.bb         |  6 ++--
 meta/recipes-gnome/gnome/gnome-common_3.18.0.bb    | 20 -------------
 ...hbox-desktop_2.1.bb => matchbox-desktop_2.2.bb} |  6 ++--
 6 files changed, 75 insertions(+), 26 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch
 create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
 delete mode 100644 meta/recipes-gnome/gnome/gnome-common_3.18.0.bb
 rename meta/recipes-sato/matchbox-desktop/{matchbox-desktop_2.1.bb => matchbox-desktop_2.2.bb} (87%)

-- 
2.1.4

[PATCH 1/4] matchbox-desktop: Upgrade to 2.2

[Jussi Kukkonen]

Only change is dropping dependency on gnome-common
(which is deprecated upstream).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{matchbox-desktop_2.1.bb => matchbox-desktop_2.2.bb}            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-sato/matchbox-desktop/{matchbox-desktop_2.1.bb => matchbox-desktop_2.2.bb} (87%)

diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
similarity index 87%
rename from meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
rename to meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
index c9a7b4b..b0cdfa2 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \
                     file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00"
 
-DEPENDS = "gnome-common-native gtk+3 startup-notification dbus"
+DEPENDS = "gtk+3 startup-notification dbus"
 SECTION = "x11/wm"
 
-# SRCREV tagged 2.1
-SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80"
+# SRCREV tagged 2.2
+SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777"
 SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \
            file://vfolders/* \
            "
-- 
2.1.4

[PATCH 2/4] python3-pygobject: Don't use gnome-common

[Jussi Kukkonen]

Patch out the one use of gnome-common macros: pygobject is moving to
autoconf-archive in next release so this patch is temporary.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...onfigure.ac-Don-t-use-gnome-common-macros.patch | 33 ++++++++++++++++++++++
 .../python/python3-pygobject_3.24.1.bb             |  3 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch

diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch b/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch
new file mode 100644
index 0000000..aaedb58
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch
@@ -0,0 +1,33 @@
+From 206360744cedff20eae3c8fcfde9938fdae99592 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 6 Jul 2017 11:47:21 +0300
+Subject: [PATCH] configure.ac: Don't use gnome-common macros
+
+remove GNOME_COMPILE_WARNINGS() call: it's from gnome-common which
+is deprecated.
+
+This patch can be removed when upgrading to 3.25.1: at that point
+pygobject needs autoconf-archive instead.
+
+Upstream-Status: Inappropriate [Already handled upstream]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1f15b3c..5cb170f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -221,8 +221,6 @@ AC_ARG_WITH(common,
+     with_common=yes)
+ AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes")
+ 
+-# compiler warnings, errors, required cflags, and code coverage support
+-GNOME_COMPILE_WARNINGS([maximum], [-Wno-error=missing-prototypes])
+ AC_MSG_CHECKING(for Gnome code coverage support)
+ m4_ifdef([GNOME_CODE_COVERAGE],
+          [AC_MSG_RESULT(yes)
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
index 5795ae3..9d10af2 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
@@ -5,12 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
 inherit autotools pkgconfig gnomebase distutils3-base gobject-introspection upstream-version-is-even
 
-DEPENDS += "gnome-common-native python3 glib-2.0"
+DEPENDS += "python3 glib-2.0"
 
 SRCNAME="pygobject"
 SRC_URI = " \
     http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
     file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
+    file://0001-configure.ac-Don-t-use-gnome-common-macros.patch \
 "
 
 SRC_URI[md5sum] = "69a843311d0f0385dff376e11a2d83d2"
-- 
2.1.4

[PATCH 3/4] gnome-desktop: Don't use gnome-common

[Jussi Kukkonen]

Add a patch to no use gnome-common macros

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...figure.ac-Remove-gnome-common-macro-calls.patch | 33 ++++++++++++++++++++++
 .../gnome-desktop/gnome-desktop3_3.24.2.bb         |  6 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch

diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
new file mode 100644
index 0000000..992c353
--- /dev/null
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
@@ -0,0 +1,33 @@
+From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 6 Jul 2017 13:13:45 +0300
+Subject: [PATCH] configure.ac: Remove gnome-common macro calls
+
+gnome-common is deprecated and these aren't doing much for us.
+
+Upstreamable fix would probably involve using autoconf-archive:
+Trying to avoid that dependency for now.
+
+Upstream-Status: [Inappropriate]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7adcf0e..bb7659d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE)
+ AC_SUBST(GNOME_DATE_COMMENT_START)
+ AC_SUBST(GNOME_DATE_COMMENT_END)
+ 
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ AC_ARG_ENABLE(deprecation_flags,
+               [AC_HELP_STRING([--enable-deprecation-flags],
+                               [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
+-- 
+2.1.4
+
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
index 24d23ba..5c1c213 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
@@ -10,9 +10,11 @@ inherit gnome pkgconfig upstream-version-is-even gobject-introspection
 SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93"
 SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"
 
-SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch"
+SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \
+            file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
+"
 
-DEPENDS += "intltool-native gnome-common-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
+DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
 
 inherit distro_features_check gtk-doc
 REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.1.4

[PATCH 4/4] gnome-common: Remove as deprecated

[Jussi Kukkonen]

Nothing in oe-core requires gnome-common and it is also deprecated
upstream: Remove it.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-gnome/gnome/gnome-common_3.18.0.bb | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-common_3.18.0.bb

diff --git a/meta/recipes-gnome/gnome/gnome-common_3.18.0.bb b/meta/recipes-gnome/gnome/gnome-common_3.18.0.bb
deleted file mode 100644
index 06f3bb3..0000000
--- a/meta/recipes-gnome/gnome/gnome-common_3.18.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Common macros for building GNOME applications"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SECTION = "x11/gnome"
-inherit gnomebase allarch
-
-SRC_URI[archive.md5sum] = "933258d9c23e218eb6eec9cc1951b053"
-SRC_URI[archive.sha256sum] = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"
-
-EXTRA_AUTORECONF = ""
-DEPENDS = ""
-
-FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = ""
-
-BBCLASSEXTEND = "native"
-- 
2.1.4

✗ patchtest: failure for Remove gnome-common

[Patchwork]

== Series Details ==

Series: Remove gnome-common
Revision: 1
URL   : https://patchwork.openembedded.org/series/7744/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Upstream-Status is in incorrect format [test_upstream_status_format] 
  Suggested fix    Fix Upstream-Status format in meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch so it is one of: Pending, Submitted, Accepted, Backport, Denied, Inappropriate



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

[PATCHv2 3/4] gnome-desktop: Don't use gnome-common

[Jussi Kukkonen]

Add a patch to no use gnome-common macros

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---

Changes since v1:
* Fix Upstream-Status line

Branch jku/gnome-common in poky-contrib has been updated.

 ...figure.ac-Remove-gnome-common-macro-calls.patch | 33 ++++++++++++++++++++++
 .../gnome-desktop/gnome-desktop3_3.24.2.bb         |  6 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch

diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
new file mode 100644
index 0000000..e95393c
--- /dev/null
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
@@ -0,0 +1,33 @@
+From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Thu, 6 Jul 2017 13:13:45 +0300
+Subject: [PATCH] configure.ac: Remove gnome-common macro calls
+
+gnome-common is deprecated and these aren't doing much for us.
+
+Upstreamable fix would probably involve using autoconf-archive:
+Trying to avoid that dependency for now.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7adcf0e..bb7659d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE)
+ AC_SUBST(GNOME_DATE_COMMENT_START)
+ AC_SUBST(GNOME_DATE_COMMENT_END)
+ 
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ AC_ARG_ENABLE(deprecation_flags,
+               [AC_HELP_STRING([--enable-deprecation-flags],
+                               [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
+-- 
+2.1.4
+
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
index 24d23ba..5c1c213 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
@@ -10,9 +10,11 @@ inherit gnome pkgconfig upstream-version-is-even gobject-introspection
 SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93"
 SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"
 
-SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch"
+SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \
+            file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
+"
 
-DEPENDS += "intltool-native gnome-common-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
+DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
 
 inherit distro_features_check gtk-doc
 REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.1.4

Re: [PATCH 0/4] Remove gnome-common

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 2103 bytes --]

On 14 July 2017 at 15:25, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> Patchset should preferably only be merged once "gnome-common: Add
> recipe (from oe-core)" (2017-07-06) patch has been merged in meta-oe.
> I can ping the thread once it happens.
>

meta-openembedded master was updated so this set is good to go.


>
> This set removes gnome-common, an obsolete collection of m4-macros
> that partially conflicts with autoconf-archive. The plan is to fix the
> hacks between autoconf-archive and gnome-common once they're in the
> same repo.
>
> Thanks,
>  Jussi
>
> The following changes since commit 81498aac9560fbeaeb58eaada32ce8
> 0e0ea51628:
>
>   yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib jku/gnome-common
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=
> jku/gnome-common
>
> Jussi Kukkonen (4):
>   matchbox-desktop: Upgrade to 2.2
>   python3-pygobject: Don't use gnome-common
>   gnome-desktop: Don't use gnome-common
>   gnome-common: Remove as deprecated
>
>  ...onfigure.ac-Don-t-use-gnome-common-macros.patch | 33
> ++++++++++++++++++++++
>  .../python/python3-pygobject_3.24.1.bb             |  3 +-
>  ...figure.ac-Remove-gnome-common-macro-calls.patch | 33
> ++++++++++++++++++++++
>  .../gnome-desktop/gnome-desktop3_3.24.2.bb         |  6 ++--
>  meta/recipes-gnome/gnome/gnome-common_3.18.0.bb    | 20 -------------
>  ...hbox-desktop_2.1.bb => matchbox-desktop_2.2.bb} |  6 ++--
>  6 files changed, 75 insertions(+), 26 deletions(-)
>  create mode 100644 meta/recipes-devtools/python/python3-pygobject/0001-
> configure.ac-Don-t-use-gnome-common-macros.patch
>  create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-
> configure.ac-Remove-gnome-common-macro-calls.patch
>  delete mode 100644 meta/recipes-gnome/gnome/gnome-common_3.18.0.bb
>  rename meta/recipes-sato/matchbox-desktop/{matchbox-desktop_2.1.bb =>
> matchbox-desktop_2.2.bb} (87%)
>
> --
> 2.1.4
>
>

[-- Attachment #2: Type: text/html, Size: 3650 bytes --]