Skip to content

Commit

Permalink
qt6: split port into modules
Browse files Browse the repository at this point in the history
Fixes #5402
  • Loading branch information
cproc authored and chelmuth committed Dec 11, 2024
1 parent d3002b2 commit dd64164
Show file tree
Hide file tree
Showing 39 changed files with 174 additions and 68 deletions.
8 changes: 3 additions & 5 deletions repos/libports/lib/import/import-qt6.inc
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ $(error Error: unsupported platform)
endif

ifeq ($(CONTRIB_DIR),)
QT_DIR = $(call select_from_repositories,src/lib/qt6)
QT_API_DIR = $(call select_from_repositories,mkspecs)/..
QT_API_DIR = $(abspath $(call select_from_repositories,lib/import/import-qt6.inc)/../../..)
abi_symbol_path = $(wildcard $(call select_from_repositories,lib/symbols/$1))
else
QT_PORT_DIR := $(call select_from_ports,qt6)
QT_DIR = $(QT_PORT_DIR)/src/lib/qt6
QT_API_DIR = $(QT_DIR)/genode/api
QT_API_PORT_DIR := $(call select_from_ports,qt6_api)
QT_API_DIR = $(QT_API_PORT_DIR)/src/lib/qt6_api
abi_symbol_path = $(wildcard $(addprefix $(QT_API_DIR)/lib/symbols/,$1))
endif

Expand Down
1 change: 0 additions & 1 deletion repos/libports/ports/qt6.hash

This file was deleted.

8 changes: 0 additions & 8 deletions repos/libports/ports/qt6.port

This file was deleted.

1 change: 1 addition & 0 deletions repos/libports/ports/qt6_api.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1114bb5e6cdf5a3dcb071e067d8ef16b05b3e28
8 changes: 8 additions & 0 deletions repos/libports/ports/qt6_api.port
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2

DOWNLOADS := qt6_api.git

URL(qt6_api) := https://github.com/cproc/qt6_api.git
REV(qt6_api) := issue5402
DIR(qt6_api) := src/lib/qt6_api
1 change: 1 addition & 0 deletions repos/libports/ports/qt6_base.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c646a46cfe1589a347d520bbbabbbd09d02d2fc2
8 changes: 8 additions & 0 deletions repos/libports/ports/qt6_base.port
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2

DOWNLOADS := qt6_base.git

URL(qt6_base) := https://github.com/cproc/qt6_base.git
REV(qt6_base) := issue5402
DIR(qt6_base) := src/lib/qt6_base
1 change: 1 addition & 0 deletions repos/libports/ports/qt6_declarative.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2bcee8ddd2456a084c91e32d01387fa7392d3997
8 changes: 8 additions & 0 deletions repos/libports/ports/qt6_declarative.port
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2

DOWNLOADS := qt6_declarative.git

URL(qt6_declarative) := https://github.com/cproc/qt6_declarative.git
REV(qt6_declarative) := issue5402
DIR(qt6_declarative) := src/lib/qt6_declarative
1 change: 1 addition & 0 deletions repos/libports/ports/qt6_shadertools.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec9f67054cfafae32e1e811a738f9a0ae2f333d1
8 changes: 8 additions & 0 deletions repos/libports/ports/qt6_shadertools.port
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2

DOWNLOADS := qt6_shadertools.archive

URL(qt6_shadertools) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz
SHA(qt6_shadertools) := 628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f
DIR(qt6_shadertools) := src/lib/qt6_shadertools
1 change: 1 addition & 0 deletions repos/libports/ports/qt6_svg.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30ec422bd2a6d26bd70a4e9d609a53e0cd45392d
8 changes: 8 additions & 0 deletions repos/libports/ports/qt6_svg.port
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2

DOWNLOADS := qt6_svg.archive

URL(qt6_svg) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz
SHA(qt6_svg) := 5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181
DIR(qt6_svg) := src/lib/qt6_svg
1 change: 1 addition & 0 deletions repos/libports/ports/qt6_tools.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
178b2eaa49d51ac12313e755a2cb51957256cbfb
8 changes: 8 additions & 0 deletions repos/libports/ports/qt6_tools.port
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LICENSE := LGPL
VERSION := 6.6.2

DOWNLOADS := qt6_tools.archive

URL(qt6_tools) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz
SHA(qt6_tools) := e6d49e9f52111287f77878ecb8b708cce682f10b03ba2476d9247603bc6c4746
DIR(qt6_tools) := src/lib/qt6_tools
6 changes: 3 additions & 3 deletions repos/libports/recipes/api/qt6_base/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
API_DIR := $(PORT_DIR)/src/lib/qt6/genode/api
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
API_DIR := $(PORT_DIR)/src/lib/qt6_api

MIRROR_FROM_PORT_DIR := include \
metatypes \
Expand Down Expand Up @@ -45,4 +45,4 @@ $(MIRROR_SYMBOLS):
content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/api/qt6_declarative/content.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)

MIRROR_LIB_SYMBOLS := libQt6LabsAnimation \
libQt6LabsFolderListModel \
Expand Down Expand Up @@ -31,9 +31,9 @@ content: $(MIRROR_LIB_SYMBOLS)

$(MIRROR_LIB_SYMBOLS):
mkdir -p lib/symbols
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/

content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/api/qt6_shadertools/content.mk
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)

MIRROR_LIB_SYMBOLS := libQt6ShaderTools

