[gnome-remote-desktop] build: Bump FreeRDP version requirement



commit a96b5a25cebb61bb681039ff38feb1b78404c49e
Author: Pascal Nowack <Pascal Nowack gmx de>
Date:   Tue May 10 17:41:53 2022 +0200

    build: Bump FreeRDP version requirement
    
    FreeRDP 2.7.0 contains an important fix for an issue which allowed to
    circumvent the authentication mechanism in FreeRDP.
    
    To ensure, that gnome-remote-desktop runs with a FreeRDP version, that
    contains the fix, bump the FreeRDP version.
    
    Fixes: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/issues/95

 .gitlab-ci.yml | 26 +++-----------------------
 meson.build    |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d4598c6..db1af323 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ stages:
 
 .gnome-remote-desktop.fedora:35@common:
   variables:
-    FDO_DISTRIBUTION_VERSION: 35
-    BASE_TAG: '2022-05-05.0'
+    FDO_DISTRIBUTION_VERSION: 36
+    BASE_TAG: '2022-05-10.0'
     FDO_UPSTREAM_REPO: GNOME/gnome-remote-desktop
     FDO_DISTRIBUTION_EXEC: |
       dnf -y update && dnf -y upgrade &&
@@ -34,26 +34,6 @@ stages:
                      python3-gobject gnome-settings-daemon mesa-dri-drivers \
                      xorg-x11-server-Xwayland mutter &&
 
-      # To build gsettings-desktop-schemas
-      dnf builddep -y gsettings-desktop-schemas --setopt=install_weak_deps=False &&
-      dnf builddep -y gnome-settings-daemon --setopt=install_weak_deps=False &&
-      dnf builddep -y mutter --setopt=install_weak_deps=False &&
-      dnf install -y wayland-protocols-devel &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-          https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
-          master . 469f576b9b18291f858d64f2d8805fc4d578b857 &&
-
-      # To build gnome-settings-daemon
-      ./.gitlab-ci/install-meson-project.sh \
-          https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git \
-          master . 62325b51b56da15a6da7c8145e550ae047d361ea &&
-
-      # To build mutter
-      ./.gitlab-ci/install-meson-project.sh \
-          https://gitlab.gnome.org/GNOME/mutter.git \
-          main . f1cf35e1017f06c9fb5fa9bbcc18d434769024c7 &&
-
       dnf clean all
 
 .gnome-remote-desktop.fedora:35@x86_64:
@@ -87,7 +67,7 @@ build-gnome-remote-desktop:
     - .gnome-remote-desktop.fedora:35@x86_64
   stage: build
   script:
-    - meson . build -Ddebugtype=debugoptimized --werror
+    - meson . build -Dbuildtype=debugoptimized --werror
     - ninja -C build
     - ninja -C build install
   needs:
diff --git a/meson.build b/meson.build
index ce47c189..8fa4df05 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project('gnome-remote-desktop', 'c',
 
 cuda_req = '>= 11.1.5.0'
 epoxy_req = '>= 1.4'
-freerdp_req = '>= 2.5.0'
+freerdp_req = '>= 2.7.0'
 fuse_req = '>= 3.9.1'
 xkbcommon_req = '>= 1.0.0'
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]