commit: 43baa7a01014aed2a19fedebff4f7db1350db985
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 01:43:40 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 02:23:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=43baa7a0
mate-base/mate-panel: Drop 1.8.x
Package-Manager: portage-2.2.26
mate-base/mate-panel/Manifest | 1 -
...mate-panel-1.8.1-fix-networkmanager-flags.patch | 53 --------------
.../mate-panel-1.8.1-update_marco_wm_name.patch | 11 ---
mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild | 82 ----------------------
4 files changed, 147 deletions(-)
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 5af8891..52b41cb 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,2 +1 @@
DIST mate-panel-1.10.1.tar.xz 1934576 SHA256
261702b4eaf5339a55629c5f31466fb7878d5a640f80f88edde54ed1b9eba444 SHA512
4e8e2eddf2d9ae51b2b332dc6d96130afe90a767d1aca9cbc7a60b77f1e39d233c7a1c2490f5d68f33c6bc2fc834aee9f6cfb888c0cf3ab4b7886880865c9e95
WHIRLPOOL
d07913e8b09f3e6ac095a8cc801c06b83c598d38a63dfd39f8b619e736c453dcbf50ef5bb33bcf293b262687cdba4635ea7a16bc4375842b3634ae29ef6f7a40
-DIST mate-panel-1.8.1.tar.xz 1953156 SHA256
d53d1546577db3e45ce6b46b4a40b2edc066781cc1e864eef47ad07b0fdb3f19 SHA512
925189eedf604117b4b4033b77a6ec4096f5c663218ca6736d549cdfd69c5476eebed56688632a6a20d0e2de49bc09ebd8373ecf45f486161b012346bb2eff8b
WHIRLPOOL
bb298e1b4b4078409e3a6b7858e2abf1667339c8581ee728f95f8ab0ea63288598e9c205b63baed40a57b19268c062a099fc98600502fd3723675ccfc19baade
diff --git
a/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch
b/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch
deleted file mode 100644
index f677269..0000000
--- a/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f03dff4c416d417238dcd625a24ea85e380e599c Mon Sep 17 00:00:00 2001
-From: Gokturk Yuksek <gokt...@binghamton.edu>
-Date: Sun, 3 Jan 2016 03:17:40 -0500
-Subject: [PATCH 1/1] applets/clock: add missing pkgconfig flags for
- NetworkManager
-
-mate-panel-1.8 fails to compile with NetworkManager >=1.0.8 due to a
-missing include directive ('-I'). Substitute network manager CFLAGS
-and LIBS supplied by the pkgconfig macro in configure.ac and use it
-for applets/clock.
-
-Signed-off-by: Gokturk Yuksek <gokt...@binghamton.edu>
----
- applets/clock/Makefile.am | 2 ++
- configure.ac | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
-index 950ecdd..bfb6b45 100644
---- a/applets/clock/Makefile.am
-+++ b/applets/clock/Makefile.am
-@@ -39,6 +39,7 @@ CLOCK_CPPFLAGS =
\
- $(AM_CPPFLAGS) \
- $(LIBMATE_PANEL_APPLET_CFLAGS) \
- $(CLOCK_CFLAGS) \
-+ $(NETWORK_MANAGER_CFLAGS) \
- -I$(srcdir)/../../libmate-panel-applet \
- -I$(top_builddir)/libmate-panel-applet \
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-@@ -51,6 +52,7 @@ CLOCK_LDADD =
\
- ../../libmate-panel-applet/libmate-panel-applet-4.la \
- $(CLOCK_LIBS) \
- $(LIBMATE_PANEL_APPLET_LIBS) \
-+ $(NETWORK_MANAGER_LIBS) \
- libsystem-timezone.la \
- -lm
-
-diff --git a/configure.ac b/configure.ac
-index af5a422..6d1389e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -156,6 +156,8 @@ else
- fi
- if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then
- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is
enabled])
-+ AC_SUBST(NETWORK_MANAGER_CFLAGS)
-+ AC_SUBST(NETWORK_MANAGER_LIBS)
- fi
-
- # Make it possible to compile the applets in-process
---
-2.4.10
-
diff --git
a/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
deleted file mode 100644
index f57bf98..0000000
--- a/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/applets/wncklet/workspace-switcher.c
-+++ b/applets/wncklet/workspace-switcher.c
-@@ -143,6 +143,8 @@
-
- if (!wm_name)
- pager->wm = PAGER_WM_UNKNOWN;
-+ else if (strcmp(wm_name, "Metacity (Marco)") == 0)
-+ pager->wm = PAGER_WM_MARCO;
- else if (strcmp(wm_name, "Marco") == 0)
- pager->wm = PAGER_WM_MARCO;
- else if (strcmp(wm_name, "Compiz") == 0)
diff --git a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
deleted file mode 100644
index 5acf34d..0000000
--- a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils autotools gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz";
-DESCRIPTION="The MATE panel"
-HOMEPAGE="http://mate-desktop.org";
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X +introspection networkmanager"
-
-RDEPEND="
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.80:0
- >=dev-libs/glib-2.26:2
- >=dev-libs/libmateweather-1.8
- dev-libs/libxml2:2
- >=gnome-base/dconf-0.10:0
- gnome-base/librsvg:2
- >=mate-base/mate-desktop-1.8:0
- >=mate-base/mate-menus-1.8:0
- >=media-libs/libcanberra-0.23:0[gtk]
- >=sys-apps/dbus-1.1.2:0
- >=x11-libs/cairo-1:0
- >=x11-libs/gdk-pixbuf-2.7.1:2
- x11-libs/libICE:0
- x11-libs/libSM:0
- x11-libs/libX11:0
- >=x11-libs/libwnck-2.30:1[introspection?]
- >=x11-libs/pango-1.15.4:0[introspection?]
- >=x11-libs/gtk+-2.19.7:2[introspection?]
- x11-libs/libXau:0
- >=x11-libs/libXrandr-1.2:0
- virtual/libintl:0
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 )
- networkmanager? ( >=net-misc/networkmanager-0.6:0 )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools:0
- >=dev-lang/perl-5:0=
- >=dev-util/intltool-0.40:*
- >=mate-base/mate-common-1.8:0
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_prepare() {
- # Disable python check.
- sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
-
- epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" \
- "${FILESDIR}/${P}-fix-networkmanager-flags.patch"
-
- epatch_user
-
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --disable-deprecation-flags \
- $(use_enable networkmanager network-manager) \
- $(use_enable introspection) \
- $(use_with X x)
-}
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
