From d3bc1d024ed13ebe1d378920589d8b06f1ef6413 Mon Sep 17 00:00:00 2001 From: asmeron Date: Wed, 9 Aug 2023 13:47:21 +0600 Subject: [PATCH 1/4] Fix makefile --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index abd1da4..a0e7f2a 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/${PKGNAME}.h -PKGIDENT=$(subst /,-,${PREFIX}) +PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) default_target: all @@ -113,11 +113,10 @@ install: check uninstall 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 -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy - @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i - @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -140,7 +139,7 @@ help: echo "... init"; \ echo "... debug"; \ echo "... prepare"; \ - echo "... compile"; \ + echo "... build"; \ echo "... install"; \ echo "... uninstall"; \ echo "... clean" \ No newline at end of file From 78d0dbf6f5cb9b39a5df45f79d23c0402fda33de Mon Sep 17 00:00:00 2001 From: asmeron Date: Wed, 9 Aug 2023 13:57:01 +0600 Subject: [PATCH 2/4] Fix source --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a0e7f2a..fa86c91 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,11 @@ uninstall: $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done - @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" - @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}" + @$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf" + @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" + @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ @@ -113,7 +115,9 @@ install: check uninstall 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 -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "ublinux-logo.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" + @install -Dm644 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy From 6799e2ff561347a6285963e9d27513e255c0608b Mon Sep 17 00:00:00 2001 From: Dmitry Razumov Date: Thu, 28 Nov 2024 23:51:57 +0600 Subject: [PATCH 3/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB(?= =?UTF-8?q?=D0=B0)=20=D0=BD=D0=B0=20'com.ublinux.ubl-settings-manager.poli?= =?UTF-8?q?cy'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.ublinux.ubl-settings-manager.policy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/com.ublinux.ubl-settings-manager.policy b/com.ublinux.ubl-settings-manager.policy index 63fd4eb..a52804d 100644 --- a/com.ublinux.ubl-settings-manager.policy +++ b/com.ublinux.ubl-settings-manager.policy @@ -13,9 +13,9 @@ Authentication is required to run ubl-settings-manager Требуется авторизация для запуска утилиты ubl-settings-manager с правами root - auth_admin - auth_admin - auth_admin + auth_admin_keep + auth_admin_keep + auth_admin_keep /usr/bin/ubl-settings-manager true From 698f1264838369bb125467872118785182a182a3 Mon Sep 17 00:00:00 2001 From: asmeron Date: Fri, 21 Nov 2025 15:28:20 +0600 Subject: [PATCH 4/4] Fix .policy and .desktop --- com.ublinux.ubl-settings-manager.policy | 14 +++++++------- ubl-settings-manager.desktop | 17 +++++++++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/com.ublinux.ubl-settings-manager.policy b/com.ublinux.ubl-settings-manager.policy index a52804d..16f7aef 100644 --- a/com.ublinux.ubl-settings-manager.policy +++ b/com.ublinux.ubl-settings-manager.policy @@ -8,14 +8,14 @@ https://ublinux.ru - Run ubl-settings-manager as root - Запуск утилиты ubl-settings-manager с правами root - Authentication is required to run ubl-settings-manager - Требуется авторизация для запуска утилиты ubl-settings-manager с правами root + Run settings manager as root + Запустить диспетчер настроек от имени пользователя root + Authentication is required to run settings manager as root + Требуется аутентификация для запуска диспетчер настроек от имени пользователя root - auth_admin_keep - auth_admin_keep - auth_admin_keep + auth_admin + auth_admin + auth_admin /usr/bin/ubl-settings-manager true diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index e0d1b2e..e8a62e9 100644 --- a/ubl-settings-manager.desktop +++ b/ubl-settings-manager.desktop @@ -1,14 +1,19 @@ [Desktop Entry] +Version=1.0 Encoding=UTF-8 -Name=ubl-settings-manager -Name[ru]=Диспетчер настроек UBLinux -GenericName=ubl-settings-manager -GenericName[ru]=Диспетчер настроек UBLinux -Comment=ubl-settings-manager -Comment[ru]=Графический диспетчер настроек UBLinux +Name=Settings manager for the system +Name[ru]=Диспетчер настроек +GenericName=Settings manager for the system +GenericName[ru]=Диспетчер настроек системы +Comment=Graphical settings manager for the system +Comment[ru]=Графический диспетчер настроек для системы +Keywords=settings;manager;system; +Keywords[ru]=настройки;диспетчер;система; Type=Application Exec=ubl-settings-manager Icon=com.ublinux.ubl-settings-manager Terminal=false +StartupNotify=true +StartupWMClass=ubl-settings-manager X-XfcePluggable=false Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;