diff mbox series

[meta-oe,4/7] evince: update 44.0 -> 44.1

Message ID 20230516043458.6180-4-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-oe,1/7] gnome-software: update 44.0 -> 44.1 | expand

Commit Message

Markus Volk May 16, 2023, 4:34 a.m. UTC
- remove buildpath from enum-types

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../evince/{evince_44.0.bb => evince_44.1.bb}              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/evince/{evince_44.0.bb => evince_44.1.bb} (84%)

Comments

Khem Raj May 16, 2023, 5:26 a.m. UTC | #1
On Mon, May 15, 2023 at 9:35 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> - remove buildpath from enum-types
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../evince/{evince_44.0.bb => evince_44.1.bb}              | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>  rename meta-gnome/recipes-gnome/evince/{evince_44.0.bb => evince_44.1.bb} (84%)
>
> diff --git a/meta-gnome/recipes-gnome/evince/evince_44.0.bb b/meta-gnome/recipes-gnome/evince/evince_44.1.bb
> similarity index 84%
> rename from meta-gnome/recipes-gnome/evince/evince_44.0.bb
> rename to meta-gnome/recipes-gnome/evince/evince_44.1.bb
> index 1c7103c900..a2a6f9aae7 100644
> --- a/meta-gnome/recipes-gnome/evince/evince_44.0.bb
> +++ b/meta-gnome/recipes-gnome/evince/evince_44.1.bb
> @@ -34,7 +34,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open
>  def gnome_verdir(v):
>      return oe.utils.trim_version(v, 1)
>
> -SRC_URI[archive.sha256sum] = "339ee9e005dd7823a13fe21c71c2ec6d2c4cb74548026e4741eee7b2703e09da"
> +SRC_URI[archive.sha256sum] = "15afd3bb15ffb38fecab34c23350950ad270ab03a85b94e333d9dd7ee6a74314"
>
>  GTKDOC_MESON_OPTION = "gtk_doc"
>
> @@ -46,6 +46,11 @@ RRECOMMENDS:${PN} = "adwaita-icon-theme"
>
>  PACKAGES =+ "${PN}-nautilus-extension"
>
> +do_install:prepend() {
> +    sed -i -e 's|${B}/||g' ${B}/libview/ev-view-type-builtins.c
> +    sed -i -e 's|${B}/||g' ${B}/libdocument/ev-document-type-builtins.c
> +}
> +

do these files get compiled into binary ? if so then it might be too
late to edit these paths out. Perhaps they should
be removed before they get compiled in.

>  FILES:${PN} += "${datadir}/dbus-1 \
>                  ${datadir}/metainfo \
>                  ${datadir}/thumbnailers \
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#102614): https://lists.openembedded.org/g/openembedded-devel/message/102614
> Mute This Topic: https://lists.openembedded.org/mt/98920482/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk May 16, 2023, 5:45 a.m. UTC | #2
Am Mo, 15. Mai 2023 um 22:26:45 -0700 schrieb Khem Raj 
<raj.khem@gmail.com>:
> do these files get compiled into binary ? if so then it might be too
> late to edit these paths out. Perhaps they should
> be removed before they get compiled in.

The buildpath doesn't get compiled into binary, I checked that.
Probably glib-mkenum will fail, if the paths get changed before it got 
compiled. The buildpath is included to ev-view-type-builtins.c like 
this:
/* enumerations from "ev-jobs.h" */
#include 
"/home/flk/poky/build-intel/tmp/work/corei7-64-poky-linux/evince/44.0-r0/build/../evince-44.0/libview/ev-jobs.h"

And i guess thats needed so ev-jobs.h could be found
Khem Raj May 16, 2023, 2:57 p.m. UTC | #3
On Mon, May 15, 2023 at 10:52 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> I think it's just a reproducibility issue because the buildpath makes it into the debug package
>
> Am Di, 16. Mai 2023 um 07:45:12 +0200 schrieb Markus Volk <f_l_k@t-online.de>:
>
> Am Mo, 15. Mai 2023 um 22:26:45 -0700 schrieb Khem Raj <raj.khem@gmail.com>:
>
> do these files get compiled into binary ? if so then it might be too late to edit these paths out. Perhaps they should be removed before they get compiled in.
>
>
> The buildpath doesn't get compiled into binary, I checked that.
> Probably glib-mkenum will fail, if the paths get changed before it got compiled. The buildpath is included to ev-view-type-builtins.c like this:
> /* enumerations from "ev-jobs.h" */
> #include "/home/flk/poky/build-intel/tmp/work/corei7-64-poky-linux/evince/44.0-r0/build/../evince-44.0/libview/ev-jobs.h"
>

I wonder if ${B} should be replaced with usr/src/debug/ on the same
line at -ffile-prefix-map etc. we have to remap such
things

> And i guess thats needed so ev-jobs.h could be found
Markus Volk May 17, 2023, 11:27 a.m. UTC | #4
Am Di, 16. Mai 2023 um 07:57:44 -0700 schrieb Khem Raj 
<raj.khem@gmail.com>:
> I wonder if ${B} should be replaced with usr/src/debug/

Thats true. I've sent a v2, that edits the line like this:
/* enumerations from "ev-jobs.h" */
#include "/usr/src/debug/evince/44.1-r0/libview/ev-jobs.h"
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/evince/evince_44.0.bb b/meta-gnome/recipes-gnome/evince/evince_44.1.bb
similarity index 84%
rename from meta-gnome/recipes-gnome/evince/evince_44.0.bb
rename to meta-gnome/recipes-gnome/evince/evince_44.1.bb
index 1c7103c900..a2a6f9aae7 100644
--- a/meta-gnome/recipes-gnome/evince/evince_44.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_44.1.bb
@@ -34,7 +34,7 @@  REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI[archive.sha256sum] = "339ee9e005dd7823a13fe21c71c2ec6d2c4cb74548026e4741eee7b2703e09da"
+SRC_URI[archive.sha256sum] = "15afd3bb15ffb38fecab34c23350950ad270ab03a85b94e333d9dd7ee6a74314"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
@@ -46,6 +46,11 @@  RRECOMMENDS:${PN} = "adwaita-icon-theme"
 
 PACKAGES =+ "${PN}-nautilus-extension"
 
+do_install:prepend() {
+    sed -i -e 's|${B}/||g' ${B}/libview/ev-view-type-builtins.c
+    sed -i -e 's|${B}/||g' ${B}/libdocument/ev-document-type-builtins.c
+}
+
 FILES:${PN} += "${datadir}/dbus-1 \
                 ${datadir}/metainfo \
                 ${datadir}/thumbnailers \