From 018de2afc860e66740b6831948311be138f85c98 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Sat, 13 Jun 2020 04:41:08 -0300 Subject: [PATCH 1/8] New package: Itch Indie games client for Linux, the client is under MIT license, every game is DRM free and is delivered via direct download rather than codes you would have to enter into Steam or another launcher. --- srcpkgs/itch/template | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 srcpkgs/itch/template diff --git a/srcpkgs/itch/template b/srcpkgs/itch/template new file mode 100644 index 000000000000..3418772e435e --- /dev/null +++ b/srcpkgs/itch/template @@ -0,0 +1,61 @@ +# Template file for 'itch' +pkgname=itch +version=1.18.0 +revision=1 +archs="i686 x86_64" +build_style=go +hostmakedepends="wget" +makedepends="curl" +short_desc="Itch.io indie games client for Linux" +maintainer="MarcoAPC " +license="MIT" +homepage="https://github.com/itchio/itch" + +case "$XBPS_TARGET_MACHINE" in + x86_64) + _dist_arch="amd64" + _filename=itch-setup + checksum=" + e86c70044c7d02754c6e52fb428d1278678d729c77b8359b5d82198595da1351 + 874a17d72a3bce1dda9b43ea6450a2f4454bf2b01207ae259a981b0f915bbedb" + + ;; + i686) + _dist_arch="386" + _filename=itch-setup + checksum=" + e86c70044c7d02754c6e52fb428d1278678d729c77b8359b5d82198595da1351 + 447940ea9cd7051e43f98b5dd5fdb0de94e30e2e479d2812314820030f876db2" + +;; +esac + +_itchUrl="https://broth.itch.ovh/itch-setup/linux-${_dist_arch}/${version}/unpacked/default" + +distfiles=" + https://github.com/itchio/itch/archive/v25.4.0.tar.gz" + wrksrc="itch-25.4.0" + +do_fetch() { + mkdir -p $wrksrc + cd $wrksrc + wget \ + --progress=bar:force \ + -c -O $_filename \ + $_itchUrl + echo "$checksum $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; } +} + +do_install() { + vbin itch-setup + vbin ${FILESDIR}/itch + vmkdir usr/share/applications + vmkdir usr/share/icons/hicolor/16x16/apps + vmkdir usr/share/icons/hicolor/32x32/apps + vmkdir usr/share/icons/hicolor/48x48/apps + vinstall ${FILESDIR}/io.itch.itch.desktop 0644 usr/share/applications + cp release/images/itch-icons/icon16.png ${DESTDIR}/usr/share/icons/hicolor/16x16/apps/itch.png + cp release/images/itch-icons/icon32.png ${DESTDIR}/usr/share/icons/hicolor/32x32/apps/itch.png + cp release/images/itch-icons/icon48.png ${DESTDIR}/usr/share/icons/hicolor/48x48/apps/itch.png + vlicense LICENSE +} From 36c0e9ef56cda191830f74bb55869b62d9fe5e4c Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Sat, 13 Jun 2020 05:08:53 -0300 Subject: [PATCH 2/8] Add file --- srcpkgs/itch/files/io.itch.itch.desktop | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/itch/files/io.itch.itch.desktop diff --git a/srcpkgs/itch/files/io.itch.itch.desktop b/srcpkgs/itch/files/io.itch.itch.desktop new file mode 100644 index 000000000000..b760f9c51774 --- /dev/null +++ b/srcpkgs/itch/files/io.itch.itch.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Name=itch +TryExec=itch +Exec=itch %U +Icon=itch +Terminal=false +Categories=Game; +MimeType=x-scheme-handler/itchio;x-scheme-handler/itch; +X-GNOME-Autostart-enabled=true +Comment=Install and play itch.io games easily From d7eada11c562ff443b29e9130d56e83c753bcdf3 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Sat, 13 Jun 2020 05:12:39 -0300 Subject: [PATCH 3/8] Add shell script file --- srcpkgs/itch/files/itch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/itch/files/itch diff --git a/srcpkgs/itch/files/itch b/srcpkgs/itch/files/itch new file mode 100644 index 000000000000..b3601fa8405c --- /dev/null +++ b/srcpkgs/itch/files/itch @@ -0,0 +1,2 @@ +#!/bin/sh +itch-setup --prefer-launch -- "@$" From a12e76cbbdefcc50af50d978af05b7cf7465db5f Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Mon, 15 Jun 2020 04:55:59 -0300 Subject: [PATCH 4/8] Applied suggested changes to the template --- srcpkgs/itch/template | 61 ++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/srcpkgs/itch/template b/srcpkgs/itch/template index 3418772e435e..89cb86df2a8d 100644 --- a/srcpkgs/itch/template +++ b/srcpkgs/itch/template @@ -3,59 +3,42 @@ pkgname=itch version=1.18.0 revision=1 archs="i686 x86_64" +wrksrc="${pkgname}-setup-${version}" build_style=go -hostmakedepends="wget" -makedepends="curl" +go_import_path="github.com/itchio/itch-setup" +hostmakedepends="git pkg-config" +makedepends="gtk+3-devel" short_desc="Itch.io indie games client for Linux" maintainer="MarcoAPC " license="MIT" -homepage="https://github.com/itchio/itch" - -case "$XBPS_TARGET_MACHINE" in - x86_64) - _dist_arch="amd64" - _filename=itch-setup - checksum=" - e86c70044c7d02754c6e52fb428d1278678d729c77b8359b5d82198595da1351 - 874a17d72a3bce1dda9b43ea6450a2f4454bf2b01207ae259a981b0f915bbedb" - - ;; - i686) - _dist_arch="386" - _filename=itch-setup - checksum=" - e86c70044c7d02754c6e52fb428d1278678d729c77b8359b5d82198595da1351 - 447940ea9cd7051e43f98b5dd5fdb0de94e30e2e479d2812314820030f876db2" - -;; -esac - -_itchUrl="https://broth.itch.ovh/itch-setup/linux-${_dist_arch}/${version}/unpacked/default" - +homepage="https://itch.io/" distfiles=" - https://github.com/itchio/itch/archive/v25.4.0.tar.gz" - wrksrc="itch-25.4.0" + https://github.com/itchio/itch-setup/archive/v${version}.tar.gz + https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon16.png + https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon32.png + https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon48.png" +checksum=" + 96d3bff9b200dc5c03af8e46d0805a6f4dc504d6281b2956dcedda931849c0dc + c1e7154020c847cd5cd75d544a7e5dbe8bd495fe87a664afd24c4a952a7e8a78 + e38c4a04b2ced31d2a13b72f310e069beff73a7cf887a4cbde57fa7b19c67fab + 5f38d0b884053b10d856151931b7699723c4a28cf14622c95bc6022bec391c3f" +skip_extraction="icon16.png icon32.png icon48.png" -do_fetch() { - mkdir -p $wrksrc - cd $wrksrc - wget \ - --progress=bar:force \ - -c -O $_filename \ - $_itchUrl - echo "$checksum $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; } +do_build() { + cd "$GOSRCPATH" + go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} } do_install() { - vbin itch-setup + vbin ${GOPATH}/bin/itch-setup vbin ${FILESDIR}/itch vmkdir usr/share/applications vmkdir usr/share/icons/hicolor/16x16/apps vmkdir usr/share/icons/hicolor/32x32/apps vmkdir usr/share/icons/hicolor/48x48/apps vinstall ${FILESDIR}/io.itch.itch.desktop 0644 usr/share/applications - cp release/images/itch-icons/icon16.png ${DESTDIR}/usr/share/icons/hicolor/16x16/apps/itch.png - cp release/images/itch-icons/icon32.png ${DESTDIR}/usr/share/icons/hicolor/32x32/apps/itch.png - cp release/images/itch-icons/icon48.png ${DESTDIR}/usr/share/icons/hicolor/48x48/apps/itch.png + cp ${XBPS_SRCDISTDIR}/itch-${version}/icon16.png ${DESTDIR}/usr/share/icons/hicolor/16x16/apps/itch.png + cp ${XBPS_SRCDISTDIR}/itch-${version}/icon32.png ${DESTDIR}/usr/share/icons/hicolor/32x32/apps/itch.png + cp ${XBPS_SRCDISTDIR}/itch-${version}/icon48.png ${DESTDIR}/usr/share/icons/hicolor/48x48/apps/itch.png vlicense LICENSE } From 59401d60124c5a4031f7d653dd580fbc1025fb9d Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Thu, 24 Dec 2020 18:02:37 -0300 Subject: [PATCH 5/8] Update version --- srcpkgs/itch/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/itch/template b/srcpkgs/itch/template index 89cb86df2a8d..b616c2f65218 100644 --- a/srcpkgs/itch/template +++ b/srcpkgs/itch/template @@ -1,12 +1,12 @@ # Template file for 'itch' pkgname=itch -version=1.18.0 +version=1.24.0 revision=1 archs="i686 x86_64" wrksrc="${pkgname}-setup-${version}" build_style=go go_import_path="github.com/itchio/itch-setup" -hostmakedepends="git pkg-config" +hostmakedepends="git pkg-config nodejs-lts" makedepends="gtk+3-devel" short_desc="Itch.io indie games client for Linux" maintainer="MarcoAPC " @@ -18,15 +18,15 @@ distfiles=" https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon32.png https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon48.png" checksum=" - 96d3bff9b200dc5c03af8e46d0805a6f4dc504d6281b2956dcedda931849c0dc + 316c9d3077c427f2bbc001ee51243413cd800b987ea9ceb89519381f797992bb c1e7154020c847cd5cd75d544a7e5dbe8bd495fe87a664afd24c4a952a7e8a78 e38c4a04b2ced31d2a13b72f310e069beff73a7cf887a4cbde57fa7b19c67fab 5f38d0b884053b10d856151931b7699723c4a28cf14622c95bc6022bec391c3f" skip_extraction="icon16.png icon32.png icon48.png" -do_build() { - cd "$GOSRCPATH" - go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} +pre_build() { + npm install + export PATH="$PATH:${wrksrc}/node_modules/.bin/" } do_install() { From 77b3357dd0320d783652b3e2104022a82aed18a2 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Thu, 24 Dec 2020 18:22:49 -0300 Subject: [PATCH 6/8] Remove i686 architecture There is no linux-i686.zip package to download from the project's github, making it impossible to compile on i686. --- srcpkgs/itch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/itch/template b/srcpkgs/itch/template index b616c2f65218..1d5567961f5c 100644 --- a/srcpkgs/itch/template +++ b/srcpkgs/itch/template @@ -2,7 +2,7 @@ pkgname=itch version=1.24.0 revision=1 -archs="i686 x86_64" +archs="x86_64" wrksrc="${pkgname}-setup-${version}" build_style=go go_import_path="github.com/itchio/itch-setup" From 78ee171fea184eb09a5f176db513f2a1e302d9c5 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Tue, 20 Apr 2021 23:27:43 -0300 Subject: [PATCH 7/8] Applied suggested changes --- srcpkgs/itch/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/itch/template b/srcpkgs/itch/template index 1d5567961f5c..8145e54da85b 100644 --- a/srcpkgs/itch/template +++ b/srcpkgs/itch/template @@ -14,9 +14,9 @@ license="MIT" homepage="https://itch.io/" distfiles=" https://github.com/itchio/itch-setup/archive/v${version}.tar.gz - https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon16.png - https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon32.png - https://raw.githubusercontent.com/itchio/itch/master/release/images/itch-icons/icon48.png" + https://raw.githubusercontent.com/itchio/itch/v25.4.1/release/images/itch-icons/icon16.png + https://raw.githubusercontent.com/itchio/itch/v25.4.1/release/images/itch-icons/icon32.png + https://raw.githubusercontent.com/itchio/itch/v25.4.1/release/images/itch-icons/icon48.png" checksum=" 316c9d3077c427f2bbc001ee51243413cd800b987ea9ceb89519381f797992bb c1e7154020c847cd5cd75d544a7e5dbe8bd495fe87a664afd24c4a952a7e8a78 From 727775198d9a5b60b9411d5aea322d9bdb02bf04 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Thu, 17 Jun 2021 21:54:16 -0300 Subject: [PATCH 8/8] Added Patch The version of Gotk3 0.4.0, does not compile with Go 1.16, the 0.6.0 version compiles fine! --- srcpkgs/itch/patches/fix-version-error.patch | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/itch/patches/fix-version-error.patch diff --git a/srcpkgs/itch/patches/fix-version-error.patch b/srcpkgs/itch/patches/fix-version-error.patch new file mode 100644 index 000000000000..8c025ee3a4dc --- /dev/null +++ b/srcpkgs/itch/patches/fix-version-error.patch @@ -0,0 +1,25 @@ +--- go.mod 2021-04-21 22:34:25.000000000 -0300 ++++ go.mod 2021-06-16 07:42:44.652159000 -0300 +@@ -11,7 +11,7 @@ + github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect + github.com/go-ole/go-ole v1.2.4 // indirect + github.com/google/uuid v1.1.1 +- github.com/gotk3/gotk3 v0.4.0 ++ github.com/gotk3/gotk3 v0.6.0 + github.com/itchio/go-itchio v0.0.0-20200402182019-61224e60358e + github.com/itchio/headway v0.0.0-20200301160421-e15721f23905 + github.com/itchio/httpkit v0.0.0-20200618110940-5044e418b971 + +--- go.sum 2021-04-21 22:34:25.000000000 -0300 ++++ go.sum 2021-06-16 07:42:25.948158000 -0300 +@@ -92,8 +92,8 @@ + github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= + github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +-github.com/gotk3/gotk3 v0.4.0 h1:TIuhyQitGeRTxOQIV3AJlYtEWWJpC74JHwAIsxlH8MU= +-github.com/gotk3/gotk3 v0.4.0/go.mod h1:Eew3QBwAOBTrfFFDmsDE5wZWbcagBL1NUslj1GhRveo= ++github.com/gotk3/gotk3 v0.6.0 h1:Aqlq4/6VabNwtCyA9M9zFNad5yHAqCi5heWnZ9y+3dA= ++github.com/gotk3/gotk3 v0.6.0/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q= + github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= + github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= + github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=