From 943473102503e10036bb55bfe4687b368dd48a7c Mon Sep 17 00:00:00 2001 From: bbhtt <62639087+bbhtt@users.noreply.github.com> Date: Fri, 2 Sep 2022 15:10:17 +0530 Subject: [PATCH 1/3] Bump runtime to 42 --- io.github.Snaggly.PS2_Pnacher.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/io.github.Snaggly.PS2_Pnacher.yml b/io.github.Snaggly.PS2_Pnacher.yml index 8da9d89..472b2cc 100644 --- a/io.github.Snaggly.PS2_Pnacher.yml +++ b/io.github.Snaggly.PS2_Pnacher.yml @@ -1,6 +1,6 @@ app-id: io.github.Snaggly.PS2_Pnacher runtime: org.gnome.Platform -runtime-version: '40' +runtime-version: '42' sdk: org.gnome.Sdk command: ps2pnacher finish-args: @@ -55,7 +55,7 @@ modules: sha256: a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d cleanup: - '*' - + - name: libsigc++ buildsystem: meson config-opts: @@ -116,7 +116,7 @@ modules: commit: 3170a5300b6617bfe9f461f57c34f1705e0c679e cleanup: - '/lib/pangomm*' - + - name: libcdio rm-configure: true sources: From d4bf78d0986a2110bba5e42d6ac2b1c3fe580934 Mon Sep 17 00:00:00 2001 From: bbhtt <62639087+bbhtt@users.noreply.github.com> Date: Fri, 2 Sep 2022 15:21:58 +0530 Subject: [PATCH 2/3] Refresh dependencies --- io.github.Snaggly.PS2_Pnacher.yml | 47 +++++++++++++------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/io.github.Snaggly.PS2_Pnacher.yml b/io.github.Snaggly.PS2_Pnacher.yml index 472b2cc..41e6cb1 100644 --- a/io.github.Snaggly.PS2_Pnacher.yml +++ b/io.github.Snaggly.PS2_Pnacher.yml @@ -38,11 +38,11 @@ modules: buildsystem: meson config-opts: - -Dbuild-documentation=false + - -Dbuild-examples=false sources: - - type: git - url: 'https://gitlab.gnome.org/GNOME/glibmm.git' - tag: 2.66.0 - commit: 78430275553a79f845dd6f4919a5a50a203d0862 + - type: archive + url: 'https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.4.tar.xz' + sha256: 199ace5682d81b15a1d565480b4a950682f2db6402c8aa5dd7217d71edff81d5 cleanup: - '/lib/glibmm*' - '/lib/giomm*' @@ -51,19 +51,20 @@ modules: buildsystem: meson sources: - type: archive - url: 'https://download.gnome.org/sources/mm-common/1.0/mm-common-1.0.2.tar.xz' - sha256: a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d + url: 'https://download.gnome.org/sources/mm-common/1.0/mm-common-1.0.4.tar.xz' + sha256: e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8 cleanup: - '*' - name: libsigc++ buildsystem: meson config-opts: + - -Dbuild-documentation=false - -Dbuild-examples=false sources: - type: archive - url: 'https://github.com/libsigcplusplus/libsigcplusplus/releases/download/2.10.6/libsigc++-2.10.6.tar.xz' - sha256: dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b + url: 'https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.8.tar.xz' + sha256: 235a40bec7346c7b82b6a8caae0456353dc06e71f14bc414bcc858af1838719a cleanup: - '/lib/sigc++*' @@ -72,10 +73,9 @@ modules: config-opts: - -Dbuild-documentation=false sources: - - type: git - url: 'https://gitlab.gnome.org/GNOME/gtkmm.git' - tag: 3.24.3 - commit: a99220925b22a02d58e02fb1c5020d0c1d3ba389 + - type: archive + url: 'https://download.gnome.org/sources/gtkmm/3.24/gtkmm-3.24.6.tar.xz' + sha256: 4b3e142e944e1633bba008900605c341a93cfd755a7fa2a00b05d041341f11d6 cleanup: - '/lib/gdkmm*' - '/lib/gtkmm*' @@ -87,8 +87,8 @@ modules: - -Dbuild-documentation=false sources: - type: archive - url: 'https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.28/atkmm-2.28.1.tar.xz' - sha256: 116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad + url: 'https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.3.tar.xz' + sha256: 7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969 cleanup: - '/lib/atkmm*' @@ -96,10 +96,9 @@ modules: config-opts: - --disable-documentation sources: - # cairomm >= 1.14.0 requires sigc++ 3.0 and other modules require cairomm < 1.13.0 - type: archive - url: 'https://www.cairographics.org/releases/cairomm-1.12.2.tar.gz' - sha256: 45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599 + url: 'https://gitlab.freedesktop.org/cairo/cairomm/-/archive/1.14.3/cairomm-1.14.3.tar.gz' + sha256: 7dab16c5698acb284f178048337465b463fbed01c49e10bfe48acb0a852d873e post-install: - install -Dm644 -t /app/share/licenses/cairomm COPYING cleanup: @@ -110,23 +109,17 @@ modules: config-opts: - -Dbuild-documentation=false sources: - - type: git - url: 'https://gitlab.gnome.org/GNOME/pangomm.git' - tag: 2.46.0 - commit: 3170a5300b6617bfe9f461f57c34f1705e0c679e + - type: archive + url: 'https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.2.tar.xz' + sha256: 57442ab4dc043877bfe3839915731ab2d693fc6634a71614422fb530c9eaa6f4 cleanup: - '/lib/pangomm*' - name: libcdio - rm-configure: true sources: - type: archive - url: 'http://distcache.freebsd.org/ports-distfiles/libcdio-2.1.0.tar.bz2' + url: 'https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2' sha256: 8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b - - type: script - commands: - - autoreconf -fiv - dest-filename: autogen.sh post-install: - install -Dm644 -t /app/share/licenses/libcdio COPYING cleanup: From 82c1ff2f5ab4950414fd5a9ad665773651cb7a29 Mon Sep 17 00:00:00 2001 From: bbhtt <62639087+bbhtt@users.noreply.github.com> Date: Sat, 3 Sep 2022 07:31:21 +0530 Subject: [PATCH 3/3] Add a patch to fix icon dimensions --- fix-icon-dimensions.patch | 25 +++++++++++++++++++++++++ io.github.Snaggly.PS2_Pnacher.yml | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 fix-icon-dimensions.patch diff --git a/fix-icon-dimensions.patch b/fix-icon-dimensions.patch new file mode 100644 index 0000000..e584417 --- /dev/null +++ b/fix-icon-dimensions.patch @@ -0,0 +1,25 @@ +From 5d7fcb0faef5cd16a23ece983bd4c6a5d0ce9d8a Mon Sep 17 00:00:00 2001 +From: bbhtt <62639087+bbhtt@users.noreply.github.com> +Date: Sat, 3 Sep 2022 07:28:45 +0530 +Subject: [PATCH] Fix icon dimensions + +--- + res/io.github.Snaggly.PS2_Pnacher.svg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/res/io.github.Snaggly.PS2_Pnacher.svg b/res/io.github.Snaggly.PS2_Pnacher.svg +index fcca072..6eeda39 100644 +--- a/res/io.github.Snaggly.PS2_Pnacher.svg ++++ b/res/io.github.Snaggly.PS2_Pnacher.svg +@@ -10,7 +10,7 @@ + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="111.84942mm" +- height="112.50439mm" ++ height="111.84942mm" + viewBox="0 0 111.84942 112.50439" + version="1.1" + id="svg8" +-- +2.37.3 + diff --git a/io.github.Snaggly.PS2_Pnacher.yml b/io.github.Snaggly.PS2_Pnacher.yml index 41e6cb1..1b8be99 100644 --- a/io.github.Snaggly.PS2_Pnacher.yml +++ b/io.github.Snaggly.PS2_Pnacher.yml @@ -31,6 +31,8 @@ modules: commit: 6f23e70234ff3f48ed27d304413d7900c259442c - type: patch path: ps2pnacher_flatpak.patch + - type: patch + path: fix-icon-dimensions.patch post-install: - install -Dm644 flatpak/io.github.Snaggly.PS2_Pnacher.metainfo.xml /app/share/metainfo/io.github.Snaggly.PS2_Pnacher.metainfo.xml modules: