aboutsummaryrefslogtreecommitdiff
path: root/devel/lasi/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/lasi/files')
-rw-r--r--devel/lasi/files/patch-cmake+modules+instdirs.cmake16
-rw-r--r--devel/lasi/files/patch-include_LASi.h12
-rw-r--r--devel/lasi/files/patch-src_drawGlyph.cpp12
-rw-r--r--devel/lasi/files/patch-src_drawGlyph.h12
-rw-r--r--devel/lasi/files/patch-src_glyphMgr.cpp12
-rw-r--r--devel/lasi/files/patch-src_glyphMgr.h12
-rw-r--r--devel/lasi/files/patch-src_util.h11
7 files changed, 9 insertions, 78 deletions
diff --git a/devel/lasi/files/patch-cmake+modules+instdirs.cmake b/devel/lasi/files/patch-cmake+modules+instdirs.cmake
index 18fcf8b2b3c1..6f9b09198143 100644
--- a/devel/lasi/files/patch-cmake+modules+instdirs.cmake
+++ b/devel/lasi/files/patch-cmake+modules+instdirs.cmake
@@ -1,8 +1,10 @@
---- cmake/modules/instdirs.cmake.orig 2008-12-31 14:43:21.000000000 -0500
-+++ cmake/modules/instdirs.cmake 2008-12-31 14:44:24.000000000 -0500
-@@ -61,4 +61,4 @@
- set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
- set(docdir ${CMAKE_INSTALL_DATADIR}/doc/libLASi-${VERSION})
+--- cmake/modules/instdirs.cmake.orig 2019-01-31 07:34:50 UTC
++++ cmake/modules/instdirs.cmake
+@@ -80,6 +80,6 @@ set(docdir ${CMAKE_INSTALL_DATADIR}/doc/libLASi-${VERS
+ CACHE PATH "install location for documentation"
+ )
--set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
-+set(DATA_DIR ${CMAKE_INSTALL_DATADIR})
+-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION}
++set(DATA_DIR ${CMAKE_INSTALL_DATADIR}
+ CACHE PATH "install location for architecture-independent data"
+ )
diff --git a/devel/lasi/files/patch-include_LASi.h b/devel/lasi/files/patch-include_LASi.h
deleted file mode 100644
index 613b5c712c83..000000000000
--- a/devel/lasi/files/patch-include_LASi.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/LASi.h.orig 2013-12-13 10:12:32.000000000 +0100
-+++ include/LASi.h 2013-12-13 10:14:20.000000000 +0100
-@@ -11,7 +11,8 @@
- #include <sstream>
- #include <map>
- #include <pango/pango.h>
--#include <freetype/ftglyph.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-
- class FreetypeGlyphMgr;
- class ContextMgr;
diff --git a/devel/lasi/files/patch-src_drawGlyph.cpp b/devel/lasi/files/patch-src_drawGlyph.cpp
deleted file mode 100644
index 1ce9a4c23382..000000000000
--- a/devel/lasi/files/patch-src_drawGlyph.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/drawGlyph.cpp.orig 2013-12-13 10:13:26.000000000 +0100
-+++ src/drawGlyph.cpp 2013-12-13 10:15:19.000000000 +0100
-@@ -6,7 +6,8 @@
- */
-
- #include <ostream>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
- #include <algorithm>
- #include <LASi.h>
- #include <config.h>
diff --git a/devel/lasi/files/patch-src_drawGlyph.h b/devel/lasi/files/patch-src_drawGlyph.h
deleted file mode 100644
index cb174aae7889..000000000000
--- a/devel/lasi/files/patch-src_drawGlyph.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/drawGlyph.h.orig 2013-12-13 10:13:05.000000000 +0100
-+++ src/drawGlyph.h 2013-12-13 10:15:40.000000000 +0100
-@@ -10,7 +10,8 @@
-
- #include <iostream>
- #include <pango/pango.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- /** Generate the Postscript commands to draw the glyph
- * using the font in pPangoCtx.
diff --git a/devel/lasi/files/patch-src_glyphMgr.cpp b/devel/lasi/files/patch-src_glyphMgr.cpp
deleted file mode 100644
index 426821e6d803..000000000000
--- a/devel/lasi/files/patch-src_glyphMgr.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/glyphMgr.cpp.orig 2013-12-13 10:13:39.000000000 +0100
-+++ src/glyphMgr.cpp 2013-12-13 10:17:39.000000000 +0100
-@@ -10,8 +10,7 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
-
- #include <cassert>
- #include "util.h"
diff --git a/devel/lasi/files/patch-src_glyphMgr.h b/devel/lasi/files/patch-src_glyphMgr.h
deleted file mode 100644
index 23afe4b1052f..000000000000
--- a/devel/lasi/files/patch-src_glyphMgr.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/glyphMgr.h.orig 2013-12-13 10:13:45.000000000 +0100
-+++ src/glyphMgr.h 2013-12-13 10:17:50.000000000 +0100
-@@ -15,8 +15,7 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
-
- /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
- */
diff --git a/devel/lasi/files/patch-src_util.h b/devel/lasi/files/patch-src_util.h
deleted file mode 100644
index 567da584216a..000000000000
--- a/devel/lasi/files/patch-src_util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util.h.orig 2013-12-13 10:13:16.000000000 +0100
-+++ src/util.h 2013-12-13 10:17:01.000000000 +0100
-@@ -18,7 +18,7 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
-
- std::ostream& operator<<(std::ostream&, const FT_Library);
- std::ostream& operator<<(std::ostream&, const FT_Face);