diff --git a/repos/gems/recipes/src/mixer_gui_qt/used_apis b/repos/gems/recipes/src/mixer_gui_qt/used_apis index 837dbe51bf..8f079d5a3e 100644 --- a/repos/gems/recipes/src/mixer_gui_qt/used_apis +++ b/repos/gems/recipes/src/mixer_gui_qt/used_apis @@ -3,7 +3,7 @@ libc mesa os qoost -qt5 +qt5_base qt5_component report_session stdcxx diff --git a/repos/gems/recipes/src/test-tiled_wm/used_apis b/repos/gems/recipes/src/test-tiled_wm/used_apis index fa79b3c030..abc43ab058 100644 --- a/repos/gems/recipes/src/test-tiled_wm/used_apis +++ b/repos/gems/recipes/src/test-tiled_wm/used_apis @@ -3,7 +3,7 @@ libc mesa os qoost -qt5 +qt5_base qt5_component report_session stdcxx diff --git a/repos/libports/recipes/api/qt5/content.mk b/repos/libports/recipes/api/qt5_base/content.mk similarity index 96% rename from repos/libports/recipes/api/qt5/content.mk rename to repos/libports/recipes/api/qt5_base/content.mk index 2633f4f650..48bc621633 100644 --- a/repos/libports/recipes/api/qt5/content.mk +++ b/repos/libports/recipes/api/qt5_base/content.mk @@ -18,7 +18,6 @@ MIRROR_SYMBOLS := lib/symbols/libQt5Core \ lib/symbols/libQt5Network \ lib/symbols/libQt5PrintSupport \ lib/symbols/libQt5Sql \ - lib/symbols/libQt5Svg \ lib/symbols/libQt5Test \ lib/symbols/libQt5Widgets \ lib/symbols/libQt5Xml \ diff --git a/repos/libports/recipes/api/qt5/hash b/repos/libports/recipes/api/qt5_base/hash similarity index 100% rename from repos/libports/recipes/api/qt5/hash rename to repos/libports/recipes/api/qt5_base/hash diff --git a/repos/libports/recipes/api/qt5_qml/content.mk b/repos/libports/recipes/api/qt5_declarative/content.mk similarity index 61% rename from repos/libports/recipes/api/qt5_qml/content.mk rename to repos/libports/recipes/api/qt5_declarative/content.mk index 015eb322fb..e6ce698612 100644 --- a/repos/libports/recipes/api/qt5_qml/content.mk +++ b/repos/libports/recipes/api/qt5_declarative/content.mk @@ -3,11 +3,7 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5Qml \ src/lib/qt5/genode/api/lib/symbols/libQt5QmlModels \ src/lib/qt5/genode/api/lib/symbols/libQt5Quick \ - src/lib/qt5/genode/api/lib/symbols/libQt5QuickControls2 \ - src/lib/qt5/genode/api/lib/symbols/libQt5QuickTemplates2 \ - src/lib/qt5/genode/api/lib/symbols/libQt5QuickWidgets \ - src/lib/qt5/genode/api/lib/symbols/libQt5VirtualKeyboard \ - src/lib/qt5/genode/api/lib/symbols/qt5_quickcontrols + src/lib/qt5/genode/api/lib/symbols/libQt5QuickWidgets content: $(MIRROR_SYMBOLS) diff --git a/repos/libports/recipes/api/qt5_qml/hash b/repos/libports/recipes/api/qt5_declarative/hash similarity index 100% rename from repos/libports/recipes/api/qt5_qml/hash rename to repos/libports/recipes/api/qt5_declarative/hash diff --git a/repos/libports/recipes/api/qt5_quickcontrols2/content.mk b/repos/libports/recipes/api/qt5_quickcontrols2/content.mk new file mode 100644 index 0000000000..923e2db7ed --- /dev/null +++ b/repos/libports/recipes/api/qt5_quickcontrols2/content.mk @@ -0,0 +1,15 @@ +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5QuickControls2 \ + src/lib/qt5/genode/api/lib/symbols/libQt5QuickTemplates2 + +content: $(MIRROR_SYMBOLS) + +$(MIRROR_SYMBOLS): + mkdir -p lib/symbols + cp $(PORT_DIR)/$@ lib/symbols + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_quickcontrols2/hash b/repos/libports/recipes/api/qt5_quickcontrols2/hash new file mode 100644 index 0000000000..ef1d643095 --- /dev/null +++ b/repos/libports/recipes/api/qt5_quickcontrols2/hash @@ -0,0 +1 @@ +2023-03-14 111c035e1aaf9a18b2f3064127a798eec608a4d5 diff --git a/repos/libports/recipes/api/qt5_svg/content.mk b/repos/libports/recipes/api/qt5_svg/content.mk new file mode 100644 index 0000000000..473e4f8583 --- /dev/null +++ b/repos/libports/recipes/api/qt5_svg/content.mk @@ -0,0 +1,14 @@ +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5Svg + +content: $(MIRROR_SYMBOLS) + +$(MIRROR_SYMBOLS): + mkdir -p lib/symbols + cp $(PORT_DIR)/$@ lib/symbols + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_svg/hash b/repos/libports/recipes/api/qt5_svg/hash new file mode 100644 index 0000000000..ef1d643095 --- /dev/null +++ b/repos/libports/recipes/api/qt5_svg/hash @@ -0,0 +1 @@ +2023-03-14 111c035e1aaf9a18b2f3064127a798eec608a4d5 diff --git a/repos/libports/recipes/api/qt5_virtualkeyboard/content.mk b/repos/libports/recipes/api/qt5_virtualkeyboard/content.mk new file mode 100644 index 0000000000..62f8af48f4 --- /dev/null +++ b/repos/libports/recipes/api/qt5_virtualkeyboard/content.mk @@ -0,0 +1,14 @@ +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5VirtualKeyboard + +content: $(MIRROR_SYMBOLS) + +$(MIRROR_SYMBOLS): + mkdir -p lib/symbols + cp $(PORT_DIR)/$@ lib/symbols + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_virtualkeyboard/hash b/repos/libports/recipes/api/qt5_virtualkeyboard/hash new file mode 100644 index 0000000000..ef1d643095 --- /dev/null +++ b/repos/libports/recipes/api/qt5_virtualkeyboard/hash @@ -0,0 +1 @@ +2023-03-14 111c035e1aaf9a18b2f3064127a798eec608a4d5 diff --git a/repos/libports/recipes/api/qt5_webchannel/content.mk b/repos/libports/recipes/api/qt5_webchannel/content.mk new file mode 100644 index 0000000000..43fbdc1466 --- /dev/null +++ b/repos/libports/recipes/api/qt5_webchannel/content.mk @@ -0,0 +1,14 @@ +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5WebChannel + +content: $(MIRROR_SYMBOLS) + +$(MIRROR_SYMBOLS): + mkdir -p lib/symbols + cp $(PORT_DIR)/$@ lib/symbols + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_webchannel/hash b/repos/libports/recipes/api/qt5_webchannel/hash new file mode 100644 index 0000000000..5143296f69 --- /dev/null +++ b/repos/libports/recipes/api/qt5_webchannel/hash @@ -0,0 +1 @@ +2023-04-16 8958639186a59fbad82c5b80570666e9f3fb6188 diff --git a/repos/libports/recipes/api/qt5_webengine/content.mk b/repos/libports/recipes/api/qt5_webengine/content.mk index d5bb4ab0d7..a9d7e72ab5 100644 --- a/repos/libports/recipes/api/qt5_webengine/content.mk +++ b/repos/libports/recipes/api/qt5_webengine/content.mk @@ -1,7 +1,6 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5WebChannel \ - src/lib/qt5/genode/api/lib/symbols/libQt5WebEngine \ +MIRROR_SYMBOLS := src/lib/qt5/genode/api/lib/symbols/libQt5WebEngine \ src/lib/qt5/genode/api/lib/symbols/libQt5WebEngineCore \ src/lib/qt5/genode/api/lib/symbols/libQt5WebEngineWidgets \ diff --git a/repos/libports/recipes/src/libqgenodeviewwidget/used_apis b/repos/libports/recipes/src/libqgenodeviewwidget/used_apis index a5bf8105f0..c5ebe0939c 100644 --- a/repos/libports/recipes/src/libqgenodeviewwidget/used_apis +++ b/repos/libports/recipes/src/libqgenodeviewwidget/used_apis @@ -6,5 +6,5 @@ libc mesa os qoost -qt5 +qt5_base stdcxx diff --git a/repos/libports/recipes/src/libqpluginwidget/used_apis b/repos/libports/recipes/src/libqpluginwidget/used_apis index 530ba0bf05..db482ae3d8 100644 --- a/repos/libports/recipes/src/libqpluginwidget/used_apis +++ b/repos/libports/recipes/src/libqpluginwidget/used_apis @@ -8,7 +8,7 @@ loader_session mesa os qoost -qt5 +qt5_base stdcxx vfs zlib diff --git a/repos/libports/recipes/src/qt5_base/api b/repos/libports/recipes/src/qt5_base/api index 7d275211d0..85e7e52021 100644 --- a/repos/libports/recipes/src/qt5_base/api +++ b/repos/libports/recipes/src/qt5_base/api @@ -1 +1 @@ -qt5 +qt5_base diff --git a/repos/libports/recipes/src/qt5_calculatorform/used_apis b/repos/libports/recipes/src/qt5_calculatorform/used_apis index 3e0a7a5204..769561c97d 100644 --- a/repos/libports/recipes/src/qt5_calculatorform/used_apis +++ b/repos/libports/recipes/src/qt5_calculatorform/used_apis @@ -1,6 +1,6 @@ libc mesa -qt5 +qt5_base qt5_component so stdcxx diff --git a/repos/libports/recipes/src/qt5_declarative/api b/repos/libports/recipes/src/qt5_declarative/api index 7d275211d0..555d7739d0 100644 --- a/repos/libports/recipes/src/qt5_declarative/api +++ b/repos/libports/recipes/src/qt5_declarative/api @@ -1 +1 @@ -qt5 +qt5_declarative diff --git a/repos/libports/recipes/src/qt5_declarative/used_apis b/repos/libports/recipes/src/qt5_declarative/used_apis index 38a7553adb..e6694281f5 100644 --- a/repos/libports/recipes/src/qt5_declarative/used_apis +++ b/repos/libports/recipes/src/qt5_declarative/used_apis @@ -1,4 +1,5 @@ libc mesa +qt5_base so stdcxx diff --git a/repos/libports/recipes/src/qt5_graphicaleffects/api b/repos/libports/recipes/src/qt5_graphicaleffects/api deleted file mode 100644 index 7d275211d0..0000000000 --- a/repos/libports/recipes/src/qt5_graphicaleffects/api +++ /dev/null @@ -1 +0,0 @@ -qt5 diff --git a/repos/libports/recipes/src/qt5_graphicaleffects/used_apis b/repos/libports/recipes/src/qt5_graphicaleffects/used_apis index 1f26bfd851..f6074e1543 100644 --- a/repos/libports/recipes/src/qt5_graphicaleffects/used_apis +++ b/repos/libports/recipes/src/qt5_graphicaleffects/used_apis @@ -1,5 +1,6 @@ libc mesa +qt5_base +qt5_declarative so stdcxx -qt5_qml diff --git a/repos/libports/recipes/src/qt5_launchpad/used_apis b/repos/libports/recipes/src/qt5_launchpad/used_apis index a16813e3aa..b1ba247277 100644 --- a/repos/libports/recipes/src/qt5_launchpad/used_apis +++ b/repos/libports/recipes/src/qt5_launchpad/used_apis @@ -2,7 +2,7 @@ base libc mesa os -qt5 +qt5_base qt5_component stdcxx timer_session diff --git a/repos/libports/recipes/src/qt5_openglwindow/used_apis b/repos/libports/recipes/src/qt5_openglwindow/used_apis index bf0dd3e6b2..5b2246a2f6 100644 --- a/repos/libports/recipes/src/qt5_openglwindow/used_apis +++ b/repos/libports/recipes/src/qt5_openglwindow/used_apis @@ -1,5 +1,5 @@ libc mesa -qt5 +qt5_base qt5_component stdcxx diff --git a/repos/libports/recipes/src/qt5_quickcontrols/api b/repos/libports/recipes/src/qt5_quickcontrols/api deleted file mode 100644 index 7d275211d0..0000000000 --- a/repos/libports/recipes/src/qt5_quickcontrols/api +++ /dev/null @@ -1 +0,0 @@ -qt5 diff --git a/repos/libports/recipes/src/qt5_quickcontrols/used_apis b/repos/libports/recipes/src/qt5_quickcontrols/used_apis index 1f26bfd851..f6074e1543 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols/used_apis +++ b/repos/libports/recipes/src/qt5_quickcontrols/used_apis @@ -1,5 +1,6 @@ libc mesa +qt5_base +qt5_declarative so stdcxx -qt5_qml diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/api b/repos/libports/recipes/src/qt5_quickcontrols2/api index 7d275211d0..7cc64413a5 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols2/api +++ b/repos/libports/recipes/src/qt5_quickcontrols2/api @@ -1 +1 @@ -qt5 +qt5_quickcontrols2 diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/used_apis b/repos/libports/recipes/src/qt5_quickcontrols2/used_apis index 6a84445a48..ecf2b86da6 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols2/used_apis +++ b/repos/libports/recipes/src/qt5_quickcontrols2/used_apis @@ -1,5 +1,6 @@ base libc mesa +qt5_base +qt5_declarative stdcxx -qt5_qml diff --git a/repos/libports/recipes/src/qt5_samegame/used_apis b/repos/libports/recipes/src/qt5_samegame/used_apis index bf0dd3e6b2..6d4d50f303 100644 --- a/repos/libports/recipes/src/qt5_samegame/used_apis +++ b/repos/libports/recipes/src/qt5_samegame/used_apis @@ -1,5 +1,6 @@ libc mesa -qt5 +qt5_base qt5_component +qt5_declarative stdcxx diff --git a/repos/libports/recipes/src/qt5_svg/api b/repos/libports/recipes/src/qt5_svg/api index 7d275211d0..e68c170099 100644 --- a/repos/libports/recipes/src/qt5_svg/api +++ b/repos/libports/recipes/src/qt5_svg/api @@ -1 +1 @@ -qt5 +qt5_svg diff --git a/repos/libports/recipes/src/qt5_svg/used_apis b/repos/libports/recipes/src/qt5_svg/used_apis index 0e16c9b545..64a6feb1ac 100644 --- a/repos/libports/recipes/src/qt5_svg/used_apis +++ b/repos/libports/recipes/src/qt5_svg/used_apis @@ -1,4 +1,5 @@ base libc mesa +qt5_base stdcxx diff --git a/repos/libports/recipes/src/qt5_testqstring/used_apis b/repos/libports/recipes/src/qt5_testqstring/used_apis index bf0dd3e6b2..5b2246a2f6 100644 --- a/repos/libports/recipes/src/qt5_testqstring/used_apis +++ b/repos/libports/recipes/src/qt5_testqstring/used_apis @@ -1,5 +1,5 @@ libc mesa -qt5 +qt5_base qt5_component stdcxx diff --git a/repos/libports/recipes/src/qt5_tetrix/used_apis b/repos/libports/recipes/src/qt5_tetrix/used_apis index bf0dd3e6b2..5b2246a2f6 100644 --- a/repos/libports/recipes/src/qt5_tetrix/used_apis +++ b/repos/libports/recipes/src/qt5_tetrix/used_apis @@ -1,5 +1,5 @@ libc mesa -qt5 +qt5_base qt5_component stdcxx diff --git a/repos/libports/recipes/src/qt5_textedit/used_apis b/repos/libports/recipes/src/qt5_textedit/used_apis index bf0dd3e6b2..5b2246a2f6 100644 --- a/repos/libports/recipes/src/qt5_textedit/used_apis +++ b/repos/libports/recipes/src/qt5_textedit/used_apis @@ -1,5 +1,5 @@ libc mesa -qt5 +qt5_base qt5_component stdcxx diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/api b/repos/libports/recipes/src/qt5_virtualkeyboard/api index 7d275211d0..3c9b41400b 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard/api +++ b/repos/libports/recipes/src/qt5_virtualkeyboard/api @@ -1 +1 @@ -qt5 +qt5_virtualkeyboard diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis b/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis index 1f26bfd851..8ee6ab5297 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis +++ b/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis @@ -1,5 +1,7 @@ libc mesa +qt5_base +qt5_declarative +qt5_svg so stdcxx -qt5_qml diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis b/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis index 5c72bc856d..9dd0f1ed3c 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis +++ b/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis @@ -1,6 +1,7 @@ libc mesa qt5_component -qt5 -qt5_qml +qt5_base +qt5_declarative +qt5_virtualkeyboard stdcxx diff --git a/repos/libports/recipes/src/test-qpluginwidget/used_apis b/repos/libports/recipes/src/test-qpluginwidget/used_apis index 21338ebd64..c65a4e7504 100644 --- a/repos/libports/recipes/src/test-qpluginwidget/used_apis +++ b/repos/libports/recipes/src/test-qpluginwidget/used_apis @@ -9,8 +9,7 @@ mesa gui_session os qoost -qt5 +qt5_base qt5_component -qt5_qml stdcxx vfs diff --git a/repos/libports/recipes/src/test-qt_core/used_apis b/repos/libports/recipes/src/test-qt_core/used_apis index 7939ec008e..7bf64406d5 100644 --- a/repos/libports/recipes/src/test-qt_core/used_apis +++ b/repos/libports/recipes/src/test-qt_core/used_apis @@ -1,5 +1,5 @@ libc -qt5 +qt5_base qt5_component so stdcxx diff --git a/repos/libports/recipes/src/test-qt_core_cmake/used_apis b/repos/libports/recipes/src/test-qt_core_cmake/used_apis index 7939ec008e..7bf64406d5 100644 --- a/repos/libports/recipes/src/test-qt_core_cmake/used_apis +++ b/repos/libports/recipes/src/test-qt_core_cmake/used_apis @@ -1,5 +1,5 @@ libc -qt5 +qt5_base qt5_component so stdcxx diff --git a/repos/libports/recipes/src/test-qt_quick/used_apis b/repos/libports/recipes/src/test-qt_quick/used_apis index 99d2a3da10..6d4d50f303 100644 --- a/repos/libports/recipes/src/test-qt_quick/used_apis +++ b/repos/libports/recipes/src/test-qt_quick/used_apis @@ -1,6 +1,6 @@ libc mesa -qt5 +qt5_base qt5_component -qt5_qml +qt5_declarative stdcxx