From 75f0e24bf8edd2d0ec1d43fa563fcbe9081c397b Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 19 Mar 2022 13:23:23 +0100 Subject: [PATCH] Remove local repo packages --- .../n/nodeeditor/patches/2.1.3/fix_qt.patch | 34 -------------- xmake-repo/packages/n/nodeeditor/xmake.lua | 44 ------------------- xmake.lua | 2 - 3 files changed, 80 deletions(-) delete mode 100644 xmake-repo/packages/n/nodeeditor/patches/2.1.3/fix_qt.patch delete mode 100644 xmake-repo/packages/n/nodeeditor/xmake.lua diff --git a/xmake-repo/packages/n/nodeeditor/patches/2.1.3/fix_qt.patch b/xmake-repo/packages/n/nodeeditor/patches/2.1.3/fix_qt.patch deleted file mode 100644 index ce1dd3560..000000000 --- a/xmake-repo/packages/n/nodeeditor/patches/2.1.3/fix_qt.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/include/nodes/internal/NodePainterDelegate.hpp b/include/nodes/internal/NodePainterDelegate.hpp -index d532619..f22496c 100644 ---- a/include/nodes/internal/NodePainterDelegate.hpp -+++ b/include/nodes/internal/NodePainterDelegate.hpp -@@ -1,6 +1,6 @@ - #pragma once - --#include -+#include - - #include "NodeGeometry.hpp" - #include "NodeDataModel.hpp" -diff --git a/include/nodes/internal/QStringStdHash.hpp b/include/nodes/internal/QStringStdHash.hpp -index 3d47a3f..cc5eb68 100644 ---- a/include/nodes/internal/QStringStdHash.hpp -+++ b/include/nodes/internal/QStringStdHash.hpp -@@ -1,5 +1,11 @@ - #pragma once - -+#include -+ -+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) -+ -+// As of 5.14 there is a specialization std::hash -+ - #include - - #include -@@ -17,3 +23,5 @@ struct hash - } - }; - } -+ -+#endif diff --git a/xmake-repo/packages/n/nodeeditor/xmake.lua b/xmake-repo/packages/n/nodeeditor/xmake.lua deleted file mode 100644 index 8b8bc2ae6..000000000 --- a/xmake-repo/packages/n/nodeeditor/xmake.lua +++ /dev/null @@ -1,44 +0,0 @@ -package("nodeeditor") - - set_homepage("https://github.com/paceholder/nodeeditor") - set_description("Qt Node Editor. Dataflow programming framework") - set_license("BSD-3") - - set_urls("https://github.com/paceholder/nodeeditor/archive/refs/tags/$(version).tar.gz", - "https://github.com/paceholder/nodeeditor.git") - add_versions("2.1.3", "4e3194a04ac4a2a2bf4bc8eb6cc27d5cc154923143c1ecf579ce7f0115a90585") - add_patches("2.1.3", path.join(os.scriptdir(), "patches", "2.1.3", "fix_qt.patch"), "11b6e765f8c8b0002f84ef0c3eb7dde23076b0564679760b7f4c8ba7c7e46887") - - add_deps("cmake") - - on_load(function (package) - package:add("deps", "qt5core", "qt5gui", "qt5widgets", {debug = package:is_debug()}) - - if package:config("shared") then - package:add("defines", "NODE_EDITOR_SHARED") - else - package:add("defines", "NODE_EDITOR_STATIC") - end - end) - - on_install("windows", "linux", "mingw", "macosx", function (package) - local qt = package:dep("qt5core"):fetch().qtdir - - local configs = {"-DBUILD_EXAMPLES=OFF", "-DBUILD_TESTING=OFF"} - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - if qt then - table.insert(configs, "-DQt5_DIR=" .. path.join(qt.libdir, "cmake", "Qt5")) - end - - import("package.tools.cmake").install(package, configs) - end) - - on_test(function (package) - assert(package:check_cxxsnippets({test = [[ - void test() { - QtNodes::FlowScene scene(std::make_shared()); - QtNodes::FlowView view(&scene); - } - ]]}, {configs = {languages = "c++14", cxflags = not package:is_plat("windows") and "-fPIC" or nil}, includes = {"nodes/FlowScene", "nodes/FlowView"}})) - end) diff --git a/xmake.lua b/xmake.lua index 11e9724c4..aea0c5f48 100644 --- a/xmake.lua +++ b/xmake.lua @@ -127,8 +127,6 @@ option_end() set_project("NazaraEngine") set_xmakever("2.6.3") -add_repositories("local-repo xmake-repo") - add_requires("chipmunk2d", "dr_wav", "efsw", "entt >=3.9", "kiwisolver", "libflac", "libsdl", "minimp3", "stb") add_requires("freetype", { configs = { bzip2 = true, png = true, woff2 = true, zlib = true, debug = is_mode("debug") } }) add_requires("libvorbis", { configs = { with_vorbisenc = false } })