diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index 964cb94..2eb1cb0 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.26 lz4-master lzo-2.10 lzma-5.2.3 glew-2.0.0 freeglut-3.0.0 superlu-5.2.1 openblas-master boost-1.61.0 qt-5.7 mypaintlib-master" +DEPS="jpeg-9b png-1.6.26 lz4-master lzo-2.10 lzma-5.2.3 glew-2.0.0 freeglut-3.0.0 superlu-5.2.1 openblas-master boost-1.61.0 qt-5.9.2 mypaintlib-master" DEPS_NATIVE="cmake-3.6.2" PK_DIRNAME="opentoonz" diff --git a/docker-builder-data/build/script/packet/qt-5.7.0.files/idc.pro.patch b/docker-builder-data/build/script/packet/qt-5.7.0.files/idc.pro.patch new file mode 100644 index 0000000..d98e3d1 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.7.0.files/idc.pro.patch @@ -0,0 +1,2 @@ +1d0 +< option(host_build) diff --git a/docker-builder-data/build/script/packet/qt-5.7.0.files/qmake.conf.patch b/docker-builder-data/build/script/packet/qt-5.7.0.files/qmake.conf.patch new file mode 100644 index 0000000..284a2d3 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.7.0.files/qmake.conf.patch @@ -0,0 +1,4 @@ +33c33 +< QMAKE_CFLAGS_RELEASE = -O2 +--- +> QMAKE_CFLAGS_RELEASE = -O2 -Wa,-mbig-obj diff --git a/docker-builder-data/build/script/packet/qt-5.7.0.sh b/docker-builder-data/build/script/packet/qt-5.7.0.sh new file mode 100644 index 0000000..53e4560 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.7.0.sh @@ -0,0 +1,68 @@ +DEPS="png-1.6.26 glib-2.50.0" + +PK_DIRNAME="qt-everywhere-opensource-src-5.7.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="http://download.qt.io/official_releases/qt/5.7/5.7.0/single/$PK_ARCHIVE" +PK_LICENSE_FILES="LICENSE.LGPLv21" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + +if [ "$PLATFORM" = "linux" ]; then + DEPS="$DEPS xcbfull-1.12" +fi + + +pkbuild() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + + if ! check_packet_function $NAME build.configure; then + local LOCAL_OPTIONS= + if [ "$PLATFORM" = "win" ]; then + rm -f "qtbase/mkspecs/win32-g++/qmake.conf" + patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/mkspecs/win32-g++/qmake.conf" \ + -i "$FILES_PACKET_DIR/qmake.conf.patch" -o - \ + > "qtbase/mkspecs/win32-g++/qmake.conf" + + rm -f "qtactiveqt/src/tools/idc/idc.pro" + patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtactiveqt/src/tools/idc/idc.pro" \ + -i "$FILES_PACKET_DIR/idc.pro.patch" -o - \ + > "qtactiveqt/src/tools/idc/idc.pro" + + LOCAL_OPTIONS="-xplatform win32-g++ -device-option CROSS_COMPILE=$HOST-" + fi + + native_at_place \ + ./configure \ + -prefix "$INSTALL_PACKET_DIR" \ + $LOCAL_OPTIONS \ + -release \ + -opensource -confirm-license \ + -nomake examples \ + || return 1 + + set_done $NAME build.configure + fi + + native_at_place make -j${THREADS} || native_at_place make ||return 1 +} + +pkinstall() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + make install || return 1 + +cat << EOF > "$INSTALL_PACKET_DIR/bin/qt.conf" +[Paths] +Prefix=.. +EOF + + if [ ! $? -eq 0 ]; then + return 1 + fi +} + +pkhook_postinstall_release() { + cd "$INSTALL_RELEASE_PACKET_DIR" || return 1 + rm -rf "examples" || return 1 + rm -rf "mkspecs" || return 1 + rm -rf "doc" || return 1 +} \ No newline at end of file diff --git a/docker-builder-data/build/script/packet/qt-5.7.files/idc.pro.patch b/docker-builder-data/build/script/packet/qt-5.7.files/idc.pro.patch deleted file mode 100644 index d98e3d1..0000000 --- a/docker-builder-data/build/script/packet/qt-5.7.files/idc.pro.patch +++ /dev/null @@ -1,2 +0,0 @@ -1d0 -< option(host_build) diff --git a/docker-builder-data/build/script/packet/qt-5.7.files/qmake.conf.patch b/docker-builder-data/build/script/packet/qt-5.7.files/qmake.conf.patch deleted file mode 100644 index 284a2d3..0000000 --- a/docker-builder-data/build/script/packet/qt-5.7.files/qmake.conf.patch +++ /dev/null @@ -1,4 +0,0 @@ -33c33 -< QMAKE_CFLAGS_RELEASE = -O2 ---- -> QMAKE_CFLAGS_RELEASE = -O2 -Wa,-mbig-obj diff --git a/docker-builder-data/build/script/packet/qt-5.7.sh b/docker-builder-data/build/script/packet/qt-5.7.sh deleted file mode 100644 index 53e4560..0000000 --- a/docker-builder-data/build/script/packet/qt-5.7.sh +++ /dev/null @@ -1,68 +0,0 @@ -DEPS="png-1.6.26 glib-2.50.0" - -PK_DIRNAME="qt-everywhere-opensource-src-5.7.0" -PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="http://download.qt.io/official_releases/qt/5.7/5.7.0/single/$PK_ARCHIVE" -PK_LICENSE_FILES="LICENSE.LGPLv21" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh - -if [ "$PLATFORM" = "linux" ]; then - DEPS="$DEPS xcbfull-1.12" -fi - - -pkbuild() { - cd "$BUILD_PACKET_DIR/$PK_DIRNAME" - - if ! check_packet_function $NAME build.configure; then - local LOCAL_OPTIONS= - if [ "$PLATFORM" = "win" ]; then - rm -f "qtbase/mkspecs/win32-g++/qmake.conf" - patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/mkspecs/win32-g++/qmake.conf" \ - -i "$FILES_PACKET_DIR/qmake.conf.patch" -o - \ - > "qtbase/mkspecs/win32-g++/qmake.conf" - - rm -f "qtactiveqt/src/tools/idc/idc.pro" - patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtactiveqt/src/tools/idc/idc.pro" \ - -i "$FILES_PACKET_DIR/idc.pro.patch" -o - \ - > "qtactiveqt/src/tools/idc/idc.pro" - - LOCAL_OPTIONS="-xplatform win32-g++ -device-option CROSS_COMPILE=$HOST-" - fi - - native_at_place \ - ./configure \ - -prefix "$INSTALL_PACKET_DIR" \ - $LOCAL_OPTIONS \ - -release \ - -opensource -confirm-license \ - -nomake examples \ - || return 1 - - set_done $NAME build.configure - fi - - native_at_place make -j${THREADS} || native_at_place make ||return 1 -} - -pkinstall() { - cd "$BUILD_PACKET_DIR/$PK_DIRNAME" - make install || return 1 - -cat << EOF > "$INSTALL_PACKET_DIR/bin/qt.conf" -[Paths] -Prefix=.. -EOF - - if [ ! $? -eq 0 ]; then - return 1 - fi -} - -pkhook_postinstall_release() { - cd "$INSTALL_RELEASE_PACKET_DIR" || return 1 - rm -rf "examples" || return 1 - rm -rf "mkspecs" || return 1 - rm -rf "doc" || return 1 -} \ No newline at end of file diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/socketcanbackend.cpp.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/socketcanbackend.cpp.patch new file mode 100644 index 0000000..d0ec26d --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/socketcanbackend.cpp.patch @@ -0,0 +1,3 @@ +73a74,75 +> #define CANFD_BRS 0x01 +> #define CANFD_ESI 0x02 diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.sh b/docker-builder-data/build/script/packet/qt-5.9.2.sh new file mode 100644 index 0000000..f97c94c --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.sh @@ -0,0 +1,73 @@ +DEPS="png-1.6.26 glib-2.50.0" + +PK_DIRNAME="qt-everywhere-opensource-src-5.9.2" +PK_ARCHIVE="$PK_DIRNAME.tar.xz" +PK_URL="http://download.qt.io/official_releases/qt/5.9/5.9.2/single/$PK_ARCHIVE" +PK_LICENSE_FILES="LICENSE.LGPLv21" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + +if [ "$PLATFORM" = "linux" ]; then + DEPS="$DEPS xcbfull-1.12" +fi + + +pkbuild() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + + if ! check_packet_function $NAME build.configure; then + local LOCAL_OPTIONS= + if [ "$PLATFORM" = "win" ]; then + #rm -f "qtbase/mkspecs/win32-g++/qmake.conf" + #patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/mkspecs/win32-g++/qmake.conf" \ + # -i "$FILES_PACKET_DIR/qmake.conf.patch" -o - \ + # > "qtbase/mkspecs/win32-g++/qmake.conf" + + #rm -f "qtactiveqt/src/tools/idc/idc.pro" + #patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtactiveqt/src/tools/idc/idc.pro" \ + # -i "$FILES_PACKET_DIR/idc.pro.patch" -o - \ + # > "qtactiveqt/src/tools/idc/idc.pro" + + LOCAL_OPTIONS="-xplatform win32-g++ -device-option CROSS_COMPILE=$HOST-" + fi + + rm -f "qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" + patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" \ + -i "$FILES_PACKET_DIR/socketcanbackend.cpp.patch" -o - \ + > "qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" + + native_at_place \ + ./configure \ + -prefix "$INSTALL_PACKET_DIR" \ + $LOCAL_OPTIONS \ + -release \ + -opensource -confirm-license \ + -nomake examples \ + || return 1 + + set_done $NAME build.configure + fi + + native_at_place make -j${THREADS} || native_at_place make ||return 1 +} + +pkinstall() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + make install || return 1 + +cat << EOF > "$INSTALL_PACKET_DIR/bin/qt.conf" +[Paths] +Prefix=.. +EOF + + if [ ! $? -eq 0 ]; then + return 1 + fi +} + +pkhook_postinstall_release() { + cd "$INSTALL_RELEASE_PACKET_DIR" || return 1 + rm -rf "examples" || return 1 + rm -rf "mkspecs" || return 1 + rm -rf "doc" || return 1 +} \ No newline at end of file