Date: Sat, 20 Jun 2015 16:18:14 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390166 - in head/graphics: . copperspice copperspice/files Message-ID: <201506201618.t5KGIE9K026867@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Jun 20 16:18:13 2015 New Revision: 390166 URL: https://svnweb.freebsd.org/changeset/ports/390166 Log: Add new port: graphics/copperspice I would consider copperspice "experimental" for the time being. The developers tested it on linux, windows, and macos, but not BSD. Several issues have been identified already: * differences in BSD install from GNU install caused fatal build failure (already fixed in v1.0.2) * It's not jobs safe (not reproducible on Linux, I suspect this is another difference of the install programs * specs don't exist for any BSD * qmutex was implemented for non-linux, non-windows * libtool is missing --tag * Makefile template missing dozens of lines to support OSTYPE_FREEBSD (or OSTYPE_BSD ?) which also needs to be implemented * FreeBSD 9 (and presumably 8) fails with "to_string" is not recognized as std namespace despite using gcc48 to build * FreeBSD10/i386 fails because of c++11 narrowing rules violations The upsteam is already aware of some of these issues and is committed to make CopperSpice work on BSD as a first class citizen. So this initial import might be considered a work in progress. I've been working on a jobs-safe problem workaround but hit another jobs-safe failure. ===== Copperspice is a C++ library derived from the existing Qt 4.8 framework. The goal was to change the core design of the libraries, leveraging template functionality and C++11 capabilities. The redesign allowed the Qt Meta-Object Compiler (moc) system to be completely removed. Moc is a code generator and does not support many aspects of C++ including templates, complex data types, static type checking, and relies heavily on string comparisons. Removing moc improves runtime performance, reduces the complexity of the build process, and allows more issues to be detected at compile time. Key features: * Qt Meta-Object Compiler (moc) is obsolete * Written in C++11 * Library links directory to any standard C++ application * A template class can inherit from QObject * Copperspice includes several Qt5 classes Added: head/graphics/copperspice/ head/graphics/copperspice/Makefile (contents, props changed) head/graphics/copperspice/distinfo (contents, props changed) head/graphics/copperspice/files/ head/graphics/copperspice/files/patch-Makefile.in (contents, props changed) head/graphics/copperspice/files/patch-configure (contents, props changed) head/graphics/copperspice/files/patch-mkspecs_bsd-g++_qplatformdefs.h (contents, props changed) head/graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h (contents, props changed) head/graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h (contents, props changed) head/graphics/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_TypeTraits.h (contents, props changed) head/graphics/copperspice/files/patch-src_corelib_thread_qmutex__unix.cpp (contents, props changed) head/graphics/copperspice/pkg-descr (contents, props changed) head/graphics/copperspice/pkg-plist (contents, props changed) Modified: head/graphics/Makefile Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sat Jun 20 15:16:06 2015 (r390165) +++ head/graphics/Makefile Sat Jun 20 16:18:13 2015 (r390166) @@ -95,6 +95,7 @@ SUBDIR += commons-utilities SUBDIR += compupic SUBDIR += converseen + SUBDIR += copperspice SUBDIR += cosmoplayer SUBDIR += crw SUBDIR += cthumb Added: head/graphics/copperspice/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/Makefile Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,66 @@ +# Created by: marino@FreeBSD.org +# $FreeBSD$ + +PORTNAME= copperspice +PORTVERSION= 1.0.3 +CATEGORIES= graphics +MASTER_SITES= http://download.copperspice.com/copperspice/source/ + +MAINTAINER= marino@FreeBSD.org +COMMENT= Modern cross-platform C++ GUI library (derived from Qt 4.8) + +LICENSE= LGPL21 + +BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas \ + libfreetype.so:${PORTSDIR}/print/freetype2 + +USES= compiler:c++11-lib gmake iconv libtool pkgconfig \ + tar:bz2 +USE_XORG= ice sm x11 xcursor xext xi xinerama xrandr +USE_GNOME= glib20 +USE_GL= gl +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +CFLAGS+= -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/glib-2.0 \ + -I${LOCALBASE}/lib/glib-2.0/include \ + -I${LOCALBASE}/include/freetype2 +LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} -L${LOCALBASE}/lib + +CONFIGURE_ARGS= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL="${INSTALL}" \ + OSTYPE=FREEBSD +CONFIGURE_ENV= ZLIB_LIBS="-lz" ZLIB_CFLAGS="-I/usr/include -L/usr/lib" +MAKE_ENV= INSTALL_STRIP_PROGRAM="${INSTALL_PROGRAM}" +PLIST_SUB= SHORT_VER=0 LONG_VER=0.0.0 + +MAKE_JOBS_UNSAFE= yes +WITH_OPENSSL_PORT= yes + +BROKEN_FreeBSD_8= error: 'to_string' is not a member of 'std' +BROKEN_FreeBSD_9= error: 'to_string' is not a member of 'std' +BROKEN_i386= qx11embed_x11.cpp:470:20: non-constant-expression\ + cannot be narrowed from type 'unsigned int' to 'long'\ + in initializer list [-Wc++11-narrowing] + +#OPTIONS_DEFINE= OPENSSL #MYSQL PGSQL +#OPTIONS_DEFAULT= OPENSSL +#OPENSSL_USE= OPENSSL +#.include <bsd.port.options.mk> + +post-extract: + ${MKDIR} ${WRKSRC}/mkspecs/bsd-g++ + +post-patch: + ${REINPLACE_CMD} -e 's|@INSTALL@|${INSTALL}|g' \ + ${WRKSRC}/src/webkit/Makefile.in + +post-configure: + ${REINPLACE_CMD} -e '/^hardcode_libdir_flag/ \ + s|spec=.*|spec="-Wl,-rpath,${LOCALBASE}/lib"|' \ + ${WRKSRC}/libtool + +.include <bsd.port.mk> Added: head/graphics/copperspice/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/distinfo Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,2 @@ +SHA256 (copperspice-1.0.3.tar.bz2) = 274dd9072bb7d53e6367b472c0a9f4a56feb076442c9ff5ae2e7a4c74a399889 +SIZE (copperspice-1.0.3.tar.bz2) = 15341523 Added: head/graphics/copperspice/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-Makefile.in Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,505 @@ +--- Makefile.in.orig 2015-06-11 09:26:06 UTC ++++ Makefile.in +@@ -200,10 +200,10 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_WIN_TRUE@am__append_19 = -I$(top_srcdir)/mkspecs/win32-g++ + @OSTYPE_WIN_TRUE@am__append_20 = -I$(top_srcdir)/mkspecs/win32-g++ -DQT_MAKEDLL + @OSTYPE_WIN_TRUE@am__append_21 = -lole32 -lws2_32 -Wl,-luuid +-@OSTYPE_DARWIN_TRUE@am__append_22 = -I$(top_srcdir)/mkspecs/macx-g++ +-@OSTYPE_DARWIN_TRUE@am__append_23 = -I$(top_srcdir)/mkspecs/macx-g++ +-@OSTYPE_DARWIN_TRUE@am__append_24 = -I$(top_srcdir)/mkspecs/macx-g++ +-@OSTYPE_DARWIN_TRUE@am__append_25 = -framework CoreFoundation -framework Security -framework ApplicationServices -lObjC ++@OSTYPE_FREEBSD_TRUE@am__append_22 = -I$(top_srcdir)/mkspecs/bsd-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_23 = -I$(top_srcdir)/mkspecs/bsd-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_24 = -I$(top_srcdir)/mkspecs/bsd-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_25 = -lpthread + @ZLIB_TRUE@am__append_26 = $(ZLIB_CFLAGS) + @ZLIB_TRUE@am__append_27 = $(ZLIB_LIBS) + @ZLIB_FALSE@am__append_28 = -I$(top_srcdir)/src/3rdparty/zlib +@@ -228,8 +228,8 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@am__append_31 = \ + @OSTYPE_LINUX_TRUE@ src/corelib/codecs/qiconvcodec.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_32 = \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/codecs/qiconvcodec.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_32 = \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/codecs/qiconvcodec.cpp + + + # qfsfileengine_unix.cpp +@@ -260,15 +260,13 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@ src/corelib/io/qfilesystemiterator_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/corelib/io/qstandardpaths_unix.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_35 = \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qfilesystemengine_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qfilesystemiterator_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qfilesystemwatcher_fsevents.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qfilesystemwatcher_kqueue.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qfsfileengine_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qprocess_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qsettings_mac.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/qstandardpaths_mac.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_35 = \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/qfilesystemengine_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/qfilesystemiterator_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/qfilesystemwatcher_kqueue.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/qfsfileengine_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/qprocess_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/qstandardpaths_unix.cpp + + @OSTYPE_WIN_TRUE@am__append_36 = \ + @OSTYPE_WIN_TRUE@ src/corelib/kernel/qeventdispatcher_win.cpp \ +@@ -285,13 +283,13 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@ src/corelib/kernel/qeventdispatcher_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/corelib/kernel/qeventdispatcher_glib.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_38 = \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/qcore_mac.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/qcore_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/qcoreapplication_mac.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/qeventdispatcher_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/qsharedmemory_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/qsystemsemaphore_unix.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_38 = \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/qcore_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/qcrashhandler.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/qcoreapplication_mac.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/qeventdispatcher_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/qsharedmemory_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/qsystemsemaphore_unix.cpp + + @OSTYPE_WIN_TRUE@am__append_39 = \ + @OSTYPE_WIN_TRUE@ src/corelib/plugin/qlibrary_win.cpp \ +@@ -300,8 +298,8 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@am__append_40 = \ + @OSTYPE_LINUX_TRUE@ src/corelib/plugin/qlibrary_unix.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_41 = \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/plugin/qlibrary_unix.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_41 = \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/plugin/qlibrary_unix.cpp + + @OSTYPE_WIN_TRUE@am__append_42 = \ + @OSTYPE_WIN_TRUE@ src/corelib/thread/qmutex_win.cpp \ +@@ -313,10 +311,9 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@ src/corelib/thread/qthread_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/corelib/thread/qwaitcondition_unix.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_44 = \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/thread/qmutex_mac.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/thread/qthread_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/thread/qwaitcondition_unix.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_44 = src/corelib/thread/qmutex_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/thread/qthread_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/thread/qwaitcondition_unix.cpp + + + # FIXME platform specific +@@ -331,11 +328,10 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@ src/corelib/tools/qelapsedtimer_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/corelib/tools/qlocale_unix.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_47 = \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/tools/qelapsedtimer_mac.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/tools/qlocale_mac.mm ++@OSTYPE_FREEBSD_TRUE@am__append_47 = \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/tools/qelapsedtimer_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/tools/qlocale_unix.mm + +-@OSTYPE_DARWIN_TRUE@am__append_48 = mkspecs/macx-g++/Info.plist.app + @OSTYPE_LINUX_TRUE@am__append_49 = -I$(top_srcdir)/mkspecs/linux-g++ \ + @OSTYPE_LINUX_TRUE@ -DQT_NO_XINPUT -DQT_NO_STYLE_MAC \ + @OSTYPE_LINUX_TRUE@ -DQT_NO_STYLE_WINDOWSXP \ +@@ -347,10 +343,13 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_WIN_TRUE@ -DQT_NO_DIRECTWRITE -DQT_MAKEDLL + @OSTYPE_WIN_TRUE@am__append_52 = -lgdi32 -lwinmm -lole32 -lwinspool -loleaut32 -lcomdlg32 -limm32 -Wl,-luuid --export-all-symbols + @OSTYPE_DARWIN_TRUE@am__append_53 = src/gui/mac/qrc_macresources.cpp +-@OSTYPE_DARWIN_TRUE@am__append_54 = -I$(top_srcdir)/mkspecs/macx-g++ +-@OSTYPE_DARWIN_TRUE@am__append_55 = $(lib_libCsGui1_la_CXXFLAGS) +-@OSTYPE_DARWIN_TRUE@am__append_56 = -I$(top_srcdir)/mkspecs/macx-g++ -DQT_NO_STYLE_WINDOWSVISTA -DQ_OS_UNIX +-@OSTYPE_DARWIN_TRUE@am__append_57 = -lObjC -framework Carbon ++@OSTYPE_FREEBSD_TRUE@am__append_54 = -I$(top_srcdir)/mkspecs/bsd-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_56 = -I$(top_srcdir)/mkspecs/bsd-g++ \ ++@OSTYPE_FREEBSD_TRUE@ -DQT_NO_XINPUT -DQT_NO_STYLE_MAC \ ++@OSTYPE_FREEBSD_TRUE@ -DQT_NO_STYLE_WINDOWSXP \ ++@OSTYPE_FREEBSD_TRUE@ -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_TABLET \ ++@OSTYPE_FREEBSD_TRUE@ $(FONTCONFIG_CFLAGS) ++@OSTYPE_FREEBSD_TRUE@am__append_50 = $(FONTCONFIG_LIBS) -lX11 -lXrender -lXrandr -lXcursor -lXinerama -lSM -lICE -laudio -lpthread + @OSTYPE_WIN_TRUE@am__append_58 = \ + @OSTYPE_WIN_TRUE@ src/gui/accessible/qaccessible_win.cpp + +@@ -534,11 +533,10 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @X11_TRUE@am__append_86 = \ + @X11_TRUE@ src/gui/styles/qwindowsstyle.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_87 = \ +-@OSTYPE_DARWIN_TRUE@ src/gui/styles/qwindowsstyle.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/gui/styles/qmacstyle_mac.mm ++@OSTYPE_FREEBSD_TRUE@am__append_87 = \ ++@OSTYPE_FREEBSD_TRUE@ src/gui/styles/qwindowsstyle.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_88 = -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_GTK ++@OSTYPE_FREEBSD_TRUE@am__append_88 = -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_GTK + @GTK_TRUE@am__append_89 = $(GTK_CFLAGS) + @GTK_TRUE@am__append_90 = $(GTK_LIBS) + @GTK_TRUE@am__append_91 = \ +@@ -592,14 +590,9 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @X11_TRUE@am__append_102 = \ + @X11_TRUE@ src/gui/widgets/qmenubar_x11.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_103 = \ +-@OSTYPE_DARWIN_TRUE@ src/gui/mac/qt_menu.nib/classes.nib \ +-@OSTYPE_DARWIN_TRUE@ src/gui/mac/qt_menu.nib/info.nib \ +-@OSTYPE_DARWIN_TRUE@ src/gui/mac/qt_menu.nib/keyedobjects.nib +- + @OSTYPE_LINUX_TRUE@am__append_104 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_105 = -I$(top_srcdir)/mkspecs/win32-g++ +-@OSTYPE_DARWIN_TRUE@am__append_106 = -I$(top_srcdir)/mkspecs/macx-g++ -DQ_OS_UNIX ++@OSTYPE_FREEBSD_TRUE@am__append_106 = -I$(top_srcdir)/mkspecs/bsd-g++ -DQ_OS_UNIX + @OSTYPE_WIN_TRUE@am__append_107 = \ + @OSTYPE_WIN_TRUE@ src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp \ + @OSTYPE_WIN_TRUE@ src/multimedia/audio/qaudiooutput_win32_p.cpp \ +@@ -616,17 +609,16 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@am__append_112 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_113 = -I$(top_srcdir)/mkspecs/win32-g++ + @OSTYPE_WIN_TRUE@am__append_114 = -lws2_32 +-@OSTYPE_DARWIN_TRUE@am__append_115 = -I$(top_srcdir)/mkspecs/macx-g++ +-@OSTYPE_DARWIN_TRUE@am__append_116 = -framework CoreServices ++@OSTYPE_FREEBSD_TRUE@am__append_115 = -I$(top_srcdir)/mkspecs/bsd-g++ + @OSTYPE_LINUX_TRUE@am__append_117 = \ + @OSTYPE_LINUX_TRUE@ src/network/kernel/qhostinfo_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/network/kernel/qnetworkinterface_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/network/kernel/qnetworkproxy_generic.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_118 = \ +-@OSTYPE_DARWIN_TRUE@ src/network/kernel/qhostinfo_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/network/kernel/qnetworkinterface_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/network/kernel/qnetworkproxy_generic.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_118 = \ ++@OSTYPE_FREEBSD_TRUE@ src/network/kernel/qhostinfo_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/network/kernel/qnetworkinterface_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/network/kernel/qnetworkproxy_generic.cpp + + @OSTYPE_WIN_TRUE@am__append_119 = \ + @OSTYPE_WIN_TRUE@ src/network/kernel/qhostinfo_win.cpp \ +@@ -638,10 +630,10 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@ src/network/socket/qlocalsocket_unix.cpp \ + @OSTYPE_LINUX_TRUE@ src/network/socket/qlocalserver_unix.cpp + +-@OSTYPE_DARWIN_TRUE@am__append_121 = \ +-@OSTYPE_DARWIN_TRUE@ src/network/socket/qnativesocketengine_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/network/socket/qlocalsocket_unix.cpp \ +-@OSTYPE_DARWIN_TRUE@ src/network/socket/qlocalserver_unix.cpp ++@OSTYPE_FREEBSD_TRUE@am__append_121 = \ ++@OSTYPE_FREEBSD_TRUE@ src/network/socket/qnativesocketengine_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/network/socket/qlocalsocket_unix.cpp \ ++@OSTYPE_FREEBSD_TRUE@ src/network/socket/qlocalserver_unix.cpp + + @OSTYPE_WIN_TRUE@am__append_122 = \ + @OSTYPE_WIN_TRUE@ src/network/socket/qnativesocketengine_win.cpp \ +@@ -661,7 +653,7 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + + @OSTYPE_LINUX_TRUE@am__append_124 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_125 = -I$(top_srcdir)/mkspecs/win32-g++ +-@OSTYPE_DARWIN_TRUE@am__append_126 = -I$(top_srcdir)/mkspecs/macx-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_126 = -I$(top_srcdir)/mkspecs/bsd-g++ + @X11_TRUE@am__append_127 = \ + @X11_TRUE@ src/opengl/qgl_x11.cpp \ + @X11_TRUE@ src/opengl/qglpixelbuffer_x11.cpp +@@ -680,30 +672,30 @@ DIST_COMMON = $(srcdir)/src/tools/uic/Ma + @OSTYPE_LINUX_TRUE@am__append_133 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_134 = -I$(top_srcdir)/mkspecs/win32-g++ + @OSTYPE_WIN_TRUE@am__append_135 = -lws2_32 +-@OSTYPE_DARWIN_TRUE@am__append_136 = -I$(top_srcdir)/mkspecs/macx-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_136 = -I$(top_srcdir)/mkspecs/bsd-g++ + @BUILD_MYSQL_PLUGIN_TRUE@am__append_137 = lib/qsqlmysql4.la + @BUILD_PSQL_PLUGIN_TRUE@am__append_138 = lib/qsqlpsql4.la + @OSTYPE_LINUX_TRUE@am__append_139 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_140 = -I$(top_srcdir)/mkspecs/win32-g++ + @OSTYPE_WIN_TRUE@am__append_141 = -lws2_32 +-@OSTYPE_DARWIN_TRUE@am__append_142 = -I$(top_srcdir)/mkspecs/macx-g++ -DQ_OS_UNIX ++@OSTYPE_FREEBSD_TRUE@am__append_142 = -I$(top_srcdir)/mkspecs/bsd-g++ -DQ_OS_UNIX + @OSTYPE_LINUX_TRUE@am__append_143 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_144 = -I$(top_srcdir)/mkspecs/win32-g++ + @OSTYPE_WIN_TRUE@am__append_145 = +-@OSTYPE_DARWIN_TRUE@am__append_146 = -I$(top_srcdir)/mkspecs/macx-g++ -DQ_OS_UNIX ++@OSTYPE_FREEBSD_TRUE@am__append_146 = -I$(top_srcdir)/mkspecs/bsd-g++ -DQ_OS_UNIX + @OSTYPE_WIN_TRUE@am__append_147 = lib/phonon_ds9.la + @OSTYPE_LINUX_TRUE@am__append_148 = lib/phonon_gstreamer.la +-@OSTYPE_DARWIN_TRUE@am__append_149 = lib/phonon_qt7.la ++@OSTYPE_FREEBSD_TRUE@am__append_149 = lib/phonon_gstreamer.la + @OSTYPE_LINUX_TRUE@am__append_150 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_151 = -I$(top_srcdir)/mkspecs/win32-g++ + @OSTYPE_WIN_TRUE@am__append_152 = -lwinmm +-@OSTYPE_DARWIN_TRUE@am__append_153 = -I$(top_srcdir)/mkspecs/macx-g++ -DENABLE_JSC_MULTIPLE_THREADS=0 ++@OSTYPE_FREEBSD_TRUE@am__append_153 = -I$(top_srcdir)/mkspecs/bsd-g++ -DENABLE_JSC_MULTIPLE_THREADS=0 + @OSTYPE_LINUX_TRUE@am__append_154 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_155 = -I$(top_srcdir)/mkspecs/win32-g++ +-@OSTYPE_DARWIN_TRUE@am__append_156 = -I$(top_srcdir)/mkspecs/macx-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_156 = -I$(top_srcdir)/mkspecs/bsd-g++ + @OSTYPE_LINUX_TRUE@am__append_157 = -I$(top_srcdir)/mkspecs/linux-g++ + @OSTYPE_WIN_TRUE@am__append_158 = -I$(top_srcdir)/mkspecs/win32-g++ +-@OSTYPE_DARWIN_TRUE@am__append_159 = -I$(top_srcdir)/mkspecs/macx-g++ ++@OSTYPE_FREEBSD_TRUE@am__append_159 = -I$(top_srcdir)/mkspecs/bsd-g++ + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = \ +@@ -900,6 +892,7 @@ am__lib_libCsCore1_la_SOURCES_DIST = src + src/corelib/thread/qsemaphore.cpp \ + src/corelib/thread/qthread.cpp \ + src/corelib/thread/qthreadstorage.cpp \ ++ src/corelib/thread/qmutex_unix.cpp \ + src/corelib/thread/qmutex_win.cpp \ + src/corelib/thread/qthread_win.cpp \ + src/corelib/thread/qwaitcondition_win.cpp \ +@@ -969,7 +962,7 @@ am__dirstamp = $(am__leading_dot)dirstam + @ZLIB_FALSE@ src/3rdparty/zlib/lib_libCsCore1_la-uncompr.lo \ + @ZLIB_FALSE@ src/3rdparty/zlib/lib_libCsCore1_la-zutil.lo + @OSTYPE_LINUX_TRUE@am__objects_2 = src/corelib/codecs/lib_libCsCore1_la-qiconvcodec.lo +-@OSTYPE_DARWIN_TRUE@am__objects_3 = src/corelib/codecs/lib_libCsCore1_la-qiconvcodec.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_3 = src/corelib/codecs/lib_libCsCore1_la-qiconvcodec.lo + @OSTYPE_WIN_TRUE@am__objects_4 = src/corelib/io/lib_libCsCore1_la-qwindowspipewriter.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemiterator_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qsettings_win.lo \ +@@ -985,14 +978,12 @@ am__dirstamp = $(am__leading_dot)dirstam + @OSTYPE_LINUX_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemwatcher_dnotify.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemiterator_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/io/lib_libCsCore1_la-qstandardpaths_unix.lo +-@OSTYPE_DARWIN_TRUE@am__objects_6 = src/corelib/io/lib_libCsCore1_la-qfilesystemengine_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemiterator_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemwatcher_fsevents.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemwatcher_kqueue.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qfsfileengine_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qprocess_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qsettings_mac.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/io/lib_libCsCore1_la-qstandardpaths_mac.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_6 = src/corelib/io/lib_libCsCore1_la-qfilesystemengine_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemiterator_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/lib_libCsCore1_la-qfilesystemwatcher_kqueue.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/lib_libCsCore1_la-qfsfileengine_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/lib_libCsCore1_la-qprocess_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/io/lib_libCsCore1_la-qstandardpaths_unix.lo + @OSTYPE_WIN_TRUE@am__objects_7 = src/corelib/kernel/lib_libCsCore1_la-qeventdispatcher_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qcoreapplication_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qwineventnotifier_p.lo \ +@@ -1004,31 +995,29 @@ am__dirstamp = $(am__leading_dot)dirstam + @OSTYPE_LINUX_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qsystemsemaphore_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qeventdispatcher_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qeventdispatcher_glib.lo +-@OSTYPE_DARWIN_TRUE@am__objects_9 = src/corelib/kernel/lib_libCsCore1_la-qcore_mac.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qcore_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qcoreapplication_mac.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qeventdispatcher_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qsharedmemory_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qsystemsemaphore_unix.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_9 = src/corelib/kernel/lib_libCsCore1_la-qcore_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qeventdispatcher_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qsharedmemory_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/kernel/lib_libCsCore1_la-qsystemsemaphore_unix.lo + @OSTYPE_WIN_TRUE@am__objects_10 = src/corelib/plugin/lib_libCsCore1_la-qlibrary_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/plugin/lib_libCsCore1_la-qsystemlibrary.lo + @OSTYPE_LINUX_TRUE@am__objects_11 = src/corelib/plugin/lib_libCsCore1_la-qlibrary_unix.lo +-@OSTYPE_DARWIN_TRUE@am__objects_12 = src/corelib/plugin/lib_libCsCore1_la-qlibrary_unix.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_12 = src/corelib/plugin/lib_libCsCore1_la-qlibrary_unix.lo + @OSTYPE_WIN_TRUE@am__objects_13 = src/corelib/thread/lib_libCsCore1_la-qmutex_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/thread/lib_libCsCore1_la-qthread_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/thread/lib_libCsCore1_la-qwaitcondition_win.lo + @OSTYPE_LINUX_TRUE@am__objects_14 = src/corelib/thread/lib_libCsCore1_la-qmutex_linux.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/thread/lib_libCsCore1_la-qthread_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/thread/lib_libCsCore1_la-qwaitcondition_unix.lo +-@OSTYPE_DARWIN_TRUE@am__objects_15 = src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/thread/lib_libCsCore1_la-qthread_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/thread/lib_libCsCore1_la-qwaitcondition_unix.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_15 = src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/thread/lib_libCsCore1_la-qthread_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/thread/lib_libCsCore1_la-qwaitcondition_unix.lo + @OSTYPE_WIN_TRUE@am__objects_16 = src/corelib/tools/lib_libCsCore1_la-qelapsedtimer_win.lo \ + @OSTYPE_WIN_TRUE@ src/corelib/tools/lib_libCsCore1_la-qlocale_win.lo + @OSTYPE_LINUX_TRUE@am__objects_17 = src/corelib/tools/lib_libCsCore1_la-qelapsedtimer_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/corelib/tools/lib_libCsCore1_la-qlocale_unix.lo +-@OSTYPE_DARWIN_TRUE@am__objects_18 = src/corelib/tools/lib_libCsCore1_la-qelapsedtimer_mac.lo \ +-@OSTYPE_DARWIN_TRUE@ src/corelib/tools/lib_libCsCore1_la-qlocale_mac.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_18 = src/corelib/tools/lib_libCsCore1_la-qelapsedtimer_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/corelib/tools/lib_libCsCore1_la-qlocale_unix.lo + am_lib_libCsCore1_la_OBJECTS = $(am__objects_1) \ + src/corelib/animation/lib_libCsCore1_la-qabstractanimation.lo \ + src/corelib/animation/lib_libCsCore1_la-qvariantanimation.lo \ +@@ -1676,7 +1665,7 @@ am__lib_libCsGui1_la_SOURCES_DIST = src/ + src/gui/widgets/qmacnativewidget_mac.mm \ + src/gui/widgets/qmainwindowlayout_mac.mm \ + src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenubar_x11.cpp +-@OSTYPE_DARWIN_TRUE@am__objects_19 = src/gui/mac/lib_libCsGui1_la-qrc_macresources.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_19 = src/gui/mac/lib_libCsGui1_la-qrc_macresources.lo + @OSTYPE_WIN_TRUE@am__objects_20 = src/gui/accessible/lib_libCsGui1_la-qaccessible_win.lo + @OSTYPE_LINUX_TRUE@am__objects_21 = src/gui/accessible/lib_libCsGui1_la-qaccessible_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/gui/accessible/lib_libCsGui1_la-qaccessiblebridge.lo +@@ -1813,8 +1802,6 @@ am__objects_31 = + @OSTYPE_WIN_TRUE@ src/gui/styles/lib_libCsGui1_la-qwindowsvistastyle.lo + @X11_TRUE@am__objects_45 = \ + @X11_TRUE@ src/gui/styles/lib_libCsGui1_la-qwindowsstyle.lo +-@OSTYPE_DARWIN_TRUE@am__objects_46 = src/gui/styles/lib_libCsGui1_la-qwindowsstyle.lo \ +-@OSTYPE_DARWIN_TRUE@ src/gui/styles/lib_libCsGui1_la-qmacstyle_mac.lo + @GTK_TRUE@am__objects_47 = \ + @GTK_TRUE@ src/gui/styles/lib_libCsGui1_la-qgtkstyle.lo \ + @GTK_TRUE@ src/gui/styles/lib_libCsGui1_la-qgtkpainter.lo \ +@@ -2402,18 +2389,18 @@ am__lib_libCsNetwork1_la_SOURCES_DIST = + @OSTYPE_LINUX_TRUE@am__objects_59 = src/network/kernel/lib_libCsNetwork1_la-qhostinfo_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkinterface_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkproxy_generic.lo +-@OSTYPE_DARWIN_TRUE@am__objects_60 = src/network/kernel/lib_libCsNetwork1_la-qhostinfo_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkinterface_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkproxy_generic.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_60 = src/network/kernel/lib_libCsNetwork1_la-qhostinfo_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkinterface_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkproxy_generic.lo + @OSTYPE_WIN_TRUE@am__objects_61 = src/network/kernel/lib_libCsNetwork1_la-qhostinfo_win.lo \ + @OSTYPE_WIN_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkinterface_win.lo \ + @OSTYPE_WIN_TRUE@ src/network/kernel/lib_libCsNetwork1_la-qnetworkproxy_generic.lo + @OSTYPE_LINUX_TRUE@am__objects_62 = src/network/socket/lib_libCsNetwork1_la-qnativesocketengine_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalsocket_unix.lo \ + @OSTYPE_LINUX_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalserver_unix.lo +-@OSTYPE_DARWIN_TRUE@am__objects_63 = src/network/socket/lib_libCsNetwork1_la-qnativesocketengine_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalsocket_unix.lo \ +-@OSTYPE_DARWIN_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalserver_unix.lo ++@OSTYPE_FREEBSD_TRUE@am__objects_63 = src/network/socket/lib_libCsNetwork1_la-qnativesocketengine_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalsocket_unix.lo \ ++@OSTYPE_FREEBSD_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalserver_unix.lo + @OSTYPE_WIN_TRUE@am__objects_64 = src/network/socket/lib_libCsNetwork1_la-qnativesocketengine_win.lo \ + @OSTYPE_WIN_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalsocket_win.lo \ + @OSTYPE_WIN_TRUE@ src/network/socket/lib_libCsNetwork1_la-qlocalserver_win.lo +@@ -3251,9 +3238,7 @@ lib_phonon_gstreamer_la_LINK = $(LIBTOOL + $(lib_phonon_gstreamer_la_CXXFLAGS) $(CXXFLAGS) \ + $(lib_phonon_gstreamer_la_LDFLAGS) $(LDFLAGS) -o $@ + @OSTYPE_LINUX_TRUE@am_lib_phonon_gstreamer_la_rpath = -rpath $(libdir) +-@OSTYPE_DARWIN_TRUE@lib_phonon_qt7_la_DEPENDENCIES = \ +-@OSTYPE_DARWIN_TRUE@ lib/libCsCore1.la lib/libCsGui1.la \ +-@OSTYPE_DARWIN_TRUE@ lib/libCsPhonon1.la lib/libCsOpenGL1.la ++@OSTYPE_FREEBSD_TRUE@am_lib_phonon_gstreamer_la_rpath = -rpath $(libdir) + am__lib_phonon_qt7_la_SOURCES_DIST = \ + src/3rdparty/phonon/qt7/quicktimevideoplayer.mm \ + src/3rdparty/phonon/qt7/backendheader.mm \ +@@ -3277,34 +3262,11 @@ am__lib_phonon_qt7_la_SOURCES_DIST = \ + src/3rdparty/phonon/qt7/audiograph.mm \ + src/3rdparty/phonon/qt7/audionode.mm \ + src/3rdparty/phonon/qt7/videowidget.mm +-@OSTYPE_DARWIN_TRUE@am_lib_phonon_qt7_la_OBJECTS = src/3rdparty/phonon/qt7/lib_phonon_qt7_la-quicktimevideoplayer.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-backendheader.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-medianodevideopart.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-medianodeevent.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audiooutput.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-backendinfo.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audiosplitter.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audioeffects.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-quicktimestreamreader.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-medianode.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-backend.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-mediaobject.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-mediaobjectaudionode.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audiomixer.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-quicktimeaudioplayer.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-videoframe.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-quicktimemetadata.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audiodevice.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audioconnection.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audiograph.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-audionode.lo \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/lib_phonon_qt7_la-videowidget.lo + lib_phonon_qt7_la_OBJECTS = $(am_lib_phonon_qt7_la_OBJECTS) + lib_phonon_qt7_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \ + $(lib_phonon_qt7_la_OBJCXXFLAGS) $(OBJCXXFLAGS) \ + $(lib_phonon_qt7_la_LDFLAGS) $(LDFLAGS) -o $@ +-@OSTYPE_DARWIN_TRUE@am_lib_phonon_qt7_la_rpath = -rpath $(libdir) + @BUILD_MYSQL_PLUGIN_TRUE@lib_qsqlmysql4_la_DEPENDENCIES = \ + @BUILD_MYSQL_PLUGIN_TRUE@ lib/libCsCore1.la lib/libCsSql1.la + am__lib_qsqlmysql4_la_SOURCES_DIST = \ +@@ -7689,39 +7651,12 @@ PHONON_HEADERS_INSTALLED = \ + + @OSTYPE_LINUX_TRUE@lib_phonon_gstreamer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined -module $(GSTREAMER_LIBS) $(GSTREAMER_AUDIO_LIBS) + @OSTYPE_LINUX_TRUE@lib_phonon_gstreamer_la_LIBADD = lib/libCsCore1.la lib/libCsGui1.la lib/libCsPhonon1.la +-@OSTYPE_DARWIN_TRUE@lib_phonon_qt7_la_SOURCES = \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/quicktimevideoplayer.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/backendheader.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/medianodevideopart.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/medianodeevent.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audiooutput.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/backendinfo.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audiosplitter.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audioeffects.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/quicktimestreamreader.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/medianode.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/backend.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/mediaobject.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/mediaobjectaudionode.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audiomixer.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/quicktimeaudioplayer.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/videoframe.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/quicktimemetadata.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audiodevice.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audioconnection.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audiograph.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/audionode.mm \ +-@OSTYPE_DARWIN_TRUE@ src/3rdparty/phonon/qt7/videowidget.mm +- +-@OSTYPE_DARWIN_TRUE@lib_phonon_qt7_la_OBJCXXFLAGS = $(AM_CXXFLAGS) -DQT_NO_OPENGL -I$(top_srcdir)/src/3rdparty/phonon/qt7 -Iinclude -Iinclude/QtCore \ +-@OSTYPE_DARWIN_TRUE@ -Iinclude/QtGui -Iinclude/phonon -Isrc/3rdparty/phonon/qt7/ -Iprivateinclude -IprivateInclude/OpenGL \ +-@OSTYPE_DARWIN_TRUE@ -DQT_BUILD_QT7_LIB -DQT_SHARED -DQT_MAKEDLL +- +-@OSTYPE_DARWIN_TRUE@lib_phonon_qt7_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -module \ +-@OSTYPE_DARWIN_TRUE@ -Xarch_i386 -framework QuickTime -Xarch_x86_64 -framework QTKit -framework AppKit -framework AudioUnit \ +-@OSTYPE_DARWIN_TRUE@ -framework AudioToolbox -framework CoreAudio -framework QuartzCore ++@OSTYPE_FREEBSD_TRUE@lib_phonon_gstreamer_la_CXXFLAGS = $(AM_CXXFLAGS) -DQT_NO_OPENGL $(GSTREAMER_CFLAGS) $(GSTREAMER_AUDIO_CFLAGS) \ ++@OSTYPE_FREEBSD_TRUE@ -I$(top_srcdir)/src/3rdparty/phonon/gstreamer -Iinclude -Iinclude/QtCore -Iinclude/QtGui -Iinclude/phonon \ ++@OSTYPE_FREEBSD_TRUE@ -Isrc/3rdparty/phonon/gstreamer -DQT_BUILD_GSTREAMER_LIB -DQT_SHARED -DQT_MAKEDLL + +-@OSTYPE_DARWIN_TRUE@lib_phonon_qt7_la_LIBADD = lib/libCsCore1.la lib/libCsGui1.la lib/libCsPhonon1.la lib/libCsOpenGL1.la ++@OSTYPE_FREEBSD_TRUE@lib_phonon_gstreamer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined -module $(GSTREAMER_LIBS) $(GSTREAMER_AUDIO_LIBS) ++@OSTYPE_FREEBSD_TRUE@lib_phonon_gstreamer_la_LIBADD = lib/libCsCore1.la lib/libCsGui1.la lib/libCsPhonon1.la + lib_libCsScript1_la_SOURCES = src/script/api/qscriptclass.cpp \ + src/script/api/qscriptclasspropertyiterator.cpp \ + src/script/api/qscriptcontext.cpp \ +@@ -9649,7 +9584,7 @@ src/corelib/thread/lib_libCsCore1_la-qth + src/corelib/thread/lib_libCsCore1_la-qwaitcondition_unix.lo: \ + src/corelib/thread/$(am__dirstamp) \ + src/corelib/thread/$(DEPDIR)/$(am__dirstamp) +-src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo: \ ++src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo: \ + src/corelib/thread/$(am__dirstamp) \ + src/corelib/thread/$(DEPDIR)/$(am__dirstamp) + src/corelib/tools/$(am__dirstamp): +@@ -15163,7 +15098,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qatomic.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_linux.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_mac.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_unix.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_win.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutexpool.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qreadwritelock.Plo@am__quote@ +@@ -18361,12 +18296,12 @@ src/corelib/thread/lib_libCsCore1_la-qwa + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_libCsCore1_la_CXXFLAGS) $(CXXFLAGS) -c -o src/corelib/thread/lib_libCsCore1_la-qwaitcondition_unix.lo `test -f 'src/corelib/thread/qwaitcondition_unix.cpp' || echo '$(srcdir)/'`src/corelib/thread/qwaitcondition_unix.cpp + +-src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo: src/corelib/thread/qmutex_mac.cpp +-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_libCsCore1_la_CXXFLAGS) $(CXXFLAGS) -MT src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo -MD -MP -MF src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_mac.Tpo -c -o src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo `test -f 'src/corelib/thread/qmutex_mac.cpp' || echo '$(srcdir)/'`src/corelib/thread/qmutex_mac.cpp +-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_mac.Tpo src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_mac.Plo +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/corelib/thread/qmutex_mac.cpp' object='src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo' libtool=yes @AMDEPBACKSLASH@ ++src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo: src/corelib/thread/qmutex_unix.cpp ++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_libCsCore1_la_CXXFLAGS) $(CXXFLAGS) -MT src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo -MD -MP -MF src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_unix.Tpo -c -o src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo `test -f 'src/corelib/thread/qmutex_unix.cpp' || echo '$(srcdir)/'`src/corelib/thread/qmutex_unix.cpp ++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_unix.Tpo src/corelib/thread/$(DEPDIR)/lib_libCsCore1_la-qmutex_unix.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/corelib/thread/qmutex_unix.cpp' object='src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_libCsCore1_la_CXXFLAGS) $(CXXFLAGS) -c -o src/corelib/thread/lib_libCsCore1_la-qmutex_mac.lo `test -f 'src/corelib/thread/qmutex_mac.cpp' || echo '$(srcdir)/'`src/corelib/thread/qmutex_mac.cpp ++@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_libCsCore1_la_CXXFLAGS) $(CXXFLAGS) -c -o src/corelib/thread/lib_libCsCore1_la-qmutex_unix.lo `test -f 'src/corelib/thread/qmutex_unix.cpp' || echo '$(srcdir)/'`src/corelib/thread/qmutex_unix.cpp + + src/corelib/tools/lib_libCsCore1_la-qarraydata.lo: src/corelib/tools/qarraydata.cpp + @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_libCsCore1_la_CXXFLAGS) $(CXXFLAGS) -MT src/corelib/tools/lib_libCsCore1_la-qarraydata.lo -MD -MP -MF src/corelib/tools/$(DEPDIR)/lib_libCsCore1_la-qarraydata.Tpo -c -o src/corelib/tools/lib_libCsCore1_la-qarraydata.lo `test -f 'src/corelib/tools/qarraydata.cpp' || echo '$(srcdir)/'`src/corelib/tools/qarraydata.cpp +@@ -28974,7 +28909,7 @@ clean-cs: + + install-data-hook: webkit-headers + mkdir -p $(includedir) +- cp -r include/Qt* include/phonon $(includedir) ++ cp -r include/Qt* include/phonon $(DESTDIR)$(includedir) + + uninstall-hook: + for i in `cd include; find Qt* -type f`; do \ Added: head/graphics/copperspice/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-configure Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,64 @@ +--- configure.orig 2015-06-11 09:26:00 UTC ++++ configure +@@ -664,6 +664,8 @@ X11_FALSE + X11_TRUE + OSTYPE_DARWIN_FALSE + OSTYPE_DARWIN_TRUE ++OSTYPE_FREEBSD_FALSE ++OSTYPE_FREEBSD_TRUE + OSTYPE_LINUX_FALSE + OSTYPE_LINUX_TRUE + OSTYPE_WIN_FALSE +@@ -8512,7 +8514,7 @@ fi + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CC' + + + +@@ -18232,6 +18234,14 @@ else + OSTYPE_LINUX_FALSE= + fi + ++ if test "$OSTYPE" == FREEBSD; then ++ OSTYPE_FREEBSD_TRUE= ++ OSTYPE_FREEBSD_FALSE='#' ++else ++ OSTYPE_FREEBSD_TRUE='#' ++ OSTYPE_FREEBSD_FALSE= ++fi ++ + if test "$OSTYPE" == DARWIN; then + OSTYPE_DARWIN_TRUE= + OSTYPE_DARWIN_FALSE='#' +@@ -18249,6 +18259,14 @@ else + X11_FALSE= + fi + ++ if test "$OSTYPE" == FREEBSD; then ++ X11_TRUE= ++ X11_FALSE='#' ++else ++ X11_TRUE='#' ++ X11_FALSE= ++fi ++ + if test "$OSTYPE" == DARWIN; then + COCOA_TRUE= + COCOA_FALSE='#' +@@ -18301,6 +18319,13 @@ else + FREETYPE_FALSE= + fi + ++ if test "x$OSTYPE" = x""FREEBSD; then ++ FREETYPE_TRUE= ++ FREETYPE_FALSE='#' ++else ++ FREETYPE_TRUE='#' ++ FREETYPE_FALSE= ++fi + + # turns zlib and alsa off always + if test "x" = x""yes; then Added: head/graphics/copperspice/files/patch-mkspecs_bsd-g++_qplatformdefs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-mkspecs_bsd-g++_qplatformdefs.h Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,46 @@ +--- mkspecs/bsd-g++/qplatformdefs.h.orig 2015-06-13 02:02:25 UTC ++++ mkspecs/bsd-g++/qplatformdefs.h +@@ -0,0 +1,43 @@ ++#ifndef QPLATFORMDEFS_H ++#define QPLATFORMDEFS_H ++ ++// Get Qt defines/settings ++ ++#include "qglobal.h" ++ ++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs ++ ++#include <unistd.h> ++ ++ ++// We are hot - unistd.h should have turned on the specific APIs we requested ++ ++ ++#include <pthread.h> ++#include <dirent.h> ++#include <fcntl.h> ++#include <grp.h> ++#include <pwd.h> ++#include <signal.h> ++ ++#include <sys/types.h> ++#include <sys/ioctl.h> ++#include <sys/ipc.h> ++#include <sys/time.h> ++#include <sys/shm.h> ++#include <sys/socket.h> ++#include <sys/stat.h> ++#include <sys/wait.h> ++#include <netinet/in.h> ++#ifndef QT_NO_IPV6IFNAME ++#include <net/if.h> ++#endif ++ ++#include "../common/posix/qplatformdefs.h" ++ ++#undef QT_OPEN_LARGEFILE ++#define QT_OPEN_LARGEFILE 0 ++#define QT_SNPRINTF ::snprintf ++#define QT_VSNPRINTF ::vsnprintf ++ ++#endif // QPLATFORMDEFS_H Added: head/graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,11 @@ +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2015-04-23 19:00:27 UTC ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -405,7 +405,7 @@ + #endif + + /* OS(FREEBSD) - FreeBSD */ +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #define WTF_OS_FREEBSD 1 + #endif + Added: head/graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,71 @@ +--- 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 + Added: head/graphics/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_TypeTraits.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_TypeTraits.h Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,71 @@ +--- 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 + Added: head/graphics/copperspice/files/patch-src_corelib_thread_qmutex__unix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/files/patch-src_corelib_thread_qmutex__unix.cpp Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,87 @@ +--- src/corelib/thread/qmutex_unix.cpp.orig 2015-06-13 13:15:35 UTC ++++ src/corelib/thread/qmutex_unix.cpp +@@ -0,0 +1,84 @@ ++/*********************************************************************** ++* ++* Copyright (c) 2012-2014 Barbara Geller ++* Copyright (c) 2012-2014 Ansel Sermersheim ++* Copyright (c) 2012-2014 Digia Plc and/or its subsidiary(-ies). ++* Copyright (c) 2008-2012 Nokia Corporation and/or its subsidiary(-ies). ++* All rights reserved. ++* ++* This file is part of CopperSpice. ++* ++* CopperSpice is free software: you can redistribute it and/or ++* modify it under the terms of the GNU Lesser General Public License ++* version 2.1 as published by the Free Software Foundation. ++* ++* CopperSpice is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++* Lesser General Public License for more details. ++* ++* You should have received a copy of the GNU Lesser General Public ++* License along with CopperSpice. If not, see ++* <http://www.gnu.org/licenses/>. ++* ++***********************************************************************/ ++ ++#include "qplatformdefs.h" ++#include "qmutex.h" ++ ++#if !defined(QT_NO_THREAD) ++ ++#include "qmutex_p.h" ++#include <errno.h> ++ ++QT_BEGIN_NAMESPACE ++ ++QMutexPrivate::QMutexPrivate() ++{ ++ wakeup = false; ++} ++ ++QMutexPrivate::~QMutexPrivate() ++{ ++ /* do nothing */ ++} ++ ++bool QMutexPrivate::wait(int timeout) ++{ ++ int errorCode = 0; ++ while (!wakeup) { ++ if (timeout < 0) { ++ errorCode = pthread_cond_wait(&cond, &mutex); ++ } else { ++ struct timeval tv; ++ gettimeofday(&tv, 0); ++ ++ timespec ti; ++ ti.tv_nsec = (tv.tv_usec + (timeout % 1000) * 1000) * 1000; ++ ti.tv_sec = tv.tv_sec + (timeout / 1000) + ++ (ti.tv_nsec / 100000000); ++ ti.tv_nsec %= 1000000000; ++ ++ errorCode = pthread_cond_timedwait(&cond, &mutex, &ti); ++ } ++ if (errorCode) { ++ if (errorCode == ETIMEDOUT) { ++ if (wakeup) ++ errorCode = 0; ++ break; ++ } ++ } ++ } ++ wakeup = false; ++ return errorCode == 0; ++} ++ ++void QMutexPrivate::wakeUp() ++{ ++ wakeup = true; ++} ++ ++ ++QT_END_NAMESPACE ++ ++#endif //QT_NO_THREAD Added: head/graphics/copperspice/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/pkg-descr Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,19 @@ +Copperspice is a C++ library derived from the existing Qt 4.8 framework. +The goal was to change the core design of the libraries, leveraging +template functionality and C++11 capabilities. + +The redesign allowed the Qt Meta-Object Compiler (moc) system to be +completely removed. Moc is a code generator and does not support many +aspects of C++ including templates, complex data types, static type +checking, and relies heavily on string comparisons. Removing moc improves +runtime performance, reduces the complexity of the build process, and +allows more issues to be detected at compile time. + +Key features: + * Qt Meta-Object Compiler (moc) is obsolete + * Written in C++11 + * Library links directory to any standard C++ application + * A template class can inherit from QObject + * Copperspice includes several Qt5 classes + +WWW: http://www.copperspice.com Added: head/graphics/copperspice/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/copperspice/pkg-plist Sat Jun 20 16:18:13 2015 (r390166) @@ -0,0 +1,2140 @@ +bin/lconvert +bin/lrelease +bin/lupdate +bin/rcc +bin/uic +include/QtWebKit/qtwebkit.h +include/QtWebKit/qwebelementcollection.h +include/QtWebKit/qwebfullscreenvideohandler.h +include/QtWebKit/qwebhapticfeedbackplayer.h +include/QtWebKit/qwebhistoryitem.h +include/QtWebKit/qwebhittestresult.h +include/QtWebKit/qwebnotificationdata.h +include/QtWebKit/qwebnotificationpresenter.h +include/QtWebKit/qwebselectdata.h +include/QtWebKit/qwebselectmethod.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506201618.t5KGIE9K026867>