CVS commit: pkgsrc/graphics/silgraphite

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Apr 13 19:16:47 UTC 2020

Modified Files:
        pkgsrc/graphics/silgraphite: distinfo
Added Files:
        pkgsrc/graphics/silgraphite/patches: patch-src_segment_Segment.cpp

Log Message:
libc++ doesn't support the pre-C++11 std::swap, so inline the
equivalent.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/silgraphite/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/silgraphite/patches/patch-src_segment_Segment.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/silgraphite/distinfo
diff -u pkgsrc/graphics/silgraphite/distinfo:1.3 pkgsrc/graphics/silgraphite/distinfo:1.4
--- pkgsrc/graphics/silgraphite/distinfo:1.3    Tue Nov  3 21:34:20 2015
+++ pkgsrc/graphics/silgraphite/distinfo        Mon Apr 13 19:16:47 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 21:34:20 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/04/13 19:16:47 joerg Exp $
 
 SHA1 (silgraphite-2.3.1.tar.gz) = fffd16e1aa24ff0afdc39aaf534323e23d5b8464
 RMD160 (silgraphite-2.3.1.tar.gz) = baaf57ff95622bff9fc3908ae55872789eab5836
 SHA512 (silgraphite-2.3.1.tar.gz) = 6b0fa29e0ee507da17509ed6374b64d51360b3012bba512785186348c153047c2e6f28114e36d133f3c05dd319919bd79e9ed97fc9e29ad6bf2f7a032eb22df2
 Size (silgraphite-2.3.1.tar.gz) = 3239482 bytes
+SHA1 (patch-src_segment_Segment.cpp) = 091835ec22bf606f2f658b23e0379a21e6a18dbd

Added files:

Index: pkgsrc/graphics/silgraphite/patches/patch-src_segment_Segment.cpp
diff -u /dev/null pkgsrc/graphics/silgraphite/patches/patch-src_segment_Segment.cpp:1.1
--- /dev/null   Mon Apr 13 19:16:47 2020
+++ pkgsrc/graphics/silgraphite/patches/patch-src_segment_Segment.cpp   Mon Apr 13 19:16:47 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_segment_Segment.cpp,v 1.1 2020/04/13 19:16:47 joerg Exp $
+
+--- src/segment/Segment.cpp.orig       2020-04-12 22:06:15.425721206 +0000
++++ src/segment/Segment.cpp
+@@ -575,7 +575,13 @@ void Segment::SwapWith(Segment * pgrseg)
+       int crefThis = m_cref;
+       int crefOther = pgrseg->m_cref;
+ 
++#ifdef _LIBCPP_VERSION
++      Segment tmp(*this);
++      *pgrseg = *this;
++      *this = tmp;
++#else
+       std::swap(*this, *pgrseg);
++#endif
+ 
+       m_cref = crefThis;
+       pgrseg->m_cref = crefOther;