Fixed build without timezonemap

README.md

@@ -1,39 +1,48 @@
-# [UBInstall](https://ublinux.ru/)
+# ubinstall-gtk
-![ubinstall-icon-gui](ublinux-ubinstall_gui.svg) ![ubinstall-icon-console](ublinux-ubinstall_console.svg)
 
-## Описание
+## Description
+The operating system installer (<b>UBInstall-gtk</b>) allows you to conveniently install the operating system.
 
-Установщик оерационной системы UBLinux (<b>UBInstall</b>) позволяет в удобно установить операционную систему.
+# Build
+In order to build ubinstall-gtk you will need:
 
-## Установка
+- CMake
+- C compiler
+- GTK+ 3 & dependencies
+- webkit2gtk (optional)
+- timezonemap (optional)
+- [libublsettings](https://gitea.ublinux.ru/Applications/libublsettings)
+- [libublsettings-gtk3](https://gitea.ublinux.ru/Applications/libublsettings-gtk3)
+- [libublsettingsui-gtk3](https://gitea.ublinux.ru/Applications/libublsettingsui-gtk3)
 
-1. Скачайте репозитрий с утилитами
+Once you have all the necessary dependencies, you can use:
-   ```
+```sh
-   $ git clone http://git.ublinux.ru:3000/UBGroup/ubinstall.git
+$ make
-   ```
-2. Перейдите в каталог ubinstall
-   ```
-   $ cd ubinstall
 ```
-3. Установите утилиту
+
+# Installation
+After a successful build, just use:
+```sh
+$ sudo make install clean
 ```
-   $ make
+
+# Uninstallation
+After a successful build, just use:
+```sh
+$ sudo make uninstall
 ```
 
-## Использование
+## Usage
 
-### <b>Запуск</b>
+### <b>Launch</b>
 
-Запуск утилиты возможен двумя способами:
+The utility can be launched in two ways:
-1. Терминал
+1. Terminal
 
-    CLI версия:
-   ```
-   $ ubinstall.cli
 ```
-   GTK версия
+$ ubinstall-gtk
-   ```
-   $ ubinstall.gtk
 ```
 
-2. Ярлык
+2. Shortcut
+
+![alt text](screenshot/screenshot.png)

source/CMakeLists.txt

@@ -8,11 +8,6 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
 
-pkg_check_modules(VTE291 REQUIRED vte-2.91)
-include_directories(${VTE291_INCLUDE_DIRS})
-link_directories(${VTE291_LIBRARY_DIRS})
-add_definitions(${VTE291_CFLAGS_OTHER})
-
 pkg_check_modules(JSON REQUIRED json-c)
 include_directories(${JSON_INCLUDE_DIRS})
 link_directories(${JSON_LIBRARY_DIRS})
@@ -23,22 +18,18 @@ include_directories(${PWQUALITY_INCLUDE_DIRS})
 link_directories(${PWQUALITY_LIBRARY_DIRS})
 add_definitions(${PWQUALITY_CFLAGS_OTHER})
 
-# pkg_check_modules(TIMEZONEMAP REQUIRED timezonemap)
-# include_directories(${TIMEZONEMAP_INCLUDE_DIRS})
-# link_directories(${TIMEZONEMAP_LIBRARY_DIRS})
-# add_definitions(${TIMEZONEMAP_CFLAGS_OTHER})
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 find_library(TIMEZONEMAP_LIBRARIES_FOUND timezonemap)
 
-option(WEBKIT_FOUND "No" OFF)
 if(WEBKIT_LIBRARIES_FOUND)
-        option(WEBKIT_FOUND "Yes" ON)
+        add_definitions(-DWEBKIT_INCLUDE)
         PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
         include_directories(${WEBKIT_INCLUDE_DIRS})
         link_directories(${WEBKIT_LIBRARY_DIRS})
         add_definitions(${WEBKIT_CFLAGS_OTHER})
 endif()
+
 if(TIMEZONEMAP_LIBRARIES_FOUND)
         message("TIMEZONEMAP ENABLED")
         add_definitions(-DTIMEZONEMAP_INCLUDE)
@@ -119,7 +110,7 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-add_definitions(-DVTE_INCLUDE)
+# add_definitions(-DVTE_INCLUDE)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \

source/ubinstall-gtk.h

@@ -12,7 +12,7 @@
 #include <libublsettings.h>
 #include <libublsettings-gtk3.h>
 #include <libublsettingsui-gtk3.h>
-#ifdef WEBKIT_FOUND
+#ifdef WEBKIT_INCLUDE
 #include <webkit2/webkit2.h>
 #endif
 #include "ubl-strings.h"
@@ -1188,9 +1188,9 @@ void yon_set_max_size_from_partition(GtkTreeView *table, GtkSpinButton *spin_siz
 gboolean on_yon_exit(GtkWidget *, GdkEvent *, main_window *widgets);
 void on_locale_changed(GtkWidget *, main_window *);
 #ifdef TIMEZONEMAP_INCLUDE
-void on_region_changed(GtkComboBox *self, main_window *widgets);
-#endif
 void on_zone_changed(GtkWidget *, main_window *widgets);
+#endif
+void on_region_changed(GtkComboBox *self, main_window *widgets);
 void on_page_cancel_clicked(GtkWidget *, main_window *widgets);
 int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree, char *mode, main_window *widgets);
 void on_process_log_view(GtkWidget *, main_window *widgets);