Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/qt4/qt4-4.8.7-r6.smage2

    Diff of /trunk/extras/qt4/qt4-4.8.7-r6.smage2

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

    revision 31397 by niro, Fri Jun 29 11:23:17 2018 UTC revision 31398 by niro, Tue Jul 3 05:57:10 2018 UTC
    # Line 133  SRC_URI=( Line 133  SRC_URI=(
    133   mirror://${PNAME}/qt-4.8.7-glib-honor-excludesocketnotifiers-flag.patch   mirror://${PNAME}/qt-4.8.7-glib-honor-excludesocketnotifiers-flag.patch
    134   mirror://${PNAME}/qt-4.8.7-l-qclipboard_fix_recursive.patch   mirror://${PNAME}/qt-4.8.7-l-qclipboard_fix_recursive.patch
    135   mirror://${PNAME}/qt-4.8.7-l-qclipboard_delay.patch   mirror://${PNAME}/qt-4.8.7-l-qclipboard_delay.patch
      mirror://${PNAME}/qt-4.8.7-disable-sslv3.patch  
    136   mirror://${PNAME}/qt-4.8.7-gcc6.patch   mirror://${PNAME}/qt-4.8.7-gcc6.patch
    137   mirror://${PNAME}/qt-4.8.7-glibc225.patch   mirror://${PNAME}/qt-4.8.7-glibc225.patch
    138   mirror://${PNAME}/qt-4.8.7-icu59.patch   mirror://${PNAME}/qt-4.8.7-icu59-2.patch
    139   mirror://${PNAME}/qt-4.8.7-openssl-1.1.patch   mirror://${PNAME}/qt-4.8.7-openssl-1.1-2.patch
    140     mirror://${PNAME}/qt-4.8.7-gcc8.patch
    141  )  )
    142    
    143  # add phonon patches  # add phonon patches
    # Line 436  src_prepare() Line 436  src_prepare()
    436   # see: https://bugreports.qt.io/browse/QTBUG-38585   # see: https://bugreports.qt.io/browse/QTBUG-38585
    437   mpatch qt-4.8.7-l-qclipboard_delay.patch || die   mpatch qt-4.8.7-l-qclipboard_delay.patch || die
    438    
      # comply with openssl sslv3 policy  
      mpatch qt-4.8.7-disable-sslv3.patch || die  
       
    439   # fix several FTBFS   # fix several FTBFS
    440   mpatch qt-4.8.7-gcc6.patch || die   mpatch qt-4.8.7-gcc6.patch || die
    441   mpatch qt-4.8.7-glibc225.patch || die   mpatch qt-4.8.7-glibc225.patch || die
    442   mpatch qt-4.8.7-icu59.patch || die   mpatch qt-4.8.7-icu59-2.patch || die
    443   # Np1 required here, patchlevel depth will not be detected correctly   # Np1 required here, patchlevel depth will not be detected correctly
    444   mpatch -Np1 qt-4.8.7-openssl-1.1.patch || die   mpatch -Np1 qt-4.8.7-openssl-1.1-2.patch || die
    445     mpatch qt-4.8.7-gcc8.patch || die
    446    
    447     # more gcc fixes
    448     echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri || die
    449     echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/plugins/accessible/qaccessiblebase.pri || die
    450    
    451   if [[ ${QT4_PHONON} = yes ]]   if [[ ${QT4_PHONON} = yes ]]
    452   then   then
    Legend:
    Removed from v.31397  
    changed lines
      Added in v.31398