Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove libadwaita-qt{5,6} packages #36

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

ledif
Copy link
Collaborator

@ledif ledif commented Dec 16, 2024

All image builds are failing with the following error (from https://github.com/ublue-os/aurora/actions/runs/12336280554/job/34428627112):

error: Could not depsolve transaction; 2 problems detected:
 Problem 1: conflicting requests
  - installed package qt5-qtbase-gui-5.15.15-3.fc41.x86_64 obsoletes libadwaita-qt5 <= 1.4.2 provided by libadwaita-qt5-1.4.2-8.fc41.i686 from fedora
  - installed package qt5-qtbase-gui-5.15.15-3.fc41.x86_64 obsoletes libadwaita-qt5 <= 1.4.2 provided by libadwaita-qt5-1.4.2-8.fc41.x86_64 from fedora
 Problem 2: conflicting requests
  - installed package qt6-qtbase-gui-6.8.1-5.fc41.x86_64 obsoletes libadwaita-qt6 <= 1.4.2 provided by libadwaita-qt6-1.4.2-8.fc41.i686 from fedora
  - installed package qt6-qtbase-gui-6.8.1-5.fc41.x86_64 obsoletes libadwaita-qt6 <= 1.4.2 provided by libadwaita-qt6-1.4.2-8.fc41.x86_64 from fedora
Error: building at STEP "RUN --mount=type=cache,dst=/var/cache/rpm-ostree --mount=type=bind,from=ctx,source=/,target=/ctx /ctx/build_files/shared/build-base.sh": while running runtime: exit status 1
error: Recipe `build` failed with exit code 1
error: Recipe `build-ghcr` failed with exit code 1

According to the FedoraQt/adwaita-qt repository, the adwaita-qt project is dead. Both libadwaita-qt5 and libadwaita-qt6 have been recently purged from Fedora's packaging sources.

See this commit as an example: https://src.fedoraproject.org/rpms/adwaita-qt/c/924ff971ac92d6504260e2578c60e2dc59877557?branch=rawhide

Removing these two packages causes the image build process to succeed again.

Other resources


Edit: It looks like this commit from rpms/qt6-qtbase that was committed a few days ago is to blame for this. It adds Obsoletes directives for libadwaita-qt6 which causes the error shown above.

diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index ed3665f..9efa172 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -46,7 +46,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
 Version: 6.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@@ -212,6 +212,8 @@ handling.
 %package common
 Summary: Common files for Qt6
 Requires: %{name} = %{version}-%{release}
+Obsoletes: qgnomeplatform-common <= 0.9.2
+Provides:  qgnomeplatform-common = %{version}-%{release}
 BuildArch: noarch
 %description common
 %{summary}.
@@ -311,6 +313,10 @@ Recommends: mesa-dri-drivers%{?_isa}
 Recommends: qt6-qtwayland%{?_isa}
 # Required for some locales: https://pagure.io/fedora-kde/SIG/issue/311
 Recommends: qt6-qttranslations
+Obsoletes: adwaita-qt6 <= 1.4.2
+Obsoletes: libadwaita-qt6 <= 1.4.2
+Obsoletes: qgnomeplatform-qt6 <= 0.9.2
+Provides:  qgnomeplatform-qt6 = %{version}-%{release}
 # for Source6: 10-qt6-check-opengl2.sh:
 # glxinfo
 Requires: glx-utils
@@ -886,6 +892,9 @@ make check -k ||:
 
 
 %changelog
+* Tue Dec 10 2024 Jan Grulich <[email protected]> - 6.8.1-5
+- Obsolete QGnomePlatform and AdwaitaQt
+
 * Sat Dec 07 2024 Jan Grulich <[email protected]> - 6.8.1-4
 - Move all mkspecs to -devel

@NiHaiden NiHaiden added this pull request to the merge queue Dec 16, 2024
Merged via the queue into ublue-os:main with commit 0fff62f Dec 16, 2024
26 checks passed
@tobiasmicheler
Copy link
Contributor

Nice. Could you guys also build stable (non-daily) so that these get updated as well? The nvidia images are like two weeks old now.

@NiHaiden
Copy link
Collaborator

Nice. Could you guys also build stable (non-daily) so that these get updated as well? The nvidia images are like two weeks old now.

What image specifically? As far as I can see aurora-nvidia and aurora-dx-nvidia (https://github.com/ublue-os/bluefin/pkgs/container/aurora-dx-nvidia) have had new stable-daily images published today. And for the other nvidia variants (surface-nvidia, asus-nvidia) we only publish latest.

@tobiasmicheler
Copy link
Contributor

I am talking about stable (weekly). Since this is only built on sundays, the build of it failed yesterday. The build of the nvidia images also failed last sunday, the aurora-nvidia:stable is 2 weeks old now.

@ledif ledif deleted the remove_libadwaita-qt branch December 16, 2024 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants