Update copyright

brndnmtthws · Feb 22, 2024 · 35357e4 · 35357e4
1 parent ac9d107
commit 35357e4
Show file tree

Hide file tree

Showing 147 changed files with 271 additions and 257 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights
+# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights
 # reserved.
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -47,6 +47,7 @@ set(conky_sources ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/build.h)
 add_subdirectory(lua)
 add_subdirectory(data)
 add_subdirectory(doc)
+
 if(BUILD_EXTRAS)
   add_subdirectory(extras)
 endif(BUILD_EXTRAS)
@@ -61,6 +62,7 @@ if(BUILD_TESTS)
     include(CodeCoverage)
     append_coverage_compiler_flags()
   endif()
+
   include(Catch)
 endif()
 
@@ -74,6 +76,7 @@ endif()
 if(NOT DEFINED DOC_PATH)
   set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}")
 endif(NOT DEFINED DOC_PATH)
+
 set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)
 
 install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH})
@@ -86,7 +89,7 @@ endif(CHECK_CODE_QUALITY)
 # uninstall target
 if(NOT TARGET uninstall)
   configure_file(
-      "${CMAKE_MODULE_PATH}/UninstallConky.cmake.in"
+    "${CMAKE_MODULE_PATH}/UninstallConky.cmake.in"
     "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
     IMMEDIATE @ONLY)
 

diff --git a/COPYING b/COPYING
@@ -6,5 +6,5 @@ LICENSE for a copy), except where noted differently (such as in portmon and
 audacious code which are LGPL, and prss which is an MIT-style license).
 
 Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
 All rights reserved.
diff --git a/LICENSE.BSD b/LICENSE.BSD
@@ -4,7 +4,7 @@ is now licensed under GPLv3.
 
 
 Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-Copyright (c) 2005-2021 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+Copyright (c) 2005-2024 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/cmake/Conky.cmake b/cmake/Conky.cmake
@@ -3,7 +3,7 @@
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights
+# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights
 # reserved.
 #
 # This program is free software: you can redistribute it and/or modify it under

diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake
@@ -3,7 +3,7 @@
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights
+# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights
 # reserved.
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -26,15 +26,15 @@ if(NOT CMAKE_BUILD_TYPE)
     set(
       CMAKE_BUILD_TYPE Debug
       CACHE
-        STRING
-        "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
       FORCE)
   else(MAINTAINER_MODE)
     set(
       CMAKE_BUILD_TYPE RelWithDebInfo
       CACHE
-        STRING
-        "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
       FORCE)
   endif(MAINTAINER_MODE)
 endif(NOT CMAKE_BUILD_TYPE)
@@ -66,22 +66,25 @@ option(BUILD_DOCS "Build documentation" false)
 option(BUILD_EXTRAS "Build extras (includes syntax files for editors)" false)
 
 option(BUILD_I18N "Enable if you want internationalization support" true)
+
 if(BUILD_I18N)
   set(LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale"
-      CACHE STRING "Directory containing the locales")
+    CACHE STRING "Directory containing the locales")
 endif(BUILD_I18N)
 
 # Some standard options
 set(SYSTEM_CONFIG_FILE "/etc/conky/conky.conf"
-    CACHE STRING "Default system-wide Conky configuration file")
+  CACHE STRING "Default system-wide Conky configuration file")
+
 # use FORCE below to make sure this changes when CMAKE_INSTALL_PREFIX is
 # modified
 if(NOT LIB_INSTALL_DIR)
   set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
 endif(NOT LIB_INSTALL_DIR)
+
 set(PACKAGE_LIBRARY_DIR "${LIB_INSTALL_DIR}/conky"
-    CACHE STRING "Package library path (where Lua bindings are installed"
-    FORCE)
+  CACHE STRING "Package library path (where Lua bindings are installed"
+  FORCE)
 set(DEFAULTNETDEV "eno1" CACHE STRING "Default networkdevice")
 
 # Mac only override
