diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/direct2d.pro.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/direct2d.pro.patch new file mode 100644 index 0000000..5f3e189 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/direct2d.pro.patch @@ -0,0 +1,4 @@ +8c8 +< LIBS += -ldwmapi -ld2d1 -ld3d11 -ldwrite -lVersion -lgdi32 +--- +> LIBS += -ldwmapi -ld2d1 -ld3d11 -ldwrite -lversion -lgdi32 diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/idc.pro.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/idc.pro.patch new file mode 100644 index 0000000..d98e3d1 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/idc.pro.patch @@ -0,0 +1,2 @@ +1d0 +< option(host_build) diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/qmake.conf.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/qmake.conf.patch new file mode 100644 index 0000000..510b391 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/qmake.conf.patch @@ -0,0 +1,7 @@ +53,56c53 +< equals(QMAKE_HOST.os, Windows) { +< QMAKE_LINK_OBJECT_MAX = 10 +< QMAKE_LINK_OBJECT_SCRIPT = object_script +< } +--- +> QMAKE_LINK_OBJECT_MAX = 1 diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dintegration.cpp.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dintegration.cpp.patch new file mode 100644 index 0000000..5a4b27f --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dintegration.cpp.patch @@ -0,0 +1,4 @@ +111c111 +< if (VerQueryValue(info.constData(), __TEXT("\\"), +--- +> if (VerQueryValue(const_cast(info.constData()), __TEXT("\\"), diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dpaintengine.cpp.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dpaintengine.cpp.patch new file mode 100644 index 0000000..48bd7b6 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dpaintengine.cpp.patch @@ -0,0 +1,27 @@ +65a66,83 +> namespace D2D1 { +> D2D1_BITMAP_BRUSH_PROPERTIES1 +> BitmapBrushProperties1( +> D2D1_EXTEND_MODE extendModeX = D2D1_EXTEND_MODE_CLAMP, +> D2D1_EXTEND_MODE extendModeY = D2D1_EXTEND_MODE_CLAMP, +> D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR +> ) +> { +> D2D1_BITMAP_BRUSH_PROPERTIES1 bitmapBrush1Properties; +> +> bitmapBrush1Properties.extendModeX = extendModeX; +> bitmapBrush1Properties.extendModeY = extendModeY; +> bitmapBrush1Properties.interpolationMode = interpolationMode; +> +> return bitmapBrush1Properties; +> } +> } +> +947c965 +< ComPtr geometry = vectorPathToID2D1PathGeometry(path); +--- +> ComPtr geometry = vectorPathToID2D1PathGeometry(path).Get(); +1206c1224 +< ComPtr geometry = d->vectorPathToID2D1PathGeometry(path); +--- +> ComPtr geometry = d->vectorPathToID2D1PathGeometry(path).Get(); 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 index f97c94c..5a569db 100644 --- a/docker-builder-data/build/script/packet/qt-5.9.2.sh +++ b/docker-builder-data/build/script/packet/qt-5.9.2.sh @@ -14,21 +14,38 @@ 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 "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" + + rm -f "qtbase/src/plugins/platforms/direct2d/direct2d.pro" + patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/src/plugins/platforms/direct2d/direct2d.pro" \ + -i "$FILES_PACKET_DIR/direct2d.pro.patch" -o - \ + > "qtbase/src/plugins/platforms/direct2d/direct2d.pro" - #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" + # mingw bugs workarounds (https://sourceforge.net/p/mingw-w64/mailman/message/35627786/): - LOCAL_OPTIONS="-xplatform win32-g++ -device-option CROSS_COMPILE=$HOST-" + rm -f "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp" + patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp" \ + -i "$FILES_PACKET_DIR/qwindowsdirect2dpaintengine.cpp.patch" -o - \ + > "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp" + + rm -f "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp" + patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp" \ + -i "$FILES_PACKET_DIR/qwindowsdirect2dintegration.cpp.patch" -o - \ + > "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp" + + LOCAL_OPTIONS="-xplatform win32-g++ -device-option CROSS_COMPILE=$HOST- -opengl desktop" fi rm -f "qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" @@ -41,13 +58,14 @@ pkbuild() { -prefix "$INSTALL_PACKET_DIR" \ $LOCAL_OPTIONS \ -release \ + -shared \ -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 }