content: $(MIRROR_LIB_SYMBOLS)

$(MIRROR_LIB_SYMBOLS):
mkdir -p lib/symbols
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/

content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/api/qt6_svg/content.mk
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)

MIRROR_LIB_SYMBOLS := libQt6Svg

content: $(MIRROR_LIB_SYMBOLS)

$(MIRROR_LIB_SYMBOLS):
mkdir -p lib/symbols
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/

content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/raw/qt6_dejavusans/content.mk
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
content: qt6_dejavusans.tar LICENSE

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)

qt/lib/fonts/DejaVuSans.ttf:
mkdir -p $(dir $@)
cp $(PORT_DIR)/src/lib/qt6/qtbase/src/3rdparty/wasm/$(notdir $@) $@
cp $(PORT_DIR)/src/lib/qt6_base/src/3rdparty/wasm/$(notdir $@) $@

qt6_dejavusans.tar: qt/lib/fonts/DejaVuSans.ttf
tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt
rm -rf qt

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/qtbase/src/3rdparty/wasm/DEJAVU-LICENSE $@
cp $(PORT_DIR)/src/lib/qt6_base/src/3rdparty/wasm/DEJAVU-LICENSE $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/raw/qt6_samegame/content.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
content: qt6_samegame.tar

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_declarative)

SAMEGAME3_RESOURCES := samegame.qml \
Dialog.qml \
Expand All @@ -20,10 +20,10 @@ samegame/pics:
mkdir -p $@

$(addprefix samegame/, $(SAMEGAME3_RESOURCES)): samegame
cp $(PORT_DIR)/src/lib/qt6/qtdeclarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@
cp $(PORT_DIR)/src/lib/qt6_declarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@

$(addprefix samegame/pics/, $(SAMEGAME_RESOURCES)): samegame/pics
cp $(PORT_DIR)/src/lib/qt6/qtdeclarative/examples/quick/tutorials/samegame/samegame3/pics/$(notdir $@) $@
cp $(PORT_DIR)/src/lib/qt6_declarative/examples/quick/tutorials/samegame/samegame3/pics/$(notdir $@) $@


qt6_samegame.tar: $(addprefix samegame/, $(SAMEGAME3_RESOURCES)) \
Expand Down
6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_base/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase
MIRROR_FROM_PORT_DIR := src/lib/qt6_base

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -26,4 +26,4 @@ $(MIRROR_FROM_OS):
content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/LGPL-3.0-only.txt $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_calculatorform/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_tools)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qttools/examples/designer/calculatorform
MIRROR_FROM_PORT_DIR := src/lib/qt6_tools/examples/designer/calculatorform

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_tools/LICENSES/GPL-3.0-only.txt $@

6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_declarative/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_declarative)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtdeclarative
MIRROR_FROM_PORT_DIR := src/lib/qt6_declarative

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_declarative/LICENSES/LGPL-3.0-only.txt $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_openglwindow/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/examples/opengl/openglwindow
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/examples/opengl/openglwindow

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_shadertools/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_shadertools)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtshadertools
MIRROR_FROM_PORT_DIR := src/lib/qt6_shadertools

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_shadertools/LICENSES/LGPL-3.0-only.txt $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_svg/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_svg)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtsvg
MIRROR_FROM_PORT_DIR := src/lib/qt6_svg

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
content: LICENSE

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
cp $(PORT_DIR)/src/lib/qt6_svg/LICENSES/LGPL-3.0-only.txt $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_testqstring/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/examples/qtestlib/tutorial1
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/examples/qtestlib/tutorial1

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_tetrix/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/tests/manual/examples/widgets/widgets/tetrix
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/tests/manual/examples/widgets/widgets/tetrix

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -16,4 +16,4 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@
6 changes: 3 additions & 3 deletions repos/libports/recipes/src/qt6_textedit/content.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)

MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/tests/manual/examples/widgets/richtext/textedit
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/tests/manual/examples/widgets/richtext/textedit

content: $(MIRROR_FROM_PORT_DIR)

Expand All @@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
cp -r $(PORT_DIR)/$@ $(dir $@)

LICENSE:
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

9 changes: 8 additions & 1 deletion repos/libports/src/app/qt6/examples/calculatorform/target.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qttools/examples/designer/calculatorform/calculatorform.pro
ifeq ($(CONTRIB_DIR),)
QT6_TOOLS_DIR = $(call select_from_repositories,src/lib/qt6_tools)
else
QT6_TOOLS_PORT_DIR := $(call select_from_ports,qt6_tools)
QT6_TOOLS_DIR = $(QT6_TOOLS_PORT_DIR)/src/lib/qt6_tools
endif

QMAKE_PROJECT_FILE = $(QT6_TOOLS_DIR)/examples/designer/calculatorform/calculatorform.pro

QMAKE_TARGET_BINARIES = calculatorform

Expand Down
9 changes: 8 additions & 1 deletion repos/libports/src/app/qt6/examples/openglwindow/target.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/opengl/openglwindow/openglwindow.pro
ifeq ($(CONTRIB_DIR),)
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
else
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
endif

QMAKE_PROJECT_FILE = $(QT6_BASE_DIR)/examples/opengl/openglwindow/openglwindow.pro

QMAKE_TARGET_BINARIES = openglwindow

Expand Down
Loading

0 comments on commit dd64164

Please sign in to comment.