aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-wm/fluxbox-devel/Makefile1
-rw-r--r--x11-wm/fluxbox-devel/files/patch-fix_iconvmenu_crash13
2 files changed, 14 insertions, 0 deletions
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 784e3817fb1e..978e32c1c415 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fluxbox
PORTVERSION= 1.0rc2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fluxbox
diff --git a/x11-wm/fluxbox-devel/files/patch-fix_iconvmenu_crash b/x11-wm/fluxbox-devel/files/patch-fix_iconvmenu_crash
new file mode 100644
index 000000000000..fc655e7839b6
--- /dev/null
+++ b/x11-wm/fluxbox-devel/files/patch-fix_iconvmenu_crash
@@ -0,0 +1,13 @@
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude trunk.orig/src/FbTk/FbString.cc trunk.tabs/src/FbTk/FbString.cc
+--- src/FbTk/FbString.cc 2006-06-26 20:55:59.000000000 +1000
++++ src/FbTk/FbString.cc 2006-07-05 09:37:16.000000000 +1000
+@@ -261,7 +261,8 @@
+ if (newiconv == ((iconv_t)(-1)))
+ return false;
+ else {
+- iconv_close(m_iconv);
++ if (m_iconv != ((iconv_t)-1))
++ iconv_close(m_iconv);
+ m_iconv = newiconv;
+ return true;
+ }