commit: f20ea9b282c4957ccfed9e31691d29fcb747219f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun May 31 10:27:59 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun May 31 10:29:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20ea9b2
x11-plugins/fsviewer: Remove last-rited pkg Closes: https://bugs.gentoo.org/717418 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 5 -- x11-plugins/fsviewer/Manifest | 1 - .../fsviewer/files/fsviewer-0.2.6-configure.patch | 21 -------- .../files/fsviewer-0.2.6-fix_title_bar.patch | 62 ---------------------- .../fsviewer/files/fsviewer-0.2.6-gcc-10.patch | 26 --------- .../fsviewer/files/fsviewer-0.2.6-gcc5.patch | 11 ---- .../files/fsviewer-0.2.6-wmaker-0.95_support.patch | 36 ------------- x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild | 51 ------------------ x11-plugins/fsviewer/metadata.xml | 8 --- 9 files changed, 221 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 02aa676933d..25a75ab8c45 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -208,11 +208,6 @@ dev-tex/revtex <x11-wm/muffin-4.4 =dev-python/xapp-1.0.1-r2 -# Bernard Cafarelli <[email protected]> (2020-04-30) -# Does not compile with latest windowmaker, bug #717418 -# Last release in 2007. Masked for removal in 30 days. -x11-plugins/fsviewer - # Matt Turner <[email protected]> (2020-04-29) # Masked for testing >=dev-libs/gjs-1.64 diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest deleted file mode 100644 index 196c140dcd3..00000000000 --- a/x11-plugins/fsviewer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fsviewer-app-0.2.6.tar.bz2 785422 BLAKE2B cd9650fec13cbe6082c7b6cf30db75d179a870673908a02ee5fcf5439bbbb5e86815b634dd536552197c6dc20d3866f3168a49978a0c9c5ec5b3c49543a19a0c SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch deleted file mode 100644 index 2d1759fefce..00000000000 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- fsviewer-app-0.2.6.orig/configure.ac 2007-10-13 23:54:47.000000000 +0200 -+++ fsviewer-app-0.2.6/configure.ac 2015-09-02 21:10:40.829519545 +0200 -@@ -26,15 +26,15 @@ - dnl look for X windows first so further libs check - AC_PATH_X - --if test "$x_includes" != "NONE"; then -+if test "$x_includes" != "NONE" && test -n "$x_includes"; then - CFLAGS="$CFLAGS -I$x_includes" - fi --if test "$x_libraries" != "NONE"; then -+if test "$x_libraries" != "NONE" && test -n "$x_libraries"; then - LDFLAGS="$LDFLAGS -L$x_libraries" - fi - - dnl Additional "default" items --#LIBS="$LIBS -lX11" -+LIBS="$LIBS -lm -lX11 -lXpm" - #CFLAGS="$CFLAGS -I/usr/X11/include" - #LDFLAGS="$LDFLAGS -L/usr/X11/lib" - 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 deleted file mode 100644 index 36f59560937..00000000000 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur fsviewer-app-0.2.6.orig/src/FSFileView.c fsviewer-app-0.2.6/src/FSFileView.c ---- fsviewer-app-0.2.6.orig/src/FSFileView.c 2007-10-14 21:06:02.000000000 +0200 -+++ fsviewer-app-0.2.6/src/FSFileView.c 2015-09-02 21:18:39.574691303 +0200 -@@ -430,7 +430,7 @@ - WMResizableWindowMask); - attributes.window_level = WMNormalWindowLevel; - attributes.extra_flags = GSFullKeyboardEventsFlag; -- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | -+ attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | - GSExtraFlagsAttr); - WMSetWindowAttributes(fView->dpy, WMWidgetXID(fView->fileView), - &attributes); -diff -Naur fsviewer-app-0.2.6.orig/src/FSFinder.c fsviewer-app-0.2.6/src/FSFinder.c ---- fsviewer-app-0.2.6.orig/src/FSFinder.c 2006-07-23 09:24:16.000000000 +0200 -+++ fsviewer-app-0.2.6/src/FSFinder.c 2015-09-02 21:18:39.574691303 +0200 -@@ -144,7 +144,7 @@ - WMResizableWindowMask); - attributes.window_level = WMNormalWindowLevel; - attributes.extra_flags = GSFullKeyboardEventsFlag; -- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | -+ attributes.flags = (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | - GSExtraFlagsAttr); - WMSetWindowAttributes(finder->dpy, WMWidgetXID(finder->win), - &attributes); -diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c ---- fsviewer-app-0.2.6.orig/src/FSViewer.c 2007-10-14 17:29:04.000000000 +0200 -+++ fsviewer-app-0.2.6/src/FSViewer.c 2015-09-02 21:18:39.574691303 +0200 -@@ -161,7 +161,7 @@ - attributes.window_level = WMFloatingWindowLevel; - attributes.extra_flags = GSFullKeyboardEventsFlag; - attributes.flags = -- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); -+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr); - WMSetWindowAttributes(fsViewer->dpy, window, &attributes); - WMAppAddWindow(fsViewer->wmContext, window); - -@@ -189,7 +189,7 @@ - attributes.window_level = WMNormalWindowLevel; - attributes.extra_flags = GSFullKeyboardEventsFlag; - attributes.flags = -- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); -+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr); - WMSetWindowAttributes(fsViewer->dpy, window, &attributes); - WMAppAddWindow(fsViewer->wmContext, window); - } -@@ -216,7 +216,7 @@ - attributes.window_level = WMFloatingWindowLevel; - attributes.extra_flags = GSFullKeyboardEventsFlag; - attributes.flags = -- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); -+ (/*GSWindowStyleAttr |*/ GSWindowLevelAttr | GSExtraFlagsAttr); - WMSetWindowAttributes(fsViewer->dpy, window, &attributes); - WMAppAddWindow(fsViewer->wmContext, window); - } -@@ -476,6 +476,7 @@ - bindtextdomain("FSViewer", getenv("NLSPATH")); - else - bindtextdomain("FSViewer", LOCALEDIR); -+ bind_textdomain_codeset("FSViewer", "UTF-8"); - textdomain("FSViewer"); - - if (!XSupportsLocale()) { 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 deleted file mode 100644 index 00c5e651e69..00000000000 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c ---- fsviewer-app-0.2.6.orig/src/FSViewer.c 2007-10-14 17:29:04.000000000 +0200 -+++ fsviewer-app-0.2.6/src/FSViewer.c 2020-02-03 00:20:37.979716353 +0100 -@@ -25,6 +25,8 @@ - static Bool focusIn; - int ModifierFromKey(Display *dpy, char *key); - -+WMUserDefaults *defaultsDB; -+WMPropList *filesDB; - void - wAbort(Bool foo) - { -diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.h fsviewer-app-0.2.6/src/FSViewer.h ---- fsviewer-app-0.2.6.orig/src/FSViewer.h 2006-07-23 09:24:15.000000000 +0200 -+++ fsviewer-app-0.2.6/src/FSViewer.h 2020-02-03 00:20:39.299718025 +0100 -@@ -123,8 +123,8 @@ - } CallbackRec; - - /* Application defaults */ --WMUserDefaults *defaultsDB; --WMPropList *filesDB; -+extern WMUserDefaults *defaultsDB; -+extern WMPropList *filesDB; - - /* all Panels must start with the following layout */ - typedef struct PanelRec { diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch deleted file mode 100644 index 2a532625ff8..00000000000 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fsviewer-app-0.2.6.orig/src/list.h -+++ fsviewer-app-0.2.6/src/list.h -@@ -29,7 +29,7 @@ - #ifndef __LIST_H_ - #define __LIST_H_ - --#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (__GNUC__ < 5) - # define INLINE inline - #else - # define INLINE 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 deleted file mode 100644 index da64f3a0389..00000000000 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur fsviewer-app-0.2.6.orig/configure.ac fsviewer-app-0.2.6/configure.ac ---- fsviewer-app-0.2.6.orig/configure.ac 2012-07-11 17:55:06.448981246 +0200 -+++ fsviewer-app-0.2.6/configure.ac 2012-07-11 18:04:15.528940159 +0200 -@@ -81,6 +81,8 @@ - AC_MSG_ERROR([WMaker library not found])) - AC_CHECK_LIB(WINGs, WMAppSetMainMenu,, - AC_MSG_ERROR([WINGs library not found])) -+AC_CHECK_LIB(WUtil, WMCreatePLString,, -+ AC_MSG_ERROR([WUtil library not found])) - - dnl Checks for PropList (not necessary since version 0.2.3b) - dnl AC_CHECK_HEADERS(proplist.h,, AC_MSG_WARN(Can't find PropList include-file: Please install libPropList (included in WindowMaker))) -diff -Naur fsviewer-app-0.2.6.orig/defs/chdef.c fsviewer-app-0.2.6/defs/chdef.c ---- fsviewer-app-0.2.6.orig/defs/chdef.c 2012-07-11 17:55:06.444981361 +0200 -+++ fsviewer-app-0.2.6/defs/chdef.c 2012-07-11 17:55:50.387699640 +0200 -@@ -374,7 +374,7 @@ - SetIntegerForKey(0, "DisplayMCListPixmap"); - - WMWritePropListToFile(filesDB, -- wdefaultspathfordomain("FSViewer"), True); -+ wdefaultspathfordomain("FSViewer")); - result = 0; - } - else -diff -Naur fsviewer-app-0.2.6.orig/src/extnInspector.c fsviewer-app-0.2.6/src/extnInspector.c ---- fsviewer-app-0.2.6.orig/src/extnInspector.c 2012-07-11 17:55:06.452981130 +0200 -+++ fsviewer-app-0.2.6/src/extnInspector.c 2012-07-11 17:56:02.315351669 +0200 -@@ -229,7 +229,7 @@ - - if(numRows > 0) - WMWritePropListToFile(filesDB, -- wdefaultspathfordomain("FSViewer"), True); -+ wdefaultspathfordomain("FSViewer")); - - if(extn) - free(extn); diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild deleted file mode 100644 index 9e5972eaf1e..00000000000 --- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib - -MY_P=${PN}-app-${PV} - -DESCRIPTION="A file system viewer for Window Maker" -HOMEPAGE="http://wie-im-flug.net/linux/fsviewer/index.html"; -SRC_URI="http://wie-im-flug.net/linux/${PN}/${MY_P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="nls" - -RDEPEND=">=x11-wm/windowmaker-0.95.2 - x11-libs/libXft - x11-libs/libXpm - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-configure.patch - "${FILESDIR}"/${P}-gcc5.patch - "${FILESDIR}"/${P}-wmaker-0.95_support.patch - "${FILESDIR}"/${P}-fix_title_bar.patch - "${FILESDIR}"/${P}-gcc-10.patch -) -DOCS="AUTHORS ChangeLog NEWS README" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - --with-appspath=/usr/$(get_libdir)/GNUstep -} - -src_install() { - default - dosym ../$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer -} diff --git a/x11-plugins/fsviewer/metadata.xml b/x11-plugins/fsviewer/metadata.xml deleted file mode 100644 index 7d273a80ff6..00000000000 --- a/x11-plugins/fsviewer/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Bernard Cafarelli</name> - </maintainer> -</pkgmetadata>
