From 0bf014077380c9edd6433733283adb7f938ec9a1 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Wed, 28 Aug 2024 10:28:35 -0700 Subject: [PATCH 1/4] use freeglut3-dev in noble --- BuildTools/ubuntu/package/DEBIAN/control_noble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildTools/ubuntu/package/DEBIAN/control_noble b/BuildTools/ubuntu/package/DEBIAN/control_noble index aa506077..e8367d51 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control_noble +++ b/BuildTools/ubuntu/package/DEBIAN/control_noble @@ -4,7 +4,7 @@ Architecture: amd64 Priority: optional Section: graphics Installed-Size: 121795 -Depends: libgdal34, zlib1g, libexpat1, freeglut3, libreadline8, libgtk-4-1, libssl3, libwebkit2gtk-4.1-0 +Depends: libgdal34, zlib1g, libexpat1, freeglut3-dev, libreadline8, libgtk-4-1, libssl3, libwebkit2gtk-4.1-0 Maintainer: Luc Anselin < anselin@uchicago.edu > Provides: geoda Homepage: http://spatial.uchicago.edu From 93d4d66eef7fb211a5dd5d2dfe9ccf1215b82f5a Mon Sep 17 00:00:00 2001 From: Xun Li Date: Wed, 28 Aug 2024 10:37:01 -0700 Subject: [PATCH 2/4] update ubuntu_build.yml --- .github/workflows/ubuntu_build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 0b74b7fa..10792cd6 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -59,6 +59,14 @@ jobs: chmod +x BuildTools/ubuntu/create_deps.sh chmod +x BuildTools/ubuntu/install.sh echo ${{ env.TARGET_OS }} + export DEBIAN_FRONTEND=noninteractive + sudo apt-get update -y + sudo apt-get install -y ca-certificates libgnutls30 + echo '-k' > ~/.curlrc + sudo apt-get install -y libpq-dev + sudo apt-get install -y gdal-bin + sudo apt-get install -y libgdal-dev + sudo apt-get install -y unzip cmake dh-autoreconf libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev - uses: actions/cache@v3 id: cache From 57db5e524b4bc086a2ac0976052ecf3908116cc9 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Wed, 28 Aug 2024 11:06:21 -0700 Subject: [PATCH 3/4] chore: update ubuntu_build.yml and install necessary dependencies for different OS versions --- .github/workflows/ubuntu_build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 10792cd6..7f4b51f8 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -67,6 +67,15 @@ jobs: sudo apt-get install -y gdal-bin sudo apt-get install -y libgdal-dev sudo apt-get install -y unzip cmake dh-autoreconf libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev + export OS=${{ env.TARGET_OS }} + if [ $OS = 'jammy' ] ; then + sudo apt-get install -y libwebkit2gtk-4.0-dev + elif [ $OS = 'focal' ] ; then + sudo apt-get install -y libwebkit2gtk-4.0-dev + elif [ $OS = 'noble' ] ; then + sudo apt-get install -y libgtk-4-dev libwebkit2gtk-4.1-dev + else + sudo apt-get install -y libwebkitgtk-3.0-dev - uses: actions/cache@v3 id: cache From 83a6785346bee4a7a4903859370ac04ce73f015e Mon Sep 17 00:00:00 2001 From: Xun Li Date: Wed, 28 Aug 2024 11:10:08 -0700 Subject: [PATCH 4/4] chore: update ubuntu_build.yml --- .github/workflows/ubuntu_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 7f4b51f8..937eb061 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -76,6 +76,7 @@ jobs: sudo apt-get install -y libgtk-4-dev libwebkit2gtk-4.1-dev else sudo apt-get install -y libwebkitgtk-3.0-dev + fi - uses: actions/cache@v3 id: cache