From 187ef2f8c17bc388f93a2c736a5cff0248a66369 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 19 Mar 2018 21:29:08 +0100 Subject: gnome-themes: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit project is dead - last release was in 2011. That was a gnome 3 port which was not continued. Signed-off-by: Andreas Müller --- .../gnome-themes/drop-localedir-override.patch | 22 --------- .../themes/gnome-themes/iconpath-option.patch | 52 ---------------------- .../recipes-gnome/themes/gnome-themes_2.32.1.bb | 39 ---------------- 3 files changed, 113 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch delete mode 100644 meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch delete mode 100644 meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch b/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch deleted file mode 100644 index e37482b97b..0000000000 --- a/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch +++ /dev/null @@ -1,22 +0,0 @@ -Causes locale file to be installed in /usr/locale instead of /usr/share/locale - -Apply the same fix as in evolution-data-server: -https://git.gnome.org/browse/evolution-data-server/commit/configure.ac?id=ec46c763e9342f604b7228c660623d271dfeb101 - -Upstream-Status: Pending - -diff -uNr gnome-themes-2.32.1.orig/configure.in gnome-themes-2.32.1/configure.in ---- gnome-themes-2.32.1.orig/configure.in 2015-09-18 15:01:25.152055729 +0200 -+++ gnome-themes-2.32.1/configure.in 2015-09-18 15:09:03.312072156 +0200 -@@ -19,11 +19,6 @@ - - AM_GLIB_GNU_GETTEXT - --# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME --# this is the directory where the *.{mo,gmo} files are installed --localedir='${prefix}/${DATADIRNAME}/locale' --AC_SUBST(localedir) -- - # Workaround to make aclocal get the right flags - AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") - diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch b/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch deleted file mode 100644 index 1b4096dd0d..0000000000 --- a/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch +++ /dev/null @@ -1,52 +0,0 @@ - -The patch is ported from sato-icon-theme. - -pkg-config will only search the target sysroot and we want the native script. This -patch adds an option to allow the path to the tool to be specified. - -Upstream-Status: Pending -Signed-off-by: Jackie Huang ---- - configure.in | 26 ++++++++++++++++---------- - 1 file changed, 16 insertions(+), 10 deletions(-) - -diff --git a/configure.in b/configure.in -index 5f7a18c..e8fc31e 100644 ---- a/configure.in -+++ b/configure.in -@@ -74,16 +74,22 @@ AC_ARG_ENABLE([icon-mapping], - ICONMAP="true" - if test "x$enable_mapping" != "xno"; then - UTILS_REQUIRED=0.8.7 -- -- AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -- PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, have_utils=yes, have_utils=no) -- if test "x$have_utils" = "xyes"; then -- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -- ICONMAP="$UTILS_PATH/icon-name-mapping" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes]) -+ PKG_PROG_PKG_CONFIG() -+ AC_ARG_WITH(iconmap, -+ AC_HELP_STRING([--with-iconmap=], [The location of the icon-name-mapping script to use]), -+ ICONMAP=$withval, ICONMAP="") -+ if test "x$ICONMAP" = "x"; then -+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, have_utils=yes, have_utils=no) -+ if test "x$have_utils" = "xyes"; then -+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -+ ICONMAP="$UTILS_PATH/icon-name-mapping" -+ -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-themes"]) -+ fi - fi - fi - AC_SUBST(ICONMAP) --- -1.7.9.5 - diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb deleted file mode 100644 index c1ecc23f7d..0000000000 --- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "GNOME themes" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2b543dc97eb7594d026af39d9b54204b" - -PR = "r3" - -SECTION = "x11/gnome" -DEPENDS = "gtk-engines icon-naming-utils icon-naming-utils-native \ - glib-2.0 intltool-native libxml-simple-perl-native \ - glib-2.0-native \ -" -RDEPENDS_${PN} = "adwaita-icon-theme" - -EXTRA_OECONF += "--enable-all-themes \ - --with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping \ -" - -inherit distro_features_check gnomebase perlnative - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist" -FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux" -FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast" -FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse" -FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint" -FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse" -FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint" -FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist" - -FILES_${PN} += "${datadir}/themes ${datadir}/icons" - -SRC_URI += "file://iconpath-option.patch \ - file://drop-localedir-override.patch \ -" -SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1" -SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a" -GNOME_COMPRESS_TYPE="bz2" - -- cgit 1.2.3-korg