From owner-svn-ports-all@FreeBSD.ORG  Tue Nov  5 22:42:38 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 884312E9;
 Tue,  5 Nov 2013 22:42:38 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5C7DE2CD8;
 Tue,  5 Nov 2013 22:42:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA5MgcoE074650;
 Tue, 5 Nov 2013 22:42:38 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA5MgccN074649;
 Tue, 5 Nov 2013 22:42:38 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201311052242.rA5MgccN074649@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 5 Nov 2013 22:42:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332924 - head/devel/kdesdk4/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Nov 2013 22:42:38 -0000

Author: rakuco
Date: Tue Nov  5 22:42:37 2013
New Revision: 332924
URL: http://svnweb.freebsd.org/changeset/ports/332924

Log:
  Make the patch from r332921 actually apply against 4.10.5...

Modified:
  head/devel/kdesdk4/files/patch-libcxx

Modified: head/devel/kdesdk4/files/patch-libcxx
==============================================================================
--- head/devel/kdesdk4/files/patch-libcxx	Tue Nov  5 22:40:46 2013	(r332923)
+++ head/devel/kdesdk4/files/patch-libcxx	Tue Nov  5 22:42:37 2013	(r332924)
@@ -42,8 +42,8 @@ Date:   Sun Nov 3 13:19:56 2013 +0200
 
     It also allows us to remove the MSVC/SunPro workarounds from the code and
     the build system.
---- umbrello/CMakeLists.txt
-+++ umbrello/CMakeLists.txt
+--- umbrello/umbrello/CMakeLists.txt
++++ umbrello/umbrello/CMakeLists.txt
 @@ -267,37 +267,21 @@ set(libcodeimport_SRCS
      codeimport/csharp/csharpimport.cpp
  )
@@ -97,8 +97,8 @@ Date:   Sun Nov 3 13:19:56 2013 +0200
  
  set(libclipboard_SRCS
      clipboard/umldragdata.cpp
---- umbrello/codeimport/classimport.cpp
-+++ umbrello/codeimport/classimport.cpp
+--- umbrello/umbrello/codeimport/classimport.cpp
++++ umbrello/umbrello/codeimport/classimport.cpp
 @@ -20,9 +20,7 @@
  #include "javaimport.h"
  #include "adaimport.h"
@@ -123,8 +123,8 @@ Date:   Sun Nov 3 13:19:56 2013 +0200
      return classImporter;
  }
  
---- umbrello/codeimport/kdevcppparser/position.h
-+++ umbrello/codeimport/kdevcppparser/position.h
+--- umbrello/umbrello/codeimport/kdevcppparser/position.h
++++ umbrello/umbrello/codeimport/kdevcppparser/position.h
 @@ -20,22 +20,6 @@
  #ifndef POSITION_H
  #define POSITION_H
@@ -184,16 +184,16 @@ Date:   Sun Nov 3 13:19:56 2013 +0200
  typedef boost::spirit::classic::file_position_base<PositionFilename> PositionType;
  
  class Position : public PositionType
---- umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
-+++ umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
+--- umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
++++ umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
 @@ -41,13 +41,11 @@
  
  #define PREPROCESSLEXER_DEBUG
  
 -#ifdef Q_CC_MSVC
  template <class _Tp>
--struct _Identity : public std::unary_function<_Tp, _Tp> {
-+struct identity : public std::unary_function<_Tp, _Tp> {
+-struct _Identity : public std::unary_function<_Tp,_Tp> {
++struct identity : public std::unary_function<_Tp,_Tp> {
    _Tp& operator()(_Tp& __x) const { return __x; }
    const _Tp& operator()(const _Tp& __x) const { return __x; }
  };