[ci,nighty] update deb/rpm scripts to package webview

the ci builder does not allow downloading of external sources, so bundle
the webview beforehand.

client/SDL/common/aad/CMakeLists.txt

@@ -23,6 +23,12 @@ if(WITH_WEBVIEW)
 
   include(FetchContent)
 
+  set(FETCHCONTENT_SOURCE_DIR_WEBVIEW "${CMAKE_CURRENT_SOURCE_DIR}/../../../../external/webview")
+  if(IS_DIRECTORY "${FETCHCONTENT_SOURCE_DIR_WEBVIEW}")
+    message("Using existing source from ${FETCHCONTENT_SOURCE_DIR_WEBVIEW}")
+  else()
+    unset(FETCHCONTENT_SOURCE_DIR_WEBVIEW)
+  endif()
   FetchContent_Declare(webview GIT_REPOSITORY https://github.com/akallabeth/webview GIT_TAG navigation-listener SYSTEM)
   FetchContent_MakeAvailable(webview)
 

packaging/deb/freerdp-nightly/control

@@ -8,7 +8,6 @@ Build-Depends:
  dpkg-dev,
  autotools-dev,
  cmake,
- git,
  pkg-config,
  libssl-dev,
  ninja-build,

packaging/deb/freerdp-nightly/rules

@@ -40,7 +40,6 @@ DEB_CMAKE_EXTRA_FLAGS :=  -GNinja \
 						  -DWITH_INTERNAL_MD4=ON \
 						  -DWITH_INTERNAL_MD5=ON \
 						  -DWITH_WEBVIEW=ON \
-						  -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \
 						  -DBUILD_TESTING=ON \
 						  -DWITH_KEYBOARD_LAYOUT_FROM_FILE=ON \
 						  -DWITH_TIMEZONE_FROM_FILE=ON \

packaging/rpm/freerdp-nightly.spec

@@ -200,7 +200,6 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version
 %if 0%{?fedora} >= 41
     -DWITH_CLIENT_SDL3=OFF \
     -DWITH_WEBVIEW=ON \
-		-DFETCHCONTENT_FULLY_DISCONNECTED=OFF \
 %endif
     -DCMAKE_C_COMPILER=clang \
     -DCMAKE_CXX_COMPILER=clang++ \

packaging/scripts/create_deb.sh

@@ -14,7 +14,7 @@ fi
 
 # First create a link to the debian/control folder
 cd "$SCRIPT_PATH/../.."
-ln -sf "packaging/deb/freerdp-nightly" "debian"
+./packaging/scripts/prepare_deb_freerdp-nightly.sh
 
 # Check all dependencies are installed
 $BUILD_DEPS "debian/control"

packaging/scripts/create_rpm.sh

@@ -5,7 +5,18 @@ SCRIPT_PATH=$(dirname "${BASH_SOURCE[0]}")
 SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
 
 mkdir -p ~/rpmbuild/SOURCES/
-git archive --format=tar HEAD --output ~/rpmbuild/SOURCES/freerdp-nightly-3.0.tar.bz2 --prefix=freerdp-nightly-3.0/
 $SCRIPT_PATH/prepare_rpm_freerdp-nightly.sh
+
+BASE_PREFIX="--prefix=freerdp-nightly-3.0/"
+FILES=""
+for dir in $(find external/webview -type d -not -path "external/webview/.git*"); do
+  FILES+=" $BASE_PREFIX$dir/"
+  for file in $(find $dir -maxdepth 1 -type f -not -path "$dir/.git*"); do
+    FILES+=" --add-file=$file"
+  done
+done
+FILES+=" $BASE_PREFIX"
+
+git archive --format=tar $FILES HEAD --output ~/rpmbuild/SOURCES/freerdp-nightly-3.0.tar.bz2
 cp source_version ~/rpmbuild/SOURCES/
 rpmbuild -ba "$SCRIPT_PATH/../rpm/freerdp-nightly.spec"

packaging/scripts/prepare_deb_freerdp-nightly.sh

@@ -1,4 +1,8 @@
 #!/bin/sh
 
+if [ ! -d external/webview ]; then
+  git clone -b navigation-listener --depth=1 https://github.com/akallabeth/webview external/webview
+fi
+
 ln -s packaging/deb/freerdp-nightly debian
 git rev-parse --short HEAD >.source_version

packaging/scripts/prepare_rpm_freerdp-nightly.sh

@@ -1,3 +1,7 @@
 #!/bin/bash
 
+if [ ! -d external/webview ]; then
+  git clone -b navigation-listener --depth=1 https://github.com/akallabeth/webview external/webview
+fi
+
 git rev-parse --short HEAD >source_version