From e5cdd7bbf1d8b80dacd250022628eea2ec251a68 Mon Sep 17 00:00:00 2001
From: F1ash <kaperang07@gmail.com>
Date: Tue, 14 Jun 2022 13:49:53 +0300
Subject: [PATCH] some fixes for building with old Kauth releases;

---
 Changelog                                            |  2 +-
 dnscrypt-proxy-gui.spec                              |  5 ++++-
 src/helpers/job_helper/dnscrypt_client_helper.h      | 12 ++++--------
 .../reload_helper/dnscrypt_client_reload_helper.h    | 12 ++++--------
 .../test_helper/dnscrypt_client_test_helper.h        | 12 ++++--------
 5 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/Changelog b/Changelog
index f9e70dd..7c5de5e 100644
--- a/Changelog
+++ b/Changelog
@@ -85,6 +85,6 @@ v.1.24.17 :
 implemented re-initialization action
     for in tray menu for ver.2;
 
-v.1.24.19 :
+v.1.24.20 :
 fixed deprecated headers;
 some fixes for building with old Kauth releases;
diff --git a/dnscrypt-proxy-gui.spec b/dnscrypt-proxy-gui.spec
index c59c207..d62d672 100644
--- a/dnscrypt-proxy-gui.spec
+++ b/dnscrypt-proxy-gui.spec
@@ -2,7 +2,7 @@
 %global app_name DNSCryptClient
 
 Name:          dnscrypt-proxy-gui
-Version:       1.24.18
+Version:       1.24.20
 Release:       1%{?dist}
 Summary:       GUI wrapper for dnscrypt-proxy
 License:       GPLv2+
@@ -92,6 +92,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{app_name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{app_name}.png
 
 %changelog
+* Mon Jun  6 2022 Fl@sh <kaperang07@gmail.com> - 1.24.20-1
+- version updated;
+
 * Mon Jun  6 2022 Fl@sh <kaperang07@gmail.com> - 1.24.18-1
 - version updated;
 
diff --git a/src/helpers/job_helper/dnscrypt_client_helper.h b/src/helpers/job_helper/dnscrypt_client_helper.h
index 09c118d..2602026 100644
--- a/src/helpers/job_helper/dnscrypt_client_helper.h
+++ b/src/helpers/job_helper/dnscrypt_client_helper.h
@@ -1,13 +1,9 @@
-#if defined(KAUTHCORE_ENABLE_DEPRECATED_SINCE)
+#include <kauth_version.h>
+#if KAUTH_VERSION < ((5<<16)|(92<<8)|(0))
     #include <kauth.h>
 #else
-    #include <kauth/kauthcore_export.h>
-    #if KAUTHCORE_ENABLE_DEPRECATED_SINCE(5, 92)
-        #include <kauth/actionreply.h>
-        #include <kauth/helpersupport.h>
-    #else
-        #include <kauth.h>
-    #endif
+    #include <kauth/actionreply.h>
+    #include <kauth/helpersupport.h>
 #endif
 using namespace KAuth;
 
diff --git a/src/helpers/reload_helper/dnscrypt_client_reload_helper.h b/src/helpers/reload_helper/dnscrypt_client_reload_helper.h
index f91441e..ad94fd8 100644
--- a/src/helpers/reload_helper/dnscrypt_client_reload_helper.h
+++ b/src/helpers/reload_helper/dnscrypt_client_reload_helper.h
@@ -1,13 +1,9 @@
-#if defined(KAUTHCORE_ENABLE_DEPRECATED_SINCE)
+#include <kauth_version.h>
+#if KAUTH_VERSION < ((5<<16)|(92<<8)|(0))
     #include <kauth.h>
 #else
-    #include <kauth/kauthcore_export.h>
-    #if KAUTHCORE_ENABLE_DEPRECATED_SINCE(5, 92)
-        #include <kauth/actionreply.h>
-        #include <kauth/helpersupport.h>
-    #else
-        #include <kauth.h>
-    #endif
+    #include <kauth/actionreply.h>
+    #include <kauth/helpersupport.h>
 #endif
 using namespace KAuth;
 
diff --git a/src/helpers/test_helper/dnscrypt_client_test_helper.h b/src/helpers/test_helper/dnscrypt_client_test_helper.h
index 53290c4..5755b7f 100644
--- a/src/helpers/test_helper/dnscrypt_client_test_helper.h
+++ b/src/helpers/test_helper/dnscrypt_client_test_helper.h
@@ -1,13 +1,9 @@
-#if defined(KAUTHCORE_ENABLE_DEPRECATED_SINCE)
+#include <kauth_version.h>
+#if KAUTH_VERSION < ((5<<16)|(92<<8)|(0))
     #include <kauth.h>
 #else
-    #include <kauth/kauthcore_export.h>
-    #if KAUTHCORE_ENABLE_DEPRECATED_SINCE(5, 92)
-        #include <kauth/actionreply.h>
-        #include <kauth/helpersupport.h>
-    #else
-        #include <kauth.h>
-    #endif
+    #include <kauth/actionreply.h>
+    #include <kauth/helpersupport.h>
 #endif
 using namespace KAuth;