Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/extras/qt4/qt4-4.8.6-r2.smage2

    Diff of /branches/R11-unstable/extras/qt4/qt4-4.8.6-r2.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 23285 by niro, Fri Nov 7 09:01:19 2014 UTC revision 23286 by niro, Fri Nov 7 10:07:38 2014 UTC
    # Line 496  src_compile() Line 496  src_compile()
    496   -docdir ${QT_PREFIX}/share/doc/qt${PVER%%.*}-${PVER} \   -docdir ${QT_PREFIX}/share/doc/qt${PVER%%.*}-${PVER} \
    497   -headerdir ${QT_PREFIX}/include/qt${PVER%%.*} \   -headerdir ${QT_PREFIX}/include/qt${PVER%%.*} \
    498   -plugindir ${QT_PREFIX}/$(mlibdir)/qt${PVER%%.*}/plugins \   -plugindir ${QT_PREFIX}/$(mlibdir)/qt${PVER%%.*}/plugins \
    499     -importdir ${QT_PREFIX}/$(mlibdir)/qt${PVER%%.*}/imports \
    500   -libdir ${QT_PREFIX}/$(mlibdir) \   -libdir ${QT_PREFIX}/$(mlibdir) \
    501   -datadir ${QT_PREFIX}/share/qt${PVER%%.*} \   -datadir ${QT_PREFIX}/share/qt${PVER%%.*} \
    502   -translationdir ${QT_PREFIX}/share/qt/translations \   -translationdir ${QT_PREFIX}/share/qt${PVER%%.*}/translations \
    503   -confirm-license \   -confirm-license \
    504   -opensource \   -opensource \
    505   -platform ${PLATFORM} \   -platform ${PLATFORM} \
    # Line 578  src_install_qt4-core() Line 579  src_install_qt4-core()
    579   # remove unneeded specs   # remove unneeded specs
    580   echo "removing unneeded specs ..."   echo "removing unneeded specs ..."
    581   install -d ${BUILDDIR}/keep   install -d ${BUILDDIR}/keep
    582   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/default ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/default ${BUILDDIR}/keep || die
    583   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/common ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/common ${BUILDDIR}/keep || die
    584   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/features ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/features ${BUILDDIR}/keep || die
    585   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/qws ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/qws ${BUILDDIR}/keep || die
    586   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/${PLATFORM} ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/${PLATFORM} ${BUILDDIR}/keep || die
    587   if [[ ${ARCH} = x86_64 ]]   if [[ ${ARCH} = x86_64 ]]
    588   then   then
    589   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/linux-g++ ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/linux-g++ ${BUILDDIR}/keep || die
    590   fi   fi
    591   mv ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/qconfig.pri ${BUILDDIR}/keep || die   mv ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/qconfig.pri ${BUILDDIR}/keep || die
    592   rm -rf ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs/* || die   rm -rf ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs/* || die
    593   mv ${BUILDDIR}/keep/* ${BINDIR}/${QT_PREFIX}/share/qt/mkspecs || die   mv ${BUILDDIR}/keep/* ${BINDIR}/${QT_PREFIX}/share/qt${PVER%%.*}/mkspecs || die
    594    
    595   # fix qmake cache file   # fix qmake cache file
    596   minstalldir ${QT_PREFIX}/share/qt${PVER%%.*} || die   minstalldir ${QT_PREFIX}/share/qt${PVER%%.*} || die
    # Line 602  src_install_qt4-core() Line 603  src_install_qt4-core()
    603   # use freshly built libraries   # use freshly built libraries
    604   LD_LIBRARY_PATH=${SRCDIR}/lib ${SRCDIR}/bin/lrelease translations/*.ts || die   LD_LIBRARY_PATH=${SRCDIR}/lib ${SRCDIR}/bin/lrelease translations/*.ts || die
    605   minstalldir ${QT_PREFIX}/share/qt${PVER%%.*}/translations || die   minstalldir ${QT_PREFIX}/share/qt${PVER%%.*}/translations || die
    606   minstallfile translations/\*.qm ${QT_PREFIX}/share/qt/translations || die   minstallfile translations/\*.qm ${QT_PREFIX}/share/qt${PVER%%.*}/translations || die
    607    
    608   # keep the qt4 sysdir   # keep the qt4 sysdir
    609   mkeepdir ${QT_SYSCONFDIR} || die   mkeepdir ${QT_SYSCONFDIR} || die
    # Line 851  src_install_qt4-pixeltool() Line 852  src_install_qt4-pixeltool()
    852   install_qt_target tools/pixeltool   install_qt_target tools/pixeltool
    853  }  }
    854    
    855  src_install_qt4-pixeltool()  src_install_qt4-qdbusviewer()
    856  {  {
    857   cd ${SRCDIR}   cd ${SRCDIR}
    858    
    Legend:
    Removed from v.23285  
    changed lines
      Added in v.23286