The second Pre-Release for the 11/April target release is available.

It has been imported as 'next' into both the Mer community OBS and the meego.com
community OBS and is available from releases.merproject.org :

  http://releases.merproject.org/releases/0.20130411.0.2/

Qt changes include an update to 5.0.1 and improved Qt4/Qt5 co-existence with
qtchooser; spec files should now use %qmake5 instead of %qmake for qt5 based
packages. If you use don't use the macro then use "qmake -qt=5".
ccache support in sb2 has been included into the toolchain (see comments in the
changelog) and bluez-config has been split out to allow vendor overrides.

This prerelease fixes some qmake build issues:

Changelog since last PreRelease

Package qt changed from 0dc6a843bb17d17ea6dc27921e63b6e58640ea89 to
b5b8e51d6356aaa954ed7bcf6394e6f9f8ed96ab in git packages-git/mer-core/qt:

commit b5b8e51d6356aaa954ed7bcf6394e6f9f8ed96ab
Author: Juha Kallioinen <[email protected]>
Date:   Mon Apr 8 08:06:11 2013 +0000

    Pass MAKEFLAGS to configure

    The configure script calls make to build qmake. Setting MAKEFLAGS to
    enable concurrency, qmake will be built faster.

    qt4-default no longer requires libqt-devel

    Signed-off-by: Juha Kallioinen <[email protected]>
    Change-Id: Ib3c54bfc2b73bd99e1cb4234972275cf589452bd

Package qtbase changed from 6cebda1583e17da7593b13d383a563a1dd3175a4 to
a99b376a71fd26c3095be1a45dec31a5dfb2194a in git packages-git/mer-core/qtbase:

commit a99b376a71fd26c3095be1a45dec31a5dfb2194a
Author: Juha Kallioinen <[email protected]>
Date:   Mon Apr 8 08:16:38 2013 +0000

    Pass MAKEFLAGS to configure

    The configure script calls make to build qmake. Setting MAKEFLAGS to
    enable concurrency, qmake will be built faster.

    Signed-off-by: Juha Kallioinen <[email protected]>

Package qtchooser changed from bd6275c87e7e7e6b3410839941e1e09691944843 to
7ca28b518554bf55a573731a6ded2f0ea5f62b69 in git packages-git/mer-core/qtchooser:

commit 7ca28b518554bf55a573731a6ded2f0ea5f62b69
Author: Juha Kallioinen <[email protected]>
Date:   Wed Apr 10 13:45:29 2013 +0000

    Modify %qmake macro and require qt-default

    %qmake macro now adds -qt=4 to its options

    Signed-off-by: Juha Kallioinen <[email protected]>




Changelog since the last full release:

Package bluez changed from 96c3f3857b27ff771a123cf60ec81a500c5589fe to
f33d36addcf4caf6d098cf766364ba01c6509458 in git packages-git/mer-core/bluez:

commit f33d36addcf4caf6d098cf766364ba01c6509458
Author: Pekka Lundstrom <[email protected]>
Date:   Fri Apr 5 13:24:53 2013 +0000

    Created new packages bluez-doc and bluez-configs-mer
    Fixes MER#715
    Signed-off-by: Pekka Lundstrom <[email protected]>

Package build changed from 16673116185a2dec9ee05f490be3358d89673575 to
78933d677a19a4d3d7b3f24cddab8cb90608832b in git packages-git/mer-core/build:

commit 78933d677a19a4d3d7b3f24cddab8cb90608832b
Author: Juha Kallioinen <[email protected]>
Date:   Sat Mar 23 19:19:26 2013 +0000

    Make ccache work with scratchbox2 sessions

    Modify build script's setupccache function to set up an additional
    CCACHE_TOOLS_PATH environment variable, which will be picked up by the
    sb2 script and inserted into the sb2 session path.

    Pass along the --ccache command line option to recursive build script
    calls.

    Signed-off-by: Juha Kallioinen <[email protected]>
    Change-Id: Icec8b5357bc5a534832632e8ef4010f3dcc062d4

Package qt changed from eb7c0ebc6e766ba73ba630d0f2d4eace372be433 to
b5b8e51d6356aaa954ed7bcf6394e6f9f8ed96ab in git packages-git/mer-core/qt:

commit b5b8e51d6356aaa954ed7bcf6394e6f9f8ed96ab
Author: Juha Kallioinen <[email protected]>
Date:   Mon Apr 8 08:06:11 2013 +0000

    Pass MAKEFLAGS to configure

    The configure script calls make to build qmake. Setting MAKEFLAGS to
    enable concurrency, qmake will be built faster.

    qt4-default no longer requires libqt-devel

    Signed-off-by: Juha Kallioinen <[email protected]>
    Change-Id: Ib3c54bfc2b73bd99e1cb4234972275cf589452bd

