From ab6009ef53f54ddbee61c3681f2bc4ed95639ee2 Mon Sep 17 00:00:00 2001 From: amid Date: Mon, 13 Feb 2023 21:05:14 +0600 Subject: [PATCH 1/4] [package] update --- VERSION.md | 1 + devel/update-version | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 VERSION.md create mode 100755 devel/update-version diff --git a/VERSION.md b/VERSION.md new file mode 100644 index 0000000..2fee778 --- /dev/null +++ b/VERSION.md @@ -0,0 +1 @@ +VERSION 1.1 diff --git a/devel/update-version b/devel/update-version new file mode 100755 index 0000000..881bf04 --- /dev/null +++ b/devel/update-version @@ -0,0 +1,20 @@ +#!/bin/bash +## +## Update VERSION 1.4 +## $1 - Version +## Default - current Version value plus one (in minor section) +## + +FILE_VERSION="VERSION.md" +[[ $1 ]] && VER=$1 +if [[ -z ${VER} ]] ; then + SOURCE_FILE_VERSION=$(find ../ -maxdepth 1 -type f -iname "${FILE_VERSION}" -print -quit) + CURRENT=$(cat ${SOURCE_FILE_VERSION} | grep 'VERSION' | cut -d" " -f2) + MAJOR=$(echo ${CURRENT} | cut -d. -f1) + MINOR=$(echo ${CURRENT} | cut -d. -f2) + VER="${MAJOR}.$(echo $((${MINOR} +1)))" +fi +echo ":: Updated VERSION ${CURRENT} to ${VER}" +find ../ -maxdepth 2 -type f -iname "${FILE_VERSION}" -exec echo ":: Insert version in file: {}" \; -exec sed "s/VERSION *[[:digit:]]*.*/VERSION ${VER}/" -i {} \; + + From f506f013bf0e458e764f3a08165de1c1ea7a7d44 Mon Sep 17 00:00:00 2001 From: amid Date: Mon, 13 Feb 2023 21:42:02 +0600 Subject: [PATCH 2/4] [package] update --- Makefile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index af79dbe..7ddaa26 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ CMAKE_BUILD_DIR = ./compile DEPENDS = cmake PKGNAME = $(MAKEFILE_DIR) #PKGNAME = ubl-settings-datetime +pkgdir = default_target: all all: init build @@ -89,27 +90,27 @@ install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 /usr/share/locale/$${LANG}/LC_MESSAGES; \ + install -dm755 "${pkgdir}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${pkgdir}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ echo $${FILE_PO}; \ msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ done @for SIZE in 16 32 48; do \ - install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \ + install -dm755 "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data ${PKGNAME}.svg -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.png"; \ done - @install -dm755 /usr/share/icons/hicolor/scalable/apps - @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg - @install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} - @install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop - @install -Dm644 -t /usr/share/polkit-1/actions/ ru.ublinux.pkexec.${PKGNAME}.exec.policy - @install -dm755 /usr/share/${PKGNAME}/{ui,images,css} - @install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade - @install -Dm644 -t /usr/share/${PKGNAME}/css/ style.css - @install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.svg - @install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.png - @install -Dm644 -t /usr/share/${PKGNAME}/images/ bg_top.png + @install -dm755 "${pkgdir}/usr/share/icons/hicolor/scalable/apps" + @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "${PKGNAME}.svg" + @install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 -t "${pkgdir}/usr/share/applications/" "${PKGNAME}.desktop" + @install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${PKGNAME}.exec.policy" + @install -dm755 "${pkgdir}/usr/share/${PKGNAME}"/{ui,images,css} + @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/ui/" "${PKGNAME}.glade" + @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/css/" style.css + @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/images/" "${PKGNAME}.svg" + @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/images/" "${PKGNAME}.png" + @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/images/" bg_top.png @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications From 754bf586d6701fe4a6635abbcc37dab4caad2508 Mon Sep 17 00:00:00 2001 From: amid Date: Mon, 13 Feb 2023 21:58:37 +0600 Subject: [PATCH 3/4] [package] update --- Makefile | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 7ddaa26..39c6a5d 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = ./source CMAKE_BUILD_DIR = ./compile DEPENDS = cmake -PKGNAME = $(MAKEFILE_DIR) -#PKGNAME = ubl-settings-datetime +pkgname = $(MAKEFILE_DIR) +#pkgname = ubl-settings-datetime pkgdir = default_target: all @@ -48,10 +48,10 @@ prepare: check: @echo "Check ..."; \ - if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \ + if [ -f ${CMAKE_BUILD_DIR}/${pkgname} ]; then \ echo "Check: OK"; \ else \ - echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not fount !"; \ + echo "Check: ${CMAKE_BUILD_DIR}/${pkgname} not fount !"; \ exit 1; \ fi @@ -69,18 +69,18 @@ uninstall: $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.svg"; \ - $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.png"; \ + $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${pkgname}.svg"; \ + $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${pkgname}.png"; \ done @for FILE_SVG in $(wildcard *.svg); do \ for SIZE in 16x16 32x32 48x48 scalable; do \ $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done - @$(RM) "/usr/bin/${PKGNAME}" - @$(RM) "/usr/share/applications/${PKGNAME}.desktop" - @$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${PKGNAME}.exec.policy" - @$(RM) -rd "/usr/share/${PKGNAME}" + @$(RM) "/usr/bin/${pkgname}" + @$(RM) "/usr/share/applications/${pkgname}.desktop" + @$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${pkgname}.exec.policy" + @$(RM) -rd "/usr/share/${pkgname}" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications @@ -98,19 +98,19 @@ install: check uninstall done @for SIZE in 16 32 48; do \ install -dm755 "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data ${PKGNAME}.svg -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.png"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data ${pkgname}.svg -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${pkgname}.png"; \ done @install -dm755 "${pkgdir}/usr/share/icons/hicolor/scalable/apps" - @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "${PKGNAME}.svg" - @install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -Dm644 -t "${pkgdir}/usr/share/applications/" "${PKGNAME}.desktop" - @install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${PKGNAME}.exec.policy" - @install -dm755 "${pkgdir}/usr/share/${PKGNAME}"/{ui,images,css} - @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/ui/" "${PKGNAME}.glade" - @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/css/" style.css - @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/images/" "${PKGNAME}.svg" - @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/images/" "${PKGNAME}.png" - @install -Dm644 -t "${pkgdir}/usr/share/${PKGNAME}/images/" bg_top.png + @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "${pkgname}.svg" + @install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${pkgname}" + @install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop" + @install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${pkgname}.exec.policy" + @install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,images,css} + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/ui/" "${pkgname}.glade" + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg" + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png" + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications From 09d565b870a98e151c55397b2a235ed2ba045c16 Mon Sep 17 00:00:00 2001 From: amid Date: Mon, 13 Feb 2023 23:08:27 +0600 Subject: [PATCH 4/4] [package] update --- source/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 13840d1..e4e1133 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -10,7 +10,10 @@ add_definitions(${GTK_CFLAGS_OTHER}) find_package(ICU REQUIRED COMPONENTS uc dt in io) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ + -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection") set(SOURCE_FILES main.cc