From 22bcfe821b41dca49b253879b376a996f052faf8 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 15:42:16 +0200 Subject: [PATCH 01/19] Update 'PKGBUILD' --- PKGBUILD | 2 -- 1 file changed, 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 3d33580..11be2bc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,8 +11,6 @@ depends=('xfce4-appfinder' 'rsync' 'inotify-tools' 'qt5-styleplugins' - 'qt5ct' - 'qt6ct' 'qt6gtk2' 'qqc2-desktop-style') provides=('tromjaro-fixes') -- 2.30.2 From 2f029b03a74a71663e0a6c020fddf8ad53e73f86 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 15:43:44 +0200 Subject: [PATCH 02/19] create tromjaro-fixes.sh --- tromjaro-fixes.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tromjaro-fixes.sh diff --git a/tromjaro-fixes.sh b/tromjaro-fixes.sh new file mode 100644 index 0000000..55012ed --- /dev/null +++ b/tromjaro-fixes.sh @@ -0,0 +1,2 @@ +export QT_QPA_PLATFORMTHEME="gtk2" +export QT_QUICK_CONTROLS_STYLE="gtk2" \ No newline at end of file -- 2.30.2 From af82c8bd40fb5a874af6c344ff384e8d97b181b8 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 15:46:39 +0200 Subject: [PATCH 03/19] Update 'tromjaro-fixes.sh' --- tromjaro-fixes.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tromjaro-fixes.sh b/tromjaro-fixes.sh index 55012ed..3dfa56f 100644 --- a/tromjaro-fixes.sh +++ b/tromjaro-fixes.sh @@ -1,2 +1,12 @@ export QT_QPA_PLATFORMTHEME="gtk2" -export QT_QUICK_CONTROLS_STYLE="gtk2" \ No newline at end of file +export QT_QUICK_CONTROLS_STYLE="gtk2" + +# Show color output in less +export LESS=-R +export LESS_TERMCAP_mb=$'\e[1;31m' +export LESS_TERMCAP_md=$'\e[1;36m' +export LESS_TERMCAP_me=$'\e[0m' +export LESS_TERMCAP_so=$'\e[01;44;33m' +export LESS_TERMCAP_se=$'\e[0m' +export LESS_TERMCAP_us=$'\e[1;32m' +export LESS_TERMCAP_ue=$'\e[0m' \ No newline at end of file -- 2.30.2 From 66feb5daf619fe67e5ec0cc0d7c1c54c71edcbce Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 15:56:31 +0200 Subject: [PATCH 04/19] added tromjaro-fixes.sh --- PKGBUILD | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 11be2bc..7aa937a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,8 +16,10 @@ depends=('xfce4-appfinder' provides=('tromjaro-fixes') backup=() options=(!strip) -source=('scalable.zip::https://www.drive.tromsite.com/s/y8Gm7q6wLrXmtEN/download') -sha256sums=('SKIP') +source=('scalable.zip::https://www.drive.tromsite.com/s/y8Gm7q6wLrXmtEN/download' + 'tromjaro-fixes.sh') +sha256sums=('SKIP' + 'SKIP') install='fixes-package.install' prepare() { cp -R ../bin ../flatpak-overrides ../alpm-hooks ../systemd . @@ -48,4 +50,8 @@ package() { # copy zafiro icons install -d ${pkgdir}/usr/local/share/icons/zafiro/apps/scalable install -Dm755 ${srcdir}/scalable/* ${pkgdir}/usr/local/share/icons/zafiro/apps/scalable + + # copy tromjaro-fixes.sh + install -d ${pkgdir}/etc/profile.d/ + install -Dm644 ${srcdir}/tromjaro-fixes.sh ${pkgdir}/etc/profile.d/ } \ No newline at end of file -- 2.30.2 From 61afd40bfab64404156937d242a07691b3ab74ce Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 15:57:47 +0200 Subject: [PATCH 05/19] Update 'PKGBUILD' --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 7aa937a..474bfd9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -43,7 +43,7 @@ package() { install -d ${pkgdir}/usr/lib/systemd/user install -Dm644 ${srcdir}/systemd/services/* ${pkgdir}/usr/lib/systemd/user - # copy zafiro icons dark + # copy zafiro dark icons install -d ${pkgdir}/usr/local/share/icons/zafiro-dark/apps/scalable install -Dm755 ${srcdir}/scalable/* ${pkgdir}/usr/local/share/icons/zafiro-dark/apps/scalable -- 2.30.2 From d9091586465936ced21525cbd29cc753f524133d Mon Sep 17 00:00:00 2001 From: rokosun Date: Wed, 28 Sep 2022 16:28:05 +0200 Subject: [PATCH 06/19] No need to edit qt configuration files anymore --- bin/periodic/fix-theming | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/bin/periodic/fix-theming b/bin/periodic/fix-theming index 1b84018..11aa04c 100755 --- a/bin/periodic/fix-theming +++ b/bin/periodic/fix-theming @@ -12,36 +12,6 @@ sync_theme() { gsettings set org.gnome.desktop.interface gtk-theme "$theme" } -setvalue() { - grep -qz "^\[Appearance\][^\[]*$1=$2" "$file" && return - if grep -qz "^\[Appearance\][^\[]*$1=" "$file"; then - sed -i "/\[Appearance\]/,/^\s*$1=/{s/^\s*$1=.*$/$1=$2/}" "$file" - else - sed -i "/\[Appearance\]/a $1=$2" "$file" - fi -} - -sync_icon_theme() { - # Get the current icon theme - icon_theme=$(xfconf-query -c xsettings -p /Net/IconThemeName) - # Apply the same theme in qt5ct and qt6ct configuration - for file in "$HOME"/.config/qt5ct/qt5ct.conf "$HOME"/.config/qt6ct/qt6ct.conf; do - # Create the config directory - dir=$(dirname "$file") - mkdir -p "$dir" || { echo "failed to make directory $dir"; continue; } - # Create the config file appropriately - if grep -q '^\[Appearance\]' "$file"; then - setvalue 'icon_theme' "$icon_theme" - setvalue 'style' 'gtk2' - elif grep -q '\S' "$file"; then - tail -n1 "$file" | grep -qx '\s*' && begin='' || begin='\n' - printf '%b[Appearance]\nicon_theme=%s\nstyle=gtk2\n' "$begin" "$icon_theme" >> "$file" - else - printf '[Appearance]\nicon_theme=%s\nstyle=gtk2\n' "$icon_theme" > "$file" - fi - done -} - sync_font() { # Get the current system font font=$(xfconf-query -c xsettings -p /Gtk/FontName) @@ -50,13 +20,11 @@ sync_font() { } sync_theme -sync_icon_theme sync_font while read -r line; do case "$line" in 'set: /Net/ThemeName') sync_theme ;; - 'set: /Net/IconThemeName') sync_icon_theme ;; 'set: /Gtk/FontName') sync_font ;; esac done < <(xfconf-query -c xsettings -m) -- 2.30.2 From a729acbbef32342f40b202361641ff81e79a4392 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 17:47:28 +0200 Subject: [PATCH 07/19] added "xset b off" to remove the beep sound --- tromjaro-fixes.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tromjaro-fixes.sh b/tromjaro-fixes.sh index 3dfa56f..f71b444 100644 --- a/tromjaro-fixes.sh +++ b/tromjaro-fixes.sh @@ -1,3 +1,4 @@ +# Sync the QT with GTK export QT_QPA_PLATFORMTHEME="gtk2" export QT_QUICK_CONTROLS_STYLE="gtk2" @@ -9,4 +10,7 @@ export LESS_TERMCAP_me=$'\e[0m' export LESS_TERMCAP_so=$'\e[01;44;33m' export LESS_TERMCAP_se=$'\e[0m' export LESS_TERMCAP_us=$'\e[1;32m' -export LESS_TERMCAP_ue=$'\e[0m' \ No newline at end of file +export LESS_TERMCAP_ue=$'\e[0m' + +# Disable the beep sound +xset b off \ No newline at end of file -- 2.30.2 From ca054b9b6edb34392386d54ba87e3679b668093d Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 17:55:45 +0200 Subject: [PATCH 08/19] added export QT_AUTO_SCREEN_SCALE_FACTOR=1 --- tromjaro-fixes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tromjaro-fixes.sh b/tromjaro-fixes.sh index f71b444..3005cdb 100644 --- a/tromjaro-fixes.sh +++ b/tromjaro-fixes.sh @@ -1,6 +1,7 @@ # Sync the QT with GTK export QT_QPA_PLATFORMTHEME="gtk2" export QT_QUICK_CONTROLS_STYLE="gtk2" +export QT_AUTO_SCREEN_SCALE_FACTOR=1 # Show color output in less export LESS=-R -- 2.30.2 From 2268c4c2bd5cbf1989f70e91d7f9307dbd52fb16 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 17:57:22 +0200 Subject: [PATCH 09/19] Add 'timeshift-autosnap.conf' --- timeshift-autosnap.conf | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 timeshift-autosnap.conf diff --git a/timeshift-autosnap.conf b/timeshift-autosnap.conf new file mode 100644 index 0000000..9951dcf --- /dev/null +++ b/timeshift-autosnap.conf @@ -0,0 +1,29 @@ +# +# /etc/timeshift-autosnap.conf +# + +# skipAutosnap defines if timeshift-autosnap execution should be skipped. +# Default value is false. +skipAutosnap=false + +# skipRsyncAutosnap defines if timeshift-autosnap execution should be skipped on filesystems other than btrfs. +# Default value is true. +skipRsyncAutosnap=false + +# deleteSnapshots defines if old snapshots should be deleted. +# Default value is true. +deleteSnapshots=true + +# maxSnapshots defines how much old snapshots script should left. +# Only positive whole numbers can be used. +# Default value is 3. +maxSnapshots=3 + +# updateGrub defines if grub entries should be auto-generated. +# If grub-btrfs package is not installed grub won't be generated. +# Default value is true. +updateGrub=true + +# snapshotDescription defines value used to distinguish snapshots created using timeshift-autosnap +# Default value is "{timeshift-autosnap} {created before upgrade}". +snapshotDescription={timeshift-autosnap} {created before upgrade} -- 2.30.2 From 275b811f0f57bd1697ee2b855ddcde89af15428f Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 18:02:05 +0200 Subject: [PATCH 10/19] added timeshift-autosnap.conf file --- PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 474bfd9..454c6f2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,8 +17,10 @@ provides=('tromjaro-fixes') backup=() options=(!strip) source=('scalable.zip::https://www.drive.tromsite.com/s/y8Gm7q6wLrXmtEN/download' - 'tromjaro-fixes.sh') + 'tromjaro-fixes.sh' + 'timeshift-autosnap.conf') sha256sums=('SKIP' + 'SKIP' 'SKIP') install='fixes-package.install' prepare() { @@ -54,4 +56,8 @@ package() { # copy tromjaro-fixes.sh install -d ${pkgdir}/etc/profile.d/ install -Dm644 ${srcdir}/tromjaro-fixes.sh ${pkgdir}/etc/profile.d/ + + # copy timeshift-autosnap.conf + install -d ${pkgdir}/etc/ + install -Dm644 ${srcdir}/timeshift-autosnap.conf ${pkgdir}/etc/timeshift-autosnap.conf } \ No newline at end of file -- 2.30.2 From 58b415ae8d0f5fcd343d0c7ad1456ae00c88efb7 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 22:24:35 +0200 Subject: [PATCH 11/19] Delete 'timeshift-autosnap.conf' --- timeshift-autosnap.conf | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 timeshift-autosnap.conf diff --git a/timeshift-autosnap.conf b/timeshift-autosnap.conf deleted file mode 100644 index 9951dcf..0000000 --- a/timeshift-autosnap.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -# /etc/timeshift-autosnap.conf -# - -# skipAutosnap defines if timeshift-autosnap execution should be skipped. -# Default value is false. -skipAutosnap=false - -# skipRsyncAutosnap defines if timeshift-autosnap execution should be skipped on filesystems other than btrfs. -# Default value is true. -skipRsyncAutosnap=false - -# deleteSnapshots defines if old snapshots should be deleted. -# Default value is true. -deleteSnapshots=true - -# maxSnapshots defines how much old snapshots script should left. -# Only positive whole numbers can be used. -# Default value is 3. -maxSnapshots=3 - -# updateGrub defines if grub entries should be auto-generated. -# If grub-btrfs package is not installed grub won't be generated. -# Default value is true. -updateGrub=true - -# snapshotDescription defines value used to distinguish snapshots created using timeshift-autosnap -# Default value is "{timeshift-autosnap} {created before upgrade}". -snapshotDescription={timeshift-autosnap} {created before upgrade} -- 2.30.2 From 11f5d9da18b65bc9838e383ae7f3bb2655af4a5c Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Wed, 28 Sep 2022 22:25:01 +0200 Subject: [PATCH 12/19] removed timeshift autosnap config --- PKGBUILD | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 454c6f2..3aa715e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,10 +17,8 @@ provides=('tromjaro-fixes') backup=() options=(!strip) source=('scalable.zip::https://www.drive.tromsite.com/s/y8Gm7q6wLrXmtEN/download' - 'tromjaro-fixes.sh' - 'timeshift-autosnap.conf') + 'tromjaro-fixes.sh') sha256sums=('SKIP' - 'SKIP' 'SKIP') install='fixes-package.install' prepare() { -- 2.30.2 From 9f9713a67342ac71646dff58afb9386ed14a6721 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 00:03:38 +0200 Subject: [PATCH 13/19] Update 'PKGBUILD' --- PKGBUILD | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 3aa715e..c02b561 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: TROM pkgname=tromjaro-fixes -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="Various fixes for TROMjaro OS" arch=(any) @@ -55,7 +55,4 @@ package() { install -d ${pkgdir}/etc/profile.d/ install -Dm644 ${srcdir}/tromjaro-fixes.sh ${pkgdir}/etc/profile.d/ - # copy timeshift-autosnap.conf - install -d ${pkgdir}/etc/ - install -Dm644 ${srcdir}/timeshift-autosnap.conf ${pkgdir}/etc/timeshift-autosnap.conf } \ No newline at end of file -- 2.30.2 From 700235c52ec6ac3b99ebd96b621e4c58d0cf4ed6 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 17:33:48 +0200 Subject: [PATCH 14/19] Using the AUR to build these packages They need to be built against the system's qt5-base and qt6-base versions, else all qt apps will fail to work --- bin/standalone/reinstall-for-qt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/standalone/reinstall-for-qt b/bin/standalone/reinstall-for-qt index 3b45df9..16be70b 100755 --- a/bin/standalone/reinstall-for-qt +++ b/bin/standalone/reinstall-for-qt @@ -2,4 +2,4 @@ parent_process=$(ps -p $PPID -o comm=) [ "$parent_process" = 'pacman' ] || [ "$parent_process" = 'pamac-daemon' ] || exit rm /var/lib/pacman/db.lck -pacman --noconfirm -S qt5-styleplugins qt6gtk2 +pamac build --no-confirm qt5-styleplugins qt6gtk2 -- 2.30.2 From 4c96bb94064fd678440ab81f81dbbe2c3554acb0 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 17:50:55 +0200 Subject: [PATCH 15/19] Update 'bin/standalone/reinstall-for-qt5' --- bin/standalone/{reinstall-for-qt => reinstall-for-qt5} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename bin/standalone/{reinstall-for-qt => reinstall-for-qt5} (76%) diff --git a/bin/standalone/reinstall-for-qt b/bin/standalone/reinstall-for-qt5 similarity index 76% rename from bin/standalone/reinstall-for-qt rename to bin/standalone/reinstall-for-qt5 index 16be70b..ba6f597 100755 --- a/bin/standalone/reinstall-for-qt +++ b/bin/standalone/reinstall-for-qt5 @@ -2,4 +2,4 @@ parent_process=$(ps -p $PPID -o comm=) [ "$parent_process" = 'pacman' ] || [ "$parent_process" = 'pamac-daemon' ] || exit rm /var/lib/pacman/db.lck -pamac build --no-confirm qt5-styleplugins qt6gtk2 +pamac build --no-confirm qt5-styleplugins -- 2.30.2 From c07cb59ff0a57418b8b7b368a772791c7b3b1488 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 17:51:19 +0200 Subject: [PATCH 16/19] Add 'bin/standalone/reinstall-for-qt6' --- bin/standalone/reinstall-for-qt6 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 bin/standalone/reinstall-for-qt6 diff --git a/bin/standalone/reinstall-for-qt6 b/bin/standalone/reinstall-for-qt6 new file mode 100644 index 0000000..d421322 --- /dev/null +++ b/bin/standalone/reinstall-for-qt6 @@ -0,0 +1,5 @@ +#!/bin/bash +parent_process=$(ps -p $PPID -o comm=) +[ "$parent_process" = 'pacman' ] || [ "$parent_process" = 'pamac-daemon' ] || exit +rm /var/lib/pacman/db.lck +pamac build --no-confirm qt6gtk2 \ No newline at end of file -- 2.30.2 From 1a9ed580a0e3a9ea8f77940b0c67a4fe0bccb474 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 17:52:01 +0200 Subject: [PATCH 17/19] Update 'alpm-hooks/reinstall-for-qt5.hook' --- alpm-hooks/{reinstall-for-qt.hook => reinstall-for-qt5.hook} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename alpm-hooks/{reinstall-for-qt.hook => reinstall-for-qt5.hook} (77%) diff --git a/alpm-hooks/reinstall-for-qt.hook b/alpm-hooks/reinstall-for-qt5.hook similarity index 77% rename from alpm-hooks/reinstall-for-qt.hook rename to alpm-hooks/reinstall-for-qt5.hook index 7fb0f94..d9af11a 100644 --- a/alpm-hooks/reinstall-for-qt.hook +++ b/alpm-hooks/reinstall-for-qt5.hook @@ -2,10 +2,9 @@ Operation = Upgrade Type = Package Target = qt5-base -Target = qt6-base [Action] Description = Reinstalling needed packages for theming QT applications... When = PostTransaction -Exec = /usr/bin/reinstall-for-qt \ No newline at end of file +Exec = /usr/bin/reinstall-for-qt5 \ No newline at end of file -- 2.30.2 From 9fa5ce277ed0b18f7b6f1e999c6aa866f5e060f5 Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 17:52:23 +0200 Subject: [PATCH 18/19] Add 'alpm-hooks/reinstall-for-qt6.hook' --- alpm-hooks/reinstall-for-qt6.hook | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 alpm-hooks/reinstall-for-qt6.hook diff --git a/alpm-hooks/reinstall-for-qt6.hook b/alpm-hooks/reinstall-for-qt6.hook new file mode 100644 index 0000000..ec2a942 --- /dev/null +++ b/alpm-hooks/reinstall-for-qt6.hook @@ -0,0 +1,10 @@ +[Trigger] +Operation = Upgrade +Type = Package +Target = qt6-base + + +[Action] +Description = Reinstalling needed packages for theming QT applications... +When = PostTransaction +Exec = /usr/bin/reinstall-for-qt \ No newline at end of file -- 2.30.2 From 3cf00d0cd2291e3ad194093c08297cdddc273f0d Mon Sep 17 00:00:00 2001 From: Tio TROM Date: Thu, 29 Sep 2022 18:19:19 +0200 Subject: [PATCH 19/19] small typo --- alpm-hooks/reinstall-for-qt6.hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpm-hooks/reinstall-for-qt6.hook b/alpm-hooks/reinstall-for-qt6.hook index ec2a942..12c9512 100644 --- a/alpm-hooks/reinstall-for-qt6.hook +++ b/alpm-hooks/reinstall-for-qt6.hook @@ -7,4 +7,4 @@ Target = qt6-base [Action] Description = Reinstalling needed packages for theming QT applications... When = PostTransaction -Exec = /usr/bin/reinstall-for-qt \ No newline at end of file +Exec = /usr/bin/reinstall-for-qt6 \ No newline at end of file -- 2.30.2