diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rwxr-xr-x | blurry-text-fix-cairo | 8 | ||||
| -rw-r--r-- | blurry-text-fix-reinstall | 28 | ||||
| -rw-r--r-- | blurry-text-fix.install | 33 | ||||
| -rw-r--r-- | settings.ini | 5 |
7 files changed, 31 insertions, 64 deletions
@@ -1,12 +1,12 @@ pkgbase = blurry-text-fix - pkgdesc = Fixes blurry text in GTK4 and Flatpak - pkgver = 2 - pkgrel = 8 + pkgdesc = Fix blurry text in GTK4 and/or Flatpak + pkgver = 3 + pkgrel = 1 install = blurry-text-fix.install arch = any license = GPL3 depends = gtk4 - optdepends = flatpak + optdepends = flatpak: overwrite flatpak provides = blurry-text-fix pkgname = blurry-text-fix diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..57a868c40327 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/pkg +/src +*.tar.zst @@ -1,17 +1,15 @@ # Maintainer: Tomkoid <tomkoid@tomkoid.tk> pkgname=blurry-text-fix -pkgver=2 -pkgrel=8 -pkgdesc="Fixes blurry text in GTK4 and Flatpak" +pkgver=3 +pkgrel=1 +pkgdesc="Fix blurry text in GTK4 and/or Flatpak" license=('GPL3') provides=('blurry-text-fix') install=blurry-text-fix.install arch=('any') depends=('gtk4') -optdepends=('flatpak') +optdepends=('flatpak: overwrite flatpak') package() { - install -Dm644 ../settings.ini "$pkgdir/etc/blurry-text-fix/gtk-4.0/settings.ini" - install -Dm755 ../blurry-text-fix-reinstall "$pkgdir/usr/bin/blurry-text-fix-reinstall" install -Dm755 ../blurry-text-fix-cairo "$pkgdir/usr/bin/blurry-text-fix-cairo" } diff --git a/blurry-text-fix-cairo b/blurry-text-fix-cairo index e4d68082d523..e442e8ac80ed 100755 --- a/blurry-text-fix-cairo +++ b/blurry-text-fix-cairo @@ -1,3 +1,7 @@ +#!/bin/bash + +package_url="https://codeberg.org/Tomkoid/tomkoid-repo/raw/branch/main/x86_64/cairo-1.16.0-2-x86_64.pkg.tar.xz" + if [ "$(id -u)" != 0 ]; then echo "####################################" echo "You need to run this command as root" @@ -5,4 +9,6 @@ if [ "$(id -u)" != 0 ]; then exit 1 fi -pacman -U 'https://gitlab.com/Tomkoid/tomkoid-repo/x86_64/cairo-1.16.0-2-x86_64.pkg.tar.xz' +wget $package_url -O /tmp/cairo.pkg.tar.xz +pacman -U /tmp/cairo.pkg.tar.xz +rm /tmp/cairo.pkg.tar.xz diff --git a/blurry-text-fix-reinstall b/blurry-text-fix-reinstall deleted file mode 100644 index 0f2a7309d2cf..000000000000 --- a/blurry-text-fix-reinstall +++ /dev/null @@ -1,28 +0,0 @@ -if [ "$(id -u)" != 0 ]; then - echo "####################################" - echo "You need to run this command as root" - echo "####################################" - exit 1 -fi - -# GTK 4 -if [[ ! -f "/usr/share/gtk-4.0/settings-old.ini" ]] -then - echo "> Renaming gtk-4.0/settings.ini to gtk-4.0/settings-old.ini." - mv /usr/share/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings-old.ini -fi - -echo "> Installing modified config to gtk-4.0/settings.ini." -cp /etc/blurry-text-fix/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings.ini - -if [[ -f "/usr/bin/flatpak" ]] -then - echo "> Overriding Flatpak.." - flatpak override --filesystem=xdg-config/gtk-4.0 - flatpak override --filesystem=xdg-config/gtk-3.0 -fi - -echo "INFO: Your backup file is in /usr/share/gtk-<version>/settings-old.ini" -echo "INFO: If you want to edit settings.ini, then edit this file /etc/blurry-text-fix and then run blurry-text-fix-reload" -echo "### Done. Please relog to apply changes." -exit 0 diff --git a/blurry-text-fix.install b/blurry-text-fix.install index a99b05ea6726..f8943b5e4633 100644 --- a/blurry-text-fix.install +++ b/blurry-text-fix.install @@ -1,46 +1,39 @@ pre_install() { if [[ ! -f "/usr/share/gtk-4.0/settings.ini" ]] then - echo "### ERROR: /usr/share/gtk-4.0/settings.ini doesn't exist." + echo "ERROR: /usr/share/gtk-4.0/settings.ini doesn't exist." exit 1 fi } post_install() { + already_contains=$(grep -q "gtk-hint-font-metrics=true" /usr/share/gtk-4.0/settings.ini && echo true || echo false) + # GTK 4 - if [[ ! -f "/usr/share/gtk-4.0/settings-old.ini" ]] + if [[ "$already_contains" == false ]] then - echo "> Renaming gtk-4.0/settings.ini to gtk-4.0/settings-old.ini." - mv /usr/share/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings-old.ini + echo "gtk-hint-font-metrics=true" >> /usr/share/gtk-4.0/settings.ini fi - echo "> Installing modified config to gtk-4.0/settings.ini." - cp /etc/blurry-text-fix/gtk-4.0/settings.ini /usr/share/gtk-4.0/settings.ini - if [[ -f "/usr/bin/flatpak" ]] then - echo "> Overriding flatpak" - flatpak override --filesystem=xdg-config/gtk-4.0 - flatpak override --filesystem=xdg-config/gtk-3.0 + echo "Flatpak found! Overriding flatpak" + flatpak override --filesystem=xdg-config/gtk-4.0 || exit 1 + flatpak override --filesystem=xdg-config/gtk-3.0 || exit 1 fi - echo "INFO: Your backup file is in /usr/share/gtk-<version>/settings-old.ini" - echo "INFO: If you want to edit settings.ini, then edit this file /etc/blurry-text-fix and then run blurry-text-fix-reinstall" - echo "### Done. Please relog to apply changes." + echo "SUCCESS: Settings have been written to '/usr/share/gtk-4.0/settings.ini'" + echo "Please relog to apply changes." } post_upgrade() { - echo "### Please ignore the file information warnings." post_install } post_remove() { - echo "> Removing modified gtk-4.0/settings.ini." - rm /usr/share/gtk-4.0/settings.ini - echo "> Restoring old gtk-4.0/settings.ini." - mv /usr/share/gtk-4.0/settings-old.ini /usr/share/gtk-4.0/settings.ini + sed -e "s/gtk-hint-font-metrics=true//g" -i /usr/share/gtk-4.0/settings.ini - echo "INFO: The old config file is stored in /usr/share/gtk-<version>/settings.ini." - echo "### Done. Please relog to apply changes." + echo "SUCCESS: Settings have been removed from '/usr/share/gtk-4.0/settings.ini'" + echo "Please relog to apply changes." } diff --git a/settings.ini b/settings.ini deleted file mode 100644 index 5691d9e4a774..000000000000 --- a/settings.ini +++ /dev/null @@ -1,5 +0,0 @@ -[Settings] -gtk-icon-theme-name = Adwaita -gtk-theme-name = Adwaita -gtk-font-name = Cantarell 11 -gtk-hint-font-metrics=true |