Skip to contentSkip to conversation

epiphany: Update to 40.1

PATCH In review Robert Joslyn 2 participants 4 messages May 11, 2021 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 epiphany: Update to 40.1

Refresh patch and adjust version directory for new version numbering scheme. Add new dependency on libarchive.

---
 .../epiphany/{epiphany_3.38.3.bb => epiphany_40.1.bb}     | 7 ++++---
 .../0002-help-meson.build-disable-the-use-of-yelp.patch   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.38.3.bb => epiphany_40.1.bb} (82%)
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +4 -3
similarity index 82%
rename from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_40.1.bb
index ce24336ace..e1e3ad7868 100644
@@ -8,18 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr gnutls \
 	   gsettings-desktop-schemas libxml2-native \
-	   glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal"
+	   glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal \
+	   libarchive"
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] = "ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275"
+SRC_URI[archive.sha256sum] = "696a426b1702774af8d0f056828f5d9ff9350507aba7f4c7e3e499f07a581ad0"
 
 # Developer mode enables debugging
 PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +4 -4
index 118b5d1825..a6c4f92c86 100644
@@ -1,4 +1,4 @@
-From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001
+From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
 Subject: [PATCH] help/meson.build: disable the use of yelp
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/help/meson.build b/help/meson.build
-index 484860c..d9b2e80 100644
+index ff324dd..f5e421d 100644
 --- a/help/meson.build
 +++ b/help/meson.build
-@@ -32,7 +32,7 @@ help_media = [
-   'media/epiphany-private-3-36.png'
+@@ -31,7 +31,7 @@ help_media = [
+   'media/org.gnome.Epiphany.svg'
  ]
  
 -gnome.yelp(meson.project_name(),
Signature · 1 line
2.26.3
#1 lore raw

Thanks Robert, I guess we should drop upstream-version-is-even from all gnome recipes which I'll take care of - these new 40.x versions weren't properly reported somehow.

Alex

Quoted 89 lines · Robert Joslyn

Refresh patch and adjust version directory for new version numbering scheme. Add new dependency on libarchive.

---
 .../epiphany/{epiphany_3.38.3.bb => epiphany_40.1.bb}     | 7 ++++---
 .../0002-help-meson.build-disable-the-use-of-yelp.patch   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.38.3.bb =>

epiphany_40.1.bb} (82%)

meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -0
similarity index 82%
rename from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_40.1.bb
index ce24336ace..e1e3ad7868 100644
@@ -8,18 +8,19 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr

gnutls \
           gsettings-desktop-schemas libxml2-native \
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -1
-          glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal"
+          glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal

\
+ libarchive"

GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings features_check upstream-version-is-even
gettext mime-xdg
REQUIRED_DISTRO_FEATURES = "x11 opengl"

-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}",

1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            file://migrator.patch \
            file://distributor.patch \
            "

-SRC_URI[archive.sha256sum] = "ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275" +SRC_URI[archive.sha256sum] = "696a426b1702774af8d0f056828f5d9ff9350507aba7f4c7e3e499f07a581ad0"

# Developer mode enables debugging
PACKAGECONFIG[developer-mode] =
"-Ddeveloper_mode=true,-Ddeveloper_mode=false"
diff --git a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch index 118b5d1825..a6c4f92c86 100644
---
a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
+++
b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch

meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -1
@@ -1,4 +1,4 @@
-From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001
+From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
 Subject: [PATCH] help/meson.build: disable the use of yelp
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/help/meson.build b/help/meson.build

meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +3 -4
-index 484860c..d9b2e80 100644
+index ff324dd..f5e421d 100644
 --- a/help/meson.build
 +++ b/help/meson.build
-@@ -32,7 +32,7 @@ help_media = [
-   'media/epiphany-private-3-36.png'
+@@ -31,7 +31,7 @@ help_media = [
+   'media/org.gnome.Epiphany.svg'
  ]
 
 -gnome.yelp(meson.project_name(),
--

2.26.3

#2 lore raw
Quoted 6 lines · Alexander Kanavin

Thanks Robert, I guess we should drop upstream-version-is-even from all gnome recipes which I'll take care of - these new 40.x versions weren't properly reported somehow.

Alex

That’s a good point, the new versioning scheme doesn’t do the even is release, odd is development thing anymore. I can send a v3, or a separate patch if that’s easier since v2 is already on master-next.

Thanks,
Robert

Quoted 72 lines · Robert Joslyn

Refresh patch and adjust version directory for new version numbering scheme. Add new dependency on libarchive.

---
 .../epiphany/{epiphany_3.38.3.bb => epiphany_40.1.bb}     | 7 ++++---
 .../0002-help-meson.build-disable-the-use-of-yelp.patch   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.38.3.bb => epiphany_40.1.bb} (82%)
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +4 -3
similarity index 82%
rename from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_40.1.bb
index ce24336ace..e1e3ad7868 100644
@@ -8,18 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr gnutls \
           gsettings-desktop-schemas libxml2-native \
-          glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal"
+          glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal \
+          libarchive"
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] = "ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275"
+SRC_URI[archive.sha256sum] = "696a426b1702774af8d0f056828f5d9ff9350507aba7f4c7e3e499f07a581ad0"
 
 # Developer mode enables debugging
 PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +4 -4
