Merge branch 'bugfix-license' into develop

Author: setvisible

.github/workflows/deployment.yml

@@ -14,7 +14,7 @@ on:
 env:
   # We want to see all warnings for the project, but hide them for Libtorrent:
   CXX_FLAGS_Libtorrent: "-Wall -Wextra -Wpedantic -Wvla -Wno-noexcept-type -Wno-format-zero-length -ftemplate-depth=512 -Wno-attributes -Wno-narrowing -Wno-overflow -Wno-redundant-move -Wno-maybe-uninitialized" # -Wa,-mbig-obj"
-  CXX_FLAGS_Project: "-Wall -Wextra -Wpedantic -Wvla -ftemplate-depth=512" 
+  CXX_FLAGS_Project: "-Wall -Wextra -Wpedantic -Wvla -ftemplate-depth=512"
 
   BUILD_TYPE: "Release" # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BOOST_VERSION: 1.77.0
@@ -41,7 +41,7 @@ jobs:
     environment: production
     steps:
     - name: Check out repository code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Create WebBrowser Addons
       id: webaddons
@@ -68,13 +68,13 @@ jobs:
                    print(f"Addon_Web_Extension_Firefox={ artifact_firefox }", file=f)
 
     - name: Upload Chromium Addon
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: artifact_chromium
         path: ${{ steps.webaddons.outputs.Addon_Web_Extension_Chromium }}
 
     - name: Upload Firefox Addon
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: artifact_firefox
         path: ${{ steps.webaddons.outputs.Addon_Web_Extension_Firefox }}
@@ -116,9 +116,9 @@ jobs:
 
     steps:
     - name: Check out repository code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
-#    - name: Clean Environment 
+#    - name: Clean Environment
 #      shell: python # otherwise Windows uses Powershell, Linux uses bash
 #      run: |
 #           import os
@@ -183,6 +183,10 @@ jobs:
                version = my_file.readline()
                version = ''.join(version.split())
            
+           version_major = None
+           version_minor = None
+           version_tiny = None
+           
            with open(r"${{env.LibtorrentRasterbar_VERSION_FILE}}", "rt") as my_file:
                for line in my_file:
                    x = regex_major.search(line)
@@ -225,7 +229,7 @@ jobs:
            echo "LibtorrentRasterbar_VERSION: '${{env.LibtorrentRasterbar_VERSION}}'"
 
     - name: Cache Libtorrent Static Libraries
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       id: cache-libtorrent
       env:
         LibtorrentRasterbar_VERSION: ${{ steps.getversion.outputs.LibtorrentRasterbar_VERSION }}
@@ -236,8 +240,24 @@ jobs:
         path: |
           ${{env.LibtorrentRasterbar_INSTALL_DIR}}
 
+    - name: Install NSIS
+      # Note: Github runners after windows-2022 don't include NSIS. NSIS must be installed manually
+      # Source: https://github.com/NSIS-Dev/ci-examples/blob/main/.github/workflows/windows-latest.yml
+      if: ${{ matrix.os == 'windows-latest' }}
+      uses: repolevedavaj/install-nsis@v1.1.0
+      with:
+        nsis-version: '3.12'
+
+    - name: Print NSIS version
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: makensis -VERSION
+
+    - name: Print NSIS compile flags
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: makensis -HDRINFO
+
     - name: Install Boost
-      uses: MarkusJx/install-boost@v2.4.5
+      uses: MarkusJx/install-boost@v2.6.0
       id: install-boost
       with:
         boost_version: ${{env.BOOST_VERSION}}
@@ -301,7 +321,7 @@ jobs:
       #        ./config
       #        make
       #        make test
-      #        sudo make install_sw 
+      #        sudo make install_sw
       #    Then:
       #    openssl_dir = os.path.normpath(os.path.join(r"${{env.QT_ROOT_DIR}}", "..", "..", "Tools", "OpenSSLv3", "src"))
       #    openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libcrypto.a"))
@@ -319,7 +339,7 @@ jobs:
                openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libcrypto.lib"))
                openssl_ssl_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libssl.lib"))
            
-           if "${{ matrix.os }}" == "ubuntu-latest":
+           elif "${{ matrix.os }}" == "ubuntu-latest":
                openssl_dir = os.path.normpath("/usr")
                openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "x86_64-linux-gnu", "libcrypto.a"))
                openssl_ssl_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "x86_64-linux-gnu", "libssl.a"))
