From 6b36f6eb2d7cc17f406c03950ed1d9d3846d4400 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Wed, 19 Apr 2023 00:03:41 +0600
Subject: [PATCH 1/8] Bump version

---
 VERSION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.md b/VERSION.md
index 31c5941..48eea8c 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 1.2
+VERSION 1.3

From fca16862fc4181c73ad1323cb79f2cae44ed4e3f Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Thu, 20 Apr 2023 10:05:59 +0600
Subject: [PATCH 2/8] Bump version 1.4

---
 VERSION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.md b/VERSION.md
index 48eea8c..c1fc6fc 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 1.3
+VERSION 1.4

From ee577ef3e21875ca3d207907d6012ab02886f955 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Thu, 20 Apr 2023 12:19:22 +0600
Subject: [PATCH 3/8] Fix Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e166a62..862fda5 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ install: check uninstall
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
 	@install -dm755 "${DESTDIR}/etc/xdg"
-	@install -Dm744 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
+	@install -Dm644 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
 	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
 	@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}

From 07df46bf74393e1982b6e0c51d96d30dfd6185f3 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Thu, 11 May 2023 16:24:23 +0600
Subject: [PATCH 4/8] Bump version to 1.5

---
 VERSION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.md b/VERSION.md
index c1fc6fc..e7b8c01 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 1.4
+VERSION 1.5

From 88a22e7fd8573e2894e1fc8bd068bffb6180dd3d Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Sat, 13 May 2023 17:29:32 +0600
Subject: [PATCH 5/8] Bump version to 2.1

---
 Makefile                      |  5 +----
 VERSION.md                    |  2 +-
 source/CMakeLists.txt         | 27 ++++++++++++---------------
 source/ubl-settings-manager.h |  2 +-
 ubl-settings-manager.desktop  |  6 +++---
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 862fda5..670f669 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,10 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
 CMAKE_COMMAND = cmake
 CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
 CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-#CMAKE_SOURCE_DIR = ./source
-#CMAKE_BUILD_DIR = ./compile
 FILE_VERSION = VERSION.md
 DEPENDS = /bin/cmake
 PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-manager
 
 default_target: all
 
@@ -35,8 +32,8 @@ depend:
 		exit 1; \
 	    fi; \
 	done; \
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \
 	echo "Check depends: OK"
-#	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 
 debug:
 	@echo "Debug ..."
diff --git a/VERSION.md b/VERSION.md
index e7b8c01..2923038 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 1.5
+VERSION 2.1
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 8caec66..b2b71f4 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,17 +1,16 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.23)
 project(ubl-settings-manager)
 
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(GTK REQUIRED gtk+-3.0)
-include_directories(${GTK_INCLUDE_DIRS})
-link_directories(${GTK_LIBRARY_DIRS})
-add_definitions(${GTK_CFLAGS_OTHER})
-
-option(WEBKIT_FOUND "No" OFF)
+pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+include_directories(${GTK3_INCLUDE_DIRS})
+link_directories(${GTK3_LIBRARY_DIRS})
+add_definitions(${GTK3_CFLAGS_OTHER})
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
+option(WEBKIT_FOUND "No" OFF)
 if(WEBKIT_LIBRARIES_FOUND)
         option(WEBKIT_FOUND "Yes" ON)
         PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
@@ -35,13 +34,11 @@ set(SOURCE_FILES
         ubl-settings-manager-cm.h)
 
 set(LIBRARIES
-        ${GTK_LIBRARIES}
+        ${GTK3_LIBRARIES}
+        ${WEBKIT_LIBRARIES}
         pthread)
 
-add_executable(ubl-settings-manager ${SOURCE_FILES})
-target_link_libraries(ubl-settings-manager PUBLIC ${WEBKIT_LIBRARIES} ${LIBRARIES})
-target_include_directories(ubl-settings-manager PUBLIC
-                           "${PROJECT_BINARY_DIR}"
-                           ${WEBKIT_INCLUDE_DIRS}
-                           )
-install(TARGETS ubl-settings-manager DESTINATION bin)
\ No newline at end of file
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR})
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h
index 5de5932..54073ea 100644
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@@ -31,7 +31,7 @@
 #define ubl_settings_infoPath "ubl-settings-info"
 #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
 typedef char* string;
