From 2f47bbde30ce876550106de81a42d035045c4496 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Tue, 12 May 2020 08:10:00 +0200 Subject: [PATCH] qt5: use VFS pipe plugin Fixes #3759 --- repos/gems/run/mixer_gui_qt_test.run | 3 ++- repos/gems/run/tiled_wm.run | 15 ++++++++++----- repos/libports/lib/mk/qt5_core.mk | 2 +- repos/libports/recipes/pkg/qt5_textedit/archives | 1 + repos/libports/recipes/pkg/qt5_textedit/runtime | 2 +- .../recipes/raw/qt5_textedit/textedit.config | 3 ++- repos/libports/recipes/src/qt5_core/content.mk | 5 +---- repos/libports/run/qt5.run | 9 ++++++--- repos/libports/run/qt5_calculatorform.run | 3 ++- repos/libports/run/qt5_common.inc | 1 + repos/libports/run/qt5_openglwindow.run | 3 ++- repos/libports/run/qt5_qpluginwidget.run | 3 ++- repos/libports/run/qt5_quicktest.run | 3 ++- repos/libports/run/qt5_samegame.run | 3 ++- repos/libports/run/qt5_testqstring.run | 3 ++- repos/libports/run/qt5_tetrix.run | 3 ++- repos/libports/run/qt5_textedit.run | 6 ++++-- repos/libports/run/qt5_virtualkeyboard.run | 3 ++- repos/ports/recipes/pkg/arora/archives | 1 + repos/ports/recipes/pkg/arora/runtime | 2 +- repos/ports/recipes/raw/arora/init.config | 3 ++- repos/ports/run/arora.run | 3 ++- 22 files changed, 51 insertions(+), 29 deletions(-) diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index cd1a4bf1b..06fdfed14 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -70,12 +70,13 @@ append config { + 2018-01-01 00:01 - + diff --git a/repos/gems/run/tiled_wm.run b/repos/gems/run/tiled_wm.run index 8c9a11fce..2d76aef07 100644 --- a/repos/gems/run/tiled_wm.run +++ b/repos/gems/run/tiled_wm.run @@ -111,9 +111,10 @@ append config { - + + 2018-01-01 00:01 @@ -135,9 +136,10 @@ append config { - + + 2018-01-01 00:01 @@ -156,9 +158,10 @@ append config { - + + 2018-01-01 00:01 @@ -177,9 +180,10 @@ append config { - + + 2018-01-01 00:01 @@ -197,9 +201,10 @@ append config { - + + 2018-01-01 00:01 diff --git a/repos/libports/lib/mk/qt5_core.mk b/repos/libports/lib/mk/qt5_core.mk index 00cfab1fd..497515803 100644 --- a/repos/libports/lib/mk/qt5_core.mk +++ b/repos/libports/lib/mk/qt5_core.mk @@ -22,6 +22,6 @@ include $(REP_DIR)/lib/mk/qt5.inc SRC_CC += libc_dummies.cc vpath libc_dummies.cc $(REP_DIR)/src/lib/qt5 -LIBS += zlib qt5_pcre2 libc libm libc_pipe +LIBS += zlib qt5_pcre2 libc libm CC_CXX_WARN_STRICT = diff --git a/repos/libports/recipes/pkg/qt5_textedit/archives b/repos/libports/recipes/pkg/qt5_textedit/archives index d0701ca15..9b284fe4b 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/archives +++ b/repos/libports/recipes/pkg/qt5_textedit/archives @@ -11,6 +11,7 @@ _/src/qt5_qjpeg _/src/qt5_qpa_nitpicker _/src/stdcxx _/src/vfs +_/src/vfs_pipe _/src/zlib _/raw/qt5_textedit _/src/qt5_component diff --git a/repos/libports/recipes/pkg/qt5_textedit/runtime b/repos/libports/recipes/pkg/qt5_textedit/runtime index 1d57b867a..3003ba541 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/runtime +++ b/repos/libports/recipes/pkg/qt5_textedit/runtime @@ -19,7 +19,6 @@ - @@ -30,6 +29,7 @@ + diff --git a/repos/libports/recipes/raw/qt5_textedit/textedit.config b/repos/libports/recipes/raw/qt5_textedit/textedit.config index c60c34f46..07c8c7e69 100644 --- a/repos/libports/recipes/raw/qt5_textedit/textedit.config +++ b/repos/libports/recipes/raw/qt5_textedit/textedit.config @@ -1,11 +1,12 @@ + 2018-01-01 00:01 - + diff --git a/repos/libports/recipes/src/qt5_core/content.mk b/repos/libports/recipes/src/qt5_core/content.mk index a396b6e4f..2bceea286 100644 --- a/repos/libports/recipes/src/qt5_core/content.mk +++ b/repos/libports/recipes/src/qt5_core/content.mk @@ -3,10 +3,7 @@ MIRROR_FROM_REP_DIR := lib/mk/qt5_core.mk \ lib/mk/qt5_pcre2.mk \ lib/mk/qt5_pcre2_generated.inc \ lib/mk/qt5.inc \ - src/lib/qt5/libc_dummies.cc \ - include/libc-plugin \ - lib/mk/libc_pipe.mk \ - src/lib/libc_pipe + src/lib/qt5/libc_dummies.cc content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_core/target.mk diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 4092e655b..fe97bd87f 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -37,9 +37,10 @@ append config { - + + 2018-01-01 00:01 @@ -47,9 +48,10 @@ append config { - + + 2018-01-01 00:01 @@ -59,9 +61,10 @@ append config { - + + 2018-01-01 00:01 diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 0afa7a6ff..b3ecfb9a3 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -36,12 +36,13 @@ append config { + 2018-01-01 00:01 - + diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index dd4e666c4..41793c303 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -25,6 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/report_rom \ [depot_user]/src/stdcxx \ [depot_user]/src/vfs \ + [depot_user]/src/vfs_pipe \ [depot_user]/src/zlib \ [depot_user]/pkg/themed_wm \ [depot_user]/raw/qt5_dejavusans diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index 577a4ee48..767be920e 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -42,12 +42,13 @@ append config { + 2018-01-01 00:01 - + diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 1c85d08bb..7e0316146 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -62,12 +62,13 @@ append config { + 2018-01-01 00:01 - + diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index 81c450880..a3d798f9d 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -42,6 +42,7 @@ append config { + 2018-01-01 00:01 @@ -49,7 +50,7 @@ append config { - + diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 9ea38f4ae..49ae0e1b4 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -42,6 +42,7 @@ append config { + 2018-01-01 00:01 @@ -50,7 +51,7 @@ append config { - + diff --git a/repos/libports/run/qt5_testqstring.run b/repos/libports/run/qt5_testqstring.run index c0914ba0a..687c0cf96 100644 --- a/repos/libports/run/qt5_testqstring.run +++ b/repos/libports/run/qt5_testqstring.run @@ -37,12 +37,13 @@ append config { + 2018-01-01 00:01 - + diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index 8e4375348..b020546cc 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -37,12 +37,13 @@ append config { + 2018-01-01 00:01 - + diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index ccb6112ca..3834d8e87 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -55,9 +55,10 @@ append config { - + + 2018-01-01 00:01 @@ -76,9 +77,10 @@ append config { - + + 2018-01-01 00:01 diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index 446e90c8b..e6b5c50f7 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -59,6 +59,7 @@ append config { + 2018-01-01 00:01 @@ -81,7 +82,7 @@ append config { - + diff --git a/repos/ports/recipes/pkg/arora/archives b/repos/ports/recipes/pkg/arora/archives index 0d4b09a29..48d320d53 100644 --- a/repos/ports/recipes/pkg/arora/archives +++ b/repos/ports/recipes/pkg/arora/archives @@ -11,6 +11,7 @@ _/src/qt5_qjpeg _/src/qt5_qpa_nitpicker _/src/stdcxx _/src/vfs +_/src/vfs_pipe _/src/zlib _/raw/arora _/src/arora diff --git a/repos/ports/recipes/pkg/arora/runtime b/repos/ports/recipes/pkg/arora/runtime index cacb72eb6..ad014aeb1 100644 --- a/repos/ports/recipes/pkg/arora/runtime +++ b/repos/ports/recipes/pkg/arora/runtime @@ -21,7 +21,6 @@ - @@ -32,6 +31,7 @@ + diff --git a/repos/ports/recipes/raw/arora/init.config b/repos/ports/recipes/raw/arora/init.config index 9d8cbd521..93bbd349b 100644 --- a/repos/ports/recipes/raw/arora/init.config +++ b/repos/ports/recipes/raw/arora/init.config @@ -30,6 +30,7 @@ + @@ -37,7 +38,7 @@ - + diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index 9b1a5ffb1..f82c019b1 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -113,6 +113,7 @@ append config { + 2018-01-01 00:01 @@ -120,7 +121,7 @@ append config { - +