Skip to content

Commit

Permalink
mate-base/mate-applets: Drop mate-icon-theme requirement, #593474
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.3.0
  • Loading branch information
NP-Hardass committed Sep 12, 2016
1 parent 6a38782 commit 2d40752
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 0a9439346e00aded616fe99773ffec2f3f7bcc49 Mon Sep 17 00:00:00 2001
From: raveit65 <[email protected]>
Date: Thu, 1 Oct 2015 00:27:53 +0200
Subject: [PATCH] drop dpendency to mate-icon-theme

The dependency is not really needed; depending on GTK+ should be enough
to guarantee the presence of a spec-compliant icon theme.
---
configure.ac | 4 ----
1 file changed, 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index b69e1a4..284dba7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,6 @@ LIBNOTIFY_REQUIRED=0.7.0
UPOWER_REQUIRED=0.9.4
DBUS_REQUIRED=1.1.2
DBUS_GLIB_REQUIRED=0.74
-MATE_ICON_THEME_REQUIRED=1.1.0
LIBXML_REQUIRED=2.5.0
POLKIT_REQUIRED=0.92
dnl ***************************************************************************
@@ -122,9 +121,6 @@ dnl ***************************************************************************
dnl *** Use pkg-config to check for dependancies ***
dnl ***************************************************************************

-dnl -- Check for mate-icon-theme (required) ----------------------------------
-PKG_CHECK_MODULES(GIT, mate-icon-theme >= $MATE_ICON_THEME_REQUIRED)
-
dnl -- check for gio (required) ------------------------------------------
PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0)
AC_SUBST(GIO_CFLAGS)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ EAPI="5"
GCONF_DEBUG="no"
PYTHON_COMPAT=( python2_7 )

inherit eutils gnome2 python-single-r1 versionator
inherit eutils gnome2 python-single-r1 autotools versionator

MATE_BRANCH="$(get_version_component_range 1-2)"

Expand All @@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"

LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
KEYWORDS="~amd64 ~arm ~x86"

IUSE="X ipv6 policykit +upower"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
Expand Down Expand Up @@ -45,7 +45,6 @@ RDEPEND="${PYTHON_DEPS}
x11-libs/libX11:0
>=x11-libs/libwnck-2.30:1
x11-libs/pango:0
>=x11-themes/mate-icon-theme-1.10:0
virtual/libintl:0
policykit? ( >=sys-auth/polkit-0.92:0 )"

Expand All @@ -59,6 +58,17 @@ DEPEND="${RDEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"

PATCHES=(
"${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch"
"${FILESDIR}/${PN}-1.10.4-drop-icon-theme-dep.patch"
)

src_prepare() {
epatch ${PATCHES[@]}
eautoreconf
gnome2_src_prepare
}

src_configure() {
gnome2_src_configure \
--libexecdir=/usr/libexec/mate-applets \
Expand Down

0 comments on commit 2d40752

Please sign in to comment.