From bf3bd713568e71f539c167a6fc2c916c433529f3a44fd6300522ee3800814525 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 23 Nov 2021 09:31:58 +0000
Subject: [PATCH] Accepting request 933220 from
 home:wolfi323:branches:KDE:Extra

- Update to 1.9.4
  * Fix windows style cr/lf line ending handling (kde#442199)
  * Fix race on exit if qt sends QApplication::focusChanged during
    teardown (kde#444654)

OBS-URL: https://build.opensuse.org/request/show/933220
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=33
---
 kdiff3-1.9.3.tar.xz     |  3 ---
 kdiff3-1.9.3.tar.xz.sig | 16 ----------------
 kdiff3-1.9.4.tar.xz     |  3 +++
 kdiff3-1.9.4.tar.xz.sig | 16 ++++++++++++++++
 kdiff3.changes          |  8 ++++++++
 kdiff3.spec             |  2 +-
 6 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100644 kdiff3-1.9.3.tar.xz
 delete mode 100644 kdiff3-1.9.3.tar.xz.sig
 create mode 100644 kdiff3-1.9.4.tar.xz
 create mode 100644 kdiff3-1.9.4.tar.xz.sig

diff --git a/kdiff3-1.9.3.tar.xz b/kdiff3-1.9.3.tar.xz
deleted file mode 100644
index 7c6f5f1..0000000
--- a/kdiff3-1.9.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:317bf5c7e27cba81bce7e1a7a579105443133b633cbb71bc1f169e86a235af9c
-size 1056920
diff --git a/kdiff3-1.9.3.tar.xz.sig b/kdiff3-1.9.3.tar.xz.sig
deleted file mode 100644
index 49441b5..0000000
--- a/kdiff3-1.9.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmEdUAEACgkQ9EKzbWFL
-BrxtURAAsWEgaEqwBEdFZorV3JCHjnvI4bMiJ/iRojJnp/Oi5+/Rvm8LKrl7RD/U
-FXLQOOWYrY30wLEForWp8Yz54xQzOh6RMcSQXK9Ojy79OfRuaD4BU+KDuyfXXZdy
-dbjhfaV7QQAYZDW/CcRLQDD+Kc1B8FMr9slyd/b6gYnpEqHQ038bEgOm5CeXvadO
-pyt0ET2pA/6Qp2+a++nHxQp5mDb8bZADrJrABNiWrTH4NTcAWtR1pCNp5yPFWDqB
-6YuRv6yhOg9bWDidXgvIF3H2twooeUzyPZ1Nbxc3jJ8l/yW4B9KG+uFsb6iJliBh
-ivHEUFhlZwvOg3haV5pQQT7yUX2SuoA6S41qP7abQY9AyUA8yh8gm7CCe7j7lPj5
-T3ik7GRbKrTrsgRKMUv2yUCNpnXEZxfGyAALUj+OyF9Irg2aJ8r1yjf1dbchNE5Y
-KVh6/mWy0xzFrC6LOOHDoYUibB8SOaH4Rbe+hE1LmBYCk+YinGM24CAvwWYy9qs4
-6Gc+uJ7gL9G06CjpYXGTkujlf8ryEG5eaztATj6ZdbU1BrI+ysdex9ztBUW82sMt
-NybrkBendsyE8PJSSXk3U2hxuABxXOaPEYnAWiLrgldwf6mz8/klU5jyzf7gKZkF
-Y/r2+Co055f5CJzb1Av/cjUx2JD6siSBV5UdF304/grwFYRFuVw=
-=nhB8
------END PGP SIGNATURE-----
diff --git a/kdiff3-1.9.4.tar.xz b/kdiff3-1.9.4.tar.xz
new file mode 100644
index 0000000..ae6bf96
--- /dev/null
+++ b/kdiff3-1.9.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a130712ceef074df691426909fc4a332b66f4c3f1490a548ab5bfb46316c385a
+size 1057404
diff --git a/kdiff3-1.9.4.tar.xz.sig b/kdiff3-1.9.4.tar.xz.sig
new file mode 100644
index 0000000..591c6b5
--- /dev/null
+++ b/kdiff3-1.9.4.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmGW20kACgkQ9EKzbWFL
+BryfEA//S97ZdQ2SPwB/hSOBR6VGEvH/8VzQlDGHabHNZLpUHnPWjxo8buUNVYnn
+NXtlBIJS3rUcTtbD8SfEddpJK9Q2XO71wghSfZnS8gNcTKdPukQzGmySOqIJfsA9
+UfeBj9dHm1rLdI6uKT11h3ErP38unUoLJygk6w4FPKXwgpsujaXztbCJRR7ljavV
+VMiR59/cFdHr/dzW0CNw7dmg1dWTkKcuTYsC7kXE++gqTwDOvXEDBaYrRSh/KKGF
+RnfmjDRqrJH6lQnj2RfmozeUE1LbPujOw/EqjaV7FS4aN3fIN3iVnl+3nyghHI43
+jLqcwOE2V2LHfHWixo/rDbiwY+o2jCBk9589pZz+tNZGVCUtkCDVQNv8VpafDgfq
+7sxPHV9BAE30Yu1u2RX10ca9n+9ziKuIiVghlNHSlrCntIPs9Y0/xe8NAy0OQZpT
+n1k7AfoLN0wCvc5Xpl+pIK0pduQJuPA0Bsaz9oSTU7dI2DvXT9oZallkd4RrLFN/
+1XldfXt8EV+gf6lcW34jc6SmdGk1T4wGxZlwfVspCEFRZDoXdkkVVzh1Kp9Fkx38
+oA/o52TXU3nHnfQm7+aZH/r+/J6MMVbXMr4Ysi1qL2CTA+0Dips6zKPmce4vw/2P
+o8jxeP9lwGj03moedXNhEsugVoPWveWtxPMp4+3NtZd7BHV8i08=
+=rpcs
+-----END PGP SIGNATURE-----
diff --git a/kdiff3.changes b/kdiff3.changes
index 168f278..f47824e 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 23 08:16:03 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Update to 1.9.4
+  * Fix windows style cr/lf line ending handling (kde#442199)
+  * Fix race on exit if qt sends QApplication::focusChanged during
+    teardown (kde#444654)
+
 -------------------------------------------------------------------
 Fri Aug 20 12:58:46 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 99d69a0..c0c7c7c 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -18,7 +18,7 @@
 
 %bcond_without lang
 Name:           kdiff3
-Version:        1.9.3
+Version:        1.9.4
 Release:        0
 Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later