1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00

graphics/copperspice: Upgrade version 1.03 => 1.04 (Unbreak F10 !i386)

Upstream made an attempt to make copperspice jobs safe.  They got closer
but no cigar yet.  The new version did built in poudriere for me
(F10/amd64) so I am unbreaking !F(8|9).  I will check i386 and F9 and
lower and remove BROKEN if/as they pass.  Without multijob support these
builds take hours (> 4 on dedicated machine, > 11 on bulk build)
This commit is contained in:
John Marino 2015-07-08 05:35:16 +00:00
parent 8c4803560d
commit 81d07266e4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=391545
4 changed files with 3 additions and 147 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= copperspice
PORTVERSION= 1.0.3
PORTVERSION= 1.0.4
CATEGORIES= graphics
MASTER_SITES= http://download.copperspice.com/copperspice/source/
@ -11,8 +11,6 @@ COMMENT= Modern cross-platform C++ GUI library (derived from Qt 4.8)
LICENSE= LGPL21
BROKEN_FreeBSD= F10 q_emitSignals unable to register method pointer
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas \
libfreetype.so:${PORTSDIR}/print/freetype2

View File

@ -1,2 +1,2 @@
SHA256 (copperspice-1.0.3.tar.bz2) = 274dd9072bb7d53e6367b472c0a9f4a56feb076442c9ff5ae2e7a4c74a399889
SIZE (copperspice-1.0.3.tar.bz2) = 15341523
SHA256 (copperspice-1.0.4.tar.bz2) = b4ce66b7a80dfc15ca94abb90da7d4bbb18f4884f3c5d89c1a4425a9c675bfc5
SIZE (copperspice-1.0.4.tar.bz2) = 15348145

View File

@ -1,71 +0,0 @@
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h.orig 2015-04-23 19:00:28 UTC
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
@@ -164,60 +164,15 @@ namespace WTF {
typedef T Type;
};
+ template<typename T>
+ struct HasTrivialConstructor :
+ public std::is_trivially_constructible<T> {
+ };
-} // namespace WTF
-
-
-// copperspice solution for type traits (used in javascript and webkit)
-class cs_alternate{};
-
-class cs_preferred : public cs_alternate{};
-
-namespace std{
- template<class> struct is_trivially_constructible;
- template<class> struct has_trivial_default_constructor;
-
- template<class> struct is_trivially_destructible;
- template<class> struct has_trivial_destructor;
-}
-
-namespace WTF {
-
-// constructor
-template<typename T>
-decltype(std::is_trivially_constructible<T>::value, std::is_trivially_constructible<T>{})
- cs_check_constructor(const cs_preferred &)
-{
-}
-
-template<typename T>
-decltype(std::has_trivial_default_constructor<T>::value, std::has_trivial_default_constructor<T>{})
- cs_check_constructor(const cs_alternate &)
-{
-}
-
-template<typename T>
-struct HasTrivialConstructor : public decltype(cs_check_constructor<T>(cs_preferred{}))
-{
-};
-
-// destructor
-template<typename T>
-decltype(std::is_trivially_destructible<T>::value, std::is_trivially_destructible<T>{})
- cs_check_destructor(const cs_preferred &)
-{
-}
-
-template<typename T>
-decltype(std::has_trivial_destructor<T>::value, std::has_trivial_destructor<T>{})
- cs_check_destructor(const cs_alternate &)
-{
-}
-
-template<typename T>
-struct HasTrivialDestructor : public decltype(cs_check_destructor<T>(cs_preferred{}))
-{
-};
+ template<typename T>
+ struct HasTrivialDestructor :
+ public std::is_trivially_destructible<T> {
+ };
} // namespace WTF

View File

@ -1,71 +0,0 @@
--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h.orig 2015-04-23 19:00:48 UTC
+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
@@ -176,60 +176,15 @@ namespace WTF {
typedef T Type;
};
+ template<typename T>
+ struct HasTrivialConstructor :
+ public std::is_trivially_constructible<T> {
+ };
-} // namespace WTF
-
-
-// copperspice solution for type traits (used in javascript and webkit)
-class cs_alternate{};
-
-class cs_preferred : public cs_alternate{};
-
-namespace std{
- template<class> struct is_trivially_constructible;
- template<class> struct has_trivial_default_constructor;
-
- template<class> struct is_trivially_destructible;
- template<class> struct has_trivial_destructor;
-}
-
-namespace WTF {
-
-// constructor
-template<typename T>
-decltype(std::is_trivially_constructible<T>::value, std::is_trivially_constructible<T>{})
- cs_check_constructor(const cs_preferred &)
-{
-}
-
-template<typename T>
-decltype(std::has_trivial_default_constructor<T>::value, std::has_trivial_default_constructor<T>{})
- cs_check_constructor(const cs_alternate &)
-{
-}
-
-template<typename T>
-struct HasTrivialConstructor : public decltype(cs_check_constructor<T>(cs_preferred{}))
-{
-};
-
-// destructor
-template<typename T>
-decltype(std::is_trivially_destructible<T>::value, std::is_trivially_destructible<T>{})
- cs_check_destructor(const cs_preferred &)
-{
-}
-
-template<typename T>
-decltype(std::has_trivial_destructor<T>::value, std::has_trivial_destructor<T>{})
- cs_check_destructor(const cs_alternate &)
-{
-}
-
-template<typename T>
-struct HasTrivialDestructor : public decltype(cs_check_destructor<T>(cs_preferred{}))
-{
-};
+ template<typename T>
+ struct HasTrivialDestructor :
+ public std::is_trivially_destructible<T> {
+ };
} // namespace WTF