Merge branch 'main' into dev

TurboVNC · Dec 1, 2023 · 12d001e · 12d001e
2 parents 5447cdf + 33550c8
commit 12d001e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   LJT_VERSION: 3.0.1
-  LJT_GPG_KEY: https://sourceforge.net/projects/libjpeg-turbo/files/LJT-GPG-KEY
+  LJT_GPG_KEY: https://raw.githubusercontent.com/libjpeg-turbo/repo/main/LJT-GPG-KEY
 
 jobs:
   linux:
@@ -20,7 +20,7 @@ jobs:
       - name: Set global environment variables
         run: |
           echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV
-          echo "LJT_URL=https://sourceforge.net/projects/libjpeg-turbo/files/$LJT_VERSION" >>$GITHUB_ENV
+          echo "LJT_URL=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LJT_VERSION" >>$GITHUB_ENV
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up build
@@ -72,7 +72,7 @@ jobs:
       - name: Set global environment variables
         run: |
           echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV
-          echo "LJT_URL=https://sourceforge.net/projects/libjpeg-turbo/files/$LJT_VERSION" >>$GITHUB_ENV
+          echo "LJT_URL=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LJT_VERSION" >>$GITHUB_ENV
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up build
@@ -99,7 +99,7 @@ jobs:
       - name: Set global environment variables
         run: |
           echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV
-          echo "LJT_URL=https://sourceforge.net/projects/libjpeg-turbo/files/$LJT_VERSION" >>$GITHUB_ENV
+          echo "LJT_URL=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LJT_VERSION" >>$GITHUB_ENV
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up build

diff --git a/BUILDING.md b/BUILDING.md
@@ -14,8 +14,8 @@ Build Requirements
     Server.)
 
 - libjpeg-turbo SDK v1.2 or later
-  * The libjpeg-turbo SDK binary packages can be downloaded from the "Files"
-    area of <http://sourceforge.net/projects/libjpeg-turbo>.
+  * The libjpeg-turbo SDK binary packages can be downloaded from
+    <https://github.com/libjpeg-turbo/libjpeg-turbo/releases>.
   * The TurboVNC build system will search for the TurboJPEG header and library
     under __/opt/libjpeg-turbo__ on Un\*x or __c:\libjpeg-turbo[64]__ (Visual
     C++) or __c:\libjpeg-turbo-gcc[64]__ (MinGW) on Windows, but you can

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   LJT_VERSION: 3.0.1
-  LJT_64BIT_SDK: "https://sourceforge.net/projects/libjpeg-turbo/files/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc64.exe"
-  LJT_32BIT_SDK: "https://sourceforge.net/projects/libjpeg-turbo/files/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc.exe"
+  LJT_64BIT_SDK: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc64.exe"
+  LJT_32BIT_SDK: "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LJT_VERSION%/libjpeg-turbo-%LJT_VERSION%-vc.exe"
 
 install:
   - cmd: >-

diff --git a/doc/index.html b/doc/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <meta name="language" content="en">
-<meta name="date" content="2023-09-06T17:18:34">
+<meta name="date" content="2023-12-01T16:11:12">
 <meta name="generator" content="deplate.rb 0.8.5">
 <title>User&rsquo;s Guide for TurboVNC 3.2</title>
 <link rel="start" href="index.html" title="Frontpage">
@@ -565,12 +565,12 @@ <h3 id="hd005001001">Installing TurboVNC</h3>
     <li class="Ordered-1 Ordered" value="1">
         Download the appropriate TurboVNC binary package for your system from 
         the 
-        <span class="remote"><a href="http://sourceforge.net/projects/turbovnc/files/" class="remote">Files 
+        <span class="remote"><a href="https://github.com/TurboVNC/turbovnc/releases" class="remote">Releases 
         area</a></span><a name="idx0012"></a> of the 