@@ -90,13 +93,13 @@ if(OS_DARWIN)
 endif(OS_DARWIN)
 
 set(XDG_CONFIG_FILE "$HOME/.config/conky/conky.conf"
-    CACHE STRING "Configfile of the user (XDG)")
+  CACHE STRING "Configfile of the user (XDG)")
 set(CONFIG_FILE "$HOME/.conkyrc" CACHE STRING "Configfile of the user")
 set(MAX_USER_TEXT_DEFAULT "16384"
-    CACHE STRING
-          "Default maximum size of config TEXT buffer, i.e. below TEXT line.")
+  CACHE STRING
+  "Default maximum size of config TEXT buffer, i.e. below TEXT line.")
 set(DEFAULT_TEXT_BUFFER_SIZE "256"
-    CACHE STRING "Default size used for temporary, static text buffers")
+  CACHE STRING "Default size used for temporary, static text buffers")
 set(MAX_NET_INTERFACES "256" CACHE STRING "Maximum number of network devices")
 
 # Platform specific options Linux only
@@ -127,15 +130,14 @@ cmake_dependent_option(
   "OS_DARWIN" false)
 
 # Optional features etc
-
 option(BUILD_WLAN "Enable wireless support" false)
 
 option(BUILD_BUILTIN_CONFIG "Enable builtin default configuration" true)
 
 option(BUILD_IOSTATS "Enable disk I/O stats" true)
 
 option(BUILD_OLD_CONFIG "Enable support for the old syntax of configurations"
-       true)
+  true)
 
 option(BUILD_MATH "Enable math support" true)
 
@@ -198,6 +200,7 @@ dependent_option(BUILD_XINPUT "Build Xinput 2 support" true
 if(BUILD_X11)
   set(BUILD_GUI true)
 endif(BUILD_X11)
+
 if(BUILD_WAYLAND)
   set(BUILD_GUI true)
 endif(BUILD_WAYLAND)
@@ -236,6 +239,7 @@ option(BUILD_ICAL "Enable if you want iCalendar (RFC 5545) support" false)
 option(BUILD_IRC "Enable if you want IRC support" false)
 
 option(BUILD_HTTP "Enable if you want HTTP support" false)
+
 if(BUILD_HTTP)
   set(HTTPPORT "10080" CACHE STRING "Port to use for out_to_http")
 endif(BUILD_HTTP)
@@ -245,13 +249,13 @@ option(BUILD_ICONV "Enable iconv support" false)
 option(BUILD_CMUS "Enable support for cmus music player" true)
 
 option(BUILD_JOURNAL "Enable support for reading from the systemd journal"
-       false)
+  false)
 
 option(BUILD_PULSEAUDIO
-       "Enable support for Pulseaudio's default sink and source" false)
+  "Enable support for Pulseaudio's default sink and source" false)
 
 option(BUILD_INTEL_BACKLIGHT
-       "Enable support for Intel backlight" false)
+  "Enable support for Intel backlight" false)
 
 run_dependency_checks()
 
@@ -269,6 +273,6 @@ message(STATUS "CMAKE_CXX_FLAGS_RELEASE: " ${CMAKE_CXX_FLAGS_RELEASE})
 
 message(STATUS "CMAKE_C_FLAGS_RELWITHDEBINFO: " ${CMAKE_C_FLAGS_RELWITHDEBINFO})
 message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO: "
-               ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+  ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
 
 message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
diff --git a/cmake/ConkyCPackSetup.cmake b/cmake/ConkyCPackSetup.cmake
@@ -3,7 +3,7 @@
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights
+# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights
 # reserved.
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -23,7 +23,7 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>=2.10-1), libgcc1 (>= 1:4.4.0)")
 set(CPACK_PACKAGE_CONTACT "[email protected]")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Brenden Matthews")
 set(CPACK_PACKAGE_FILE_NAME
-    "${PROJECT_NAME}-${VERSION}-${CMAKE_SYSTEM_NAME}-${CPU_ARCH}")
+  "${PROJECT_NAME}-${VERSION}-${CMAKE_SYSTEM_NAME}-${CPU_ARCH}")
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME})
 
