From d2e334dad1c25512570672111d766ef7f94957f6 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 3 Jun 2016 14:53:36 -0500 Subject: [PATCH 1/4] Update notes for OS X --- recipes/qt5/notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt5/notes.md b/recipes/qt5/notes.md index 1e9a40f142a9e..aecfdc993456b 100644 --- a/recipes/qt5/notes.md +++ b/recipes/qt5/notes.md @@ -21,8 +21,8 @@ You need the following packages to build Qt5 on CentOS 6 - To build Qt5 you need XCode in your system, Command Line Tools is not accepted. See this [Qt bug](https://bugreports.qt.io/browse/QTBUG-41908) for details. -- The right XCode version for your OS X version is listed - [here](https://github.com/Homebrew/homebrew/blob/master/Library/Homebrew/os/mac/xcode.rb) +- The minimal XCode version accepted is 6.1 +- The minimal OS X version accepted is 10.9 (Mavericks) ## Notes concerning Windows: From 1c68203646a60457f61d2a62374164f3ca50e9cd Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 3 Jun 2016 15:10:33 -0500 Subject: [PATCH 2/4] Fix dependencies in meta.yaml --- recipes/qt5/meta.yaml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/recipes/qt5/meta.yaml b/recipes/qt5/meta.yaml index 813ef2591fb61..4f841a6745f79 100644 --- a/recipes/qt5/meta.yaml +++ b/recipes/qt5/meta.yaml @@ -36,35 +36,38 @@ build: requirements: build: - 7za # [win] - - curl - bison # [linux] + - curl # [win] - flex # [linux] - fontconfig # [linux] - - freetype # [unix] + - freetype # [linux] + - gcc # [linux] - gst-plugins-base # [linux] - icu - jom # [win] - jpeg - libpng 1.6* - libxcb # [linux] - - openssl - - perl >=5.20 + - m2-gperf # [win] + - m2-bison # [win] + - m2-flex # [win] + - m2-git # [win] + - openssl # [win or linux] + - perl >=5.20 # [win] - python + - xz # [unix] - zlib - - m2-gperf # [win] - - m2-bison # [win] - - m2-flex # [win] - - m2-git # [win] run: - - freetype # [unix] + - fontconfig # [linux] + - freetype # [linux] + - gst-plugins-base # [linux] - jpeg - icu + - libgcc # [linux] - libpng 1.6* - libxcb # [linux] - - fontconfig # [linux] - - openssl - - gst-plugins-base # [linux] + - openssl # [win or linux] - zlib about: From e1eaab51168b2565e921bc8b86e532387075024c Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 3 Jun 2016 15:13:45 -0500 Subject: [PATCH 3/4] Fix build.sh and add qt.conf file to the recipe --- recipes/qt5/build.sh | 70 ++++++++++++++++++++++++++++++-------------- recipes/qt5/qt.conf | 4 +++ 2 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 recipes/qt5/qt.conf diff --git a/recipes/qt5/build.sh b/recipes/qt5/build.sh index f6e48cfea8d8f..41f08ef34e5ed 100644 --- a/recipes/qt5/build.sh +++ b/recipes/qt5/build.sh @@ -1,8 +1,13 @@ #!/bin/bash +# Main variables +# -------------- BIN=$PREFIX/lib/qt5/bin QTCONF=$BIN/qt.conf + +# Compile +# ------- chmod +x configure if [ `uname` == Linux ]; then @@ -23,17 +28,30 @@ if [ `uname` == Linux ]; then -nomake examples \ -nomake tests \ -verbose \ - -no-libudev \ - -gtkstyle \ - -qt-xcb \ - -qt-pcre \ - -openssl \ + -skip enginio \ + -skip location \ + -skip sensors \ + -skip serialport \ + -skip script \ + -skip serialbus \ + -skip quickcontrols2 \ + -skip wayland \ + -skip canvas3d \ + -skip 3d \ -system-libjpeg \ -system-libpng \ -system-zlib \ + -qt-pcre \ + -qt-xcb \ -qt-xkbcommon \ -xkb-config-root $PREFIX/lib \ - -dbus + -dbus \ + -c++11 \ + -no-linuxfb \ + -no-libudev + + LD_LIBRARY_PATH=$PREFIX/lib make -j $MAKE_JOBS + make install fi if [ `uname` == Darwin ]; then @@ -61,14 +79,22 @@ if [ `uname` == Darwin ]; then -nomake examples \ -nomake tests \ -verbose \ - -skip qtwebengine \ - -openssl \ + -skip enginio \ + -skip location \ + -skip sensors \ + -skip serialport \ + -skip script \ + -skip serialbus \ + -skip quickcontrols2 \ + -skip wayland \ + -skip canvas3d \ + -skip 3d \ -system-libjpeg \ -system-libpng \ -system-zlib \ -qt-pcre \ - -platform macx-g++ \ - -no-c++11 \ + -qt-freetype \ + -c++11 \ -no-framework \ -no-dbus \ -no-mtdev \ @@ -77,28 +103,28 @@ if [ `uname` == Darwin ]; then -no-xcb-xlib \ -no-libudev \ -no-egl + + DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib make -j $MAKE_JOBS + make install fi -make -j $MAKE_JOBS -make install + +# Post build setup +# ---------------- + +# Remove unneeded files +rm -rf $PREFIX/share/qt5 + +# Make symlinks of binaries in $BIN to $PREFIX/bin for file in $BIN/* do ln -sfv ../lib/qt5/bin/$(basename $file) $PREFIX/bin/$(basename $file)-qt5 done -#removes doc, phrasebooks, and translations -rm -rf $PREFIX/share/qt5 - # Remove static libs rm -rf $PREFIX/lib/*.a # Add qt.conf file to the package to make it fully relocatable -cat <$QTCONF -[Paths] -Prefix = $PREFIX/lib/qt5 -Libraries = $PREFIX/lib -Headers = $PREFIX/include/qt5 - -EOF +cp $RECIPE_DIR/qt.conf $BIN/ diff --git a/recipes/qt5/qt.conf b/recipes/qt5/qt.conf new file mode 100644 index 0000000000000..ce96fa33f675c --- /dev/null +++ b/recipes/qt5/qt.conf @@ -0,0 +1,4 @@ +[Paths] +Prefix = /opt/anaconda1anaconda2anaconda3/lib/qt5 +Libraries = /opt/anaconda1anaconda2anaconda3/lib +Headers = /opt/anaconda1anaconda2anaconda3/include/qt5 From 8aece68b2c273b777ff8c4a0bd4e7d45c306cfd9 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 3 Jun 2016 15:25:59 -0500 Subject: [PATCH 4/4] Pin ICU --- recipes/qt5/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt5/meta.yaml b/recipes/qt5/meta.yaml index 4f841a6745f79..9b94b040951bc 100644 --- a/recipes/qt5/meta.yaml +++ b/recipes/qt5/meta.yaml @@ -43,7 +43,7 @@ requirements: - freetype # [linux] - gcc # [linux] - gst-plugins-base # [linux] - - icu + - icu 56* - jom # [win] - jpeg - libpng 1.6* @@ -63,7 +63,7 @@ requirements: - freetype # [linux] - gst-plugins-base # [linux] - jpeg - - icu + - icu 56* - libgcc # [linux] - libpng 1.6* - libxcb # [linux]