index 118b5d1825..a6c4f92c86 100644
@@ -1,4 +1,4 @@
-From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001
+From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
 Subject: [PATCH] help/meson.build: disable the use of yelp
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/help/meson.build b/help/meson.build
-index 484860c..d9b2e80 100644
+index ff324dd..f5e421d 100644
 --- a/help/meson.build
 +++ b/help/meson.build
-@@ -32,7 +32,7 @@ help_media = [
-   'media/epiphany-private-3-36.png'
+@@ -31,7 +31,7 @@ help_media = [
+   'media/org.gnome.Epiphany.svg'
  ]
 
 -gnome.yelp(meson.project_name(),
Signature · 1 line
2.26.3
#3 lore raw

I've already sent a patch, so no need I guess.

Alex

Quoted 110 lines · Robert Joslyn
Quoted 2 lines

On May 11, 2021, at 4:29 AM, Alexander Kanavin <[email protected]>

Quoted 2 lines · wrote:

Thanks Robert, I guess we should drop upstream-version-is-even from all

gnome recipes which I'll take care of - these new 40.x versions weren't properly reported somehow.

Quoted 2 lines

Alex

That’s a good point, the new versioning scheme doesn’t do the even is release, odd is development thing anymore. I can send a v3, or a separate patch if that’s easier since v2 is already on master-next.

Thanks,
Robert

Quoted 1 line

On Tue, 11 May 2021 at 07:39, Robert Joslyn <

Quoted 9 lines · [email protected]> wrote:

Refresh patch and adjust version directory for new version numbering scheme. Add new dependency on libarchive.

---
 .../epiphany/{epiphany_3.38.3.bb => epiphany_40.1.bb}     | 7 ++++---
 .../0002-help-meson.build-disable-the-use-of-yelp.patch   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.38.3.bb =>

epiphany_40.1.bb} (82%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta/recipes-gnome/epiphany/epiphany_40.1.bb

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM =

Quoted 7 lines

similarity index 82%
rename from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb rename to meta/recipes-gnome/epiphany/epiphany_40.1.bb index ce24336ace..e1e3ad7868 100644

meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -0
@@ -8,18 +8,19 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = · line 8

Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -0
 DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr

gnutls \

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = · line 10

Quoted 2 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -1
           gsettings-desktop-schemas libxml2-native \
-          glib-2.0 glib-2.0-native json-glib libdazzle libhandy

libportal"

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = · line 10

Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -0
+          glib-2.0 glib-2.0-native json-glib libdazzle libhandy

libportal \

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

Quoted 4 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -0
+          libarchive"
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gsettings features_check upstream-version-is-even

gettext mime-xdg

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

Quoted 3 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -1
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-SRC_URI =

"${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = · line 17

Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -0
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}",

1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

Quoted 5 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -1
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] =

"ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275"

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = · line 22

Quoted 1 line
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -0
+SRC_URI[archive.sha256sum] =

"696a426b1702774af8d0f056828f5d9ff9350507aba7f4c7e3e499f07a581ad0"

meta/recipes-gnome/epiphany/epiphany_40.1.bb LIC_FILES_CHKSUM = · line 24

Quoted 3 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +0 -0
 # Developer mode enables debugging
 PACKAGECONFIG[developer-mode] =

"-Ddeveloper_mode=true,-Ddeveloper_mode=false"

Quoted 1 line

diff --git

a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch

Quoted 2 lines

index 118b5d1825..a6c4f92c86 100644
---

a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch

Quoted 1 line

+++

b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch

meta/recipes-gnome/epiphany/epiphany_40.1.bb Signed-off-by: Alexander Kanavin <

Quoted 7 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +1 -1
@@ -1,4 +1,4 @@
-From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001
+From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
 Subject: [PATCH] help/meson.build: disable the use of yelp
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

Quoted 20 lines
meta/recipes-gnome/epiphany/epiphany_40.1.bb renamed from meta/recipes-gnome/epiphany/epiphany_3.38.3.bb +3 -4
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/help/meson.build b/help/meson.build
-index 484860c..d9b2e80 100644
+index ff324dd..f5e421d 100644
 --- a/help/meson.build
 +++ b/help/meson.build
-@@ -32,7 +32,7 @@ help_media = [
-   'media/epiphany-private-3-36.png'
+@@ -31,7 +31,7 @@ help_media = [
+   'media/org.gnome.Epiphany.svg'
  ]
 
 -gnome.yelp(meson.project_name(),
--

2.26.3