-        <span class="remote"><a href="http://sourceforge.net/projects/turbovnc" class="remote">TurboVNC 
-        SourceForge project page</a></span><a name="idx0013"></a>. RPM and 
-        Debian packages are provided for Linux distributions that contain GLIBC 
-        2.17 or later. <br />
+        <span class="remote"><a href="https://github.com/TurboVNC/turbovnc" class="remote">TurboVNC 
+        GitHub project page</a></span><a name="idx0013"></a>. RPM and Debian 
+        packages are provided for Linux distributions that contain GLIBC 2.17 or 
+        later. <br />
     </li>
     <li class="Ordered-1 Ordered" value="2">
         cd to the directory where you downloaded the binary package, and issue 
@@ -655,10 +655,10 @@ <h2 id="hd005002">5.2&nbsp;Installing the TurboVNC Viewer on macOS</h2>
         (<strong class="filename">TurboVNC-3.1.80-x86_64.dmg</strong> for Intel 
         CPUs or <strong class="filename">TurboVNC-3.1.80-arm64.dmg</strong> for 
         Apple silicon CPUs) from the 
-        <span class="remote"><a href="http://sourceforge.net/projects/turbovnc/files/" class="remote">Files 
+        <span class="remote"><a href="https://github.com/TurboVNC/turbovnc/releases" class="remote">Releases 
         area</a></span><a name="idx0014"></a> of the 
-        <span class="remote"><a href="http://sourceforge.net/projects/turbovnc" class="remote">TurboVNC 
-        SourceForge project page</a></span><a name="idx0015"></a>.
+        <span class="remote"><a href="https://github.com/TurboVNC/turbovnc" class="remote">TurboVNC 
+        GitHub project page</a></span><a name="idx0015"></a>.
     </li>
     <li class="Ordered-1 Ordered">
         Open the disk image, then open 
@@ -677,10 +677,10 @@ <h2 id="hd005003">5.3&nbsp;Installing the TurboVNC Viewer on Windows</h2>
         (<strong class="filename">TurboVNC-3.1.80-x64.exe</strong> for 64-bit 
         systems or <strong class="filename">TurboVNC-3.1.80-x86.exe</strong> for 
         legacy 32-bit-only systems) from the 
-        <span class="remote"><a href="http://sourceforge.net/projects/turbovnc/files/" class="remote">Files 
+        <span class="remote"><a href="https://github.com/TurboVNC/turbovnc/releases" class="remote">Releases 
         area</a></span><a name="idx0016"></a> of the 
-        <span class="remote"><a href="http://sourceforge.net/projects/turbovnc" class="remote">TurboVNC 
-        SourceForge project page</a></span><a name="idx0017"></a>.
+        <span class="remote"><a href="https://github.com/TurboVNC/turbovnc" class="remote">TurboVNC 
+        GitHub project page</a></span><a name="idx0017"></a>.
     </li>
     <li class="Ordered-1 Ordered">
         Run the TurboVNC installer.  The installation of TurboVNC should be 
@@ -697,11 +697,11 @@ <h2 id="hd005004">5.4&nbsp;Installing TurboVNC from Source</h2>
 pre-built TurboVNC binary package available, then download the TurboVNC 
 source tarball 
 (<strong class="filename">turbovnc-3.1.80.tar.gz</strong>) from the 
-<span class="remote"><a href="http://sourceforge.net/projects/turbovnc/files/" class="remote">Files 
+<span class="remote"><a href="https://github.com/TurboVNC/turbovnc/releases" class="remote">Releases 
 area</a></span><a name="idx0018"></a> of the 
-<span class="remote"><a href="http://sourceforge.net/projects/turbovnc" class="remote">TurboVNC 
-SourceForge project page</a></span><a name="idx0019"></a>, uncompress 
-it, <code>cd turbovnc-3.1.80</code>, and read 
+<span class="remote"><a href="https://github.com/TurboVNC/turbovnc" class="remote">TurboVNC 
+GitHub project page</a></span><a name="idx0019"></a>, uncompress it, 
+<code>cd turbovnc-3.1.80</code>, and read 
 <strong class="filename">BUILDING.md</strong> for further instructions 
 on how to build TurboVNC from source.</p>
 

