diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 index 7ed6ff8..1e8b314 100644 --- a/.github/release-canary-v3 +++ b/.github/release-canary-v3 @@ -1 +1 @@ -5 +6 diff --git a/debian/changelog b/debian/changelog index 384e48e..68b2ccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -goverlay (2:1.1.1-101pika1) pika; urgency=medium +goverlay (2:1.1.1-101pika2) pika; urgency=medium * New upstream release + Update to PikaOS 4 diff --git a/debian/control b/debian/control index 462121b..09b8d5d 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,10 @@ Build-Depends: debhelper-compat (= 13), lcl-qt5, lazarus-src, libgl-dev, + libqt6pas6-dev, Rules-Requires-Root: no Standards-Version: 4.6.1 Homepage: https://github.com/benjamimgois/goverlay -Vcs-Browser: https://salsa.debian.org/games-team/goverlay -Vcs-Git: https://salsa.debian.org/games-team/goverlay.git Package: goverlay Architecture: any @@ -22,8 +21,9 @@ Depends: ${misc:Depends}, mangohud, mesa-utils, vulkan-tools, + libqt6pas6, git, -Recommends: vkbasalt, +Recommends: vkbasalt, mangohud:i386 Suggests: breeze, adwaita-qt, Description: Graphical UI to help manage Vulkan / OpenGL overlays diff --git a/main.sh b/main.sh index 188ecd2..3abe52d 100755 --- a/main.sh +++ b/main.sh @@ -8,6 +8,14 @@ source ./pika-build-config.sh echo "$PIKA_BUILD_ARCH" > pika-build-arch +# temp lib +if [[ $(cat ./.github/release-canary-v3) == "6" ]] +then + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.8/libqt6pas6-dev_6.2.8-1_amd64.deb -O ./libqt6pas6-dev.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.8/libqt6pas6_6.2.8-1_amd64.deb -O ./libqt6pas6.deb + apt-get install ./libqt6pas6-dev.deb ./libqt6pas6.deb -y +fi + # Clone Upstream git clone https://github.com/benjamimgois/goverlay -b "$VERSION" cp -rvf ./debian ./goverlay @@ -15,13 +23,6 @@ cd ./goverlay # Get build deps apt-get build-dep ./ -y -# temp lib -if [[ $(cat ../.github/release-canary-v3) == "5" ]] -then - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.8/libqt6pas6-dev_6.2.8-1_amd64.deb -O ./libqt6pas6-dev.deb - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.8/libqt6pas6_6.2.8-1_amd64.deb -O ./libqt6pas6.deb - apt-get install ./libqt6pas6-dev.deb ./libqt6pas6.deb -y -fi # Build package LOGNAME=root dh_make --createorig -y -l -p goverlay_"$VERSION" || echo "dh-make: Ignoring Last Error"