mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00
Code Issues Releases Activity

graphics/copperspice: Upgrade to version 1.2.2 (Unbreak)

Browse Source 
Tested on FreeBSD 10.2 amd64.  I confirmed it still does not build on
i386 (same issue documented in BROKEN message for i386)
This commit is contained in:
John Marino 2016-03-13 17:52:30 +00:00
parent d0d924c26f
commit 83b5902bbe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=411006
8 changed files with 70 additions and 797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
graphics/copperspice/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= copperspice
PORTVERSION= 1.0.4
PORTVERSION= 1.2.2
CATEGORIES= graphics
MASTER_SITES= http://download.copperspice.com/copperspice/source/
@ -15,11 +15,11 @@ 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
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
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CFLAGS+= -I${LOCALBASE}/include \
@ -28,36 +28,21 @@ CFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/freetype2
LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} -L${LOCALBASE}/lib
CONFIGURE_ARGS= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
OVERRIDE_INS= 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}"
INSTALL="${INSTALL}"
CONFIGURE_ARGS= ${OVERRIDE_INS}
MAKE_ARGS= ${OVERRIDE_INS}
PLIST_SUB= SHORT_VER=0 LONG_VER=0.0.0
MAKE_JOBS_UNSAFE= yes
WITH_OPENSSL_PORT= yes
BROKEN= upstream notified; removed patches broke DF too
BROKEN_FreeBSD_9= PR 193528 (c++11 support is broken)
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"|' \

4
graphics/copperspice/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (copperspice-1.0.4.tar.bz2) = b4ce66b7a80dfc15ca94abb90da7d4bbb18f4884f3c5d89c1a4425a9c675bfc5
SIZE (copperspice-1.0.4.tar.bz2) = 15348145
SHA256 (copperspice-1.2.2.tar.bz2) = fbcda16ef133a86014875c85f7a829b1049026b1b754eaf6cd262dc6806e20fe
SIZE (copperspice-1.2.2.tar.bz2) = 15225245

496
graphics/copperspice/files/patch-Makefile.in
View File

@ -1,496 +0,0 @@
--- Makefile.in.orig 2015-07-05 11:31:09 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 \
@@ -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 = \
@@ -7697,39 +7659,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 \
@@ -9661,7 +9596,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):
@@ -15175,7 +15110,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@
@@ -18373,12 +18308,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
@@ -28994,7 +28929,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 \

64
graphics/copperspice/files/patch-configure
View File

@ -1,64 +0,0 @@
--- 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

46
graphics/copperspice/files/patch-mkspecs_bsd-g++_qplatformdefs.h
View File

@ -1,46 +0,0 @@
--- 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

11
graphics/copperspice/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
View File

@ -1,11 +0,0 @@
--- 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

87
graphics/copperspice/files/patch-src_corelib_thread_qmutex__unix.cpp
View File

@ -1,87 +0,0 @@
--- 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

130
graphics/copperspice/pkg-plist
View File