-string version_application = "1.4";
+string version_application = "2.1";
 
 #define UBL_SETTINGS_MANAGER_TITLE _("UBLinux Settings Manager")
 #define UBL_SETTINGS_MANAGER_ABOUT_TITLE _("About UBLinux Settings Manager")
diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop
index c16cec7..e0df822 100644
--- a/ubl-settings-manager.desktop
+++ b/ubl-settings-manager.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=ubl-settings-manager
-Name[ru]=Настройки UBLinux
+Name[ru]=Менеджер настроек UBLinux
 GenericName=ubl-settings-manager
-GenericName[ru]=Настройки UBLinux
+GenericName[ru]=Менеджер настроек UBLinux
 Comment=ubl-settings-manager
-Comment[ru]=Приложение для управления настройками UBLinux
+Comment[ru]=Менеджер управления настройками UBLinux
 Type=Application
 Exec=ubl-settings-manager
 Icon=com.ublinux.ubl-settings-manager

From a5bb3f796f2f04d3661bd447e0910a250b4586ed Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Sat, 13 May 2023 17:54:13 +0600
Subject: [PATCH 6/8] Bump version to 2.2

---
 VERSION.md                   | 2 +-
 ubl-settings-manager.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION.md b/VERSION.md
index 2923038..ca75749 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 2.1
+VERSION 2.2
diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop
index e0df822..8038835 100644
--- a/ubl-settings-manager.desktop
+++ b/ubl-settings-manager.desktop
@@ -11,4 +11,4 @@ Exec=ubl-settings-manager
 Icon=com.ublinux.ubl-settings-manager
 Terminal=false
 X-XfcePluggable=false
-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
+Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;

From 4cf47a821f3ddf7884a7a1f53fa91800d087d97e Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Sat, 13 May 2023 17:54:32 +0600
Subject: [PATCH 7/8] Bump version to 2.2

---
 source/ubl-settings-manager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h
index 54073ea..f4a1fc7 100644
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@@ -31,7 +31,7 @@
 #define ubl_settings_infoPath "ubl-settings-info"
 #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
 typedef char* string;
-string version_application = "2.1";
+string version_application = "2.2";
 
 #define UBL_SETTINGS_MANAGER_TITLE _("UBLinux Settings Manager")
 #define UBL_SETTINGS_MANAGER_ABOUT_TITLE _("About UBLinux Settings Manager")

From 67100eb658530afd27d6f85fdb23026f5f1c9aec Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Tue, 30 May 2023 22:33:54 +0600
Subject: [PATCH 8/8] Delete control VERSION.md

---
 Makefile   | 21 ++++++++-------------
 VERSION.md |  1 -
 2 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 VERSION.md

diff --git a/Makefile b/Makefile
index 670f669..22a9678 100644
--- a/Makefile
+++ b/Makefile
@@ -8,20 +8,24 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
 CMAKE_COMMAND = cmake
 CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
 CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-FILE_VERSION = VERSION.md
 DEPENDS = /bin/cmake
 PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
 
 default_target: all
 
-.PHONY: all init depend debug prepare check build uninstall install clean up_ver help
+.PHONY: all init depend debug prepare check build uninstall install clean help
 
 all: init build
 
 init:
 	@echo "Initialize ..."; \
-	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-manager.h; \
+	if [ -d ".git" ]; then \
+	    LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \
+	else \
+	    LATEST_TAG="0.0"; \
+	fi; \
+	sed -r "s/^(string version_application = ).*/\1\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
 
 depend:
@@ -134,14 +138,6 @@ clean:
 	    echo "Clean: OK"; \
 	fi
 
-up_ver:
-	@CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" "  -f2); \
-	MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \
-	MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \
-	VER="$${MAJOR}.$$(($${MINOR}+1))"; \
-	sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \
-	echo "Updated version to VERSION.md: $${CURRENT} to $${VER}"
-
 help:
 	@echo "The following are some of the valid targets for this Makefile:"; \
 	echo "... all (the default if no target is provided)"; \
@@ -151,5 +147,4 @@ help:
 	echo "... compile"; \
 	echo "... install"; \
 	echo "... uninstall"; \
-	echo "... clean"; \
-	echo "... up_ver"
+	echo "... clean"
diff --git a/VERSION.md b/VERSION.md
deleted file mode 100644
index ca75749..0000000
--- a/VERSION.md
+++ /dev/null
@@ -1 +0,0 @@
-VERSION 2.2