[packages/meld] - updated to 3.22.1

qboosh qboosh at pld-linux.org
Mon Feb 19 07:56:14 CET 2024


commit 62602450a6f15941934baf78ab1681895db21071
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 19 06:32:41 2024 +0100

    - updated to 3.22.1

 meld-distutils.patch | 11 -----------
 meld.spec            |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index 02fbccb..2f35919 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,16 +1,16 @@
 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.0
+Version:	3.22.1
 Release:	1
 License:	GPL v2+
 Group:		Applications/Text
 Source0:	https://download.gnome.org/sources/meld/3.22/%{name}-%{version}.tar.xz
-# Source0-md5:	c32fa8675137e0d0c7334c4fc2de6114
+# Source0-md5:	5cc5f940994aafbcc7413e5c88424ced
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-distutils.patch
 Patch2:		%{name}-install.patch
 URL:		http://meldmerge.org/
+BuildRequires:	glib2-devel >= 1:2.48
 BuildRequires:	gtk+3-devel >= 3.20
 BuildRequires:	gtksourceview4-devel >= 4.0.0
 BuildRequires:	intltool
@@ -63,7 +63,6 @@ zakładkami, pozwalający na otwieranie wielu plików diff naraz.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 cp -p meld/vc/COPYING COPYING.vc
@@ -71,6 +70,7 @@ cp -p meld/vc/README README.vc
 
 %build
 %meson build
+
 %ninja_build -C build
 
 %install
diff --git a/meld-distutils.patch b/meld-distutils.patch
deleted file mode 100644
index 60732a3..0000000
--- a/meld-distutils.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meld-3.22.0/meld/build_helpers.py.orig	2022-09-06 21:30:17.648921101 +0200
-+++ meld-3.22.0/meld/build_helpers.py	2022-09-07 06:20:41.447497325 +0200
-@@ -64,7 +64,7 @@ def has_data(self):
-     return "build_data" in self.distribution.cmdclass
- 
- 
--command_base.command.build.Build.sub_commands.extend([
-+command_base.command.build.build.sub_commands.extend([
-     ("build_i18n", has_i18n),
-     ("build_icons", has_icons),
-     ("build_help", has_help),
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/62602450a6f15941934baf78ab1681895db21071



More information about the pld-cvs-commit mailing list