@@ -44,20 +44,24 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION}-src")
 set(CPACK_SOURCE_GENERATOR "TBZ2")
 execute_process(COMMAND ${APP_UNAME}
-                COMMAND ${APP_AWK} "{print $1}"
-                RESULT_VARIABLE RETVAL
-                OUTPUT_VARIABLE CPU_ARCH
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
+  COMMAND ${APP_AWK} "{print $1}"
+  RESULT_VARIABLE RETVAL
+  OUTPUT_VARIABLE CPU_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 set(CPACK_SOURCE_IGNORE_FILES
-    # Exclude backup files generated by text editors.
-    "~$"
-    # Git dir/files.
-    "\\\\.git.*$"
-    # vim swap files
-    "\\\\..*\\\\.swp$"
-    # Build dir.
-    "build.*$")
+
+  # Exclude backup files generated by text editors.
+  "~$"
+
+  # Git dir/files.
+  "\\\\.git.*$"
+
+  # vim swap files
+  "\\\\..*\\\\.swp$"
+
+  # Build dir.
+  "build.*$")
 
 # Enable CPack
 include(CPack)
diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
@@ -3,7 +3,7 @@
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights
+# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights
 # reserved.
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -428,10 +428,10 @@ if(BUILD_X11)
       set(conky_libs ${conky_libs} ${X11_Xinput_LIB})
     endif(BUILD_XINPUT)
 
-
     if(X11_xcb_FOUND)
       set(HAVE_XCB true)
       set(conky_libs ${conky_libs} ${X11_xcb_LIB})
+
       if(X11_xcb_errors_FOUND)
         set(HAVE_XCB_ERRORS true)
         set(conky_libs ${conky_libs} ${X11_xcb_LIB} ${X11_xcb_errors_LIB})

diff --git a/cmake/ToLua.cmake b/cmake/ToLua.cmake
@@ -3,7 +3,7 @@
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2021 Brenden Matthews, et. al. (see AUTHORS) All rights
+# Copyright (c) 2005-2024 Brenden Matthews, et. al. (see AUTHORS) All rights
 # reserved.
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -30,11 +30,11 @@ function(wrap_tolua VAR FIL)
     get_filename_component(PATCH ${ARGV2} ABSOLUTE)
     set(TOLUA_OUT ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}-orig.c)
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c
-                       COMMAND ${APP_PATCH} -s ${TOLUA_OUT} ${PATCH} -o
-                               ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c
-                       DEPENDS ${TOLUA_OUT} ${PATCH}
-                       COMMENT "Patching lib${FIL_WE}-orig.c"
-                       VERBATIM)
+      COMMAND ${APP_PATCH} -s ${TOLUA_OUT} ${PATCH} -o
+      ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c
+      DEPENDS ${TOLUA_OUT} ${PATCH}
+      COMMENT "Patching lib${FIL_WE}-orig.c"
+      VERBATIM)
     set_source_files_properties(${TOLUA_OUT} PROPERTIES GENERATED TRUE)
   else()
     set(TOLUA_OUT ${CMAKE_CURRENT_BINARY_DIR}/lib${FIL_WE}.c)
@@ -43,20 +43,19 @@ function(wrap_tolua VAR FIL)
   # Call toluapp from 3rdparty/ path directly. The last argument to toluapp is
   # the path to the tolua Lua sources.
   add_custom_command(OUTPUT ${TOLUA_OUT} ${INCL}
-                     COMMAND toluapp -n ${FIL_WE} -o ${TOLUA_OUT} ${ABS_FIL}
-                             ${CMAKE_SOURCE_DIR}/3rdparty/toluapp/src/bin/lua/
-                     DEPENDS ${ABS_FIL}
-                     COMMENT "Running tolua++ on ${FIL}"
-                     VERBATIM)
+    COMMAND toluapp -n ${FIL_WE} -o ${TOLUA_OUT} ${ABS_FIL}
+    ${CMAKE_SOURCE_DIR}/3rdparty/toluapp/src/bin/lua/
+    DEPENDS ${ABS_FIL}
+    COMMENT "Running tolua++ on ${FIL}"
+    VERBATIM)
 
   set_source_files_properties(${${VAR}} ${INCL} PROPERTIES GENERATED TRUE)
   set_source_files_properties(
     ${${VAR}}
     PROPERTIES
     COMPILE_FLAGS
     "-Wno-bad-function-cast -Wno-unused-parameter -Wno-cast-qual -Wno-error=pedantic"
-    )
+  )
 
   set(${VAR} ${${VAR}} PARENT_SCOPE)
-
 endfunction(wrap_tolua)