diff options
| author | Dawid Wróbel <me@dawidwrobel.com> | 2021-09-28 06:51:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 20:51:35 -0700 |
| commit | 56f6ec6c111c4362c457e96c51d31f9711da5002 (patch) | |
| tree | 5e44eb44c16e891b518f1dbd357879aa852eef7b | |
| parent | 39b1392eedfe50ed9738acb58ee4486730e08941 (diff) | |
| download | vcpkg-56f6ec6c111c4362c457e96c51d31f9711da5002.tar.gz vcpkg-56f6ec6c111c4362c457e96c51d31f9711da5002.zip | |
[kf5xmlgui] fix loading resources when building statically (#20346)
* [kf5xmlgui] fix loading resources when built statically
* [kf5xmlgui] update versions
| -rw-r--r-- | ports/kf5xmlgui/fix_static_resources.diff | 26 | ||||
| -rw-r--r-- | ports/kf5xmlgui/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/kf5xmlgui/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/k-/kf5xmlgui.json | 5 |
5 files changed, 34 insertions, 1 deletions
diff --git a/ports/kf5xmlgui/fix_static_resources.diff b/ports/kf5xmlgui/fix_static_resources.diff new file mode 100644 index 000000000..ae8bcfaad --- /dev/null +++ b/ports/kf5xmlgui/fix_static_resources.diff @@ -0,0 +1,26 @@ +diff --git a/src/kxmlguiclient.cpp b/src/kxmlguiclient.cpp +index a830ad0fa6b962654a0d1ebb161761a3afafb479..b2c9d0d21dce5f5d9ae4941ae4a909dfa9531155 100644 +--- a/src/kxmlguiclient.cpp ++++ b/src/kxmlguiclient.cpp +@@ -70,6 +70,8 @@ KXMLGUIClient::KXMLGUIClient() + KXMLGUIClient::KXMLGUIClient(KXMLGUIClient *parent) + : d(new KXMLGUIClientPrivate) + { ++ Q_INIT_RESOURCE(kxmlgui); ++ + parent->insertChildClient(this); + } + +diff --git a/src/kxmlguifactory.cpp b/src/kxmlguifactory.cpp +index fc453cb2598dd36f8212cbccb3d4e777ffca4480..5c8dbda2b5700144e9aaf96f877615f874292640 100644 +--- a/src/kxmlguifactory.cpp ++++ b/src/kxmlguifactory.cpp +@@ -172,6 +172,8 @@ KXMLGUIFactory::KXMLGUIFactory(KXMLGUIBuilder *builder, QObject *parent) + : QObject(parent) + , d(new KXMLGUIFactoryPrivate) + { ++ Q_INIT_RESOURCE(kxmlgui); ++ + d->builder = builder; + d->guiClient = nullptr; + if (d->builder) { diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake index 57f519f11..707d93ea8 100644 --- a/ports/kf5xmlgui/portfile.cmake +++ b/ports/kf5xmlgui/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES remove_explicit_shared_argument.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/d12e8f6266188ce7e221dc014a56071b8a5ef706 add_support_for_static_builds.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/2f1b948ad690942d4ec208c5676c11218f29181a + fix_static_resources.diff # https://invent.kde.org/frameworks/kxmlgui/-/merge_requests/77 ) vcpkg_check_features( diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json index 3c57d2955..85ccdcae0 100644 --- a/ports/kf5xmlgui/vcpkg.json +++ b/ports/kf5xmlgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5xmlgui", "version": "5.84.0", + "port-version": 1, "description": "Framework for managing menu and toolbar actions", "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a27eb2f70..7a5fa610b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3086,7 +3086,7 @@ }, "kf5xmlgui": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kfr": { "baseline": "4.2.1", diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json index a8c819144..2d454fa83 100644 --- a/versions/k-/kf5xmlgui.json +++ b/versions/k-/kf5xmlgui.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4fa462d8e9f3592a9ded89bb25ea21de65932112", + "version": "5.84.0", + "port-version": 1 + }, + { "git-tree": "5cecdc03d8c8a9d399ef6aae83e26a9cd32d2f28", "version": "5.84.0", "port-version": 0 |