diff --git a/doc/install.txt b/doc/install.txt
@@ -6,8 +6,8 @@
 #OPT: noList! plain!
 
 	1. Download the appropriate TurboVNC binary package for your system from the
-		[[http://sourceforge.net/projects/turbovnc/files/][Files area]]
-		of the [[http://sourceforge.net/projects/turbovnc][TurboVNC SourceForge project page]].
+		[[https://github.com/TurboVNC/turbovnc/releases][Releases area]]
+		of the [[https://github.com/TurboVNC/turbovnc][TurboVNC GitHub project page]].
 		RPM and Debian packages are provided for Linux distributions that contain
 		GLIBC 2.17 or later.
 		{nl}
@@ -73,8 +73,8 @@ Add {file: ~/turbovnc} to any paths specified in this document.
 	#. Download the TurboVNC Mac disk image
 		({file: TurboVNC-{val: _VERSION}-x86_64.dmg} for Intel CPUs or
 		{file: TurboVNC-{val: _VERSION}-arm64.dmg} for Apple silicon CPUs) from the
-		[[http://sourceforge.net/projects/turbovnc/files/][Files area]]
-		of the [[http://sourceforge.net/projects/turbovnc][TurboVNC SourceForge project page]].
+		[[https://github.com/TurboVNC/turbovnc/releases][Releases area]]
+		of the [[https://github.com/TurboVNC/turbovnc][TurboVNC GitHub project page]].
 
 	#. Open the disk image, then open {file: TurboVNC.pkg} inside the disk image.
 		Follow the instructions to install the Mac TurboVNC Viewer.
@@ -84,8 +84,8 @@ Add {file: ~/turbovnc} to any paths specified in this document.
 	#. Download the TurboVNC Windows installer package
 		({file: TurboVNC-{val: _VERSION}-x64.exe} for 64-bit systems or
 		{file: TurboVNC-{val: _VERSION}-x86.exe} for legacy 32-bit-only systems)
-		from the [[http://sourceforge.net/projects/turbovnc/files/][Files area]]
-		of the [[http://sourceforge.net/projects/turbovnc][TurboVNC SourceForge project page]].
+		from the [[https://github.com/TurboVNC/turbovnc/releases][Releases area]]
+		of the [[https://github.com/TurboVNC/turbovnc][TurboVNC GitHub project page]].
 
 	#. Run the TurboVNC installer.  The installation of TurboVNC should be
 		self-explanatory.  The only configuration option is the directory into
@@ -96,8 +96,8 @@ Add {file: ~/turbovnc} to any paths specified in this document.
 If you are using a Linux/Un*x platform for which there is not a pre-built
 TurboVNC binary package available, then download the TurboVNC source tarball
 ({file: turbovnc-{val: _VERSION}.tar.gz}) from the
-[[http://sourceforge.net/projects/turbovnc/files/][Files area]]
-of the [[http://sourceforge.net/projects/turbovnc][TurboVNC SourceForge project page]],
+[[https://github.com/TurboVNC/turbovnc/releases][Releases area]]
+of the [[https://github.com/TurboVNC/turbovnc][TurboVNC GitHub project page]],
 uncompress it, {pcode: cd turbovnc-{val: _VERSION}}, and read
 {file: BUILDING.md} for further instructions on how to build TurboVNC from
 source.

diff --git a/release/rpm.spec.in b/release/rpm.spec.in
@@ -59,7 +59,7 @@ Version:   @VERSION@
 Release:   @BUILD@
 Vendor:    @PKGVENDOR@
 URL:       @PKGURL@
-#-->Source0: http://prdownloads.sourceforge.net/@CMAKE_PROJECT_NAME_LC@/@CMAKE_PROJECT_NAME_LC@-%{version}.tar.gz
+#-->Source0: https://github.com/TurboVNC/turbovnc/releases/download/%{version}/turbovnc-%{version}.tar.gz
 License:   GPL
 Group:     User Interface/Desktops
 Requires:  bash >= 2.0