Skip to content

Comments

Fix builds broken by libportal update#153225

Merged
jtojnar merged 5 commits intostagingfrom
libportal
Jan 2, 2022
Merged

Fix builds broken by libportal update#153225
jtojnar merged 5 commits intostagingfrom
libportal

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Jan 2, 2022

  • gcolor3
  • gnome-builder
  • gnome-todo
  • epiphany
  • nautilus
  • eog
  • xdg-desktop-portal

@jtojnar jtojnar requested a review from hedning as a code owner January 2, 2022 16:09
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Jan 2, 2022
@jtojnar jtojnar mentioned this pull request Jan 2, 2022
25 tasks
@ofborg ofborg bot requested review from amaxine and dasj19 January 2, 2022 18:41
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 2, 2022
@ofborg ofborg bot requested review from bobby285271 and davidak January 2, 2022 18:49
@ofborg ofborg bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 2, 2022
Copy link
Contributor

@dasj19 dasj19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, except I don't understand why the nautilus patch has some files excluded.

And most of the patches were accepted upstream. That's always a good sign.

sha256 = "xSb9l7xxEYpAwmdmeWT/t7Z9Ck3DPtsODzbReQW/Q70=";
excludes = [
"build-aux/flatpak/org.gnome.Nautilus.json"
"build-aux/flatpak/org.gnome.Nautilus.yml"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why exculding these two files?

Copy link
Member Author

@jtojnar jtojnar Jan 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due to merge conflicts and irrelevancy (the Flatpak manifest is only used for building Flatpak package).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I can see now that building flatpaks is irrelevant for us. Thanks for explaining.

@jtojnar jtojnar merged commit 009de75 into staging Jan 2, 2022
@jtojnar jtojnar deleted the libportal branch January 2, 2022 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants