PR#17: Remove gtk3 BuildRequire, not needed anymore - rpms/gnome-shell

rpms / gnome-shell

#17 Remove gtk3 BuildRequire, not needed anymore

Closed 2 years ago by kalev. Opened 2 years ago by ojab.

rpms/ ojab/gnome-shell rawhide into rawhide

Remove gtk3 BuildRequire, not needed anymore

ojab • 2 years ago

a62ffc9

gnome-shell.spec

file modified

+5 -5

		`@@ -2,7 +2,7 @@`

		`Name: gnome-shell`
		`Version: 43.0`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`
		`Summary: Window management and application launching for GNOME`

		`License: GPLv2+`
		`@@ -31,7 +31,6 @@`
		`%define glib2_version 2.56.0`
		`%define gobject_introspection_version 1.49.1`
		`%define gjs_version 1.73.1`
		`- %define gtk3_version 3.15.0`
		`%define gtk4_version 4.0.0`
		`%define adwaita_version 1.0.0`
		`%define mutter_version 43.0`
		`@@ -65,7 +64,6 @@`
		`# for screencast recorder functionality`
		`BuildRequires: pkgconfig(gstreamer-base-1.0) >= %{gstreamer_version}`
		`BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version}`
		`- BuildRequires: pkgconfig(gdk-x11-3.0) >= %{gtk3_version}`
		`BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}`
		`BuildRequires: gettext >= 0.19.6`
		`BuildRequires: python3`
		`@@ -92,7 +90,6 @@`
		`Requires: gcr%{?_isa}`
		`Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}`
		`Requires: gjs%{?_isa} >= %{gjs_version}`
		`- Requires: gtk3%{?_isa} >= %{gtk3_version}`
		`Requires: gtk4%{?_isa} >= %{gtk4_version}`
		`Requires: libadwaita%{_isa} >= %{adwaita_version}`
		`Requires: highcontrast-icon-theme`
		`@@ -238,6 +235,9 @@`
		`%{_mandir}/man1/gnome-shell.1*`

		`%changelog`
		`+ * Thu Sep 29 2022 ojab <ojab@ojab.ru> - 43.0-3`
		`+ - Remove gtk3 Require & BuildRequire, not needed anymore`
		`+`
		`* Thu Sep 22 2022 Kalev Lember <klember@redhat.com> - 43.0-2`
		`- Backport MR2487 and MR2495 to fix input sources sorting (#2121110)`

		`@@ -1645,7 +1645,7 @@`

		`* Fri Sep 4 2009 Owen Taylor <otaylor@redhat.com> - 2.27.2-1`
		`- Update to 2.27.2`
		`- - Add an explicit dep on gobject-introspection 0.6.5 which is required`
		`+ - Add an explicit dep on gobject-introspection 0.6.5 which is required`
		`for the new version`

		`* Sat Aug 29 2009 Owen Taylor <otaylor@redhat.com> - 2.27.1-4`

ojab commented 2 years ago

sudo dnf remove $(sudo rpm -q --whatrequires gtk3) work fine /shrug

kalev commented 2 years ago

I believe it's still needed, it just that something else happens to pull in gtk3-devel to the build root so removing it doesn't break the build.

/usr/lib64/gnome-shell/libgnome-shell.so for example still links with gtk3.

ojab commented 2 years ago

Right, it's gnome-desktop3-devel & we have Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} there.
And we already have implicit dependency via

$ rpm -qR gnome-shell | grep gtk-3
libgtk-3.so.0()(64bit)

So do we need explicit gtk3 dependency only to enforce some minimum version or it's superfluous?

jadahl commented 2 years ago

It is indeed still used for various things, including XEmbed/tray-icon support, and loading icons.

zuul commented 2 years ago

Build succeeded.

check-for-arches : SUCCESS in 1m 01s
rpm-scratch-build : SUCCESS in 7m 48s
rpm-scratch-build-s390x : SUCCESS in 10m 05s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 11m 21s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 10m 49s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 11m 51s (non-voting)
rpm-linter : FAILURE in 2m 40s (non-voting)
rpm-rpminspect : SUCCESS in 4m 50s (non-voting)
check-for-tests : SUCCESS in 27s
check-for-sti-tests : SUCCESS in 41s
check-for-fmf-tests : SUCCESS in 29s
rpm-install-test : SUCCESS in 5m 48s
rpm-test : SKIPPED
rpm-tmt-test : SKIPPED
rpm-sti-test : SKIPPED

kalev commented 2 years ago

If gnome-shell still uses it then it makes sense to explicitly list it as BuildRequires and not rely on some other dep accidentally pulling it in. The explicit Requires: is to enforce a minimum dependency, yes.