From 5be1dabf8c23f0b5c96d04c73f564dbde885f8c9 Mon Sep 17 00:00:00 2001 From: amid Date: Thu, 11 May 2023 16:19:25 +0600 Subject: [PATCH 1/3] Bump version to 1.7 --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index d65a353..53a0a4e 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.6 +VERSION 1.7 From 4a202bc56ab495d8a108d168f2f22860d3a26ba0 Mon Sep 17 00:00:00 2001 From: amid Date: Sat, 13 May 2023 16:59:48 +0600 Subject: [PATCH 2/3] Bump version to 2.1 --- Makefile | 30 +++++++++--------- VERSION.md | 2 +- ...> com.ublinux.ubl-settings-datetime.policy | 2 +- source/CMakeLists.txt | 31 +++++++++++-------- source/ubl-settings-datetime.cc | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) rename com.ublinux.pkexec.ubl-settings-datetime.exec.policy => com.ublinux.ubl-settings-datetime.policy (93%) mode change 100755 => 100644 source/ubl-settings-datetime.cc diff --git a/Makefile b/Makefile index d8a02b7..60bbf95 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-datetime 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 ..." @@ -86,7 +83,7 @@ uninstall: @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/logo-background.png" - @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.pkexec.${PKGNAME}.exec.policy" + @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @if [ -z ${DESTDIR} ]; then \ @@ -108,7 +105,7 @@ install: check uninstall done @for SIZE in 16 32 48; do \ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @@ -116,7 +113,7 @@ install: check uninstall @install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.pkexec.${PKGNAME}.exec.policy" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" @@ -148,12 +145,13 @@ up_ver: 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)" - @echo "... init" - @echo "... debug" - @echo "... prepare" - @echo "... compile" - @echo "... install" - @echo "... uninstall" - @echo "... clean" \ No newline at end of file + @echo "The following are some of the valid targets for this Makefile:"; \ + echo "... all (the default if no target is provided)"; \ + echo "... init"; \ + echo "... debug"; \ + echo "... prepare"; \ + echo "... compile"; \ + echo "... install"; \ + echo "... uninstall"; \ + echo "... clean"; \ + echo "... up_ver" \ No newline at end of file diff --git a/VERSION.md b/VERSION.md index 53a0a4e..2923038 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.7 +VERSION 2.1 diff --git a/com.ublinux.pkexec.ubl-settings-datetime.exec.policy b/com.ublinux.ubl-settings-datetime.policy similarity index 93% rename from com.ublinux.pkexec.ubl-settings-datetime.exec.policy rename to com.ublinux.ubl-settings-datetime.policy index ab1f268..04ce0af 100644 --- a/com.ublinux.pkexec.ubl-settings-datetime.exec.policy +++ b/com.ublinux.ubl-settings-datetime.policy @@ -7,7 +7,7 @@ UBLinux https://ublinux.ru - + Run "Time date settings" as root Запуск настройки даты и времени" с правами root Authentication is required to run the time date settings diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 24b1c08..210a4bb 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -3,16 +3,21 @@ project(ubl-settings-datetime) find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED gtkmm-3.0) -include_directories(${GTK_INCLUDE_DIRS}) -link_directories(${GTK_LIBRARY_DIRS}) -add_definitions(${GTK_CFLAGS_OTHER}) +pkg_check_modules(GTK3 REQUIRED gtk+-3.0) +include_directories(${GTK3_INCLUDE_DIRS}) +link_directories(${GTK3_LIBRARY_DIRS}) +add_definitions(${GTK3_CFLAGS_OTHER}) + +pkg_check_modules(GTKMM30 REQUIRED gtkmm-3.0) +include_directories(${GTKMM30_INCLUDE_DIRS}) +link_directories(${GTKMM30_LIBRARY_DIRS}) +add_definitions(${GTKMM30_CFLAGS_OTHER}) + find_package(ICU REQUIRED COMPONENTS uc dt in io) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) option(WEBKIT_FOUND "No" OFF) - find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) if(WEBKIT_LIBRARIES_FOUND) option(WEBKIT_FOUND "Yes" ON) @@ -38,13 +43,13 @@ set(SOURCE_FILES ubl-settings-datetime.h) set(LIBRARIES - ${GTK_LIBRARIES} + ${GTK3_LIBRARIES} + ${GTKMM30_LIBRARIES} + ${WEBKIT_LIBRARIES} + ${ICU_LIBRARIES} pthread) -add_executable(ubl-settings-datetime ${SOURCE_FILES}) -target_link_libraries(ubl-settings-datetime PUBLIC ${ICU_LIBRARIES} ${WEBKIT_LIBRARIES} ${LIBRARIES}) -target_include_directories(ubl-settings-datetime PUBLIC - "${PROJECT_BINARY_DIR}" - ${WEBKIT_INCLUDE_DIRS} - ) -install(TARGETS ubl-settings-datetime 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-datetime.cc b/source/ubl-settings-datetime.cc old mode 100755 new mode 100644 index 6b06498..6341e72 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -13,7 +13,7 @@ bool flag_load_global = false; bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = "1.6"; +string version_application = "2.1"; MainWindow* obj_main; void wrapper_synopsis_show() { obj_main->aboutWindows->hide(); From d5021219f8d578f61f87c1ca3335947a573d0fe8 Mon Sep 17 00:00:00 2001 From: amid Date: Sat, 13 May 2023 17:12:40 +0600 Subject: [PATCH 3/3] Cleen up CMakeLists.txt --- source/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 210a4bb..74e52ce 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -18,7 +18,6 @@ find_package(ICU REQUIRED COMPONENTS uc dt in io) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) option(WEBKIT_FOUND "No" OFF) -find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) if(WEBKIT_LIBRARIES_FOUND) option(WEBKIT_FOUND "Yes" ON) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)