<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137386] trunk/dports/devel/libsolv</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137386">137386</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-06-10 16:55:04 -0700 (Wed, 10 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libsolv: update to 0.6.11, drop patch integrated upstream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibsolvPortfile">trunk/dports/devel/libsolv/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibsolvfiles0001Fixmanpageinstalldirpatch">trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibsolvfiles0001AvoidlinkerflagswhennotavailablefixesOSXpatch">trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch</a></li>
<li><a href="#trunkdportsdevellibsolvfiles0002Fixmanpageinstalldirpatch">trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibsolvPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libsolv/Portfile (137385 => 137386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libsolv/Portfile 2015-06-10 23:30:04 UTC (rev 137385)
+++ trunk/dports/devel/libsolv/Portfile 2015-06-10 23:55:04 UTC (rev 137386)
</span><span class="lines">@@ -5,9 +5,9 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><del>-github.setup openSUSE libsolv 0.6.10
-checksums rmd160 8d01483fbc8fc1b7661d42c0701ae6aaf01a67b2 \
- sha256 a9c527d124edf4b3ba3bda7df5badf1f61a561d516ad47a222159f2a5b2b406e
</del><ins>+github.setup openSUSE libsolv 0.6.11
+checksums rmd160 0a33039dbb6599a53c5c515d8b4240be7ba54e2e \
+ sha256 1439970bb2ce8ae0d9d9ed29eb3196f66572dae7aa7984bee030d8db0ad06115
</ins><span class="cx">
</span><span class="cx"> maintainers cal openmaintainer
</span><span class="cx"> categories devel math
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><del>-patchfiles 0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch \
- 0002-Fix-manpage-install-dir.patch
</del><ins>+patchfiles 0001-Fix-manpage-install-dir.patch
</ins><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx"> configure.args-append \
</span></span></pre></div>
<a id="trunkdportsdevellibsolvfiles0001AvoidlinkerflagswhennotavailablefixesOSXpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch (137385 => 137386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch 2015-06-10 23:30:04 UTC (rev 137385)
+++ trunk/dports/devel/libsolv/files/0001-Avoid-linker-flags-when-not-available-fixes-OS-X.patch 2015-06-10 23:55:04 UTC (rev 137386)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-From 81362a2fd662f912ce5a2cf9d7c678faf3cbf991 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <neverpanic@gmail.com>
-Date: Mon, 11 May 2015 19:54:51 +0200
-Subject: [PATCH] Avoid linker flags when not available, fixes OS X
-
-The build currently fails on OS X because the OS X linker ld64 does not
-support --as-needed or --version-script. Fix this by checking whether
-these flags are supported by the currently used linker and only passing
-them if they are.
----
- CMakeLists.txt | 13 +++++++++++++
- ext/CMakeLists.txt | 2 ++
- src/CMakeLists.txt | 2 ++
- 3 files changed, 17 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab3fec9..7b43fd3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,6 +206,17 @@ CHECK_FUNCTION_EXISTS (fopencookie HAVE_FOPENCOOKIE)
- CHECK_FUNCTION_EXISTS (funopen HAVE_FUNOPEN)
- TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
-
-+INCLUDE (CMakePushCheckState)
-+INCLUDE (CheckCCompilerFlag)
-+MACRO (check_linker_flag FLAG VAR)
-+ cmake_push_check_state(RESET)
-+ set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-+ check_c_compiler_flag("" "${VAR}")
-+ cmake_pop_check_state()
-+ENDMACRO (check_linker_flag)
-+check_linker_flag("-Wl,--as-needed" HAS_LINKER_AS_NEEDED)
-+check_linker_flag("-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/libsolv.ver" HAS_LINKER_VERSION_SCRIPT)
-+
- # should create config.h with #cmakedefine instead...
- FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
- HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS
-@@ -307,7 +318,9 @@ ENDIF (ENABLE_RPMDB)
- IF (ENABLE_HAIKU)
- SET (SYSTEM_LIBRARIES ${HAIKU_SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES})
- ENDIF (ENABLE_HAIKU)
-+IF (HAS_LINKER_AS_NEEDED)
- SET (SYSTEM_LIBRARIES "-Wl,--as-needed" ${SYSTEM_LIBRARIES})
-+ENDIF (HAS_LINKER_AS_NEEDED)
-
- ADD_SUBDIRECTORY (src)
- ADD_SUBDIRECTORY (ext)
-diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
-index bdf949d..7fcf14f 100644
---- a/ext/CMakeLists.txt
-+++ b/ext/CMakeLists.txt
-@@ -112,7 +112,9 @@ IF (ENABLE_APPDATA)
- ENDIF (ENABLE_APPDATA)
-
- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+IF (HAVE_LINKER_VERSION_SCRIPT)
- SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINK_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/ext/libsolvext.ver")
-+ENDIF (HAVE_LINKER_VERSION_SCRIPT)
-
- IF (DISABLE_SHARED)
- ADD_LIBRARY (libsolvext STATIC ${libsolvext_SRCS})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b78a82a..f60853e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -28,7 +28,9 @@ SET (libsolv_HEADERS
- chksum.h dataiterator.h ${CMAKE_BINARY_DIR}/src/solvversion.h)
-
- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-+IF (HAVE_LINKER_VERSION_SCRIPT)
- SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINK_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/src/libsolv.ver")
-+ENDIF (HAVE_LINKER_VERSION_SCRIPT)
-
- IF (DISABLE_SHARED)
- ADD_LIBRARY (libsolv STATIC ${libsolv_SRCS})
---
-2.4.0
-
</del></span></pre></div>
<a id="trunkdportsdevellibsolvfiles0001Fixmanpageinstalldirpatchfromrev137379trunkdportsdevellibsolvfiles0002Fixmanpageinstalldirpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch (from rev 137379, trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch) (0 => 137386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch (rev 0)
+++ trunk/dports/devel/libsolv/files/0001-Fix-manpage-install-dir.patch 2015-06-10 23:55:04 UTC (rev 137386)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- ./CMakeLists.txt.orig 2015-05-11 20:11:58.000000000 +0200
++++ ./CMakeLists.txt 2015-05-11 20:12:36.000000000 +0200
+@@ -58,6 +58,7 @@
+ IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
+ SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
++SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}")
+
+ ####################################################################
</ins></span></pre></div>
<a id="trunkdportsdevellibsolvfiles0002Fixmanpageinstalldirpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch (137385 => 137386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch 2015-06-10 23:30:04 UTC (rev 137385)
+++ trunk/dports/devel/libsolv/files/0002-Fix-manpage-install-dir.patch 2015-06-10 23:55:04 UTC (rev 137386)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- ./CMakeLists.txt.orig 2015-05-11 20:11:58.000000000 +0200
-+++ ./CMakeLists.txt 2015-05-11 20:12:36.000000000 +0200
-@@ -58,6 +58,7 @@
- IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
- SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
- ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
-+SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
- MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}")
-
- ####################################################################
</del></span></pre>
</div>
</div>
</body>
</html>