From 75df976dea016d178f4d913a2bb86058ef4d0415 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 18 Oct 2020 19:58:34 +0200 Subject: [PATCH 01/21] Switch to F33 runtime and sources --- meld.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meld.yaml b/meld.yaml index ac7168f..1671202 100644 --- a/meld.yaml +++ b/meld.yaml @@ -16,13 +16,13 @@ data: - MIT dependencies: - buildrequires: - flatpak-common: [f32] - flatpak-runtime: [f32] - platform: [f32] + flatpak-common: [f33] + flatpak-runtime: [f33] + platform: [f33] requires: - flatpak-common: [f32] - flatpak-runtime: [f32] - platform: [f32] + flatpak-common: [f33] + flatpak-runtime: [f33] + platform: [f33] profiles: default: rpms: @@ -31,9 +31,9 @@ data: rpms: meld: rationale: Application package - ref: f32 + ref: f33 buildorder: 10 patch: rationale: Runtime dependency - ref: f32 + ref: f33 ... From f91f6b5a46c720e75ffb201bab8ea0c8dad264c3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 18 Oct 2020 19:58:48 +0200 Subject: [PATCH 02/21] Explicitly include patch in the container It's been moved from Requires to Recommends in the spec file. --- meld.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/meld.yaml b/meld.yaml index 1671202..a2409f2 100644 --- a/meld.yaml +++ b/meld.yaml @@ -27,6 +27,7 @@ data: default: rpms: - meld + - patch components: rpms: meld: From 2f4726f29c184a56aac2a4112086ade563aec8d0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 19 Oct 2020 10:55:20 +0200 Subject: [PATCH 03/21] Add patch dependencies --- meld.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meld.yaml b/meld.yaml index a2409f2..753d67a 100644 --- a/meld.yaml +++ b/meld.yaml @@ -30,6 +30,9 @@ data: - patch components: rpms: + ed: + rationale: Runtime dependency + ref: f33 meld: rationale: Application package ref: f33 @@ -37,4 +40,7 @@ data: patch: rationale: Runtime dependency ref: f33 + texinfo: + rationale: Runtime dependency + ref: f33 ... From d1d62df31af0049a03d41692d78a403761c4fdcf Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2020 12:28:37 +0200 Subject: [PATCH 04/21] Update app ID It's been renamed from org.gnome.meld to org.gnome.Meld. --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 94e13f8..dab0484 100644 --- a/container.yaml +++ b/container.yaml @@ -2,7 +2,7 @@ compose: modules: - meld:master flatpak: - id: org.gnome.meld + id: org.gnome.Meld branch: stable command: meld finish-args: |- From 7c21b986ebc8f17c60b686f4899bbb4cb10c39ce Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2020 15:58:56 +0200 Subject: [PATCH 05/21] end-of-life-rebase: org.gnome.Meld In F33 flatpak builds, meld is now org.gnome.Meld instead of org.gnome.meld. To make flatpak updates seamlessly work, this commit adds 'end-of-life-rebase: org.gnome.Meld' to org.gnome.meld to get all users migrated over to the new ID. --- container.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 94e13f8..edfbd48 100644 --- a/container.yaml +++ b/container.yaml @@ -1,8 +1,10 @@ compose: modules: - - meld:master + - meld:f32 flatpak: id: org.gnome.meld + name: eol/meld + end-of-life-rebase: org.gnome.Meld branch: stable command: meld finish-args: |- From cc854ba7a13e7912c2d11a79aacff3769c0486e7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2020 16:34:16 +0200 Subject: [PATCH 06/21] Use last ref for meld package that still has org.gnome.meld --- meld.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meld.yaml b/meld.yaml index ac7168f..6a3cb55 100644 --- a/meld.yaml +++ b/meld.yaml @@ -35,5 +35,5 @@ data: buildorder: 10 patch: rationale: Runtime dependency - ref: f32 + ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7 ... From 1e784a5d9dba070e6b40d328dde7312319d3ccf1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2020 17:14:22 +0200 Subject: [PATCH 07/21] Fix ref mixup in previous commit --- meld.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meld.yaml b/meld.yaml index 6a3cb55..d4e2471 100644 --- a/meld.yaml +++ b/meld.yaml @@ -31,9 +31,9 @@ data: rpms: meld: rationale: Application package - ref: f32 + ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7 buildorder: 10 patch: rationale: Runtime dependency - ref: c8549f7fd2ef4d178f4c489412c86c9707572bb7 + ref: f32 ... From 061f892ae166df7879169c11e3c169b8b5baeae7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 1 Apr 2021 17:08:47 +0200 Subject: [PATCH 08/21] container.yaml: Adapt for master->stable rename --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index dab0484..c544cc3 100644 --- a/container.yaml +++ b/container.yaml @@ -1,6 +1,6 @@ compose: modules: - - meld:master + - meld:stable flatpak: id: org.gnome.Meld branch: stable From 137cb50d71f9f5bfbfa7c718397b3382881d2197 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 1 Apr 2021 17:08:57 +0200 Subject: [PATCH 09/21] Switch to F34 runtime and sources --- meld.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meld.yaml b/meld.yaml index 753d67a..a9be90a 100644 --- a/meld.yaml +++ b/meld.yaml @@ -16,13 +16,13 @@ data: - MIT dependencies: - buildrequires: - flatpak-common: [f33] - flatpak-runtime: [f33] - platform: [f33] + flatpak-common: [f34] + flatpak-runtime: [f34] + platform: [f34] requires: - flatpak-common: [f33] - flatpak-runtime: [f33] - platform: [f33] + flatpak-common: [f34] + flatpak-runtime: [f34] + platform: [f34] profiles: default: rpms: @@ -32,15 +32,15 @@ data: rpms: ed: rationale: Runtime dependency - ref: f33 + ref: f34 meld: rationale: Application package - ref: f33 + ref: f34 buildorder: 10 patch: rationale: Runtime dependency - ref: f33 + ref: f34 texinfo: rationale: Runtime dependency - ref: f33 + ref: f34 ... From 2e520b2fd5dbe5c2d99c9986b0f911ad81fd8ef8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 12 Oct 2021 19:30:13 +0200 Subject: [PATCH 10/21] Switch to F35 runtime and sources --- meld.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meld.yaml b/meld.yaml index a9be90a..5a9cd2b 100644 --- a/meld.yaml +++ b/meld.yaml @@ -16,13 +16,13 @@ data: - MIT dependencies: - buildrequires: - flatpak-common: [f34] - flatpak-runtime: [f34] - platform: [f34] + flatpak-common: [f35] + flatpak-runtime: [f35] + platform: [f35] requires: - flatpak-common: [f34] - flatpak-runtime: [f34] - platform: [f34] + flatpak-common: [f35] + flatpak-runtime: [f35] + platform: [f35] profiles: default: rpms: @@ -32,15 +32,15 @@ data: rpms: ed: rationale: Runtime dependency - ref: f34 + ref: f35 meld: rationale: Application package - ref: f34 + ref: f35 buildorder: 10 patch: rationale: Runtime dependency - ref: f34 + ref: f35 texinfo: rationale: Runtime dependency - ref: f34 + ref: f35 ... From 1418bc8b867de89842f853c0dbd35196af610aa1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 7 Oct 2022 17:40:47 +0200 Subject: [PATCH 11/21] Switch to F37 runtime and sources --- meld.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meld.yaml b/meld.yaml index 5a9cd2b..124810d 100644 --- a/meld.yaml +++ b/meld.yaml @@ -16,13 +16,13 @@ data: - MIT dependencies: - buildrequires: - flatpak-common: [f35] - flatpak-runtime: [f35] - platform: [f35] + flatpak-common: [f37] + flatpak-runtime: [f37] + platform: [f37] requires: - flatpak-common: [f35] - flatpak-runtime: [f35] - platform: [f35] + flatpak-common: [f37] + flatpak-runtime: [f37] + platform: [f37] profiles: default: rpms: @@ -32,15 +32,15 @@ data: rpms: ed: rationale: Runtime dependency - ref: f35 + ref: f37 meld: rationale: Application package - ref: f35 + ref: f37 buildorder: 10 patch: rationale: Runtime dependency - ref: f35 + ref: f37 texinfo: rationale: Runtime dependency - ref: f35 + ref: f37 ... From 5999f7412e508bdc876222f4f63b9b7a830b41a4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 7 Oct 2022 17:41:36 +0200 Subject: [PATCH 12/21] Limit arches to aarch64 and x86_64 --- meld.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meld.yaml b/meld.yaml index 124810d..67419e3 100644 --- a/meld.yaml +++ b/meld.yaml @@ -28,19 +28,25 @@ data: rpms: - meld - patch + buildopts: + arches: [aarch64, x86_64] components: rpms: ed: rationale: Runtime dependency ref: f37 + arches: [aarch64, x86_64] meld: rationale: Application package ref: f37 buildorder: 10 + arches: [aarch64, x86_64] patch: rationale: Runtime dependency ref: f37 + arches: [aarch64, x86_64] texinfo: rationale: Runtime dependency ref: f37 + arches: [aarch64, x86_64] ... From 48bd413af88ccfc565bb21dba6d5bc5397b55d1a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 10 Apr 2023 23:25:41 -0400 Subject: [PATCH 13/21] Update to F38 --- meld.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meld.yaml b/meld.yaml index 67419e3..15122ac 100644 --- a/meld.yaml +++ b/meld.yaml @@ -16,13 +16,13 @@ data: - MIT dependencies: - buildrequires: - flatpak-common: [f37] - flatpak-runtime: [f37] - platform: [f37] + flatpak-common: [f38] + flatpak-runtime: [f38] + platform: [f38] requires: - flatpak-common: [f37] - flatpak-runtime: [f37] - platform: [f37] + flatpak-common: [f38] + flatpak-runtime: [f38] + platform: [f38] profiles: default: rpms: @@ -34,19 +34,19 @@ data: rpms: ed: rationale: Runtime dependency - ref: f37 + ref: f38 arches: [aarch64, x86_64] meld: rationale: Application package - ref: f37 + ref: f38 buildorder: 10 arches: [aarch64, x86_64] patch: rationale: Runtime dependency - ref: f37 + ref: f38 arches: [aarch64, x86_64] texinfo: rationale: Runtime dependency - ref: f37 + ref: f38 arches: [aarch64, x86_64] ... From 6594fa05fd96df4941e281cde18d4047023f2106 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 6 Jul 2023 13:07:17 -0400 Subject: [PATCH 14/21] Add git-core This is needed by Meld for git repository comparisons. texinfo is a build requirement and therefore need not be rebuilt. --- meld.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meld.yaml b/meld.yaml index 15122ac..a9830a6 100644 --- a/meld.yaml +++ b/meld.yaml @@ -28,6 +28,7 @@ data: rpms: - meld - patch + - git-core buildopts: arches: [aarch64, x86_64] components: @@ -36,6 +37,10 @@ data: rationale: Runtime dependency ref: f38 arches: [aarch64, x86_64] + git: + rationale: Runtime dependency + ref: f38 + arches: [aarch64, x86_64] meld: rationale: Application package ref: f38 @@ -45,8 +50,4 @@ data: rationale: Runtime dependency ref: f38 arches: [aarch64, x86_64] - texinfo: - rationale: Runtime dependency - ref: f38 - arches: [aarch64, x86_64] ... From d9f30a80e4d6dc1c816722da73a2637729e61427 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 11 Oct 2023 10:30:00 -0400 Subject: [PATCH 15/21] F39 --- container.yaml | 9 ++++++--- meld.yaml | 53 -------------------------------------------------- 2 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 meld.yaml diff --git a/container.yaml b/container.yaml index c544cc3..8eaca0a 100644 --- a/container.yaml +++ b/container.yaml @@ -1,6 +1,3 @@ -compose: - modules: - - meld:stable flatpak: id: org.gnome.Meld branch: stable @@ -12,3 +9,9 @@ flatpak: --socket=wayland --filesystem=host --metadata=X-DConf=migrate-path=/org/gnome/meld/ + runtime-name: flatpak-runtime + runtime-version: f39 + packages: + - meld + - patch + - git-core diff --git a/meld.yaml b/meld.yaml deleted file mode 100644 index a9830a6..0000000 --- a/meld.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -document: modulemd -version: 2 -data: - summary: Visual diff and merge tool - description: >- - Meld is a visual diff and merge tool targeted at developers. It helps you compare - files, directories, and version controlled projects. It provides two- and three-way - comparison of both files and directories, and the tabbed interface allows you - to open many diffs at once. Meld has has support for many popular version control - systems including Git, Mercurial, Bazaar, SVN and CVS. The diff viewer lets you - edit files in place (diffs update dynamically), and a middle column shows detailed - changes and allows merges. The margins show location of changes for easy navigation. - license: - module: - - MIT - dependencies: - - buildrequires: - flatpak-common: [f38] - flatpak-runtime: [f38] - platform: [f38] - requires: - flatpak-common: [f38] - flatpak-runtime: [f38] - platform: [f38] - profiles: - default: - rpms: - - meld - - patch - - git-core - buildopts: - arches: [aarch64, x86_64] - components: - rpms: - ed: - rationale: Runtime dependency - ref: f38 - arches: [aarch64, x86_64] - git: - rationale: Runtime dependency - ref: f38 - arches: [aarch64, x86_64] - meld: - rationale: Application package - ref: f38 - buildorder: 10 - arches: [aarch64, x86_64] - patch: - rationale: Runtime dependency - ref: f38 - arches: [aarch64, x86_64] -... From 96a574a38bfb4d78297d0d328d6a650694c8455f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 11 Oct 2023 12:45:20 -0400 Subject: [PATCH 16/21] Drop patch The soft dependency on patch is left over from old CVS support code, which has since been rewritten. --- container.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/container.yaml b/container.yaml index 8eaca0a..304aae3 100644 --- a/container.yaml +++ b/container.yaml @@ -13,5 +13,4 @@ flatpak: runtime-version: f39 packages: - meld - - patch - git-core From 17ae5de518ecd4079681f1c165e3acf9a25883d6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 10 Apr 2024 19:25:54 -0400 Subject: [PATCH 17/21] F40 --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 304aae3..32a1705 100644 --- a/container.yaml +++ b/container.yaml @@ -10,7 +10,7 @@ flatpak: --filesystem=host --metadata=X-DConf=migrate-path=/org/gnome/meld/ runtime-name: flatpak-runtime - runtime-version: f39 + runtime-version: f40 packages: - meld - git-core From 849f02af6c96528d05b5ea15a911f27c5941d081 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 8 Oct 2024 13:47:36 -0400 Subject: [PATCH 18/21] F41 --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 32a1705..0744bd1 100644 --- a/container.yaml +++ b/container.yaml @@ -10,7 +10,7 @@ flatpak: --filesystem=host --metadata=X-DConf=migrate-path=/org/gnome/meld/ runtime-name: flatpak-runtime - runtime-version: f40 + runtime-version: f41 packages: - meld - git-core From 676ae0e30f8e5d429b890fb4a96fe5f72dad8436 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 28 Mar 2025 16:35:45 -0400 Subject: [PATCH 19/21] F42 --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 0744bd1..ee7f755 100644 --- a/container.yaml +++ b/container.yaml @@ -10,7 +10,7 @@ flatpak: --filesystem=host --metadata=X-DConf=migrate-path=/org/gnome/meld/ runtime-name: flatpak-runtime - runtime-version: f41 + runtime-version: f42 packages: - meld - git-core From a37e11f728994b97bfc8415202e0a4ef8cf4aad0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 12 Oct 2025 14:30:26 -0400 Subject: [PATCH 20/21] F43 --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index ee7f755..6b55cdf 100644 --- a/container.yaml +++ b/container.yaml @@ -10,7 +10,7 @@ flatpak: --filesystem=host --metadata=X-DConf=migrate-path=/org/gnome/meld/ runtime-name: flatpak-runtime - runtime-version: f42 + runtime-version: f43 packages: - meld - git-core From 25731cebddc3d4060cc4779ea53079fb4d63264c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 24 Mar 2026 21:02:56 -0400 Subject: [PATCH 21/21] F44 --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 6b55cdf..8a79ff0 100644 --- a/container.yaml +++ b/container.yaml @@ -10,7 +10,7 @@ flatpak: --filesystem=host --metadata=X-DConf=migrate-path=/org/gnome/meld/ runtime-name: flatpak-runtime - runtime-version: f43 + runtime-version: f44 packages: - meld - git-core