From 3632fe8c6f18719ebb9299157fd520446f6a7406 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 1 Dec 2023 15:38:09 -0500 Subject: [PATCH 1/2] Pull libjpeg-turbo from GitHub instead of SF --- .github/workflows/build.yml | 8 ++++---- BUILDING.md | 4 ++-- appveyor.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dadbcbcd..5aea1f684 100644 --- 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 index 672d7c8a2..b20f77614 100644 --- 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 . + * The libjpeg-turbo SDK binary packages can be downloaded from + . * 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 index 90d745e7e..67a874bc7 100644 --- 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: >- From 33550c8453235c99c9fadc659eb56739c7857bb9 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 1 Dec 2023 15:45:11 -0500 Subject: [PATCH 2/2] Move official releases to GitHub --- doc/index.html | 44 ++++++++++++++++++++++---------------------- doc/install.txt | 16 ++++++++-------- release/rpm.spec.in | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/index.html b/doc/index.html index 17b2948ec..13e8f702f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -3,7 +3,7 @@ - + User’s Guide for TurboVNC 3.1 @@ -565,12 +565,12 @@

Installing TurboVNC

  • Download the appropriate TurboVNC binary package for your system from the - Files + Releases area of the - TurboVNC - SourceForge project page. RPM and - Debian packages are provided for Linux distributions that contain GLIBC - 2.17 or later.
    + TurboVNC + GitHub project page. RPM and Debian + packages are provided for Linux distributions that contain GLIBC 2.17 or + later.
  • cd to the directory where you downloaded the binary package, and issue @@ -652,13 +652,13 @@

    5.2 Installing the TurboVNC Viewer on macOS

    1. Download the TurboVNC Mac disk image - (TurboVNC-3.0.92-x86_64.dmg for Intel - CPUs or TurboVNC-3.0.92-arm64.dmg for + (TurboVNC-3.1-x86_64.dmg for Intel + CPUs or TurboVNC-3.1-arm64.dmg for Apple silicon CPUs) from the - Files + Releases area of the - TurboVNC - SourceForge project page. + TurboVNC + GitHub project page.
    2. Open the disk image, then open @@ -674,13 +674,13 @@

      5.3 Installing the TurboVNC Viewer on Windows

      1. Download the TurboVNC Windows installer package - (TurboVNC-3.0.92-x64.exe for 64-bit - systems or TurboVNC-3.0.92-x86.exe for + (TurboVNC-3.1-x64.exe for 64-bit + systems or TurboVNC-3.1-x86.exe for legacy 32-bit-only systems) from the - Files + Releases area of the - TurboVNC - SourceForge project page. + TurboVNC + GitHub project page.
      2. Run the TurboVNC installer. The installation of TurboVNC should be @@ -695,13 +695,13 @@

        5.4 Installing TurboVNC from Source

        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 -(turbovnc-3.0.92.tar.gz) from the -Files +source tarball (turbovnc-3.1.tar.gz) +from the +Releases area of the -TurboVNC -SourceForge project page, uncompress -it, cd turbovnc-3.0.92, and read +TurboVNC +GitHub project page, uncompress it, +cd turbovnc-3.1, and read BUILDING.md for further instructions on how to build TurboVNC from source.

        diff --git a/doc/install.txt b/doc/install.txt index 9cfedfaea..629b70515 100644 --- 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 index 4b819896c..d5e1686ee 100644 --- 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