commit 0dc6a843bb17d17ea6dc27921e63b6e58640ea89
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 10:35:05 2013 +0000

    Qt4-Qt5 coexistence, accelerated qmake

Package scratchbox2 changed from 427d52577d6a590f27433c0182889a554c278959 to
6395f2f57310b6b5e4095c2eb2522d2790063bce in git 
packages-git/mer-core/scratchbox2:

commit 6395f2f57310b6b5e4095c2eb2522d2790063bce
Author: Juha Kallioinen <[email protected]>
Date:   Sun Mar 24 17:31:08 2013 +0000

    Accelerate qtchooser and qmake

    Add /usr/lib/qt{4|5}/bin/qmake and /usr/bin/qtchooser to accelerated 
binaries
    in obs-rpm-build and obs-rpm-build+pp modes.

    Signed-off-by: Juha Kallioinen <[email protected]>
    Change-Id: If4b4ff486a368c652fb15823b35d7fe1d1cd5d0a

commit 55b1f569dd285d251d2bb52bdd62f976b769a9d0
Author: Juha Kallioinen <[email protected]>
Date:   Sat Mar 23 13:19:38 2013 +0000

    Add support for ccache

    If CCACHE_TOOLS_PATH is set, it gets inserted to the sb2 session PATH
    before $SBOX_DIR/bin, which usually is /usr/bin. The session PATH is
    set by the /usr/bin/sb2 script.

    Add /usr/bin/ccache acceleration to obs-rpm-build(+pp) rules.

    Signed-off-by: Juha Kallioinen <[email protected]>

Package qtbase changed from b49d07793cd0475e4dbf842ef145f24281471259 to
a99b376a71fd26c3095be1a45dec31a5dfb2194a in git packages-git/mer-core/qtbase:

commit a99b376a71fd26c3095be1a45dec31a5dfb2194a
Author: Juha Kallioinen <[email protected]>
Date:   Mon Apr 8 08:16:38 2013 +0000

    Pass MAKEFLAGS to configure

    The configure script calls make to build qmake. Setting MAKEFLAGS to
    enable concurrency, qmake will be built faster.

    Signed-off-by: Juha Kallioinen <[email protected]>

commit 6cebda1583e17da7593b13d383a563a1dd3175a4
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 11:24:30 2013 +0000

    Upgrade to 5.0.1, drop moc timestamp patch (merged), add qtchooser support

    Signed-off-by: Carsten Munk <[email protected]>

Package qtjsbackend changed from 86946e1075f8075d9eedeb998316ad7403051ffe to
99bfc5e6aa5845f6c24be5648a7405fe5de2202b in git 
packages-git/mer-core/qtjsbackend:

commit 99bfc5e6aa5845f6c24be5648a7405fe5de2202b
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 14:39:51 2013 +0000

    Upgrade to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtdeclarative changed from 319550f03149392139353399ff41f25fb7aed5d0 to
ac50e947f6cb1beede86c6e80e45292f630c0373 in git 
packages-git/mer-core/qtdeclarative:

commit ac50e947f6cb1beede86c6e80e45292f630c0373
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 11:30:03 2013 +0000

    Upgrade to 5.0.1, use qmake -qt=5

    Signed-off-by: Carsten Munk <[email protected]>

Package qtimageformats changed from 246b0e21e6451f52cb53c6e545a70619e4506b6a to
1433b3e72d26fcd232b2fb6b24e12a4e14ca67e9 in git
packages-git/mer-core/qtimageformats:

commit 1433b3e72d26fcd232b2fb6b24e12a4e14ca67e9
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 13:03:14 2013 +0000

    Upgrade to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtxmlpatterns changed from 620ec896cd811801068f52e8d533ba366697f8bc to
da78245638d9e89784122a72cca675646a4ebb00 in git 
packages-git/mer-core/qtxmlpatterns:

commit da78245638d9e89784122a72cca675646a4ebb00
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 19:54:11 2013 +0000

    Fix changelog

    Signed-off-by: Carsten Munk <[email protected]>

commit ed3ba6fb25325fce0576a3f8cd85006d6b640bca
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:49:59 2013 +0000

    Update to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtsensors changed from af5371302d39f0e971e74b6b8c269d131a62dcf3 to
285b9fd587f44a3936fe5f9f44cb7794bd95f251 in git packages-git/mer-core/qtsensors:

commit 285b9fd587f44a3936fe5f9f44cb7794bd95f251
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:10:55 2013 +0000

    Use -qt=5

    Signed-off-by: Carsten Munk <[email protected]>

