diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/FETCH_HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/FETCH_HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/FETCH_HEAD 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/FETCH_HEAD 2024-10-29 14:57:46.000000000 +0000 @@ -1,8 +1,9 @@ -14b62cbd28d25d09411c35ba85e4c643bf25a8c6 branch 'dep/fedora-42.x' of https://github.com/BrycensRanch/Rokon +ce5a0dab175c21f81afcb5244f9259515e62837d branch 'dep/fedora-42.x' of https://github.com/BrycensRanch/Rokon 9a426ad20da0dfdcced251637919de709135ab77 branch 'dep/github.com-golangci-golangci-lint-1.x' of https://github.com/BrycensRanch/Rokon +51148ebed38fde0fb03ead2a70717ddb17ad3ed7 branch 'dep/github.com-yuin-goldmark-1.x' of https://github.com/BrycensRanch/Rokon 157074012eecdc6e49882c18051f644e353bdc3e branch 'feat/bsd-package' of https://github.com/BrycensRanch/Rokon 7c0d0fefae353d98c4ac193aabb66b4e87b170b7 branch 'feat/roku-discover' of https://github.com/BrycensRanch/Rokon a2009e298f03aaaede978eab2918ac191b18145b branch 'feat/roku-discover-2' of https://github.com/BrycensRanch/Rokon -2c5ce91606c5c91e624881189bb53eac13f4a025 branch 'master' of https://github.com/BrycensRanch/Rokon +58cda32c5e506246c098f444e1cb88a2ce1114b7 branch 'master' of https://github.com/BrycensRanch/Rokon a29243f15d13d5ba742346b31efc7ee8d4c3205c branch 'origin/master' of https://github.com/BrycensRanch/Rokon 95fcfcdc9da3bcfdeca71b5fead33f3da5bcdf6a branch 'renovate/configure' of https://github.com/BrycensRanch/Rokon diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/ORIG_HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/ORIG_HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/ORIG_HEAD 2024-10-29 14:59:36.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/ORIG_HEAD 2024-10-29 14:55:52.000000000 +0000 @@ -1 +1 @@ -58cda32c5e506246c098f444e1cb88a2ce1114b7 +05493b267795bc87b5fc1e88908ae2389334f454 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/config /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/config --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/config 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/config 2024-10-29 14:57:46.000000000 +0000 @@ -20,5 +20,5 @@ gpgsign = false [http "https://github.com/"] - extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX2hpMGtDQk1xbWpBdTJWYVU0anNxY0hUQXBERHB1TjFweW9GcA== + extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX04zbmhxNmlRcEtYNmJramJLUElXTFdDNFlTbVFCUjNjSHk2Sg== [branch "master"] remote = origin Binary files /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/index and /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/index differ diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/HEAD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/HEAD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/HEAD 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/HEAD 2024-10-29 14:57:46.000000000 +0000 @@ -417,6 +417,2 @@ c2efa2446fbebffa8b524923d156e9fc4c4a0557 05493b267795bc87b5fc1e88908ae2389334f454 Brycen G 1730212364 -0400 checkout: moving from c2efa2446fbebffa8b524923d156e9fc4c4a0557 to refs/remotes/pull/34/merge 05493b267795bc87b5fc1e88908ae2389334f454 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730213866 -0400 checkout: moving from 05493b267795bc87b5fc1e88908ae2389334f454 to master -58cda32c5e506246c098f444e1cb88a2ce1114b7 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730213977 -0400 checkout: moving from master to HEAD -58cda32c5e506246c098f444e1cb88a2ce1114b7 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730213978 -0400 checkout: moving from 58cda32c5e506246c098f444e1cb88a2ce1114b7 to master -58cda32c5e506246c098f444e1cb88a2ce1114b7 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730228552 -0400 checkout: moving from master to HEAD -58cda32c5e506246c098f444e1cb88a2ce1114b7 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228553 -0400 checkout: moving from 58cda32c5e506246c098f444e1cb88a2ce1114b7 to master diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/heads/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/heads/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/heads/master 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/heads/master 2024-10-29 14:57:46.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228553 -0400 branch: Created from refs/remotes/origin/master +0000000000000000000000000000000000000000 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730213866 -0400 branch: Created from refs/remotes/origin/master diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/dep/fedora-42.x /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/dep/fedora-42.x --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/dep/fedora-42.x 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/dep/fedora-42.x 2024-10-29 14:57:46.000000000 +0000 @@ -1,3 +1,2 @@ 0000000000000000000000000000000000000000 b73d8f03f02a0380406ddb3aa4d458698f5b3892 Brycen G 1730212245 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* +c2efa2446fbebffa8b524923d156e9fc4c4a0557:refs/remotes/pull/33/merge: storing head b73d8f03f02a0380406ddb3aa4d458698f5b3892 ce5a0dab175c21f81afcb5244f9259515e62837d Brycen G 1730213866 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: forced-update -ce5a0dab175c21f81afcb5244f9259515e62837d 14b62cbd28d25d09411c35ba85e4c643bf25a8c6 Brycen G 1730228553 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: forced-update Only in /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/dep: github.com-yuin-goldmark-1.x diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/logs/refs/remotes/origin/master 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/logs/refs/remotes/origin/master 2024-10-29 14:57:46.000000000 +0000 @@ -106,3 +106,2 @@ 86ae1e532f367e6e9363eb0ae548238ea757e292 a3967deaf00ed38c159e28716769c3e9ba1ca796 Brycen G 1730212138 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: fast-forward a3967deaf00ed38c159e28716769c3e9ba1ca796 58cda32c5e506246c098f444e1cb88a2ce1114b7 Brycen G 1730213866 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: fast-forward -58cda32c5e506246c098f444e1cb88a2ce1114b7 2c5ce91606c5c91e624881189bb53eac13f4a025 Brycen G 1730228553 -0400 fetch --prune --no-recurse-submodules origin +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*: fast-forward diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/heads/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/heads/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/heads/master 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/heads/master 2024-10-29 14:57:46.000000000 +0000 @@ -1 +1 @@ -2c5ce91606c5c91e624881189bb53eac13f4a025 +58cda32c5e506246c098f444e1cb88a2ce1114b7 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/dep/fedora-42.x /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep/fedora-42.x --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/dep/fedora-42.x 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep/fedora-42.x 2024-10-29 14:57:46.000000000 +0000 @@ -1 +1 @@ -14b62cbd28d25d09411c35ba85e4c643bf25a8c6 +ce5a0dab175c21f81afcb5244f9259515e62837d Only in /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/dep: github.com-yuin-goldmark-1.x diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/master /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/master --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.git/refs/remotes/origin/master 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.git/refs/remotes/origin/master 2024-10-29 14:57:46.000000000 +0000 @@ -1 +1 @@ -2c5ce91606c5c91e624881189bb53eac13f4a025 +58cda32c5e506246c098f444e1cb88a2ce1114b7 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/build-on-other-arches.yml /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/build-on-other-arches.yml --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/build-on-other-arches.yml 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/build-on-other-arches.yml 2024-10-27 10:42:46.000000000 +0000 @@ -48,8 +48,5 @@ mv mkappimage /usr/bin git config --global --add safe.directory '*' - wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run - chmod +x *.run run: | - make run make tarball make fatimage @@ -57,28 +54,4 @@ dnf builddep -y ./rokon.spec rpmbuild -ba ./rokon.spec - - name: 😭 Upload Failed Directories For Debug - uses: actions/upload-artifact@v4 - if: failure() - with: - name: rokon-${{runner.os}}-failed-i386 - path: | - tarball - AppDir - run - *.AppImage - *.tar* - ~/rpmbuild - *.rpm - include-hidden-files: true - if-no-files-found: error - - name: 🗃️ Upload Built Runfile 📦 - uses: actions/upload-artifact@v4 - if: always() - with: - name: rokon-${{runner.os}}-runfile-aarch64 - include-hidden-files: true - if-no-files-found: error - path: | - *.run - name: 🗃️ Upload Built Tarball 📦 uses: actions/upload-artifact@v4 @@ -140,32 +113,7 @@ mv mkappimage-* mkappimage mv mkappimage /usr/bin - wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run - chmod +x *.run run: | - make EXTRAGOFLAGS="${{env.EXTRAGOFLAGS}}" run make EXTRAGOFLAGS="${{env.EXTRAGOFLAGS}}" tarball make EXTRAGOFLAGS="${{env.EXTRAGOFLAGS}}" fatimage - - name: 😭 Upload Failed Directories For Debug - uses: actions/upload-artifact@v4 - if: failure() - with: - name: rokon-${{runner.os}}-failed-i386 - path: | - tarball - AppDir - run - *.AppImage - *.tar* - include-hidden-files: true - if-no-files-found: error - - name: 🗃️ Upload Built Runfile 📦 - uses: actions/upload-artifact@v4 - if: always() - with: - name: rokon-${{runner.os}}-runfile-armv7 - include-hidden-files: true - if-no-files-found: error - path: | - *.run - name: 🗃️ Upload Built Tarball 📦 uses: actions/upload-artifact@v4 @@ -224,37 +172,12 @@ mv mkappimage-* mkappimage mv mkappimage /usr/bin - wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run - chmod +x *.run run: | - make run make tarball make fatimage - - name: 😭 Upload Failed Directories For Debug - uses: actions/upload-artifact@v4 - if: failure() - with: - name: rokon-${{runner.os}}-failed-i386 - path: | - tarball - AppDir - run - *.AppImage - *.tar* - include-hidden-files: true - if-no-files-found: error - - name: 🗃️ Upload Built Runfile 📦 - uses: actions/upload-artifact@v4 - if: always() - with: - name: rokon-${{runner.os}}-runfile-i386 - include-hidden-files: true - if-no-files-found: error - path: | - *.run - name: 🗃️ Upload Built Tarball 📦 uses: actions/upload-artifact@v4 if: always() with: - name: rokon-${{runner.os}}-tarball-i386 + name: rokon-${{runner.os}}-tarball-armv7 include-hidden-files: true if-no-files-found: error @@ -267,5 +190,5 @@ with: - name: rokon-AppImage-i386 + name: rokon-AppImage-armv7 if-no-files-found: error path: | diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/publish.yml /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/publish.yml 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml 2024-10-29 10:57:20.000000000 +0000 @@ -88,6 +88,4 @@ done sudo pacman -Syu --needed --noconfirm git go gtk4 base-devel gnupg wget curl bash gobject-introspection namcap - wget https://github.com/megastep/makeself/releases/download/release-2.5.0/makeself-2.5.0.run - chmod +x *.run - name: 👁️ Ensure Code is Linted continue-on-error: true @@ -118,14 +116,10 @@ - name: 🖼️ Assemble the Self updating Tarball run: make tarball - - name: 🖼️ Assemble the Self updating Runfile - run: make run - - name: 😭 Upload Failed Directories For Debug + - name: 😭 Upload Failed Tarball For Debug uses: actions/upload-artifact@v4 if: failure() with: name: rokon-${{runner.os}}-failed-tarball-${{ runner.arch }} - path: | - tarball - run + path: tarball include-hidden-files: true if-no-files-found: error @@ -140,17 +134,8 @@ *.tar.gz *tar*.zsync - - name: 🗃️ Upload Built Runfile 📦 - uses: actions/upload-artifact@v4 - if: always() - with: - name: rokon-${{runner.os}}-runfile-${{ runner.arch }} - include-hidden-files: true - if-no-files-found: error - path: | - *.run - name: 🗃️ Upload Built ArchLinux Package 📦 uses: actions/upload-artifact@v4 if: always() - + with: name: rokon-archlinux-pkg-${{ runner.arch }} @@ -217,5 +202,5 @@ if [[ "$rpm" != *.src.rpm ]]; then echo "Installing $rpm..." - sudo dnf install -y "$rpm" --allowerasing + sudo dnf install -y "$rpm" --allowerasing else echo "Skipping source RPM: $rpm" @@ -266,5 +251,5 @@ uses: actions/upload-artifact@v4 if: always() - + with: name: rokon-AppImage-${{ runner.arch }} @@ -460,5 +445,5 @@ - name: 🗃️ Upload Deb packages uses: actions/upload-artifact@v4 - + if: always() with: diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.gitignore /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.gitignore --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.gitignore 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.gitignore 2024-10-26 13:55:00.000000000 +0000 @@ -33,5 +33,4 @@ *.tgz *.7z -*.run *.log *.zip @@ -60,7 +59,4 @@ squashfs-root tarball -run -makeself* -latest rpm debian/.debhelper diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/APKBUILD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/APKBUILD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/APKBUILD 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/APKBUILD 2024-10-29 14:57:44.000000000 +0000 @@ -13,4 +13,5 @@ go build-base + bash unzip " @@ -31,5 +32,5 @@ package() { cd src - make DESTDIR="$pkgdir" PREFIX="/usr" install + make DESTDIR="$pkgdir" PREFIX="/usr" install } diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/Makefile /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/Makefile --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/Makefile 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/Makefile 2024-10-29 14:57:44.000000000 +0000 @@ -1,4 +1,4 @@ #!/usr/bin/make -f -SHELL := $(shell which sh) +SHELL := $(shell which bash) # Define the default install directory PREFIX ?= /usr/local @@ -50,46 +50,20 @@ METAINFODIR = $(DESTDIR)$(PREFIX)/share/metainfo TARBALLDIR ?= ./tarball -RUNDIR ?= ./run -RUNLIBS ?= $(RUNDIR)/libs -ABS_RUNDIR := $(shell realpath $(RUNDIR)) -MAKESELF := $(shell if [ -f ./makeself*.run ]; then echo "./makeself*.run && makeself*/makeself.sh"; \ - elif [ -f ./makeself*/makeself.sh ]; then echo "./makeself*/makeself.sh"; \ - elif command -v makeself > /dev/null; then echo "makeself"; \ - elif command -v makeself.sh > /dev/null; then echo "makeself.sh"; \ - else echo ""; fi) TBPKGFMT ?= portable ABS_TARBALLDIR := $(shell realpath $(TARBALLDIR)) -TBLIBSDIR ?= $(TARBALLDIR)/libs -TAR_NAME ?= Rokon-$(shell uname)-$(VERSION)-$(shell uname -m).tar.gz -# Unix* users know .run is for them. DO NOT include it in the filename! -RUNFILE_NAME ?= Rokon-$(VERSION)-$(shell uname -m).run - - -make_wrapper_script = \ - echo '\#!/bin/sh' > $1/$(TARGET); \ - echo 'export LD_LIBRARY_PATH="./libs:$$LD_LIBRARY_PATH"' >> $1/$(TARGET); \ - echo 'export LD_PRELOAD="./libs/libc.so.6"' >> $1/$(TARGET); \ - echo 'export XKB_DEFAULT_INCLUDE_PATH="./share/X11/xkb"' >> $1/$(TARGET); \ - echo 'export XKB_CONFIG_ROOT="./share/X11/xkb"' >> $1/$(TARGET); \ - echo 'exec ./libs/ld-linux* "./bin/$(TARGET)" "$$@"' >> $1/$(TARGET); \ - chmod +x $1/$(TARGET); \ - sed -i 's/rokon/\.\/$(TARGET)/g' $1/io.github.brycensranch.Rokon.desktop +LIBS_DIR ?= $(TARBALLDIR)/libs +TAR_NAME ?= rokon-$(shell uname)-$(VERSION)-$(shell uname -m).tar.gz - - -copy_deps = \ - cp -L --no-preserve=mode -v $$(ldd $1 | grep 'ld-linux' | awk '{print $$1}') $2; \ - chmod +x $2/*.so*; \ - strip --strip-all $2/*.so* || echo "Stripping libraries failed! Tarball *may* be larger than expected."; \ +resolve_deps = \ ldd -d -r $1 | awk '{print $$3}' | grep -v 'not found' | while read -r dep; do \ if [ -n "$$dep" ]; then \ echo "Copying dependency: $$dep"; \ - cp -L --no-preserve=mode -v "$$dep" $2 || { echo "Failed to copy $$dep"; exit 1; }; \ + cp -L --no-preserve=mode -v "$$dep" $(LIBS_DIR) || { echo "Failed to copy $$dep"; exit 1; }; \ fi; \ ldd -d -r "$$dep" | awk '{print $$3}' | grep -v 'not found' | while read -r subdep; do \ if [ -n "$$subdep" ]; then \ echo "Copying sub-dependency: $$subdep"; \ - cp -L --no-preserve=mode -v "$$subdep" $2 || { echo "Failed to copy $$subdep"; exit 1; }; \ + cp -L --no-preserve=mode -v "$$subdep" $(LIBS_DIR) || { echo "Failed to copy $$subdep"; exit 1; }; \ fi; \ done; \ @@ -99,5 +73,5 @@ # Target to resolve dependencies resolve: - $(call copy_deps, $(TARGET)) + $(call resolve_deps, $(TARGET)) @@ -126,5 +100,5 @@ clean: ## remove files created during build pipeline $(call print-target) - rm -rf dist .flatpak io.github.brycensranch.Rokon.desktop tarball io.github.brycensranch.Rokon.metainfo.xml macos/rokon .flatpak-builder flathub/.flatpak-builder flathub/repo *.log *.zip modules.txt flathub/export macos/share flathub/*.flatpak AppDir src squashfs-root *.AppImage makeself* *.run *.rpm *.pdf *.rtf windows/*.rtf *.deb *.msi *.exe pkg/ *.pkg.tar.zst .ptmp* *.tar* *.snap *.zsync rokon Rokon debian/tmp debian/rokon* *.changes *.buildinfo debian/.debhelper coverage.* '"$(shell go env GOCACHE)/../golangci-lint"' + rm -rf dist .flatpak io.github.brycensranch.Rokon.desktop tarball io.github.brycensranch.Rokon.metainfo.xml macos/rokon .flatpak-builder flathub/.flatpak-builder flathub/repo *.log *.zip modules.txt flathub/export macos/share flathub/*.flatpak AppDir src squashfs-root *.AppImage *.rpm *.pdf *.rtf windows/*.rtf *.deb *.msi *.exe pkg/ *.pkg.tar.zst .ptmp* *.tar* *.snap *.zsync rokon Rokon debian/tmp debian/rokon* *.changes *.buildinfo debian/.debhelper coverage.* '"$(shell go env GOCACHE)/../golangci-lint"' # go clean -i -cache -testcache -modcache -fuzzcache -x @@ -199,14 +173,16 @@ rm -rf $(TARBALLDIR) || sudo rm -v -rf $(TARBALLDIR) mkdir -p $(TARBALLDIR) - mkdir -p $(TBLIBSDIR) + mkdir -p $(LIBS_DIR) $(MAKE) PACKAGED=true PACKAGEFORMAT=$(TBPKGFMT) EXTRAGOFLAGS="$(EXTRAGOFLAGS) -trimpath" EXTRALDFLAGS="$(EXTRALDFLAGS) -s -w -linkmode=external" build $(MAKE) PREFIX=$(TARBALLDIR) APPLICATIONSDIR=$(TARBALLDIR) install cp -v ./windows/portable.txt $(TARBALLDIR) - $(call copy_deps,$(TARBALLDIR)/bin/$(TARGET),$(TBLIBSDIR)) - # patchelf --set-interpreter libs/ld-linux-$(subst _,-,$(shell uname -m)).so.2 --force-rpath --set-rpath libs $(TARBALLDIR)/bin/$(TARGET) - $(call make_wrapper_script,$(TARBALLDIR)) + $(call resolve_deps,$(TARBALLDIR)/bin/$(TARGET)) + cp -L --no-preserve=mode -v $$(ldd $(TARBALLDIR)/bin/$(TARGET) | grep 'ld-linux' | awk '{print $$1}') $(LIBS_DIR) + chmod +x $(LIBS_DIR)/*.so* + strip --strip-all $(LIBS_DIR)/*.so* + patchelf --set-interpreter libs/ld-linux-$(subst _,-,$(shell uname -m)).so.2 --force-rpath --set-rpath libs $(TARBALLDIR)/bin/$(TARGET) @if command -v glibc-downgrade > /dev/null; then \ echo "glibc-downgrade found. Downgrading binaries and libraries to glibc 2.33..."; \ - for lib in $(TBLIBSDIR)/*.so*; do \ + for lib in $(LIBS_DIR)/*.so*; do \ if [[ "$(basename "$$lib")" != *"libc.so"* && "$(basename "$$lib")" != *"libm.so"* && "$(basename "$$lib")" != *"libstdc++"* ]]; then \ echo "Applying glibc-downgrade to $$lib"; \ @@ -226,7 +202,14 @@ echo "UPX not found. Skipping compression."; \ fi - $(call make_wrapper_script,$(TARBALLDIR)) + echo '#!/bin/sh' > $(TARBALLDIR)/$(TARGET); \ + echo 'export LD_LIBRARY_PATH="./libs:$${LD_LIBRARY_PATH}"' >> $(TARBALLDIR)/$(TARGET); \ + echo 'export LD_PRELOAD="./libs/libc.so.6"' >> $(TARBALLDIR)/$(TARGET); \ + echo 'export XKB_DEFAULT_INCLUDE_PATH=./share/X11/xkb' >> $(TARBALLDIR)/$(TARGET); \ + echo 'export XKB_CONFIG_ROOT=./share/X11/xkb' >> $(TARBALLDIR)/$(TARGET); \ + echo 'exec ./libs/ld-linux* ./bin/$(TARGET) "$$@"' >> $(TARBALLDIR)/$(TARGET); \ + chmod +x $(TARBALLDIR)/$(TARGET) cd /usr && cp -r --parents -L --no-preserve=mode -r share/glib-2.0/schemas/gschemas.compiled share/X11 share/gtk-4.0 share/icons/Adwaita $(ABS_TARBALLDIR) - rm -rf $(TARBALLDIR)/share/gtk-4.0/emoji || true + rm -rf $(TARBALLDIR)/share/gtk-4.0/emoji|| true + sed -i 's/rokon/\.\/$(TARGET)/g' $(TARBALLDIR)/io.github.brycensranch.Rokon.desktop cd $(TARBALLDIR) && LD_DEBUG=libs ./$(TARGET) --version; \ status=$$?; \ @@ -251,18 +234,4 @@ endif -.PHONY: run -run: ## create run "package" - $(call print-target) - $(MAKE) PACKAGED=true PACKAGEFORMAT="run" TBPKGFMT="run" TARBALLDIR=$(RUNDIR) NOTB=1 tarball - $(MAKESELF) --sha256 $(RUNDIR) Rokon-$(VERSION)-$(uname -m).run Rokon ./$(TARGET) - LD_DEBUG=libs ./Rokon-$(VERSION)-$(uname -m).run -- "--version"; \ - status=$$?; \ - if [ $$status -ne 0 ]; then \ - echo "Sanity check failed. See output above for details."; \ - exit $$status; \ - else \ - echo "Sanity check succeeded."; \ - fi - .PHONY: dev dev: ## go run -v . @@ -271,4 +240,8 @@ go run -v . +.PHONY: run +run: ## go run -v . +run: dev + .PHONY: mod mod: ## go mod tidy diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD 2024-10-29 19:02:48.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD 2024-10-29 14:57:56.000000000 +0000 @@ -2,5 +2,5 @@ pkgname=rokon -pkgver=1.0.0+2c5ce91 +pkgver=1.0.0+58cda32 pkgrel=1 epoch=0 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/flathub/go.mod.yml /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/flathub/go.mod.yml --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/flathub/go.mod.yml 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/flathub/go.mod.yml 2024-10-29 14:57:44.000000000 +0000 @@ -4,13 +4,8 @@ type: file - dest: vendor/github.com/adrg/xdg - sha256: acdbe9c6386de47fec0dda18af1d08e319bab8a9fd134625edaa28f9e745f5c2 + sha256: 53d5cfc44ba00ff0df46c3988383f362feb1ad42d63af3e1b8243346bd65d4ee strip-components: 3 type: archive - url: https://proxy.golang.org/github.com/adrg/xdg/@v/v0.5.2.zip -- dest: vendor/github.com/benesch/cgosymbolizer - sha256: 77732751af3b44429790b41f2db2b8a7f4a19fdd10ccbf5069730a48cf5e419c - strip-components: 3 - type: archive - url: https://proxy.golang.org/github.com/benesch/cgosymbolizer/@v/v0.0.0-20190515212042-bec6fe6e597b.zip + url: https://proxy.golang.org/github.com/adrg/xdg/@v/v0.5.0.zip - dest: vendor/github.com/brycensranch/go-aptabase/pkg sha256: d30dd331b92fd16b89214b3988075f49f0e93becca5aa6f53609296b1960a4d8 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/flathub/modules.txt /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/flathub/modules.txt --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/flathub/modules.txt 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/flathub/modules.txt 2024-10-29 14:57:44.000000000 +0000 @@ -2,12 +2,9 @@ ## explicit; go 1.18 github.com/KarpelesLab/weak -# github.com/adrg/xdg v0.5.2 +# github.com/adrg/xdg v0.5.0 ## explicit; go 1.19 github.com/adrg/xdg github.com/adrg/xdg/internal/pathutil github.com/adrg/xdg/internal/userdirs -# github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b -## explicit -github.com/benesch/cgosymbolizer # github.com/brycensranch/go-aptabase/pkg v0.0.0-20241004152612-e20856549654 ## explicit; go 1.22.0 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/go.sum /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/go.sum --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/go.sum 2024-10-29 19:02:32.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/go.sum 2024-10-29 14:57:46.000000000 +0000 @@ -1,4 +1,6 @@ github.com/KarpelesLab/weak v0.1.1 h1:fNnlPo3aypS9tBzoEQluY13XyUfd/eWaSE/vMvo9s4g= github.com/KarpelesLab/weak v0.1.1/go.mod h1:pzXsWs5f2bf+fpgHayTlBE1qJpO3MpJKo5sRaLu1XNw= +github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY= +github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4= github.com/adrg/xdg v0.5.2 h1:HNeVffMIG56GLMaoKTcTcyFhD2xS/dhyuBlKSNCM6Ug= github.com/adrg/xdg v0.5.2/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ= Only in /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0: run