Upgrade to 1.41.

3 files changed, 11 insertions, 50 deletions

diff --git a/x11-fm/xfe/files/patch-configure b/x11-fm/xfe/files/patch-configure
deleted file mode 100644
index a5ddcef82e68..000000000000
--- a/x11-fm/xfe/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2015-10-21 16:59:07.344253000 +0200
-+++ configure	2015-10-21 16:59:18.245643000 +0200
-@@ -14940,7 +14940,7 @@
- 	  LIBS="$LIBS $freetype_libs"
- 	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
- 	fi
--	ac_fn_cxx_check_header_mongrel "$LINENO" "config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
-+	ac_fn_cxx_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
- if test "x$ac_cv_header_config_ftheader_h" = xyes; then :
- 
- else
diff --git a/x11-fm/xfe/files/patch-src_FilePanel.cpp b/x11-fm/xfe/files/patch-src_FilePanel.cpp
new file mode 100644
index 000000000000..c2f32bb00f47
--- /dev/null
+++ b/x11-fm/xfe/files/patch-src_FilePanel.cpp
@@ -0,0 +1,11 @@
+--- src/FilePanel.cpp.orig	2016-01-14 08:35:03 UTC
++++ src/FilePanel.cpp
+@@ -124,7 +124,7 @@ FXDEFMAP(FilePanel) FilePanelMap[] =
+     FXMAPFUNC(SEL_COMMAND, FilePanel::ID_RUN_SCRIPT, FilePanel::onCmdRunScript),
+     FXMAPFUNC(SEL_UPDATE, FilePanel::ID_RUN_SCRIPT, FilePanel::onUpdRunScript),
+     FXMAPFUNC(SEL_COMMAND, FilePanel::ID_GO_SCRIPTDIR, FilePanel::onCmdGoScriptDir),
+-    FXMAPFUNC(SEL_COMMAND, FilePanel::ID_DIR_USAGE, FilePanel::onCmdDirUsage),
++    //FXMAPFUNC(SEL_COMMAND, FilePanel::ID_DIR_USAGE, FilePanel::onCmdDirUsage),
+     FXMAPFUNC(SEL_RIGHTBUTTONRELEASE, FilePanel::ID_FILELIST, FilePanel::onCmdPopupMenu),
+     FXMAPFUNC(SEL_COMMAND, FilePanel::ID_POPUP_MENU, FilePanel::onCmdPopupMenu),
+     FXMAPFUNC(SEL_DOUBLECLICKED, FilePanel::ID_FILELIST, FilePanel::onCmdItemDoubleClicked),
diff --git a/x11-fm/xfe/files/patch-xfeutils_cpp b/x11-fm/xfe/files/patch-xfeutils_cpp
deleted file mode 100644
index 286320dba996..000000000000
--- a/x11-fm/xfe/files/patch-xfeutils_cpp
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/xfeutils.cpp.orig	2015-09-07 15:32:21 UTC
-+++ src/xfeutils.cpp
-@@ -563,36 +563,6 @@ int lstatmt(const char* filename, struct
- #endif
- 
- 
--// Safe strcpy function (Public domain, by C.B. Falconer)
--// The destination string is always null terminated
--// Size sz must be equal to strlen(src)+1
--size_t strlcpy(char* dst, const char* src, size_t sz)
--{
--	const char *start = src;
--
--	if (src && sz--)
--	{
--		while ((*dst++ = *src))
--			if (sz--)
--				src++;
--			else
--		 	{
--            	*(--dst) = '\0';
--            	break;
--         	}
--   	}
--   	if (src)
--   	{
--      	while (*src++)
--			continue;
--      	return src - start - 1;
--   	}
--   	else if (sz)
--		*dst = '\0';
--	return 0;
--}
--
--
- // Safe strcat function (Public domain, by C.B. Falconer)
- // The destination string is always null terminated
- size_t strlcat(char* dst, const char* src, size_t sz)