mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

- Fix the build with libc++ by backporting some upstream commits.

Browse Source 
In short, kdevplatform used to have a copy of Google's sparsehash library
  but had a hardcoded config.h file that assumed libstdc++ and its
  non-standard hash_fun.h header were used. kdevplatform master got rid of
  its sparsehash altogether and replaced it with some much simpler code.
  These change were backported by the developers after we reported our
  packaging/build issues. [1]

- Remove patch-util__kdevplatform_shell_environment.sh, use USES=shebangfix
  instead and also fix kdev_format_source.

PR:		ports/185859
This commit is contained in:
Raphael Kubo da Costa 2014-01-18 19:29:53 +00:00
parent 6e9fbda6ab
commit 02bed9d9f5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=340207
4 changed files with 7209 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/kdevplatform/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= kdevplatform
PORTVERSION= ${KDEVELOP_VERSION:S/4./1./}
PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src
@ -20,9 +21,11 @@ USE_KDE4= kate_run kdehier kdelibs kdeprefix automoc4
USE_QT4= qmake_build moc_build uic_build rcc_build \
corelib designer_build gui webkit
USE_XZ= yes
USES= cmake
USES= cmake shebangfix
USE_LDCONFIG= yes
SHEBANG_FILES= util/kdev_format_source util/kdevplatform_shell_environment.sh
PLIST_SUB+= SHLIB_VER=7.0.0 \
SHLIB_SHVER=7

7205
devel/kdevplatform/files/patch-git_ad31296_a4ed2fc Normal file
View File

File diff suppressed because it is too large Load Diff

8
devel/kdevplatform/files/patch-util__kdevplatform_shell_environment.sh
View File

@ -1,8 +0,0 @@
--- util/kdevplatform_shell_environment.sh.orig 2013-04-30 14:51:27.865270062 +0200
+++ util/kdevplatform_shell_environment.sh 2013-04-30 14:51:42.680269833 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# This file is part of KDevelop
# Copyright 2011 David Nolden <david.nolden.kdevelop@art-master.de>

11
devel/kdevplatform/files/patch-util_google_sparsehash_sparsehashconfig.h
View File

@ -1,11 +0,0 @@
--- util/google/sparsehash/sparseconfig.h.orig 2013-12-16 12:42:46.000000000 +0100
+++ util/google/sparsehash/sparseconfig.h 2013-12-16 12:43:09.000000000 +0100
@@ -5,7 +5,7 @@
#define GOOGLE_NAMESPACE ::google
/* the location of <hash_fun.h>/<stl_hash_fun.h> */
-#define HASH_FUN_H "hash_fun.h"
+#define HASH_FUN_H <ext/hash_fun.h>
/* the location of <hash_map> */
#define HASH_MAP_H <ext/hash_map>