DELTA 372174 0 171 SVN H< ;devel/qt5-qmldevtools||2014-11-05|Merged into lang/qt5-qml ENDREP DELTA 369465 4045 79 SVNUE w .n),nx^MK@'m!i &QNnPKw{<<3XBk70Nz=7 4̡נY M(p*T&KW(K(p9 -mfXg[![`rm-0ΑT&[>{"6pH+ P+øP+2ѻֱIɜ_bZrȑq4 3-l> BdTŤ&y. fN״5D+"\J@aUHf] , ˳E(q*=ڃP\^? cMw7ol4FQ/UiK OENDREP DELTA 371720 0 127 SVN-MfL.XblN*7B+:j_P! Ls ^~%x^uTmo8 \ . +. m&ݗ"ӉPr,/ߏdm|dy\_'$~%sU.`"Xn)WZcG"HSj)HQB;nm=(ij-rCga\|&YrѾAl;w>w UPmSGhlC=4k#15PCejg 7\;XD(Sc XU!ʜ29C\(]ヲ(Ux+*+FkU*h|]m+x:IZ٨ɮg4] /m_o#p.>_LVkG2ݦB4@ v7 ΍`6R&M0sr0M[ '_7R%"BidXJ厤vof[LJJ2%iwsg%%)\R8e) fh2(,{^+uHS!L?kF7GyǏaPO;eS@lMh'Y|y>B'z ɿ\^ko=0ܿ#gsqǼ4\It 2k`IKăy'}P⽲| ub~*)[!1NU)/ QƑ \-{HJR79nMx9Z;_T]OR>X0{! R;MX݋n&-dW/$6nq{^oFI6KY p >ĆsaENDREP DELTA SVN0200# $FreeBSD$ PORTNAME= serialport DISTVERSION= ${QT5_VERSION} CATEGORIES= comms PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access serial ports USE_QT5= core buildtools_build QT_DIST= serialport USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include ENDREP DELTA SVNcWccx^R0}la?##YLӐ`ooJi@v$|$^B6[ޖwwT%dŏ’jpߘT:! íd9 wR(cPýj/3{ziT9N -wƏo"tAgM{.M{vBͷ%t/(%c k[9d ?Q.:mh &\[uCL)Qq}7lfRĘ8?m¯)އ䲟p !6+:ga^eOeTpMDn1<缑]QM옰|ENDREP DELTA 353294 108 124 SVN[K+ ;ENDREP DELTA 362251 576 35 SVNW|9nI/OoN For now, this means adjusting the existing # unsupported/freebsd-clang mkspec while we get it into shape upstream. @${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \ ${WRKSRC}/mkspecs/freebsd-clang @${REINPLACE_CMD} -e 's|(../|(|g' \ ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf @${REINPLACE_CMD} -e 's|"../|"|g' \ ${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h @${RM} ${WRKSRC}/mkspecs/*/*.origmk> ENDREP DELTA 346930 7358 571 SVN a0ENDREP DELTA 346930 7942 487 SVNV=g `SU5!5x^}QMk0W!v8zPHtC)lJݚn7Թy# {[| @n5/> +{P7Юl{6w# #S,+L좐͡p4MkZZ;$λUQHNw 0*z}$Gڢ:24N7U`8b tdj&D΀*L&A3u)*s\v:t4egVfHV(svuP9|z.Ť_pWG+^lrۺ(-,nO7}-/fENDREP DELTA 346930 8442 548 SVNmFZXw$Gb Y--- mkspecs/freebsd-g++/qmake.conf.orig +++ mkspecs/freebsd-g++/qmake.conf @@ -2,31 +2,7-ENDREP DELTA SVNH:HHx^Qo0Wj6'BF2>!0&e1ڠ3UjW K\[\'YQ"MUqQLaqy4D焗K@w/ f_az:9?6"s^BL?2Ň[c7h_ z>:| ll GA5oll&^hYni{ ɳ GN%eh0'1)A)pp#C8rPTyIXѮF<{<ʝ(äLU;)\,;bńwuvNt%e(acIw' ^FS~) @צ]?F^l#g?#!(%E1O@a"2B]&^}7?ENDREP DELTA 371415 752 20 SVN+Xu'tS1{^\6&]ZH@ h9Pd<wH}y=QFjuG+D q Tt7RWx^Mo0 9J&ס QPeZO4V{с|IxWHRסsb~bQ0AhI| ›2l2_Wa]’RaT*2FIO)S{!f`OEf{-(b#yP2:M6J}RQ-UAMn&EX@r΅rRE*ˢNs5 ܄BF^<h!NEq XI ,a<>G-P?X$p۹G3myD> e;y>?߽'Hw:;b$\hr1IuwRhn@4Cs\ףܞeSw$lgjL9Xu= RfLW/ˆENDREP DELTA 367888 53958 35 SVN ?7bGOIM>erialport sql svg testlib webkit widgets x11extras \ xml docENDREP DELTA 346930 13040 1074 SVN67&&x^W1oG +2CHE"[7 -GVRTЭ]y2)ޞow7ݰBsӢY紡áA5FqB#ni>wo̵v>S~]_w;^8PgGiuT\".E{@F]@: iy+@ņ&A lxbl{%J}:@ CU}np/5ղdz=yp;Zᗧ=J5YzFLQq]%M0چe"JE-V{t}I@>t2|anبҺhmuzGr9ڽXXngIuM10{^WO_?`xY-OAL/{̛Fysd1{mB - JnL>"" \9-vKZ()E$R {WڰM5MNP%-κ$z^g5 QsZg:Ly oㆿnR7mWO]+7,%fs*:st*VWYs^3]6FڔLd[Q R((Dx j;Ivy3mI%+۔9EqVrKr*ۣ5H5cI_/i2(82MG\L8- r%H 6$3O叐<%'G8ڠq{x !5CENDREP DELTA 346930 14127 332 SVN;d L +Oljx^ZsH=;&;39SSN1bbfnvMr"$qw݀ qo~o#xU@ vv<loJĂ}1zvkP2Z8a#c|B.:2 b8`XۋeM# q\/Zc졎ZLhL[T”Ef*V>,K#MZ)+g),eJU24~;daev L)u~ehܣ$anI` Ԁ}o ^Hn@9?iԿƪki.!RثO[iV0iR yjR@n@_XX1yh6ӊ3u;3)$-6o.g(9bx=;owVluEbFu Z{'r$jT1m{DlQ<<; ﲪ8c su-Qs`‰HH+W{&xȈI m9 /1FΝvl,;:ТE,9wWsXw} PQP*eRHMn @r^jx+\p}m7S~ =֑_doLɚ0ߠ˭yJO!64@1v~V\ !'hvW&eW}_kP))yY_SىHy(Q[./kאR,JHJqU t^ U1ФC+ b8џZ|f5U6#x~EJ>\A@Ƀz0S\/^h:9ʘ W3tsu==% jxa\,'AZ#{Q~è ;YÏ|#oJ<"̯! R憅d1ѿb닚eLs|TNrox$}C-(rnpG"nxA# !`A}lvɧVgYEň_,X:QR'/Qx@0a ޠS¶HW,‡R; H+FE.caCWh[Avu GA`~/ϐM6XE6oop?l;ZL9ѕK]>.{CO?4CvNOf xA '޵/8)ը)"9$˽ђ/@&v!Vx>|dmѳ%=g`7 R`vdDy ?B HA | -(pvXPHzwvJcؐme(TڐTD/({L 3= ENDREP DELTA 362251 1688 309 SVN$W P89,7 +189,7 @@ QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace unix { - CONFIG += create_libtool explicitlib + CONFIG += explicitlib QMAKE_LIBTOOL_LIBDIR = $$qt_libdir QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace } ENDREP DELTA 367888 54023 22 SVNCi =MhrhBUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAMEENDREP DELTA SVNRnRRx^mRk0~_q^:h2 ll+K6uqdIeScC}0 DRy vDVi9K)~XuPd25Hth$Pq!=}S-|`&_Ma>g{qy 7ڒ8įbwVG;%ka :rG;+C5.ApkUQZ@xֈ-u!JM}m/T9IůO\KA} SSM*G%UKfkc5*2lJem(z6 V֬TTa4M%t>"=øZ2aJ>wܸȔ  j;ׯ#\' % >mbW~ 1 SSM*G%UIfkc5*2lJem(z6 V֬ThR%Ӄ:X)a>=80VL魒K87.2eC'd?m6"OAm2HSfvLC\G "g2ߪ _P!e}/H%Cqvpߖ2kaij)ENDREP DELTA 371415 1982 17 SVN*Q pKt_u5Ocmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QWebViewPlugi%%QT_PLUGINDIR%%/designer/libqquickwidget.so %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidgetENDREP DELTA 367888 54123 22 SVNK N 8tHM2MBUILD_WRKSRC= ${WRKSRC}/src/assistant INSTALL_WRKSRC= ${WRKSRC}/src/assistantENDREP DELTA SVNV6VVx^}KO0sDJP+DHDˍK,k¿g!Iǝϳ'k@6G\JIE5FDyM1w:Pb^h"J%ɖd PRd)?F"g\{F8JQAt%mdL`_)%WYSZ$IrVsazudGsz6sA@MZ -ɬF*'=Գ?3O+guz0B@ZĚ)N{9d[4s΄M\y rENDREP DELTA 371415 2027 17 SVN{1  :q ExtrasENDREP DELTA 367888 54173 35 SVN`I <LygBUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} post-install: ${INSTALL_DATA} ${BUILD_ENDREP DELTA SVNQpQQx^mRo0~_q/Rm}A&HlL!!'N&X}w}3 DRy vDVi9K)~XuPd25Hth$Pq!-}S-Ğρ_Mf \|`y{n %q 3l5vJ0tJwV: j],lP{֪ ܣ%:[BRqmsNjs >~ 1 SSM*G%UIfkc5*2lJem(z6 V֬ThR%Ӄ:X)a>=80VL魒K87.2eC'd?m6"OAm2HSfvLC\G "g2ߪ _P!e}/H%Cqvpߖ2kaIk)ENDREP DELTA 346930 26650 500 SVN|? = 2;R*;xml buildtools_build qml_build QT_DIST= tools USES= qmake BUILD_WRKSRC= ${WRKSRC}/src/linguist INSTALL_WRKSRC= ${WRKSRC}/src/linguist post-patch: @${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \ ${WRKSRC}/src/linguist/linguist.pro post-install: .for f in lrelease lupdate ${INSTALL_MAN} ${WRKSRC}/src/linguistENDREP DELTA 346930 27634 322 SVN1Z S nRRBUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRCENDREP DELTA 367888 54238 35 SVNj w ?^OvvtvBUILD_WRKSRC= ${WRKSRC}/src/qdbus/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} post-install: ${INSTALL_DATA} ${BUILD_ENDREP DELTA SVN=i==x^mRo0~_q/:^PI1-oHȉ Nls^ZJﾻYh#zM^L{@ÝTX%TxiX?iM*x>F Pq>1Pe * ENDREP DELTA 367888 54303 22 SVNl C ?fOB(DBBUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/ENDREP DELTA 371415 2386 17 SVNa)  X?"csvbenchmarkloggerENDREP DELTA 367888 54353 22 SVNm P ;^KO58OBUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/ENDREP DELTA SVNprppOnly enter the directories we want to build, otherwise we might fail due to missing dependencies. --- src/designer/src/src.pro +++ src/designer/src/src.pro @@ -1,20 +1,4 @@ TEMPLATE = subdirs SUBDIRS = \ - uitools \ - lib \ - components \ - designer - -contains(QT_CONFIG, shared): SUBDIRS += plugins - -components.depends = lib -designer.depends = components -plugins.depends = lib - -qtNomakeTools( \ - lib \ - components \ - designer \ - plugins \ -) + uitools ENDREP DELTA 367888 54403 22 SVN y^nENDREP DELTA 367888 150319 22 SVNH#@P!_#!jasper.so:${PORTSDIR}/graphics/jasper \ libmng.so:${PORTSDIR}/graphics/libmng \ libtiff.so:${PORTSDIR}/graphics/tiff \ libwebp.so:${PORTSDIR}/graphics/webpENDREP DELTA 371283 25623 17 SVNV,#wSS MX K"x^sq )MKMNRU tr RUfB@Og?xh:<5ӆPwO?ԴĒb̤”b|BWPwUUbu襤&aAfr6@mEV6@t@, $ZݱENDREP DELTA 371283 25670 17 SVNy  .fENDREP DELTA 367888 150417 35 SVNC H =rMG*GBUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC}ENDREP DELTA SVNRqRRx^mRn0 +Q6@lX XbnbaHrbͿj9"(f!XE!섉-rBNLF+4)5*ejH4LC[[=A~5-@hKg|?-Yj픬11at A8X­UG-"JkuZ#ԅ(5ڶ?Qi笏PSG?>|}A,5bSSM*{%UIfkc5*2lJem(z6 V֬TTa4M%tS}J8sWQ&V%Nd/Qm6C95 "g2ߪ _%]Alch2_T{ۈ߸L;8ߖc#ӘKf*]ENDREP DELTA 371283 25757 17 SVNZUFZyT=Tcmake/Qt5Svg/Qt5Svg_QSvgIconPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Svg/Qt5Svg_QSvgPlugiENDREP DELTA 370100 1529 41 SVNNF  7rG5BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src post-patch: # tools/tools.pro will be processed automatically unless it does not exist. ${RM} -r ${WRKSRC}/tools ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \ ${WRKSRC}/src/3rdparty/masm/masm.pri ENDREP DELTA SVNATAAx^Rr0{`486m$q2<-F)O^AM{oV:@I+ [sHB<,+RhH"?#Q%a:lNO&eM)f. :ku^51\FWY&kFFiEX@#G%XAxéE lY#\?s&\.܀g~FUAB ((̧ěݞč-r'p+J֪I Gs~lrTb|VjQaW=zUr˶W184!)(ݴrzJl&$9æ8fBdn;I+4LiHV.tGJB*C]``_ t¾ۙ6C<1<`x$`{u::x)VPA_f?ߒSENDREP DELTA SVN5755--- src/qml/jit/qv4assembler.cpp +++ src/qml/jit/qv4assembler.cpp @@ -96,7 +96,7 @@ QV4::ExecutableAllocator::ChunkOfPages *CompilationUnit::chunkForFunction(int fu /* Platform/Calling convention/Architecture specific section */ #if CPU(X86_64) -# if OS(LINUX) || OS(MAC_OS_X) +# if OS(UNIX) static const Assembler::RegisterID calleeSavedRegisters[] = { JSC::X86Registers::ebx, JSC::X86Registers::r12, // LocalsRegister ENDREP DELTA SVNLNLLOnly enter the directories we want to build, otherwise we might fail due to missing dependencies. --- src/src.pro +++ src/src.pro @@ -3,18 +3,7 @@ SUBDIRS += \ qml -qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { - SUBDIRS += \ - quick \ - qmltest \ - particles - - qtHaveModule(widgets): SUBDIRS += quickwidgets -} - SUBDIRS += \ - plugins \ - imports \ qmldevtools qmldevtools.CONFIG = host_build ENDREP DELTA 371415 2615 17 SVNnr q<X(Hf?(Z|'`JZH=_3awYDcrF ,vvLoA>@Yyxx^MN0 G.3HQVq;4I'  iXe/YFю$E LB'7Zxp$ 2hAEYvy5eYwM.ˇ_*p kNzq@2XL#YLRK]HY4]fgP(""5Uv C vpBI5 x^U[S0}:TZ_3ibi\PTx~}"${Ξ=مG`-EKod\4St  +a [t +CO+hZ \&DFXCaneo]6cpb DS90.s \SAo#a\od&{jPݞ7abAɿ?H'G"8t]ߡz:}^o&nRSpWAE&%[p?9o(5#mQ\,pf{t(c+jvrPߙX*1ފ39E2_~*a Z[6FDi1 (?Bjck,-d 3["lzv$ M'e<:`/mu73xю3.gENDREP DELTA 371415 3048 17 SVN)nHK3&2wGprotocolhandlerprotocolhandlerativesocketengine_winrtpdyprotocolhandlerENDREP DELTA 371415 3093 17 SVNOiAP R3h_p.h printdevicedeviceCUPS%%%%QT_LIBDIR%%/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugiENDREP DELTA 362251 4459 35 SVN# e ;jKdvdBUILD_WRKSRC= ${WRKSRC}/src/assistant/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/assistant/${PORTNAMEENDREP DELTA 346930 47657 354 SVNQ  F--- src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp +++ src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cppENDREP DELTA SVNx^}QMO0_1G 7AL7/lyBci-n,S337od7v-VeNǎL@J)l>ǂhKk?bQ>Nq8yD)Y~ENDREP DELTA 371415 3318 17 SVN^$^#%%FULLVER%%/QtXml/private/qxml_p.h ENDREP DELTA 371254 437 80 SVNfL 0 :JR/bison gmake gperf perl5 pkgconfig python:build ENDREP DELTA 371415 3456 17 SVN.V  (plugins.qmltypesENDREP DELTA 367888 257963 35 SVN!G 5 7CG33# qev is not connected to qttool's build system, so we cannot just run qmake # and set {BUILD,INSTALL}_WRKSRC. # Instead, we run qmake from src/${PORTNAME} but need to copy .qmake.conf to # it for all required variables to be set (MODULE_VERSION etc). post-patch: ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRCENDREP DELTA 369559 234 287 SVN7 )vu(USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}ENDREP DELTA 371415 3728 20 SVN[8I,GEGcmake/Qt5Declarative/Qt5Declarative_QTcpServerConnection.cmake %%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5Declarative_QtQuick1Plugin.cmake %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QDeclarativeViewPlugiENDREP DELTA 369847 84 82 SVNf= 7xGowCFLAGS_powerpc64= -mminimal-tocENDREP DELTA 371415 3777 20 SVNmvo3n7a#,ND(MRx+LLLLR~9!=Xj"K1layoutstyleinfo_p.h ridlayoutenginelayoutpolicyblitterLayout %%QT_INCDIR%%/QtGui/QPageSizegelayout.h %%QT_INCDIR%%/QtGui/qpagesizmpositorbackingstoreeglplatformcontexteglplatformcursoreglplatformintegrationeglplatformeglplatformwindowvthandlermacmimComposePlatformInputContextPlugiIbusPlatformInputContextENDREP DELTA 367888 267771 22 SVNfG9'IPOENDREP DELTA SVN[][[Only enter the directories we want to build, otherwise we might fail due to missing dependencies. --- src/src.pro +++ src/src.pro @@ -1,7 +1,5 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += \ - qml qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { SUBDIRS += \ @@ -14,7 +12,4 @@ qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { SUBDIRS += \ plugins \ - imports \ - qmldevtools - -qmldevtools.CONFIG = host_build + imports ENDREP DELTA 371415 3826 20 SVNM4I HWD~ .~0 i MtY;W F=x^r yhZbn]2'Io_ uls8tPh Z mvgN4dDh}On:z%lAϺ&,!+V_| ׎=#ENDREP DELTA 371415 3875 17 SVNmP@O0! >I<'Y9S `M3I|gY AJ\,Y ~Fx^R0 y& J*XA׉CeJ*$>F@<"(+{olg\.^Xj_ܱqBసWGov2ڷfShܬyr>ʭwMՏXmx%:+2Mh+X;@BKw\Shnlif}C&J-o_e&s[LKkjƍCZPҘ! /ZhO~