pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gle: fix libc++ build, missing PLIST files, depends
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Mon Mar 7 07:51:28 2016 +0200
Changeset: 7fc9dce93cbf1a46c2969e59e359b3376b0d5410
Modified Files:
gle/Makefile
gle/PLIST
gle/distinfo
Added Files:
gle/patches/patch-src_gle_tokens_StringKeyHash.h
Log Message:
gle: fix libc++ build, missing PLIST files, depends
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7fc9dce93cbf1a46c2969e59e359b3376b0d5410
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gle/Makefile | 1 +
gle/PLIST | 2 +-
gle/distinfo | 1 +
gle/patches/patch-src_gle_tokens_StringKeyHash.h | 49 ++++++++++++++++++++++++
4 files changed, 52 insertions(+), 1 deletion(-)
diffs:
diff --git a/gle/Makefile b/gle/Makefile
index c84e1b0..8462394 100644
--- a/gle/Makefile
+++ b/gle/Makefile
@@ -20,6 +20,7 @@ PKGCONFIG_OVERRIDE= platform/autoconf/gle-graphics.pc.in
# GLUT is used only by the examples, which aren't built or installed.
#.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
diff --git a/gle/PLIST b/gle/PLIST
index cfaefb7..c5743bc 100644
--- a/gle/PLIST
+++ b/gle/PLIST
@@ -43,7 +43,6 @@ share/gle-graphics/${PKGVERSION}/font/pstb.fmt
share/gle-graphics/${PKGVERSION}/font/pstbi.fmt
share/gle-graphics/${PKGVERSION}/font/psti.fmt
share/gle-graphics/${PKGVERSION}/font/pstr.fmt
-share/gle-graphics/${PKGVERSION}/font/pszcmi.fmt
share/gle-graphics/${PKGVERSION}/font/pszd.fmt
share/gle-graphics/${PKGVERSION}/font/texcmb.fmt
share/gle-graphics/${PKGVERSION}/font/texcmb.fve
@@ -89,4 +88,5 @@ share/gle-graphics/${PKGVERSION}/gleinc/tree.gle
share/gle-graphics/${PKGVERSION}/gleinc/ziptext.gle
share/gle-graphics/${PKGVERSION}/glerc
share/gle-graphics/${PKGVERSION}/init.tex
+share/gle-graphics/${PKGVERSION}/inittex.ini
share/gle-graphics/${PKGVERSION}/manip.hlp
diff --git a/gle/distinfo b/gle/distinfo
index ecb44d6..a4e468a 100644
--- a/gle/distinfo
+++ b/gle/distinfo
@@ -4,3 +4,4 @@ SHA1 (gle-graphics-4.2.5-src.tar.gz) = b5fda634d94d90c95ba14afcda562ec4cd9c1d52
RMD160 (gle-graphics-4.2.5-src.tar.gz) = 518563269d987c78d60fce94b381536dad27dc52
SHA512 (gle-graphics-4.2.5-src.tar.gz) = 0bb7e7ad7432c412b4d676f3ea21d15afa4aaf0075afd9ce0942fced8e3c48f122563e84f71d0093e590a635d42c444141982a3707c0428b1edd4ab04f4bbde7
Size (gle-graphics-4.2.5-src.tar.gz) = 2330236 bytes
+SHA1 (patch-src_gle_tokens_StringKeyHash.h) = a58899a96f6c127793c902f7b39b6432daa483e3
diff --git a/gle/patches/patch-src_gle_tokens_StringKeyHash.h b/gle/patches/patch-src_gle_tokens_StringKeyHash.h
new file mode 100644
index 0000000..0a0ef74
--- /dev/null
+++ b/gle/patches/patch-src_gle_tokens_StringKeyHash.h
@@ -0,0 +1,49 @@
+$NetBSD$
+
+Fix build with libc++, clean up macro checks.
+
+in file included from ./../tokens/Tokenizer.h:51:
+./../tokens/StringKeyHash.h:79:18: error: expected namespace name
+ using namespace __gnu_cxx; // using gnu extensions such as "hash"
+
+See also https://trac.macports.org/ticket/41760
+
+--- src/gle/tokens/StringKeyHash.h.orig 2015-08-16 07:51:24.000000000 +0000
++++ src/gle/tokens/StringKeyHash.h
+@@ -46,21 +46,19 @@
+ #pragma warning( disable : 4996 )
+ #endif
+
+-#define EXT_HASH
+-#ifdef _MSC_VER
+- #undef EXT_HASH
+-#endif
+-#ifdef GCC2
+- #undef EXT_HASH
++#ifdef __GLIBCXX__
++ #define EXT_HASH
+ #endif
++
+ #ifdef EXT_HASH
+-// #include <ext/hash_map>
++ #include <ext/hash_map>
+ #else
+ #ifdef _MSC_VER
+ #include <hash_map>
+ using namespace stdext;
+ // typedef hash _Hash;
+- #else
++ #endif
++ #ifdef __GLIBCXX__
+ #include <hash_map.h>
+ #endif
+ #endif
+@@ -74,7 +72,7 @@
+
+ using namespace std;
+
+-#ifndef GCC2
++#ifdef __GLIBCXX__
+ #ifndef _MSC_VER
+ using namespace __gnu_cxx; // using gnu extensions such as "hash"
+ #endif
Home |
Main Index |
Thread Index |
Old Index