- Fix build on -current

- Rescpect CXXFLAGS
- Use desktop-file-utils/pathfix
- Support staging

PR:		ports/184909
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

2 files changed, 15 insertions, 14 deletions

diff --git a/audio/osd-lyrics/files/patch-free-visibility b/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp
index 032d195fef72..37fa0b014e97 100644
--- a/audio/osd-lyrics/files/patch-free-visibility
+++ b/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp
@@ -1,24 +1,13 @@
 --- lib/chardetect/src/entry/impl.cpp.orig
 +++ lib/chardetect/src/entry/impl.cpp
-@@ -42,7 +42,9 @@
+@@ -41,8 +41,10 @@
+ #include "chardetect.h"
  #include "nscore.h"
  #include "nsUniversalDetector.h"
- #include <string.h>
 +#pragma GCC visibility push(default)
+ #include <string.h>
  #include <stdlib.h>
 +#pragma GCC visibility pop
  
  #ifdef _WIN32
  #   include <windows.h>
---- lib/chardetect/src/prmem.h.orig
-+++ lib/chardetect/src/prmem.h
-@@ -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)
- {
diff --git a/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h b/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h
new file mode 100644
index 000000000000..17e0610138ad
--- /dev/null
+++ b/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h
@@ -0,0 +1,12 @@
+--- lib/chardetect/src/prmem.h.orig
++++ lib/chardetect/src/prmem.h
+@@ -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)
+ {