diff options
Diffstat (limited to 'www/domoticz')
| -rw-r--r-- | www/domoticz/Makefile | 11 | ||||
| -rw-r--r-- | www/domoticz/distinfo | 6 | ||||
| -rw-r--r-- | www/domoticz/files/patch-CMakeLists.txt | 54 | ||||
| -rw-r--r-- | www/domoticz/pkg-plist | 57 |
4 files changed, 90 insertions, 38 deletions
diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile index 769b4d500821..1fad797919ad 100644 --- a/www/domoticz/Makefile +++ b/www/domoticz/Makefile @@ -1,5 +1,5 @@ PORTNAME= domoticz -DISTVERSION= 2024.7 +DISTVERSION= 2025.2 CATEGORIES= www MAINTAINER= kiwi@FreeBSD.org @@ -9,10 +9,10 @@ WWW= https://www.domoticz.com LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/License.txt -BROKEN= fails to build with Boost>=1.87 +BUILD_DEPENDS= ${LOCALBASE}/include/jwt-cpp/jwt.h:devel/jwt-cpp LIB_DEPENDS= libcurl.so:ftp/curl \ - libboost_system.so:devel/boost-libs \ + libboost_thread.so:devel/boost-libs \ libjsoncpp.so:devel/jsoncpp \ libmosquitto.so:net/mosquitto @@ -28,7 +28,8 @@ CMAKE_OFF+= GIT_SUBMODULE \ USE_BUILTIN_MINIZIP \ USE_BUILTIN_JSONCPP \ USE_BUILTIN_MQTT \ - USE_STATIC_OPENZWAVE + USE_STATIC_OPENZWAVE \ + USE_BUILTIN_JWTCPP CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz @@ -49,7 +50,7 @@ PYTHON_DESC= Enable Python for Plugins and Event-Scripts PRECOMP_CMAKE_BOOL= USE_PRECOMPILED_HEADER -PYTHON_USES= python:3.9+ +PYTHON_USES= python PYTHON_CMAKE_BOOL= USE_PYTHON post-install: diff --git a/www/domoticz/distinfo b/www/domoticz/distinfo index 9df59baa0be1..a6ef79518ca2 100644 --- a/www/domoticz/distinfo +++ b/www/domoticz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735584809 -SHA256 (domoticz-domoticz-2024.7_GH0.tar.gz) = 6ceabbfe36ada4b7c2ebb42c523d723c87e6444b87db6bbb1703d92f38ee754d -SIZE (domoticz-domoticz-2024.7_GH0.tar.gz) = 13258596 +TIMESTAMP = 1761213053 +SHA256 (domoticz-domoticz-2025.2_GH0.tar.gz) = fd016f4ffe419e8d559bc0a7f9de5ec4fcaf485fc9d1464c8e8221102b13f589 +SIZE (domoticz-domoticz-2025.2_GH0.tar.gz) = 13418498 diff --git a/www/domoticz/files/patch-CMakeLists.txt b/www/domoticz/files/patch-CMakeLists.txt index 7585d271c86d..09961f6df8c5 100644 --- a/www/domoticz/files/patch-CMakeLists.txt +++ b/www/domoticz/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-05-23 11:37:06.693431000 +0200 -+++ CMakeLists.txt 2023-05-23 11:37:14.422198000 +0200 -@@ -395,11 +395,9 @@ +--- CMakeLists.txt.orig 2025-10-13 11:42:57.000000000 +0200 ++++ CMakeLists.txt 2025-10-23 12:10:14.143268000 +0200 +@@ -417,7 +417,6 @@ # Target set( @@ -8,11 +8,7 @@ main/stdafx.cpp main/Helper.cpp main/CmdLine.cpp --main/domoticz_tester.cpp - main/BaroForecastCalculator.cpp - main/HTMLSanitizer.cpp - main/localtime_r.cpp -@@ -412,9 +410,6 @@ +@@ -434,9 +433,6 @@ #main/IFTTT.cpp @@ -22,7 +18,7 @@ # # LUA # -@@ -513,7 +508,6 @@ +@@ -535,7 +531,6 @@ # explicitly say that the executable depends on the revisiontag add_dependencies(domoticz revisiontag) @@ -30,7 +26,7 @@ TEST_BIG_ENDIAN(BIGENDIAN) IF(${BIGENDIAN}) -@@ -533,7 +527,6 @@ +@@ -555,7 +550,6 @@ set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE BOOL "Enable jsoncpp pkgconfig support" FORCE) add_subdirectory (extern/jsoncpp EXCLUDE_FROM_ALL) target_link_libraries(domoticz jsoncpp_static) @@ -38,7 +34,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/jsoncpp/include) ELSE(USE_BUILTIN_JSONCPP) find_package(PkgConfig) -@@ -543,9 +536,6 @@ +@@ -565,9 +559,6 @@ target_include_directories(domoticz PRIVATE ${JSONCPP_INCLUDE_DIRS}) target_link_directories(domoticz PRIVATE ${JSONCPP_LIBRARY_DIRS}) target_link_libraries(domoticz ${JSONCPP_LIBRARIES}) @@ -48,7 +44,7 @@ ELSE(JSONCPP_FOUND) MESSAGE(FATAL_ERROR "JSONCPP not found on your system! try 'sudo apt-get install jsoncpp-dev'") ENDIF(JSONCPP_FOUND) -@@ -558,7 +548,6 @@ +@@ -580,7 +571,6 @@ option(DOCUMENTATION "Build documentation?" OFF) add_subdirectory (extern/mosquitto EXCLUDE_FROM_ALL) target_link_libraries(domoticz libmosquitto_static) @@ -56,7 +52,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/mosquitto/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/mosquitto/lib) ELSE(USE_BUILTIN_MQTT) -@@ -577,7 +566,6 @@ +@@ -599,7 +589,6 @@ MESSAGE(STATUS "Using builtin SQLite library") add_subdirectory (extern/sqlite-amalgamation EXCLUDE_FROM_ALL) target_link_libraries(domoticz SQLite3) @@ -64,7 +60,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/sqlite-amalgamation) ELSE(USE_BUILTIN_SQLITE) find_package(SQLite3) -@@ -586,7 +574,6 @@ +@@ -608,7 +597,6 @@ MESSAGE(STATUS "SQLite includes found at: ${SQLite3_INCLUDE_DIRS}") INCLUDE_DIRECTORIES(${SQLite3_INCLUDE_DIRS}) target_link_libraries(domoticz ${SQLite3_LIBRARIES}) @@ -72,7 +68,7 @@ ELSE(SQLite3_FOUND) MESSAGE(FATAL_ERROR "SQLite3 not found on your system! try 'sudo apt-get install libsqlite3-dev'") ENDIF(SQLite3_FOUND) -@@ -596,7 +583,6 @@ +@@ -618,7 +606,6 @@ IF(USE_BUILTIN_MINIZIP) add_subdirectory (extern/minizip EXCLUDE_FROM_ALL) target_link_libraries(domoticz minizip) @@ -80,7 +76,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/minizip) ELSE(USE_BUILTIN_MINIZIP) find_package(PkgConfig) -@@ -606,9 +592,6 @@ +@@ -628,9 +615,6 @@ target_include_directories(domoticz PRIVATE ${MINIZIP_INCLUDE_DIRS}) target_link_directories(domoticz PRIVATE ${MINIZIP_LIBRARY_DIRS}) target_link_libraries(domoticz ${MINIZIP_LIBRARIES}) @@ -90,7 +86,7 @@ ELSE(MINIZIP_FOUND) MESSAGE(FATAL_ERROR "MINIZIP not found on your system! try 'sudo apt-get install minizip-dev'") ENDIF(MINIZIP_FOUND) -@@ -630,7 +613,6 @@ +@@ -658,7 +642,6 @@ find_library(MD_LIBRARY NAMES md) IF(MD_LIBRARY) target_link_libraries(domoticz ${MD_LIBRARY}) @@ -98,7 +94,7 @@ ENDIF(MD_LIBRARY) ELSE() message(STATUS "OPENSSL library found at: ${OPENSSL_LIBRARIES}") -@@ -638,7 +620,6 @@ +@@ -666,7 +649,6 @@ add_definitions(-DWITH_TLS) include_directories(${OPENSSL_INCLUDE_DIR}) target_link_libraries(domoticz ${OPENSSL_LIBRARIES}) @@ -106,20 +102,20 @@ ENDIF() # -@@ -779,7 +760,6 @@ - ENDIF(TELLDUSCORE_INCLUDE) +@@ -804,7 +786,6 @@ + endif() - target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES}) --target_link_libraries(domoticztester ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES}) + target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${RESOLV_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES}) +-target_link_libraries(domoticztester ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${RESOLV_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES}) - IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - target_link_libraries(domoticz -lresolv) -@@ -789,13 +769,11 @@ + IF(EXECINFO_LIBRARIES) target_link_libraries(domoticz ${EXECINFO_LIBRARIES}) - ELSE() - target_link_libraries(domoticz -lrt -lresolv ${EXECINFO_LIBRARIES}) -- target_link_libraries(domoticztester -lrt -lresolv ${EXECINFO_LIBRARIES}) - ENDIF() +@@ -813,13 +794,11 @@ + find_library(LIBRT rt) + if(LIBRT) + target_link_libraries(domoticz -lrt) +- target_link_libraries(domoticztester -lrt) + endif() IF(USE_PRECOMPILED_HEADER) message(STATUS "Using precompiled headers") diff --git a/www/domoticz/pkg-plist b/www/domoticz/pkg-plist index c21a1e3986e8..6abd562fad81 100644 --- a/www/domoticz/pkg-plist +++ b/www/domoticz/pkg-plist @@ -276,7 +276,6 @@ domoticz/scripts/templates/UserVariable.dzVents domoticz/scripts/templates/global_data.dzVents domoticz/scripts/update_domoticz domoticz/server_cert.pem -domoticz/updatedomo domoticz/www/app/AboutController.js domoticz/www/app/ApplicationsController.js domoticz/www/app/CamController.js @@ -347,6 +346,8 @@ domoticz/www/app/hardware/extra/DaikinParams.html domoticz/www/app/hardware/extra/DaikinParams.js domoticz/www/app/hardware/extra/MQTTParams.html domoticz/www/app/hardware/extra/MQTTParams.js +domoticz/www/app/hardware/extra/TadoParams.html +domoticz/www/app/hardware/extra/TadoParams.js domoticz/www/app/hardware/setup/BleBox.html domoticz/www/app/hardware/setup/BleBox.js domoticz/www/app/hardware/setup/EnOceanESP3.html @@ -408,9 +409,11 @@ domoticz/www/app/log/chart-hour.html domoticz/www/app/log/chart-month.html domoticz/www/app/log/chart-week.html domoticz/www/app/log/chart-year.html +domoticz/www/app/log/components/CounterStatChart.js domoticz/www/app/log/components/DeviceLevelChart.js domoticz/www/app/log/components/DeviceOnOffChart.js domoticz/www/app/log/components/DeviceTextLogTable.js +domoticz/www/app/log/components/chart-counter-stat.html domoticz/www/app/log/factories.js domoticz/www/app/main.js domoticz/www/app/notifications/DeviceNotifications.js @@ -560,6 +563,9 @@ domoticz/www/i18n/domoticz-zh_TW.json.gz domoticz/www/images/AC.png domoticz/www/images/AC48_Off.png domoticz/www/images/AC48_On.png +domoticz/www/images/AirMeasure.png +domoticz/www/images/AirMeasure48_Off.png +domoticz/www/images/AirMeasure48_On.png domoticz/www/images/Alarm.png domoticz/www/images/Alarm48_Off.png domoticz/www/images/Alarm48_On.png @@ -572,9 +578,15 @@ domoticz/www/images/Alert48_4.png domoticz/www/images/Amplifier.png domoticz/www/images/Amplifier48_Off.png domoticz/www/images/Amplifier48_On.png +domoticz/www/images/Charger.png +domoticz/www/images/Charger48_Off.png +domoticz/www/images/Charger48_On.png domoticz/www/images/ChristmasTree.png domoticz/www/images/ChristmasTree48_Off.png domoticz/www/images/ChristmasTree48_On.png +domoticz/www/images/Coffee.png +domoticz/www/images/Coffee48_Off.png +domoticz/www/images/Coffee48_On.png domoticz/www/images/Coltemp48.png domoticz/www/images/Coltemp48_Sel.png domoticz/www/images/Computer.png @@ -608,6 +620,9 @@ domoticz/www/images/Fan48_On.png domoticz/www/images/Fireplace.png domoticz/www/images/Fireplace48_Off.png domoticz/www/images/Fireplace48_On.png +domoticz/www/images/GLight.png +domoticz/www/images/GLight48_Off.png +domoticz/www/images/GLight48_On.png domoticz/www/images/Gas48.png domoticz/www/images/Generic.png domoticz/www/images/Generic48_Off.png @@ -618,9 +633,17 @@ domoticz/www/images/Harddisk48_On.png domoticz/www/images/Heating.png domoticz/www/images/Heating48_Off.png domoticz/www/images/Heating48_On.png +domoticz/www/images/Humidity48_Off.png +domoticz/www/images/Humidity48_On.png +domoticz/www/images/Inverter.png +domoticz/www/images/Inverter48_Off.png +domoticz/www/images/Inverter48_On.png domoticz/www/images/Irrigation.png domoticz/www/images/Irrigation48_Off.png domoticz/www/images/Irrigation48_On.png +domoticz/www/images/Laadpaal.png +domoticz/www/images/Laadpaal48_Off.png +domoticz/www/images/Laadpaal48_On.png domoticz/www/images/Light48_Off.png domoticz/www/images/Light48_On.png domoticz/www/images/LogitechMediaServer.png @@ -637,6 +660,9 @@ domoticz/www/images/Phone48_On.png domoticz/www/images/Printer.png domoticz/www/images/Printer48_Off.png domoticz/www/images/Printer48_On.png +domoticz/www/images/Pump.png +domoticz/www/images/Pump48_Off.png +domoticz/www/images/Pump48_On.png domoticz/www/images/Push48_Off.png domoticz/www/images/Push48_On.png domoticz/www/images/RGB.png @@ -644,23 +670,41 @@ domoticz/www/images/RGB48.png domoticz/www/images/RGB48_Off.png domoticz/www/images/RGB48_On.png domoticz/www/images/RGB48_Sel.png +domoticz/www/images/Radiator.png +domoticz/www/images/Radiator48_Off.png +domoticz/www/images/Radiator48_On.png domoticz/www/images/Rain48_Off.png domoticz/www/images/Rain48_On.png +domoticz/www/images/Soil.png +domoticz/www/images/Soil48_Off.png +domoticz/www/images/Soil48_On.png +domoticz/www/images/Solar.png +domoticz/www/images/Solar48_Off.png +domoticz/www/images/Solar48_On.png domoticz/www/images/Speaker.png domoticz/www/images/Speaker48_Off.png domoticz/www/images/Speaker48_On.png domoticz/www/images/Stop48.png +domoticz/www/images/Strip.png +domoticz/www/images/Strip48_Off.png +domoticz/www/images/Strip48_On.png domoticz/www/images/Sun.png domoticz/www/images/Sun48_Off.png domoticz/www/images/Sun48_On.png domoticz/www/images/TV.png domoticz/www/images/TV48_Off.png domoticz/www/images/TV48_On.png +domoticz/www/images/Tap.png +domoticz/www/images/Tap48_Off.png +domoticz/www/images/Tap48_On.png domoticz/www/images/Up48.png domoticz/www/images/Up48_2.png domoticz/www/images/WallSocket.png domoticz/www/images/WallSocket48_Off.png domoticz/www/images/WallSocket48_On.png +domoticz/www/images/WashingMachine.png +domoticz/www/images/WashingMachine48_Off.png +domoticz/www/images/WashingMachine48_On.png domoticz/www/images/Water.png domoticz/www/images/Water48_Off.png domoticz/www/images/Water48_On.png @@ -683,6 +727,9 @@ domoticz/www/images/WindSW.png domoticz/www/images/WindW.png domoticz/www/images/WindWNW.png domoticz/www/images/WindWSW.png +domoticz/www/images/Window.png +domoticz/www/images/Window48_Off.png +domoticz/www/images/Window48_On.png domoticz/www/images/about.png domoticz/www/images/add.png domoticz/www/images/adjust48.png @@ -714,6 +761,7 @@ domoticz/www/images/camera_default.png domoticz/www/images/capture.png domoticz/www/images/clock.png domoticz/www/images/clock48.png +domoticz/www/images/clock48_Off.png domoticz/www/images/clock48_On.png domoticz/www/images/collection.png domoticz/www/images/collection_hover.png @@ -838,6 +886,9 @@ domoticz/www/images/overrule.png domoticz/www/images/overrule_mini.png domoticz/www/images/pdf.png domoticz/www/images/pdf_hover.png +domoticz/www/images/pool.png +domoticz/www/images/pool48_Off.png +domoticz/www/images/pool48_On.png domoticz/www/images/print.png domoticz/www/images/print_hover.png domoticz/www/images/program.png @@ -909,6 +960,9 @@ domoticz/www/images/uv48.png domoticz/www/images/uvdark.png domoticz/www/images/uvsunny.png domoticz/www/images/variables.png +domoticz/www/images/victron.png +domoticz/www/images/victron48_Off.png +domoticz/www/images/victron48_On.png domoticz/www/images/visibility.png domoticz/www/images/visibility48.png domoticz/www/images/webcam.png @@ -1017,6 +1071,7 @@ domoticz/www/js/highcharts/modules/exporting.js.gz domoticz/www/js/highcharts/modules/no-data-to-display.js.gz domoticz/www/js/highcharts/modules/sankey.js.gz domoticz/www/js/highcharts/modules/xrange.js.gz +domoticz/www/js/highcharts/themes/brand-dark.js.gz domoticz/www/js/highcharts/themes/dark-unica.js.gz domoticz/www/js/html5shiv.js.gz domoticz/www/js/i18next-1.8.0.min.js.gz |