1 |
commit: cf2af553b1331ccf71ba12fcfa33ea07e19d0356 |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 26 01:43:40 2016 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 6 02:11:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2af553 |
7 |
|
8 |
mate-base/mate-panel: Drop 1.8.x |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
mate-base/mate-panel/Manifest | 1 - |
13 |
...mate-panel-1.8.1-fix-networkmanager-flags.patch | 53 -------------- |
14 |
.../mate-panel-1.8.1-update_marco_wm_name.patch | 11 --- |
15 |
mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild | 82 ---------------------- |
16 |
4 files changed, 147 deletions(-) |
17 |
|
18 |
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest |
19 |
index 5af8891..52b41cb 100644 |
20 |
--- a/mate-base/mate-panel/Manifest |
21 |
+++ b/mate-base/mate-panel/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
DIST mate-panel-1.10.1.tar.xz 1934576 SHA256 261702b4eaf5339a55629c5f31466fb7878d5a640f80f88edde54ed1b9eba444 SHA512 4e8e2eddf2d9ae51b2b332dc6d96130afe90a767d1aca9cbc7a60b77f1e39d233c7a1c2490f5d68f33c6bc2fc834aee9f6cfb888c0cf3ab4b7886880865c9e95 WHIRLPOOL d07913e8b09f3e6ac095a8cc801c06b83c598d38a63dfd39f8b619e736c453dcbf50ef5bb33bcf293b262687cdba4635ea7a16bc4375842b3634ae29ef6f7a40 |
24 |
-DIST mate-panel-1.8.1.tar.xz 1953156 SHA256 d53d1546577db3e45ce6b46b4a40b2edc066781cc1e864eef47ad07b0fdb3f19 SHA512 925189eedf604117b4b4033b77a6ec4096f5c663218ca6736d549cdfd69c5476eebed56688632a6a20d0e2de49bc09ebd8373ecf45f486161b012346bb2eff8b WHIRLPOOL bb298e1b4b4078409e3a6b7858e2abf1667339c8581ee728f95f8ab0ea63288598e9c205b63baed40a57b19268c062a099fc98600502fd3723675ccfc19baade |
25 |
|
26 |
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 |
27 |
deleted file mode 100644 |
28 |
index f677269..0000000 |
29 |
--- a/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch |
30 |
+++ /dev/null |
31 |
@@ -1,53 +0,0 @@ |
32 |
-From f03dff4c416d417238dcd625a24ea85e380e599c Mon Sep 17 00:00:00 2001 |
33 |
-From: Gokturk Yuksek <gokturk@××××××××××.edu> |
34 |
-Date: Sun, 3 Jan 2016 03:17:40 -0500 |
35 |
-Subject: [PATCH 1/1] applets/clock: add missing pkgconfig flags for |
36 |
- NetworkManager |
37 |
- |
38 |
-mate-panel-1.8 fails to compile with NetworkManager >=1.0.8 due to a |
39 |
-missing include directive ('-I'). Substitute network manager CFLAGS |
40 |
-and LIBS supplied by the pkgconfig macro in configure.ac and use it |
41 |
-for applets/clock. |
42 |
- |
43 |
-Signed-off-by: Gokturk Yuksek <gokturk@××××××××××.edu> |
44 |
---- |
45 |
- applets/clock/Makefile.am | 2 ++ |
46 |
- configure.ac | 2 ++ |
47 |
- 2 files changed, 4 insertions(+) |
48 |
- |
49 |
-diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am |
50 |
-index 950ecdd..bfb6b45 100644 |
51 |
---- a/applets/clock/Makefile.am |
52 |
-+++ b/applets/clock/Makefile.am |
53 |
-@@ -39,6 +39,7 @@ CLOCK_CPPFLAGS = \ |
54 |
- $(AM_CPPFLAGS) \ |
55 |
- $(LIBMATE_PANEL_APPLET_CFLAGS) \ |
56 |
- $(CLOCK_CFLAGS) \ |
57 |
-+ $(NETWORK_MANAGER_CFLAGS) \ |
58 |
- -I$(srcdir)/../../libmate-panel-applet \ |
59 |
- -I$(top_builddir)/libmate-panel-applet \ |
60 |
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ |
61 |
-@@ -51,6 +52,7 @@ CLOCK_LDADD = \ |
62 |
- ../../libmate-panel-applet/libmate-panel-applet-4.la \ |
63 |
- $(CLOCK_LIBS) \ |
64 |
- $(LIBMATE_PANEL_APPLET_LIBS) \ |
65 |
-+ $(NETWORK_MANAGER_LIBS) \ |
66 |
- libsystem-timezone.la \ |
67 |
- -lm |
68 |
- |
69 |
-diff --git a/configure.ac b/configure.ac |
70 |
-index af5a422..6d1389e 100644 |
71 |
---- a/configure.ac |
72 |
-+++ b/configure.ac |
73 |
-@@ -156,6 +156,8 @@ else |
74 |
- fi |
75 |
- if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then |
76 |
- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled]) |
77 |
-+ AC_SUBST(NETWORK_MANAGER_CFLAGS) |
78 |
-+ AC_SUBST(NETWORK_MANAGER_LIBS) |
79 |
- fi |
80 |
- |
81 |
- # Make it possible to compile the applets in-process |
82 |
--- |
83 |
-2.4.10 |
84 |
- |
85 |
|
86 |
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 |
87 |
deleted file mode 100644 |
88 |
index f57bf98..0000000 |
89 |
--- a/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch |
90 |
+++ /dev/null |
91 |
@@ -1,11 +0,0 @@ |
92 |
---- a/applets/wncklet/workspace-switcher.c |
93 |
-+++ b/applets/wncklet/workspace-switcher.c |
94 |
-@@ -143,6 +143,8 @@ |
95 |
- |
96 |
- if (!wm_name) |
97 |
- pager->wm = PAGER_WM_UNKNOWN; |
98 |
-+ else if (strcmp(wm_name, "Metacity (Marco)") == 0) |
99 |
-+ pager->wm = PAGER_WM_MARCO; |
100 |
- else if (strcmp(wm_name, "Marco") == 0) |
101 |
- pager->wm = PAGER_WM_MARCO; |
102 |
- else if (strcmp(wm_name, "Compiz") == 0) |
103 |
|
104 |
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 |
105 |
deleted file mode 100644 |
106 |
index 7604495..0000000 |
107 |
--- a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild |
108 |
+++ /dev/null |
109 |
@@ -1,82 +0,0 @@ |
110 |
-# Copyright 1999-2016 Gentoo Foundation |
111 |
-# Distributed under the terms of the GNU General Public License v2 |
112 |
-# $Id$ |
113 |
- |
114 |
-EAPI="5" |
115 |
- |
116 |
-GCONF_DEBUG="no" |
117 |
-GNOME2_LA_PUNT="yes" |
118 |
- |
119 |
-inherit eutils autotools gnome2 versionator |
120 |
- |
121 |
-MATE_BRANCH="$(get_version_component_range 1-2)" |
122 |
- |
123 |
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" |
124 |
-DESCRIPTION="The MATE panel" |
125 |
-HOMEPAGE="http://mate-desktop.org" |
126 |
- |
127 |
-LICENSE="GPL-2 FDL-1.1 LGPL-2" |
128 |
-SLOT="0" |
129 |
-KEYWORDS="amd64 x86" |
130 |
- |
131 |
-IUSE="X +introspection networkmanager" |
132 |
- |
133 |
-RDEPEND=" |
134 |
- dev-libs/atk:0 |
135 |
- >=dev-libs/dbus-glib-0.80:0 |
136 |
- >=dev-libs/glib-2.26:2 |
137 |
- >=dev-libs/libmateweather-1.8 |
138 |
- dev-libs/libxml2:2 |
139 |
- >=gnome-base/dconf-0.10:0 |
140 |
- gnome-base/librsvg:2 |
141 |
- >=mate-base/mate-desktop-1.8:0 |
142 |
- >=mate-base/mate-menus-1.8:0 |
143 |
- >=media-libs/libcanberra-0.23:0[gtk] |
144 |
- >=sys-apps/dbus-1.1.2:0 |
145 |
- >=x11-libs/cairo-1:0 |
146 |
- >=x11-libs/gdk-pixbuf-2.7.1:2 |
147 |
- x11-libs/libICE:0 |
148 |
- x11-libs/libSM:0 |
149 |
- x11-libs/libX11:0 |
150 |
- >=x11-libs/libwnck-2.30:1[introspection?] |
151 |
- >=x11-libs/pango-1.15.4:0[introspection?] |
152 |
- >=x11-libs/gtk+-2.19.7:2[introspection?] |
153 |
- x11-libs/libXau:0 |
154 |
- >=x11-libs/libXrandr-1.2:0 |
155 |
- virtual/libintl:0 |
156 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 ) |
157 |
- networkmanager? ( >=net-misc/networkmanager-0.6:0 )" |
158 |
- |
159 |
-DEPEND="${RDEPEND} |
160 |
- app-text/docbook-xml-dtd:4.1.2 |
161 |
- app-text/yelp-tools:0 |
162 |
- >=dev-lang/perl-5:0= |
163 |
- >=dev-util/intltool-0.40:* |
164 |
- >=mate-base/mate-common-1.8:0 |
165 |
- sys-devel/gettext:* |
166 |
- virtual/pkgconfig:*" |
167 |
- |
168 |
-src_prepare() { |
169 |
- # Disable python check. |
170 |
- sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die |
171 |
- |
172 |
- epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" \ |
173 |
- "${FILESDIR}/${P}-fix-networkmanager-flags.patch" |
174 |
- |
175 |
- epatch_user |
176 |
- |
177 |
- eautoreconf |
178 |
- |
179 |
- gnome2_src_prepare |
180 |
-} |
181 |
- |
182 |
-src_configure() { |
183 |
- gnome2_src_configure \ |
184 |
- --libexecdir=/usr/libexec/mate-applets \ |
185 |
- --disable-deprecation-flags \ |
186 |
- $(use_enable networkmanager network-manager) \ |
187 |
- $(use_enable introspection) \ |
188 |
- $(use_with X x) |
189 |
-} |
190 |
- |
191 |
-DOCS="AUTHORS ChangeLog HACKING NEWS README" |