Package qtgraphicaleffects changed from 49ff3b3b49111c51095f0c1d4e92c4acf54c7b6a
to 68753c6e46ff7fecb318dc1c64ea979ae5eb5958 in git
packages-git/mer-core/qtgraphicaleffects:

commit 68753c6e46ff7fecb318dc1c64ea979ae5eb5958
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 11:35:43 2013 +0000

    Update to 5.0.1, support qtchooser

    Signed-off-by: Carsten Munk <[email protected]>

Package qtscript changed from 523d03097dcdac384c5f0867132ce8cadb980dd8 to
33561cb6a4ddf3daf9c44e25ff1d686f0516e48a in git packages-git/mer-core/qtscript:

commit 33561cb6a4ddf3daf9c44e25ff1d686f0516e48a
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:06:42 2013 +0000

    Update to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtsvg changed from 7549f777e66b04e701f616b13cccad5073b066bd to
ab2656d803a045144e8c3b3d3ed3c2cc63304813 in git packages-git/mer-core/qtsvg:

commit ab2656d803a045144e8c3b3d3ed3c2cc63304813
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:12:02 2013 +0000

    Update to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtmultimedia changed from fa5a2e083389567dba25b278b35ec8e2a016d0f5 to
439bb77d7b0a01cacfac6ae013f9833df0869379 in git 
packages-git/mer-core/qtmultimedia:

commit 439bb77d7b0a01cacfac6ae013f9833df0869379
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 14:58:33 2013 +0000

    Upgrade to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtsystems changed from 8bfb90886e1129b16dff4aee42f325e74f8c22a9 to
ae0617720b4946b9b87b89fdb4503caadd36de90 in git packages-git/mer-core/qtsystems:

commit ae0617720b4946b9b87b89fdb4503caadd36de90
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:14:09 2013 +0000

    Use -qt=5

    Signed-off-by: Carsten Munk <[email protected]>

Package ccache changed from 13d252d391f833f4b38e9cbecfc1edccd5d7678e to
ef85c5bcf769fa50a93a8705da9c86e59ae550c8 in git packages-git/mer-core/ccache:

commit ef85c5bcf769fa50a93a8705da9c86e59ae550c8
Author: Islam Amer <[email protected]>
Date:   Sun Mar 24 00:00:59 2013 +0200

    Update ccache, contributes to MER#532

    Signed-off-by: Islam Amer <[email protected]>

Package qt3d changed from bfa19b0bddacd4f5b027b6c1b45b4a70540eef76 to
8d727d3c815355c0a57d1a057d06d6d6622091af in git packages-git/mer-core/qt3d:

commit 8d727d3c815355c0a57d1a057d06d6d6622091af
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 11:19:39 2013 +0000

    Make work with 5.0.1 and qtchooser

    Signed-off-by: Carsten Munk <[email protected]>

Package qtquick1 changed from 45f59c2968de6d12e26273c8663ccca8c0e322f9 to
df2be0f927ab61c9a55da4d9a5d64890d594aaa2 in git packages-git/mer-core/qtquick1:

commit df2be0f927ab61c9a55da4d9a5d64890d594aaa2
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:02:10 2013 +0000

    Update to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qttools changed from 9dfd2b19a7ce13da5ec3bc088d3dfc76ddcac4b0 to
1cb16053cdcbdf6da1514b151f0d6514fb2fe8a8 in git packages-git/mer-core/qttools:

commit 1cb16053cdcbdf6da1514b151f0d6514fb2fe8a8
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:41:15 2013 +0000

    Update to 5.0.1

    Signed-off-by: Carsten Munk <[email protected]>

Package qtwayland changed from a82ef3e9ea8156508ded1e97adfb3895f2cca219 to
9bb30ffdad35a2dee8af73ce6724e03c20f0100f in git packages-git/mer-core/qtwayland:

commit 9bb30ffdad35a2dee8af73ce6724e03c20f0100f
Author: Carsten Munk <[email protected]>
Date:   Fri Apr 5 15:49:12 2013 +0000

    Use -qt=5

    Signed-off-by: Carsten Munk <[email protected]>

Package qtchooser was added

commit 7ca28b518554bf55a573731a6ded2f0ea5f62b69
Author: Juha Kallioinen <[email protected]>
Date:   Wed Apr 10 13:45:29 2013 +0000

    Modify %qmake macro and require qt-default

    %qmake macro now adds -qt=4 to its options

    Signed-off-by: Juha Kallioinen <[email protected]>

commit bd6275c87e7e7e6b3410839941e1e09691944843
Author: Carsten Munk <[email protected]>
Date:   Wed Apr 3 15:48:27 2013 +0000

    Initial commit

    Signed-off-by: Carsten Munk <[email protected]>

-- 
"Don't worry, you'll be fine; I saw it work in a cartoon once..."


Reply via email to