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] 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