From 7c02c7d41175f62b7ef6859dfc069d83751b656d Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 13 May 2020 14:54:14 +0800 Subject: gnome-themes-extra: correct the recipe name Per https://gitlab.gnome.org/GNOME/gnome-themes-extra/-/blob/master/README.md, gnome-themes-extra ever named as gnome-themes-standard. So rename the recipe name to reflect the current status to avoid confusion. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../gnome-themes/gnome-themes-extra_3.28.bb | 42 ++++++++++++++++++++ .../gnome-themes/gnome-themes-standard_3.28.bb | 45 ---------------------- 2 files changed, 42 insertions(+), 45 deletions(-) create mode 100644 meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb delete mode 100644 meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb (limited to 'meta-oe/recipes-gnome') diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb new file mode 100644 index 0000000000..ac594711cd --- /dev/null +++ b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb @@ -0,0 +1,42 @@ +SUMMARY = "GTK+2 standard themes" +HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome" + +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" + +inherit gnomebase gettext gtk-icon-cache upstream-version-is-even features_check + +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +DEPENDS += "intltool-native gtk+" + +SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" +SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" + +EXTRA_OECONF = "--disable-gtk3-engine" + +do_install_append() { + # Only building Adwaita, remove highcontrast files + rm -rf ${D}${prefix}/share/themes/HighContrast \ + ${D}${prefix}/share/icons + + # The libtool archive file is unneeded with shared libs on modern Linux + rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la +} + +# There could be gnome-theme-highcontrast as well but that requires +# gtk+3 and includes lots of icons (is also broken with B != S). +PACKAGES += "gnome-theme-adwaita \ + gnome-theme-adwaita-dark \ + " + +FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ + ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" + +FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" +RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" + +# gnome-themes-standard is empty and doesn't exist +RDEPENDS_${PN}-dev = "" diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb deleted file mode 100644 index 2fa754e79d..0000000000 --- a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "GTK+2 standard themes" -HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome" - -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" - -# Upstream renamed this package to gnome-themes-extra at some point -BPN = "gnome-themes-extra" - -inherit gnomebase gettext gtk-icon-cache upstream-version-is-even features_check - -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -DEPENDS += "intltool-native gtk+" - -SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" -SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" - -EXTRA_OECONF = "--disable-gtk3-engine" - -do_install_append() { - # Only building Adwaita, remove highcontrast files - rm -rf ${D}${prefix}/share/themes/HighContrast \ - ${D}${prefix}/share/icons - - # The libtool archive file is unneeded with shared libs on modern Linux - rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la -} - -# There could be gnome-theme-highcontrast as well but that requires -# gtk+3 and includes lots of icons (is also broken with B != S). -PACKAGES += "gnome-theme-adwaita \ - gnome-theme-adwaita-dark \ - " - -FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ - ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" - -FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" -RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" - -# gnome-themes-standard is empty and doesn't exist -RDEPENDS_${PN}-dev = "" -- cgit 1.2.3-korg