@@ -360,7 +380,7 @@ jobs:
           -DBUILD_SHARED_LIBS=OFF
           -Dstatic_runtime=ON
           -Dbuild_tests=${{env.BUILD_TESTS}}
-          -Ddeprecated-functions=${{env.DEPRECATED_FUNCTIONS}}  
+          -Ddeprecated-functions=${{env.DEPRECATED_FUNCTIONS}}
           -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}"
           -DOPENSSL_INCLUDE_DIR="${{env.OPENSSL_INCLUDE_DIR}}"
           -DLIB_EAY="${{env.OpenSSL_LIB_EAY}}"
@@ -477,7 +497,7 @@ jobs:
 
     - name: Upload Linux Portable
       if: ${{ matrix.os == 'ubuntu-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       env:
         TARBALL_NAME: "${{ steps.getversion.outputs.Application_Linux_NAME }}.tar.gz"
       with:
@@ -505,7 +525,7 @@ jobs:
 
     - name: Upload Windows MingGW x64 Portable
       if: ${{ matrix.os == 'windows-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       env:
         ZIP_NAME: "${{ steps.getversion.outputs.Application_Windows_MinGW_x64_NAME }}.zip"
       with:
@@ -514,7 +534,7 @@ jobs:
 
     - name: Create NSIS installer
       if: ${{ matrix.os == 'windows-latest' }}
-      uses: joncloud/makensis-action@v4.1
+      uses: joncloud/makensis-action@v5.0
       env:
         Application_VERSION: ${{ steps.getversion.outputs.Application_VERSION }}
       with:
@@ -538,7 +558,7 @@ jobs:
 
     - name: Upload Windows 64 Installer
       if: ${{ matrix.os == 'windows-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: artifact_windows_64_installer
         path: "${{env.Project_RELEASE_DIR}}/ArrowDL_x64_Setup.exe"
@@ -618,10 +638,10 @@ jobs:
                    my_file.write("\r\n")
 
     - name: Publish
-      uses: softprops/action-gh-release@v2
-      #if: startsWith(github.ref, 'refs/tags/') # Limit releases to pushes to tags
+      uses: softprops/action-gh-release@v3
+      if: startsWith(github.ref, 'refs/tags/') # Limit releases to pushes to tags
       env:
-        BRANCH_OR_TAG_NAME: ${{ github.head_ref || github.ref_name }}
+        BRANCH_OR_TAG_NAME: ${{ github.ref_name }}
       with:
         tag_name: ${{env.BRANCH_OR_TAG_NAME}}
         name: ArrowDL ${{env.BRANCH_OR_TAG_NAME}}

3rd/yt-dlp/bin/yt-dlp

@@ -1 +1 @@
-2025.03.21
+2026.03.17

3rd/yt-dlp/bin/yt-dlp.exe

@@ -1,9 +1,8 @@
 /* - ArrowDL - Copyright (C) 2019-present Sebastien Vavassori
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License (LGPL)
+ * Version 3, 29 June 2007, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

3rd/yt-dlp/version

@@ -1,9 +1,8 @@
 /* - ArrowDL - Copyright (C) 2019-present Sebastien Vavassori
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License (LGPL)
+ * Version 3, 29 June 2007, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

src/about.h

@@ -1,9 +1,8 @@
 /* - ArrowDL - Copyright (C) 2019-present Sebastien Vavassori
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License (LGPL)
+ * Version 3, 29 June 2007, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

src/builddefs.h

@@ -1,9 +1,8 @@
 /* - ArrowDL - Copyright (C) 2019-present Sebastien Vavassori
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License (LGPL)
+ * Version 3, 29 June 2007, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

src/config.h.in

@@ -1,9 +1,8 @@
 /* - ArrowDL - Copyright (C) 2019-present Sebastien Vavassori
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License (LGPL)
+ * Version 3, 29 June 2007, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

src/config_3rd.h.in

@@ -1,9 +1,8 @@
 /* - ArrowDL - Copyright (C) 2019-present Sebastien Vavassori
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License (LGPL)
+ * Version 3, 29 June 2007, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of