Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/fsviewer/files/, x11-plugins/fsviewer/, profiles/
Date: Sun, 31 May 2020 10:30:41
Message-Id: 1590920996.f20ea9b282c4957ccfed9e31691d29fcb747219f.mgorny@gentoo
1 commit: f20ea9b282c4957ccfed9e31691d29fcb747219f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 10:27:59 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 10:29:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20ea9b2
7
8 x11-plugins/fsviewer: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/717418
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 5 --
14 x11-plugins/fsviewer/Manifest | 1 -
15 .../fsviewer/files/fsviewer-0.2.6-configure.patch | 21 --------
16 .../files/fsviewer-0.2.6-fix_title_bar.patch | 62 ----------------------
17 .../fsviewer/files/fsviewer-0.2.6-gcc-10.patch | 26 ---------
18 .../fsviewer/files/fsviewer-0.2.6-gcc5.patch | 11 ----
19 .../files/fsviewer-0.2.6-wmaker-0.95_support.patch | 36 -------------
20 x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild | 51 ------------------
21 x11-plugins/fsviewer/metadata.xml | 8 ---
22 9 files changed, 221 deletions(-)
23
24 diff --git a/profiles/package.mask b/profiles/package.mask
25 index 02aa676933d..25a75ab8c45 100644
26 --- a/profiles/package.mask
27 +++ b/profiles/package.mask
28 @@ -208,11 +208,6 @@ dev-tex/revtex
29 <x11-wm/muffin-4.4
30 =dev-python/xapp-1.0.1-r2
31
32 -# Bernard Cafarelli <voyageur@g.o> (2020-04-30)
33 -# Does not compile with latest windowmaker, bug #717418
34 -# Last release in 2007. Masked for removal in 30 days.
35 -x11-plugins/fsviewer
36 -
37 # Matt Turner <mattst88@g.o> (2020-04-29)
38 # Masked for testing
39 >=dev-libs/gjs-1.64
40
41 diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
42 deleted file mode 100644
43 index 196c140dcd3..00000000000
44 --- a/x11-plugins/fsviewer/Manifest
45 +++ /dev/null
46 @@ -1 +0,0 @@
47 -DIST fsviewer-app-0.2.6.tar.bz2 785422 BLAKE2B cd9650fec13cbe6082c7b6cf30db75d179a870673908a02ee5fcf5439bbbb5e86815b634dd536552197c6dc20d3866f3168a49978a0c9c5ec5b3c49543a19a0c SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b
48
49 diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch
50 deleted file mode 100644
51 index 2d1759fefce..00000000000
52 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch
53 +++ /dev/null
54 @@ -1,21 +0,0 @@
55 ---- fsviewer-app-0.2.6.orig/configure.ac 2007-10-13 23:54:47.000000000 +0200
56 -+++ fsviewer-app-0.2.6/configure.ac 2015-09-02 21:10:40.829519545 +0200
57 -@@ -26,15 +26,15 @@
58 - dnl look for X windows first so further libs check
59 - AC_PATH_X
60 -
61 --if test "$x_includes" != "NONE"; then
62 -+if test "$x_includes" != "NONE" && test -n "$x_includes"; then
63 - CFLAGS="$CFLAGS -I$x_includes"
64 - fi
65 --if test "$x_libraries" != "NONE"; then
66 -+if test "$x_libraries" != "NONE" && test -n "$x_libraries"; then
67 - LDFLAGS="$LDFLAGS -L$x_libraries"
68 - fi
69 -
70 - dnl Additional "default" items
71 --#LIBS="$LIBS -lX11"
72 -+LIBS="$LIBS -lm -lX11 -lXpm"
73 - #CFLAGS="$CFLAGS -I/usr/X11/include"
74 - #LDFLAGS="$LDFLAGS -L/usr/X11/lib"
75 -
76
77 diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch
78 deleted file mode 100644
79 index 36f59560937..00000000000
80 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch
81 +++ /dev/null
82 @@ -1,62 +0,0 @@
83 -diff -Naur fsviewer-app-0.2.6.orig/src/FSFileView.c fsviewer-app-0.2.6/src/FSFileView.c
84 ---- fsviewer-app-0.2.6.orig/src/FSFileView.c 2007-10-14 21:06:02.000000000 +0200
85 -+++ fsviewer-app-0.2.6/src/FSFileView.c 2015-09-02 21:18:39.574691303 +0200
86 -@@ -430,7 +430,7 @@
87 - WMResizableWindowMask);
88 - attributes.window_level = WMNormalWindowLevel;
89 - attributes.extra_flags = GSFullKeyboardEventsFlag;
90 -- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
91 -+ attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr |
92 - GSExtraFlagsAttr);
93 - WMSetWindowAttributes(fView->dpy, WMWidgetXID(fView->fileView),
94 - &attributes);
95 -diff -Naur fsviewer-app-0.2.6.orig/src/FSFinder.c fsviewer-app-0.2.6/src/FSFinder.c
96 ---- fsviewer-app-0.2.6.orig/src/FSFinder.c 2006-07-23 09:24:16.000000000 +0200
97 -+++ fsviewer-app-0.2.6/src/FSFinder.c 2015-09-02 21:18:39.574691303 +0200
98 -@@ -144,7 +144,7 @@
99 - WMResizableWindowMask);
100 - attributes.window_level = WMNormalWindowLevel;
101 - attributes.extra_flags = GSFullKeyboardEventsFlag;
102 -- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
103 -+ attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr |
104 - GSExtraFlagsAttr);
105 - WMSetWindowAttributes(finder->dpy, WMWidgetXID(finder->win),
106 - &attributes);
107 -diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
108 ---- fsviewer-app-0.2.6.orig/src/FSViewer.c 2007-10-14 17:29:04.000000000 +0200
109 -+++ fsviewer-app-0.2.6/src/FSViewer.c 2015-09-02 21:18:39.574691303 +0200
110 -@@ -161,7 +161,7 @@
111 - attributes.window_level = WMFloatingWindowLevel;
112 - attributes.extra_flags = GSFullKeyboardEventsFlag;
113 - attributes.flags =
114 -- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
115 -+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
116 - WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
117 - WMAppAddWindow(fsViewer->wmContext, window);
118 -
119 -@@ -189,7 +189,7 @@
120 - attributes.window_level = WMNormalWindowLevel;
121 - attributes.extra_flags = GSFullKeyboardEventsFlag;
122 - attributes.flags =
123 -- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
124 -+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
125 - WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
126 - WMAppAddWindow(fsViewer->wmContext, window);
127 - }
128 -@@ -216,7 +216,7 @@
129 - attributes.window_level = WMFloatingWindowLevel;
130 - attributes.extra_flags = GSFullKeyboardEventsFlag;
131 - attributes.flags =
132 -- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
133 -+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr);
134 - WMSetWindowAttributes(fsViewer->dpy, window, &attributes);
135 - WMAppAddWindow(fsViewer->wmContext, window);
136 - }
137 -@@ -476,6 +476,7 @@
138 - bindtextdomain("FSViewer", getenv("NLSPATH"));
139 - else
140 - bindtextdomain("FSViewer", LOCALEDIR);
141 -+ bind_textdomain_codeset("FSViewer", "UTF-8");
142 - textdomain("FSViewer");
143 -
144 - if (!XSupportsLocale()) {
145
146 diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
147 deleted file mode 100644
148 index 00c5e651e69..00000000000
149 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
150 +++ /dev/null
151 @@ -1,26 +0,0 @@
152 -diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
153 ---- fsviewer-app-0.2.6.orig/src/FSViewer.c 2007-10-14 17:29:04.000000000 +0200
154 -+++ fsviewer-app-0.2.6/src/FSViewer.c 2020-02-03 00:20:37.979716353 +0100
155 -@@ -25,6 +25,8 @@
156 - static Bool focusIn;
157 - int ModifierFromKey(Display *dpy, char *key);
158 -
159 -+WMUserDefaults *defaultsDB;
160 -+WMPropList *filesDB;
161 - void
162 - wAbort(Bool foo)
163 - {
164 -diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.h fsviewer-app-0.2.6/src/FSViewer.h
165 ---- fsviewer-app-0.2.6.orig/src/FSViewer.h 2006-07-23 09:24:15.000000000 +0200
166 -+++ fsviewer-app-0.2.6/src/FSViewer.h 2020-02-03 00:20:39.299718025 +0100
167 -@@ -123,8 +123,8 @@
168 - } CallbackRec;
169 -
170 - /* Application defaults */
171 --WMUserDefaults *defaultsDB;
172 --WMPropList *filesDB;
173 -+extern WMUserDefaults *defaultsDB;
174 -+extern WMPropList *filesDB;
175 -
176 - /* all Panels must start with the following layout */
177 - typedef struct PanelRec {
178
179 diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch
180 deleted file mode 100644
181 index 2a532625ff8..00000000000
182 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch
183 +++ /dev/null
184 @@ -1,11 +0,0 @@
185 ---- fsviewer-app-0.2.6.orig/src/list.h
186 -+++ fsviewer-app-0.2.6/src/list.h
187 -@@ -29,7 +29,7 @@
188 - #ifndef __LIST_H_
189 - #define __LIST_H_
190 -
191 --#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
192 -+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (__GNUC__ < 5)
193 - # define INLINE inline
194 - #else
195 - # define INLINE
196
197 diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
198 deleted file mode 100644
199 index da64f3a0389..00000000000
200 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
201 +++ /dev/null
202 @@ -1,36 +0,0 @@
203 -diff -Naur fsviewer-app-0.2.6.orig/configure.ac fsviewer-app-0.2.6/configure.ac
204 ---- fsviewer-app-0.2.6.orig/configure.ac 2012-07-11 17:55:06.448981246 +0200
205 -+++ fsviewer-app-0.2.6/configure.ac 2012-07-11 18:04:15.528940159 +0200
206 -@@ -81,6 +81,8 @@
207 - AC_MSG_ERROR([WMaker library not found]))
208 - AC_CHECK_LIB(WINGs, WMAppSetMainMenu,,
209 - AC_MSG_ERROR([WINGs library not found]))
210 -+AC_CHECK_LIB(WUtil, WMCreatePLString,,
211 -+ AC_MSG_ERROR([WUtil library not found]))
212 -
213 - dnl Checks for PropList (not necessary since version 0.2.3b)
214 - dnl AC_CHECK_HEADERS(proplist.h,, AC_MSG_WARN(Can't find PropList include-file: Please install libPropList (included in WindowMaker)))
215 -diff -Naur fsviewer-app-0.2.6.orig/defs/chdef.c fsviewer-app-0.2.6/defs/chdef.c
216 ---- fsviewer-app-0.2.6.orig/defs/chdef.c 2012-07-11 17:55:06.444981361 +0200
217 -+++ fsviewer-app-0.2.6/defs/chdef.c 2012-07-11 17:55:50.387699640 +0200
218 -@@ -374,7 +374,7 @@
219 - SetIntegerForKey(0, "DisplayMCListPixmap");
220 -
221 - WMWritePropListToFile(filesDB,
222 -- wdefaultspathfordomain("FSViewer"), True);
223 -+ wdefaultspathfordomain("FSViewer"));
224 - result = 0;
225 - }
226 - else
227 -diff -Naur fsviewer-app-0.2.6.orig/src/extnInspector.c fsviewer-app-0.2.6/src/extnInspector.c
228 ---- fsviewer-app-0.2.6.orig/src/extnInspector.c 2012-07-11 17:55:06.452981130 +0200
229 -+++ fsviewer-app-0.2.6/src/extnInspector.c 2012-07-11 17:56:02.315351669 +0200
230 -@@ -229,7 +229,7 @@
231 -
232 - if(numRows > 0)
233 - WMWritePropListToFile(filesDB,
234 -- wdefaultspathfordomain("FSViewer"), True);
235 -+ wdefaultspathfordomain("FSViewer"));
236 -
237 - if(extn)
238 - free(extn);
239
240 diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
241 deleted file mode 100644
242 index 9e5972eaf1e..00000000000
243 --- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
244 +++ /dev/null
245 @@ -1,51 +0,0 @@
246 -# Copyright 1999-2020 Gentoo Authors
247 -# Distributed under the terms of the GNU General Public License v2
248 -
249 -EAPI=6
250 -inherit autotools multilib
251 -
252 -MY_P=${PN}-app-${PV}
253 -
254 -DESCRIPTION="A file system viewer for Window Maker"
255 -HOMEPAGE="http://wie-im-flug.net/linux/fsviewer/index.html"
256 -SRC_URI="http://wie-im-flug.net/linux/${PN}/${MY_P}.tar.bz2"
257 -
258 -LICENSE="GPL-2"
259 -SLOT="0"
260 -KEYWORDS="amd64 ppc x86"
261 -IUSE="nls"
262 -
263 -RDEPEND=">=x11-wm/windowmaker-0.95.2
264 - x11-libs/libXft
265 - x11-libs/libXpm
266 - x11-libs/libX11"
267 -DEPEND="${RDEPEND}
268 - x11-base/xorg-proto
269 - nls? ( sys-devel/gettext )"
270 -
271 -S=${WORKDIR}/${MY_P}
272 -
273 -PATCHES=(
274 - "${FILESDIR}"/${P}-configure.patch
275 - "${FILESDIR}"/${P}-gcc5.patch
276 - "${FILESDIR}"/${P}-wmaker-0.95_support.patch
277 - "${FILESDIR}"/${P}-fix_title_bar.patch
278 - "${FILESDIR}"/${P}-gcc-10.patch
279 -)
280 -DOCS="AUTHORS ChangeLog NEWS README"
281 -
282 -src_prepare() {
283 - default
284 - eautoreconf
285 -}
286 -
287 -src_configure() {
288 - econf \
289 - $(use_enable nls) \
290 - --with-appspath=/usr/$(get_libdir)/GNUstep
291 -}
292 -
293 -src_install() {
294 - default
295 - dosym ../$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
296 -}
297
298 diff --git a/x11-plugins/fsviewer/metadata.xml b/x11-plugins/fsviewer/metadata.xml
299 deleted file mode 100644
300 index 7d273a80ff6..00000000000
301 --- a/x11-plugins/fsviewer/metadata.xml
302 +++ /dev/null
303 @@ -1,8 +0,0 @@
304 -<?xml version="1.0" encoding="UTF-8"?>
305 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
306 -<pkgmetadata>
307 - <maintainer type="person">
308 - <email>voyageur@g.o</email>
309 - <name>Bernard Cafarelli</name>
310 - </maintainer>
311 -</pkgmetadata>
Report Message
Find on MARC Find on Google Groups