aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2011-03-23 08:04:29 +0800
committerdelphij <delphij@FreeBSD.org>2011-03-23 08:04:29 +0800
commit457945f6438c806e0647276eef54551cbea9ed94 (patch)
treecc4817ea81f155f3abf48bbb46a23ba8dd87d3a2 /editors
parent6f4b70c62295c22e3d5d9ff397fa22462a877c8c (diff)
downloadfreebsd-ports-gnome-457945f6438c806e0647276eef54551cbea9ed94.tar.gz
freebsd-ports-gnome-457945f6438c806e0647276eef54551cbea9ed94.tar.zst
freebsd-ports-gnome-457945f6438c806e0647276eef54551cbea9ed94.zip
madedit makes use of hidden symbol feature of gcc while our system header
don't like it. The recent addition of hidden symbol feature have exposed this issue. This is a minimal set of change that makes it work. Pointed out by: tinderbox via miwi and pav
Diffstat (limited to 'editors')
-rw-r--r--editors/madedit/Makefile3
-rw-r--r--editors/madedit/files/patch-charset-detector__src__entry__impl.cpp21
-rw-r--r--editors/madedit/files/patch-charset-detector__src__prmem.h12
3 files changed, 35 insertions, 1 deletions
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index d782ff6fa46b..0023525599b2 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= madedit
PORTVERSION= 0.2.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
@@ -18,6 +18,7 @@ USE_GETTEXT= yes
USE_WX= 2.6+
WANT_UNICODE= yes
MAKE_JOBS_SAFE= yes
+USE_DOS2UNIX= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost-libs
diff --git a/editors/madedit/files/patch-charset-detector__src__entry__impl.cpp b/editors/madedit/files/patch-charset-detector__src__entry__impl.cpp
new file mode 100644
index 000000000000..8ee4e0f264c7
--- /dev/null
+++ b/editors/madedit/files/patch-charset-detector__src__entry__impl.cpp
@@ -0,0 +1,21 @@
+--- ./charset-detector/src/entry/impl.cpp.orig 2011-03-22 16:53:02.918217862 -0700
++++ ./charset-detector/src/entry/impl.cpp 2011-03-22 16:53:47.868220433 -0700
+@@ -41,8 +41,10 @@
+ #include "chardetect.h"
+ #include "nscore.h"
+ #include "nsUniversalDetector.h"
++#pragma GCC visibility push(default)
+ #include <string.h>
+ #include <stdlib.h>
++#pragma GCC visibility pop
+
+ #ifdef _WIN32
+ # include <windows.h>
+@@ -53,7 +55,6 @@
+ #pragma managed(push, off)
+ #endif
+
+-
+ class DllDetector : public nsUniversalDetector
+ {
+ protected:
diff --git a/editors/madedit/files/patch-charset-detector__src__prmem.h b/editors/madedit/files/patch-charset-detector__src__prmem.h
new file mode 100644
index 000000000000..9e851a1c1f1d
--- /dev/null
+++ b/editors/madedit/files/patch-charset-detector__src__prmem.h
@@ -0,0 +1,12 @@
+--- ./charset-detector/src/prmem.h.orig 2011-03-22 16:53:02.938216470 -0700
++++ ./charset-detector/src/prmem.h 2011-03-22 16:53:03.708221682 -0700
+@@ -37,7 +37,9 @@
+ #ifndef nsDummyPrmem_h__
+ #define nsDummyPrmem_h__
+
++#pragma GCC visibility push(default)
+ #include <stdlib.h>
++#pragma GCC visibility pop
+
+ inline void* PR_Malloc(size_t len)
+ {