@ -3,50 +3,6 @@ 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
include/QtWebKit/qwebtouchmodifier.h
include/QtSvg/qsvgrenderer.h
include/QtSvg/qsvgwidget.h
include/QtSvg/qgraphicssvgitem.h
include/QtSvg/qsvggenerator.h
include/QtSvg/qtsvg.h
include/QtSvg/QtSvg
include/QtSvg/QGraphicsSvgItem
include/QtSvg/QSvgGenerator
include/QtSvg/QSvgRenderer
include/QtSvg/QSvgWidget
include/QtMultimedia/qabstractaudiodeviceinfo.h
include/QtMultimedia/qabstractaudioinput.h
include/QtMultimedia/qabstractaudiooutput.h
include/QtMultimedia/qaudio.h
include/QtMultimedia/qaudioformat.h
include/QtMultimedia/qaudioinput.h
include/QtMultimedia/qaudiooutput.h
include/QtMultimedia/qaudiodeviceinfo.h
include/QtMultimedia/qaudioengineplugin.h
include/QtMultimedia/qaudioenginefactoryinterface.h
include/QtMultimedia/qaudioengine.h
include/QtMultimedia/qabstractvideobuffer.h
include/QtMultimedia/qabstractvideosurface.h
include/QtMultimedia/qvideoframe.h
include/QtMultimedia/qvideosurfaceformat.h
include/QtMultimedia/qtmultimedia.h
include/QtMultimedia/QAudio
include/QtMultimedia/QAudioFormat
include/QtMultimedia/QAudioInput
include/QtMultimedia/QAudioOutput
include/QtMultimedia/QAudioDeviceInfo
include/QtMultimedia/QAudioEnginePlugin
include/QtMultimedia/QAudioEngineFactoryInterface
include/QtCore/QAbstractAnimation
include/QtCore/QAbstractConcatenable
include/QtCore/QAbstractEventDispatcher
@ -64,8 +20,6 @@ include/QtCore/QArgument
include/QtCore/QArrayData
include/QtCore/QAtomicInt
include/QtCore/QAtomicPointer
include/QtCore/QBasicAtomicInt
include/QtCore/QBasicAtomicPointer
include/QtCore/QBasicTimer
include/QtCore/QBitArray
include/QtCore/QBitRef
@ -332,6 +286,7 @@ include/QtCore/QtMsgHandler
include/QtCore/QtNamespace
include/QtCore/QtPlugin
include/QtCore/QtPluginInstanceFunction
include/QtCore/cs_build_info.h
include/QtCore/csmeta.h
include/QtCore/csmeta_callevent.h
include/QtCore/csmeta_internal_1.h
@ -371,17 +326,8 @@ include/QtCore/qargument.h
include/QtCore/qarraydata.h
include/QtCore/qarraydataops.h
include/QtCore/qatomic.h
include/QtCore/qatomic_arch.h
include/QtCore/qatomic_generic.h
include/QtCore/qatomic_i386.h
include/QtCore/qatomic_macosx.h
include/QtCore/qatomic_windows.h
include/QtCore/qatomic_x86_64.h
include/QtCore/qatomicint.h
include/QtCore/qatomicpointer.h
include/QtCore/qbasicatomic.h
include/QtCore/qbasicatomicint.h
include/QtCore/qbasicatomicpointer.h
include/QtCore/qbasictimer.h
include/QtCore/qbitarray.h
include/QtCore/qbitref.h
@ -452,6 +398,7 @@ include/QtCore/qhash.h
include/QtCore/qhashdata.h
include/QtCore/qhashdummynode.h
include/QtCore/qhashdummyvalue.h
include/QtCore/qhashfwd.h
include/QtCore/qhashiterator.h
include/QtCore/qhashnode.h
include/QtCore/qhistorystate.h
@ -459,7 +406,6 @@ include/QtCore/qincompatibleflag.h
include/QtCore/qintegerforsize.h
include/QtCore/qinternal.h
include/QtCore/qiodevice.h
include/QtCore/qiterator.h
include/QtCore/qjsonarray.h
include/QtCore/qjsondocument.h
include/QtCore/qjsonobject.h
@ -526,6 +472,8 @@ include/QtCore/qpair.h
include/QtCore/qparallelanimationgroup.h
include/QtCore/qpauseanimation.h
include/QtCore/qpersistentmodelindex.h
include/QtCore/qplatformdefs.h
include/QtCore/qplatformposix.h
include/QtCore/qplugin.h
include/QtCore/qpluginloader.h
include/QtCore/qpoint.h
@ -1116,6 +1064,7 @@ include/QtGui/QX11EmbedWidget
include/QtGui/QX11Info
include/QtGui/QtEvents
include/QtGui/QtGui
include/QtGui/cs_carbon_wrapper.h
include/QtGui/qabstractbutton.h
include/QtGui/qabstractgraphicsshapeitem.h
include/QtGui/qabstractitemdelegate.h
@ -1393,7 +1342,6 @@ include/QtGui/qplatformfontdatabase_qpa.h
include/QtGui/qplatformglcontext.h
include/QtGui/qplatformglcontext_qpa.h
include/QtGui/qplatformintegration.h
include/QtGui/qplatformintegration_qpa.h
include/QtGui/qplatformintegrationfactoryinterface.h
include/QtGui/qplatformintegrationplugin.h
include/QtGui/qplatformintegrationplugin_qpa.h
@ -1601,9 +1549,32 @@ include/QtMultimedia/QAbstractAudioInput
include/QtMultimedia/QAbstractAudioOutput
include/QtMultimedia/QAbstractVideoBuffer
include/QtMultimedia/QAbstractVideoSurface
include/QtMultimedia/QAudio
include/QtMultimedia/QAudioDeviceInfo
include/QtMultimedia/QAudioEngineFactoryInterface
include/QtMultimedia/QAudioEnginePlugin
include/QtMultimedia/QAudioFormat
include/QtMultimedia/QAudioInput
include/QtMultimedia/QAudioOutput
include/QtMultimedia/QVideoFrame
include/QtMultimedia/QVideoSurfaceFormat
include/QtMultimedia/QtMultimedia
include/QtMultimedia/qabstractaudiodeviceinfo.h
include/QtMultimedia/qabstractaudioinput.h
include/QtMultimedia/qabstractaudiooutput.h
include/QtMultimedia/qabstractvideobuffer.h
include/QtMultimedia/qabstractvideosurface.h
include/QtMultimedia/qaudio.h
include/QtMultimedia/qaudiodeviceinfo.h
include/QtMultimedia/qaudioengine.h
include/QtMultimedia/qaudioenginefactoryinterface.h
include/QtMultimedia/qaudioengineplugin.h
include/QtMultimedia/qaudioformat.h
include/QtMultimedia/qaudioinput.h
include/QtMultimedia/qaudiooutput.h
include/QtMultimedia/qtmultimedia.h
include/QtMultimedia/qvideoframe.h
include/QtMultimedia/qvideosurfaceformat.h
include/QtNetwork/QAbstractNetworkCache
include/QtNetwork/QAbstractSocket
include/QtNetwork/QAuthenticator
@ -1832,6 +1803,16 @@ include/QtSql/qsqlrelationaltablemodel.h
include/QtSql/qsqlresult.h
include/QtSql/qsqltablemodel.h
include/QtSql/qtsql.h
include/QtSvg/QGraphicsSvgItem
include/QtSvg/QSvgGenerator
include/QtSvg/QSvgRenderer
include/QtSvg/QSvgWidget
include/QtSvg/QtSvg
include/QtSvg/qgraphicssvgitem.h
include/QtSvg/qsvggenerator.h
include/QtSvg/qsvgrenderer.h
include/QtSvg/qsvgwidget.h
include/QtSvg/qtsvg.h
include/QtWebKit/QGraphicsWebView
include/QtWebKit/QWebDatabase
include/QtWebKit/QWebElement
@ -1858,20 +1839,31 @@ include/QtWebKit/QWebTouchModifier
include/QtWebKit/QWebView
include/QtWebKit/QtWebKit
include/QtWebKit/qgraphicswebview.h
include/QtWebKit/qtwebkit.h
include/QtWebKit/qwebdatabase.h
include/QtWebKit/qwebelement.h
include/QtWebKit/qwebelementcollection.h
include/QtWebKit/qwebframe.h
include/QtWebKit/qwebfullscreenvideohandler.h
include/QtWebKit/qwebhapticfeedbackplayer.h
include/QtWebKit/qwebhistory.h
include/QtWebKit/qwebhistoryinterface.h
include/QtWebKit/qwebhistoryitem.h
include/QtWebKit/qwebhittestresult.h
include/QtWebKit/qwebinspector.h
include/QtWebKit/qwebkitglobal.h
include/QtWebKit/qwebkitplatformplugin.h
include/QtWebKit/qwebkitversion.h
include/QtWebKit/qwebnotificationdata.h
include/QtWebKit/qwebnotificationpresenter.h
include/QtWebKit/qwebpage.h
include/QtWebKit/qwebpluginfactory.h
include/QtWebKit/qwebscriptworld.h
include/QtWebKit/qwebsecurityorigin.h
include/QtWebKit/qwebselectdata.h
include/QtWebKit/qwebselectmethod.h
include/QtWebKit/qwebsettings.h
include/QtWebKit/qwebtouchmodifier.h
include/QtWebKit/qwebview.h
include/QtXml/QDomAttr
include/QtXml/QDomCDATASection
@ -2102,39 +2094,39 @@ include/phonon/volumefadereffect.h
include/phonon/volumefaderinterface.h
include/phonon/volumeslider.h
lib/libCsCore1.so
lib/libCsCore1.so.%%SHORT_VER%%
lib/libCsCore1.so.%%LONG_VER%%
lib/libCsCore1.so.%%SHORT_VER%%
lib/libCsGui1.so
lib/libCsGui1.so.%%SHORT_VER%%
lib/libCsGui1.so.%%LONG_VER%%
lib/libCsGui1.so.%%SHORT_VER%%
lib/libCsMultimedia1.so
lib/libCsMultimedia1.so.%%SHORT_VER%%
lib/libCsMultimedia1.so.%%LONG_VER%%
lib/libCsMultimedia1.so.%%SHORT_VER%%
lib/libCsNetwork1.so
lib/libCsNetwork1.so.%%SHORT_VER%%
lib/libCsNetwork1.so.%%LONG_VER%%
lib/libCsNetwork1.so.%%SHORT_VER%%
lib/libCsOpenGL1.so
lib/libCsOpenGL1.so.%%SHORT_VER%%
lib/libCsOpenGL1.so.%%LONG_VER%%
lib/libCsOpenGL1.so.%%SHORT_VER%%
lib/libCsPhonon1.so
lib/libCsPhonon1.so.%%SHORT_VER%%
lib/libCsPhonon1.so.%%LONG_VER%%
lib/libCsPhonon1.so.%%SHORT_VER%%
lib/libCsScript1.so
lib/libCsScript1.so.%%SHORT_VER%%
lib/libCsScript1.so.%%LONG_VER%%
lib/libCsScript1.so.%%SHORT_VER%%
lib/libCsSql1.so
lib/libCsSql1.so.%%SHORT_VER%%
lib/libCsSql1.so.%%LONG_VER%%
lib/libCsSql1.so.%%SHORT_VER%%
lib/libCsSvg1.so
lib/libCsSvg1.so.%%SHORT_VER%%
lib/libCsSvg1.so.%%LONG_VER%%
lib/libCsSvg1.so.%%SHORT_VER%%
lib/libCsWebKit1.so
lib/libCsWebKit1.so.%%SHORT_VER%%
lib/libCsWebKit1.so.%%LONG_VER%%
lib/libCsWebKit1.so.%%SHORT_VER%%
lib/libCsXml1.so
lib/libCsXml1.so.%%SHORT_VER%%
lib/libCsXml1.so.%%LONG_VER%%
lib/libCsXml1.so.%%SHORT_VER%%
lib/libCsXmlPatterns1.so
lib/libCsXmlPatterns1.so.%%SHORT_VER%%
lib/libCsXmlPatterns1.so.%%LONG_VER%%
lib/libCsXmlPatterns1.so.%%SHORT_VER%%
lib/phonon_gstreamer.so