diff --git a/libcron/Makefile b/libcron/Makefile index f763ade9b..686665204 100644 --- a/libcron/Makefile +++ b/libcron/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/PerMalmberg/libcron.git -PKG_SOURCE_DATE:=2022-08-27 -PKG_SOURCE_VERSION:=0dd9df49d7833a2d2119e4a6ff8282df58b12d5d -PKG_MIRROR_HASH:=bbcced5cd27f4e940bdb0d92b7014e31f8e00ca7928d0f642859669223448501 +PKG_SOURCE_DATE:=2023-11-14 +PKG_SOURCE_VERSION:=41f238ceb09d4179e7346d78584a0c978e5d0059 +PKG_MIRROR_HASH:=c7b0651566153b1d641e3b5ece50474c8556d42345779f19a5f22814a8183c38 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua index e52338ca5..144011898 100644 --- a/luci-app-passwall/luasrc/controller/passwall.lua +++ b/luci-app-passwall/luasrc/controller/passwall.lua @@ -21,10 +21,12 @@ function index() entry({"admin", "services", appname, "reset_config"}, call("reset_config")).leaf = true entry({"admin", "services", appname, "show"}, call("show_menu")).leaf = true entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true - if uci:get(appname, "@global[0]", "hide_from_luci") == "1" then - return + local e + if uci:get(appname, "@global[0]", "hide_from_luci") ~= "1" then + e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1) + else + e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), nil, -1) end - e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1) e.dependent = true e.acl_depends = { "luci-app-passwall" } --[[ Client ]] diff --git a/quickjspp/Makefile b/quickjspp/Makefile index 4dc7597d4..4f5e06310 100644 --- a/quickjspp/Makefile +++ b/quickjspp/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ftk/quickjspp.git -PKG_SOURCE_DATE:=2022-07-22 -PKG_SOURCE_VERSION:=9cee4b4d27271d54b95f6f42bfdc534ebeaaeb72 -PKG_MIRROR_HASH:=20aebb85c5d222851b9a0b23959b9f0e0ba2a7e174312d3d13b6820a794529ab +PKG_SOURCE_DATE:=2023-12-21 +PKG_SOURCE_VERSION:=0c00c48895919fc02da3f191a2da06addeb07f09 +PKG_MIRROR_HASH:=2adf33c7942c4d926e70045e3d6896c9ca95769743470186936bcf33a26d2798 PKG_MAINTAINER:=Tianling Shen diff --git a/rapidjson/Makefile b/rapidjson/Makefile index ffe2ab12d..30e7bcfca 100644 --- a/rapidjson/Makefile +++ b/rapidjson/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Tencent/rapidjson.git -PKG_SOURCE_DATE:=2023-08-07 -PKG_SOURCE_VERSION:=949c771b03de448bdedea80c44a4a5f65284bfeb -PKG_MIRROR_HASH:=c954ce410cf1f034b1ab7bd1213f84e19f52a9ed2f68c2eb07fdf497ea673a2d +PKG_SOURCE_DATE:=2024-04-09 +PKG_SOURCE_VERSION:=ab1842a2dae061284c0a62dca1cc6d5e7e37e346 +PKG_MIRROR_HASH:=cc9271895f8015d9e4ad3de70e16d436a6dc8693be5541d70504da31c27b7f69 PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE @@ -23,11 +23,6 @@ CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS+= \ - -DRAPIDJSON_BUILD_DOC=OFF \ - -DRAPIDJSON_BUILD_EXAMPLES=OFF \ - -DRAPIDJSON_BUILD_TESTS=OFF - define Package/rapidjson SECTION:=lib CATEGORY:=Libraries @@ -40,4 +35,9 @@ define Package/rapidjson/description A fast JSON parser/generator for C++ with both SAX/DOM style API endef +CMAKE_OPTIONS+= \ + -DRAPIDJSON_BUILD_DOC=OFF \ + -DRAPIDJSON_BUILD_EXAMPLES=OFF \ + -DRAPIDJSON_BUILD_TESTS=OFF + $(eval $(call BuildPackage,rapidjson)) diff --git a/subconverter/Makefile b/subconverter/Makefile index 8697ce416..b41caf8fe 100644 --- a/subconverter/Makefile +++ b/subconverter/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git -PKG_SOURCE_DATE:=2023-10-16 -PKG_SOURCE_VERSION:=80c2a968d1891d9234e2ce13918ca248fc873355 -PKG_MIRROR_HASH:=111f6edd155390464c8526d5609d41f84fc365739757b9a634bb9d931bfbb97c -PKG_VERSION:=0.8.1-$(call version_abbrev,$(PKG_SOURCE_VERSION)) +PKG_SOURCE_DATE:=2024-04-18 +PKG_SOURCE_VERSION:=69749107340f4b0e46e0f30525c7142f70f50e55 +PKG_MIRROR_HASH:=0d117cd24e1c235399b2514588f39fb2566e6feae30c42ad6cac12dee4bdbc2f +PKG_VERSION:=0.9.0~$(call version_abbrev,$(PKG_SOURCE_VERSION)) PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=LICENSE diff --git a/toml11/Makefile b/toml11/Makefile index 50b6b8460..e1d95bafa 100644 --- a/toml11/Makefile +++ b/toml11/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=toml11 -PKG_VERSION:=3.7.1 +PKG_VERSION:=3.8.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ToruNiina/toml11/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=afeaa9aa0416d4b6b2cd3897ca55d9317084103077b32a852247d8efd4cf6068 +PKG_HASH:=6a3d20080ecca5ea42102c078d3415bef80920f6c4ea2258e87572876af77849 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -34,4 +34,6 @@ define Package/toml11/description depending only on C++ standard library. endef +CMAKE_OPTIONS+= -DCMAKE_CXX_STANDARD=11 + $(eval $(call BuildPackage,toml11))