<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1654bf534afeb5f06b842eefc3b9e55003a68779">https://github.com/macports/macports-ports/commit/1654bf534afeb5f06b842eefc3b9e55003a68779</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1654bf5 glfw: fix patching for both release and devel
</span>1654bf5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1654bf534afeb5f06b842eefc3b9e55003a68779
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Dec 12 08:20:49 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> glfw: fix patching for both release and devel
</span>---
graphics/glfw/Portfile | 10 +++++++---
graphics/glfw/files/patch-CMakeLists.txt.devel.diff | 10 +++++-----
...CMakeLists.txt.diff => patch-src_CMakeLists.txt.devel.diff} | 7 +++----
...akeLists.txt.diff => patch-src_CMakeLists.txt.release.diff} | 2 +-
4 files changed, 16 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/Portfile b/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 043ea05..02d545c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,10 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
</span>
patchfiles-append patch-CMakeLists.txt.release.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix install name of library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,12 +86,12 @@ if {${os.platform} eq "darwin" && ${os.major} == 10} {
</span> # patch to fix install directory for cmake files and docs
patchfiles-append patch-CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to fix install name of library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix install name of library
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src_CMakeLists.txt.devel.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# use the real home page, not github's
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-CMakeLists.txt.devel.diff b/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 522789f..fd231ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,7 +320,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -321,7 +321,11 @@
</span> #--------------------------------------------------------------------
include(CMakePackageConfigHelpers)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
</span> +if (NOT GLFW_CMAKE_CONFIG_PATH)
+ set(GLFW_CMAKE_CONFIG_PATH "lib${LIB_SUFFIX}")
+endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span>
configure_package_config_file(src/glfw3Config.cmake.in
src/glfw3Config.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,6 +354,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,6 +355,9 @@
</span>
if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
add_subdirectory(docs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@
</span> endif()
#--------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,6 +376,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -371,6 +378,11 @@
</span> install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
</span>
+ if (DOXYGEN_FOUND AND GLFW_BUILD_DOCS)
+ install(FILES "${GLFW_BINARY_DIR}/docs/html"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-src_CMakeLists.txt.diff b/graphics/glfw/files/patch-src_CMakeLists.txt.devel.diff
</span>similarity index 81%
copy from graphics/glfw/files/patch-src_CMakeLists.txt.diff
copy to graphics/glfw/files/patch-src_CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index 8002d8b..b876f92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-src_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-src_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,13 @@
</span> --- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,9 +136,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,8 +134,10 @@
</span> # Add -fno-common to work around a bug in Apple's GCC
target_compile_options(glfw PRIVATE "-fno-common")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - set_target_properties(glfw PROPERTIES
+ if (NOT CMAKE_INSTALL_NAME_DIR)
+ set_target_properties(glfw PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_NAME_DIR "lib${LIB_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}")
</span> + endif()
elseif (UNIX)
# Hide symbols not explicitly tagged for export from the shared library
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glfw/files/patch-src_CMakeLists.txt.diff b/graphics/glfw/files/patch-src_CMakeLists.txt.release.diff
</span>similarity index 96%
rename from graphics/glfw/files/patch-src_CMakeLists.txt.diff
rename to graphics/glfw/files/patch-src_CMakeLists.txt.release.diff
<span style='display:block; white-space:pre;color:#808080;'>index 8002d8b..1ac5a30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glfw/files/patch-src_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glfw/files/patch-src_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,9 +136,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,9 +96,10 @@
</span> elseif (APPLE)
# Add -fno-common to work around a bug in Apple's GCC
target_compile_options(glfw PRIVATE "-fno-common")
</pre><pre style='margin:0'>
</pre>