From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Wed, 2 Sep 2015 19:25:11 +0000 (+0200)
Subject: x11-plugins/fsviewer: fix compilation, bug #558696
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c73ef93995ff1fcc17941cb549648a621dadf376;p=gentoo.git

x11-plugins/fsviewer: fix compilation, bug #558696

Also fix missing DSO for some libraries (libm, libX11, libXpm)
Also grab some fixes from http://repo.or.cz/w/fsviewer.git to fix title bar

Package-Manager: portage-2.2.20.1
---

diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch
new file mode 100644
index 000000000000..61640e0cda75
--- /dev/null
+++ b/x11-plugins/fsviewer/files/fsviewer-0.2.6-configure.patch
@@ -0,0 +1,21 @@
+--- configure.ac.orig	2007-10-13 23:54:47.000000000 +0200
++++ 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
new file mode 100644
index 000000000000..36f595609375
--- /dev/null
+++ b/x11-plugins/fsviewer/files/fsviewer-0.2.6-fix_title_bar.patch
@@ -0,0 +1,62 @@
+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/fsviewer-0.2.6-r1.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..e1d3aa0c72f2
--- /dev/null
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+MY_P=${PN}-app-${PV}
+
+DESCRIPTION="A file system viewer for Window Maker"
+HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
+SRC_URI="http://www.bayernline.de/~gscholz/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-proto/xproto
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
+	epatch "${FILESDIR}"/${P}-fix_title_bar.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-appspath=/usr/$(get_libdir)/GNUstep
+}
+
+src_install() {
+	default
+	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
+}