[packages/meld] - updated to 3.24.0
qboosh
qboosh at pld-linux.org
Sat Jul 4 19:50:11 CEST 2026
commit 79a6c96fdef581e76175dc61e25cb82199e4cbca
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jul 4 19:50:07 2026 +0200
- updated to 3.24.0
meld-desktop.patch | 4 ++--
meld-install.patch | 42 ------------------------------------------
meld.spec | 28 +++++++++++++---------------
3 files changed, 15 insertions(+), 59 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index dd45b8c..6b8e5e0 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,23 +1,22 @@
Summary: Visual diff and merge tool
Summary(pl.UTF-8): Wizualne narzędzie do oglądania i włączania zmian (diff)
Name: meld
-Version: 3.22.3
-Release: 4
+Version: 3.24.0
+Release: 1
License: GPL v2+
Group: Applications/Text
-Source0: https://download.gnome.org/sources/meld/3.22/%{name}-%{version}.tar.xz
-# Source0-md5: 8dc9da40caa2a0fd1097af77d3b87abd
+Source0: https://download.gnome.org/sources/meld/3.24/%{name}-%{version}.tar.xz
+# Source0-md5: 44d22390fef09f1f81c36fa86c78d7c3
Patch0: %{name}-desktop.patch
-Patch2: %{name}-install.patch
URL: http://meldmerge.org/
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.48
-BuildRequires: gtk+3-devel >= 3.20
+BuildRequires: gtk+3-devel >= 3.22
BuildRequires: gtksourceview4-devel >= 4.0.0
BuildRequires: intltool
BuildRequires: itstool
-BuildRequires: meson >= 0.49.0
-BuildRequires: ninja
+BuildRequires: meson >= 1.2.0
+BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
BuildRequires: python3-devel >= 1:3.6
BuildRequires: python3-modules >= 1:3.6
@@ -35,7 +34,7 @@ Requires(post,postun): desktop-file-utils
Requires(post,postun): glib2 >= 1:2.48
Requires(post,postun): gtk-update-icon-cache
Requires: glib2 >= 1:2.48
-Requires: gtk+3 >= 3.20
+Requires: gtk+3 >= 3.22
Requires: gtksourceview4 >= 4.0.0
Requires: hicolor-icon-theme
Requires: pango >= 1:1.26
@@ -65,7 +64,6 @@ zakładkami, pozwalający na otwieranie wielu plików diff naraz.
%prep
%setup -q
%patch -P 0 -p1
-%patch -P 2 -p1
cp -p meld/vc/COPYING COPYING.vc
cp -p meld/vc/README README.vc
@@ -102,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc NEWS COPYING.vc README.vc
+%doc NEWS COPYING.vc README.md README.vc
%attr(755,root,root) %{_bindir}/meld
%dir %{py3_sitescriptdir}/%{name}
%{py3_sitescriptdir}/%{name}/*.py
@@ -116,11 +114,11 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitescriptdir}/%{name}/vc
%{py3_sitescriptdir}/%{name}/vc/*.py
%{py3_sitescriptdir}/%{name}/vc/__pycache__
-%{_iconsdir}/hicolor/scalable/apps/org.gnome.Meld.svg
-%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg
%{_datadir}/%{name}
-%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
-%{_datadir}/metainfo/org.gnome.Meld.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Meld.gschema.xml
+%{_datadir}/metainfo/org.gnome.Meld.metainfo.xml
%{_datadir}/mime/packages/org.gnome.Meld.xml
%{_desktopdir}/org.gnome.Meld.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Meld.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Meld-symbolic.svg
%{_mandir}/man1/meld.1*
diff --git a/meld-desktop.patch b/meld-desktop.patch
index 5c57be1..43c86b0 100644
--- a/meld-desktop.patch
+++ b/meld-desktop.patch
@@ -1,5 +1,5 @@
---- meld-3.22.0/data/org.gnome.meld.desktop.in.in.orig 2022-09-04 06:26:14.000000000 +0200
-+++ meld-3.22.0/data/org.gnome.meld.desktop.in.in 2022-09-06 16:40:05.629916772 +0200
+--- meld-3.24.0/data/org.gnome.Meld.desktop.in.in.orig 2026-07-04 19:31:45.347039418 +0200
++++ meld-3.24.0/data/org.gnome.Meld.desktop.in.in 2026-07-04 19:32:05.630262867 +0200
@@ -9,6 +9,6 @@ Terminal=false
Type=Application
# TRANSLATORS: Do NOT translate or transliterate this text (this is an icon file name)!
diff --git a/meld-install.patch b/meld-install.patch
deleted file mode 100644
index 62cfc2a..0000000
--- a/meld-install.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- meld-3.20.1/meld/build_helpers.py.orig 2020-01-04 09:01:35.032939451 +0100
-+++ meld-3.20.1/meld/build_helpers.py 2020-01-06 12:55:45.200685245 +0100
-@@ -66,10 +66,6 @@
-
-
- class MeldDistribution(distutils.dist.Distribution):
-- global_options = distutils.dist.Distribution.global_options + [
-- ("no-update-icon-cache", None, "Don't run gtk-update-icon-cache"),
-- ("no-compile-schemas", None, "Don't compile gsettings schemas"),
-- ]
-
- def __init__(self, *args, **kwargs):
- self.no_update_icon_cache = False
-@@ -407,17 +407,26 @@
-
-
- class install_data(distutils.command.install_data.install_data):
-+ user_options = distutils.command.install_data.install_data.user_options + [
-+ ("no-update-icon-cache", None, "Don't run gtk-update-icon-cache"),
-+ ("no-compile-schemas", None, "Don't compile gsettings schemas"),
-+ ]
-+
-+ def initialize_options(self):
-+ distutils.command.install_data.install_data.initialize_options(self)
-+ self.no_update_icon_cache = None
-+ self.no_compile_schemas = None
-
- def run(self):
- distutils.command.install_data.install_data.run(self)
-
-- if not self.distribution.no_update_icon_cache:
-+ if not self.no_update_icon_cache:
- # TODO: Generalise to non-hicolor icon themes
- info("running gtk-update-icon-cache")
- icon_path = os.path.join(self.install_dir, "share/icons/hicolor")
- self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
-
-- if not self.distribution.no_compile_schemas:
-+ if not self.no_compile_schemas:
- info("compiling gsettings schemas")
- gschema_path = build_data.gschemas[0][0]
- gschema_install = os.path.join(self.install_dir, gschema_path)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/79a6c96fdef581e76175dc61e25cb82199e4cbca
More information about the pld-cvs-commit
mailing list