Version 2.2.0

README.md

@@ -1,12 +1,12 @@
 # Human theme
 
-This theme works with: **GTK 2.24+** *(with murrine)*, **GTK 3.20+** *(including 3.22 and 3.24)*, and **GTK 4.0+**.
+This theme works with: **GTK 2.24** *(with murrine)*, **GTK 3.24**, and **GTK 4.12**.
 
 It is mainly intended for Mate and Xfce desktop environments.
 
 ## Screenshots
 
-GTK 2\
+GTK 2.24 (Pango 1.51)\
 [![Preview with GTK 2 - Main window](images/thumbs/gtk2.png?raw=true)](images/gtk2.png?raw=true)
 [![Preview with GTK 2 - Orange variation - Main window](images/thumbs/gtk2-orange.png?raw=true)](images/gtk2-orange.png?raw=true)
 [![Preview with GTK 2 - Blue variation - Main window](images/thumbs/gtk2-blue.png?raw=true)](images/gtk2-blue.png?raw=true)
@@ -16,7 +16,7 @@ GTK 2\
 [![Preview with GTK 2 - Blue variation - Menu](images/thumbs/gtk2-blue-menu.png?raw=true)](images/gtk2-blue-menu.png?raw=true)
 [![Preview with GTK 2 - Green variation - Menu](images/thumbs/gtk2-green-menu.png?raw=true)](images/gtk2-green-menu.png?raw=true)
 
-GTK 2 RTL\
+GTK 2.24 RTL (Pango 1.51)\
 [![Preview with GTK 2 - RTL - Main window](images/thumbs/gtk2-rtl.png?raw=true)](images/gtk2-rtl.png?raw=true)
 [![Preview with GTK 2 - RTL - Orange variation - Main window](images/thumbs/gtk2-rtl-orange.png?raw=true)](images/gtk2-rtl-orange.png?raw=true)
 [![Preview with GTK 2 - RTL - Blue variation - Main window](images/thumbs/gtk2-rtl-blue.png?raw=true)](images/gtk2-rtl-blue.png?raw=true)
@@ -26,7 +26,7 @@ GTK 2 RTL\
 [![Preview with GTK 2 - RTL - Blue variation - Menu](images/thumbs/gtk2-rtl-blue-menu.png?raw=true)](images/gtk2-rtl-blue-menu.png?raw=true)
 [![Preview with GTK 2 - RTL - Green variation - Menu](images/thumbs/gtk2-rtl-green-menu.png?raw=true)](images/gtk2-rtl-green-menu.png?raw=true)
 
-GTK 3\
+GTK 3.24 (Pango 1.51)\
 [![Preview with GTK 3 - Main window](images/thumbs/gtk3.png?raw=true)](images/gtk3.png?raw=true)
 [![Preview with GTK 3 - Orange variation - Main window](images/thumbs/gtk3-orange.png?raw=true)](images/gtk3-orange.png?raw=true)
 [![Preview with GTK 3 - Blue variation - Main window](images/thumbs/gtk3-blue.png?raw=true)](images/gtk3-blue.png?raw=true)
@@ -36,7 +36,7 @@ GTK 3\
 [![Preview with GTK 3 - Blue variation - Menu](images/thumbs/gtk3-blue-menu.png?raw=true)](images/gtk3-blue-menu.png?raw=true)
 [![Preview with GTK 3 - Green variation - Menu](images/thumbs/gtk3-green-menu.png?raw=true)](images/gtk3-green-menu.png?raw=true)
 
-GTK 3 RTL\
+GTK 3.24 RTL (Pango 1.51)\
 [![Preview with GTK 3 - RTL - Main window](images/thumbs/gtk3-rtl.png?raw=true)](images/gtk3-rtl.png?raw=true)
 [![Preview with GTK 3 - RTL - Orange variation - Main window](images/thumbs/gtk3-rtl-orange.png?raw=true)](images/gtk3-rtl-orange.png?raw=true)
 [![Preview with GTK 3 - RTL - Blue variation - Main window](images/thumbs/gtk3-rtl-blue.png?raw=true)](images/gtk3-rtl-blue.png?raw=true)
@@ -46,7 +46,7 @@ GTK 3 RTL\
 [![Preview with GTK 3 - RTL - Blue variation - Menu](images/thumbs/gtk3-rtl-blue-menu.png?raw=true)](images/gtk3-rtl-blue-menu.png?raw=true)
 [![Preview with GTK 3 - RTL - Green variation - Menu](images/thumbs/gtk3-rtl-green-menu.png?raw=true)](images/gtk3-rtl-green-menu.png?raw=true)
 
-GTK 4\
+GTK 4.12 (Pango 1.51)\
 [![Preview with GTK 4 - Main window](images/thumbs/gtk4.png?raw=true)](images/gtk4.png?raw=true)
 [![Preview with GTK 4 - Orange variation - Main window](images/thumbs/gtk4-orange.png?raw=true)](images/gtk4-orange.png?raw=true)
 [![Preview with GTK 4 - Blue variation - Main window](images/thumbs/gtk4-blue.png?raw=true)](images/gtk4-blue.png?raw=true)
@@ -56,7 +56,7 @@ GTK 4\
 [![Preview with GTK 4 - Blue variation - Menu](images/thumbs/gtk4-blue-menu.png?raw=true)](images/gtk4-blue-menu.png?raw=true)
 [![Preview with GTK 4 - Green variation - Menu](images/thumbs/gtk4-green-menu.png?raw=true)](images/gtk4-green-menu.png?raw=true)
 
-GTK 4 RTL\
+GTK 4.12 RTL (Pango 1.51)\
 [![Preview with GTK 4 - RTL - Main window](images/thumbs/gtk4-rtl.png?raw=true)](images/gtk4-rtl.png?raw=true)
 [![Preview with GTK 4 - RTL - Orange variation - Main window](images/thumbs/gtk4-rtl-orange.png?raw=true)](images/gtk4-rtl-orange.png?raw=true)
 [![Preview with GTK 4 - RTL - Blue variation - Main window](images/thumbs/gtk4-rtl-blue.png?raw=true)](images/gtk4-rtl-blue.png?raw=true)
@@ -66,7 +66,7 @@ GTK 4 RTL\
 [![Preview with GTK 4 - RTL - Blue variation - Menu](images/thumbs/gtk4-rtl-blue-menu.png?raw=true)](images/gtk4-rtl-blue-menu.png?raw=true)
 [![Preview with GTK 4 - RTL - Green variation - Menu](images/thumbs/gtk4-rtl-green-menu.png?raw=true)](images/gtk4-rtl-green-menu.png?raw=true)
 
-Program used for the screenshots is available [here](https://github.com/luigifab/awf-extended). For screenshots: Pango 1.51 with GTK 2.24.33 & 3.24.37-classic & 4.12.2. Yes! Almost same rendering like before!!
+Program used for the screenshots is available [here](https://github.com/luigifab/awf-extended).
 
 ## Installation
 
@@ -79,8 +79,6 @@ To meet the truth (this is not required):
 
 For Debian Testing, I provide a [repository](https://build.opensuse.org/package/show/home:luigifab/gtk3-classic) for gtk3-classic.
 
-**With Pango 1.51+, criticals fails of the life of Pango from 1.43 to 1.50 are fixed (for _v35_ of _FREETYPE_PROPERTIES_). There are some differences, but for now it's acceptable.**
-
 If you can't/won't, no worries, but the truth will be far.
 
 #### Installation for Debian and Ubuntu
@@ -198,7 +196,7 @@ Fonts used:
 * *DejaVu Sans Mono Book* or *Monospace Regular*, 10
 
 Icons used:
-* *gnome*
+* *gnome* or *mate*
 
 Cursors used:
 * *DMZ white*
@@ -217,12 +215,7 @@ sudo rm 10-hinting-slight.conf # /usr/share/fontconfig/conf.avail/10-hinting-sli
 sudo ln -s /usr/share/fontconfig/conf.avail/10-hinting-full.conf
 ```
 
-## Known issues
-
-* For classic menu bar and menu items of [Firefox 46+](https://www.mozilla.org/firefox) and [Thunderbird 46+](https://www.mozilla.org/thunderbird), see [bug 1622545](https://bugzilla.mozilla.org/show_bug.cgi?id=1622545).
-* The [status bar grip](https://developer.gnome.org/gtk2/stable/GtkStatusbar.html) was removed with GTK 3 ([note1](https://developer.gnome.org/gtk3/stable/ch26s02.html#id-1.6.3.4.17), [note2](https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-set-has-resize-grip)).
-* <del><i>The [treeview](https://developer.gnome.org/gtk3/stable/GtkTreeView.html) zebra/even-odd row styling was removed with GTK 3.19 ([note](https://gitlab.gnome.org/GNOME/gtk/issues/581#note_746153))</i></del> | **fixed** with [gtk3-classic](https://github.com/lah7/gtk3-classic)!
-* <del><i>The [notebook tabs](https://developer.gnome.org/gtk3/stable/GtkNotebook.html) mouse scroll was removed with GTK 3.4</i></del> | **fixed** with [gtk3-classic](https://github.com/lah7/gtk3-classic)!
+For classic menu bar and menu items of [Firefox 46+](https://www.mozilla.org/firefox) and [Thunderbird 46+](https://www.mozilla.org/thunderbird), see [bug 1622545](https://bugzilla.mozilla.org/show_bug.cgi?id=1622545).
 
 ## Dev
 
@@ -253,9 +246,10 @@ Run `svg.sh` to update SVG images. See also [technical informations](https://git
 
 ## Copyright
 
-- Current version: 2.1.0 (10/10/2023)
-- Compatibility: GTK 2.24 / 3.20 / 3.22 / 3.24 / 4.0 / 4.2 / 4.4 / 4.6 / 4.8 / 4.10 / 4.12
+- Current version: 2.2.0 (02/02/2024)
+- Compatibility: GTK 2.24 / 3.24 / 4.12
 - Links: [luigifab.fr](https://www.luigifab.fr/gtk/human-theme) - [github.com](https://github.com/luigifab/human-theme) - [mate-look.org](https://www.mate-look.org/p/1376363/) - [xfce-look.org](https://www.xfce-look.org/p/1376363/)\
+[Arch Linux human-theme-gtk.zst](https://aur.archlinux.org/packages/human-theme-gtk)\
 [Debian human-theme-gtk.deb](https://packages.debian.org/human-theme-gtk)
   *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973445),
    [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974209))*\
@@ -266,6 +260,10 @@ Run `svg.sh` to update SVG images. See also [technical informations](https://git
 This theme is provided under the terms of the **GNU GPLv3+** license.\
 If you like, take some of your time to improve some translations, go to https://bit.ly/2HyCCEc.
 
+## Packages in official distros repositories
+
+[![Packages status](https://repology.org/badge/vertical-allrepos/human-theme-gtk.svg?header=human-theme-gtk)](https://repology.org/project/human-theme-gtk/versions)
+
 ## Credits
 
 GTK 2 theme *(CC-BY-SA-3.0+)*

archlinux/PKGBUILD

@@ -0,0 +1,35 @@
+pkgname=human-theme-gtk
+pkgver=2.2.0
+pkgrel=1
+pkgdesc="Human theme for GTK"
+arch=('any')
+url='https://github.com/luigifab/human-theme'
+license=('GPL3' 'LGPL2' 'CCBYSA')
+depends=()
+optdepends=('gtk-murrine-engine: for gtk2')
+source=("https://github.com/luigifab/human-theme/archive/v${pkgver}/human-theme-${pkgver}.tar.gz")
+md5sums=("...")
+
+prepare() {
+  mv "human-theme-$pkgver" "$pkgname-$pkgver"
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  # the entire source code is GPL-3.0-or-later, except metacity-1/* which is LGPL-2.1-or-later, and gtk-2.0/* which is CC-BY-SA-3.0+
+  mkdir -p "$pkgdir/usr/share/themes/"
+  cp -a src/human-theme/        "$pkgdir/usr/share/themes/"
+  cp -a src/human-theme-blue/   "$pkgdir/usr/share/themes/"
+  cp -a src/human-theme-green/  "$pkgdir/usr/share/themes/"
+  cp -a src/human-theme-orange/ "$pkgdir/usr/share/themes/"
+
+  mkdir -p "$pkgdir/etc/profile.d/"
+  install -pm 644 debian/profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
+
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname/"
+  install -pm 644 README.md "$pkgdir/usr/share/doc/$pkgname/"
+
+  mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
+  install -pm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/"
+}

debian/changelog

@@ -1,5 +1,5 @@
-human-theme-gtk (2.1.0-1) experimental; urgency=low
+human-theme-gtk (2.2.0-1) experimental; urgency=low
 
   * Initial Debian package release (Closes: #973445)
 
- -- Fabrice Creuzot <code@luigifab.fr>  Tue, 10 Oct 2023 20:00:00 +0000
+ -- Fabrice Creuzot <code@luigifab.fr>  Fri, 02 Feb 2024 20:00:00 +0000

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Fabrice Creuzot <code@luigifab.fr>
 Build-Depends: debhelper-compat (= 13)
 Rules-Requires-Root: no
-Standards-Version: 4.6.1.0
+Standards-Version: 4.6.2
 Homepage: https://github.com/luigifab/human-theme
 Vcs-Browser: https://github.com/luigifab/human-theme
 Vcs-Git: https://github.com/luigifab/human-theme.git
@@ -15,8 +15,9 @@ Depends: ${misc:Depends}
 Recommends: gtk2-engines-murrine, gnome-icon-theme, dmz-cursor-theme
 Suggests: gtk3-nocsd, qt5-gtk2-platformtheme, qt5-gtk-platformtheme
 Description: human theme for GTK
- This theme works with: GTK 2.24+ (with gtk2-engines-murrine),
- GTK 3.20+ (including 3.22 and 3.24), and GTK 4.0+. It is mainly
- intended for Mate and Xfce Desktop Environments.
+ This theme works with GTK 2.24 (with gtk2-engines-murrine),
+ 3.24, and 4.12. Better rendering with Pango 1.42- or 1.51+.
+ .
+ It is mainly intended for Mate and Xfce Desktop Environments.
  .
  After installation you must restart your session.

debian/copyright

@@ -7,7 +7,7 @@ Copyright:
  2011-2014 Jean-Philippe Fleury
  2013-2014 Andrew Shadura
  2020      Mike Kazantsev (mk-fg) <mk.fraggod@gmail.com>
- 2020-2023 Fabrice Creuzot (luigifab) <code@luigifab.fr>
+ 2020-2024 Fabrice Creuzot (luigifab) <code@luigifab.fr>
 License: GPL-3+
 
 Files: */metacity-1/metacity-theme-1.xml

debian/deb.sh

@@ -3,11 +3,11 @@
 
 
 cd "$(dirname "$0")"
-version="2.1.0"
+version="2.2.0"
 
 
-rm -rf builder/
 mkdir builder
+rm -rf builder/*
 
 # copy to a tmp directory
 if [ true ]; then
@@ -31,10 +31,10 @@ fi
 
 
 # create packages for Debian and Ubuntu
-for serie in experimental mantic lunar jammy focal bionic xenial trusty; do
+for serie in experimental noble mantic jammy focal bionic xenial trusty; do
 
 	if [ $serie = "experimental" ]; then
-		# for Ubuntu
+		# copy for Ubuntu
 		cp -a builder/human-theme-$version/ builder/human-theme-$version+src/
 		# Debian only
 		cd builder/human-theme-$version/

fedora/human-theme-gtk.spec

@@ -1,5 +1,5 @@
 Name:          human-theme-gtk
-Version:       2.1.0
+Version:       2.2.0
 Release:       1%{?dist}
 Summary:       Human theme for GTK
 Summary(fr):   Thème Human pour GTK
@@ -14,29 +14,30 @@ Recommends:    gnome-icon-theme
 Recommends:    gtk-murrine-engine
 
 %description %{expand:
-This theme works with: GTK 2.24+ (with gtk-murrine-engine),
-GTK 3.20+ (including 3.22 and 3.24), and GTK 4.0+. It is mainly
-intended for Mate and Xfce Desktop Environments.
+This theme works with GTK 2.24 (with gtk-murrine-engine),
+3.24, and 4.12. Better rendering with Pango 1.42- or 1.51+.
+
+It is mainly intended for Mate and Xfce Desktop Environments.
 
 After installation you must restart your session.}
 
 %description -l fr %{expand:
-Ce thème fonctionne avec : GTK 2.24+ (avec gtk-murrine-engine),
-GTK 3.20+ (y compris 3.22 et 3.24), et GTK 4.0+. Il est principalement
-destiné pour les environnements de bureau Mate et Xfce.
+Ce thème fonctionne avec : GTK 2.24 (avec gtk-murrine-engine),
+3.24, et 4.12. Meilleur rendu avec Pango 1.42- ou 1.51+.
+
+Il est principalement destiné pour les environnements de bureau Mate et Xfce.
 
 Après l'installation vous devez redémarrer votre session.}
 
 
 %prep
 %setup -q -n human-theme-%{version}
-
-%build
+sed -i 's/IconTheme=gnome/IconTheme=mate/g' src/*/index.theme
 
 %install
 mkdir -p %{buildroot}/etc/profile.d/
+install -pm 644 debian/profile.sh %{buildroot}/etc/profile.d/%{name}.sh
 mkdir -p %{buildroot}%{_datadir}/themes/
-install -p -m 644 debian/profile.sh %{buildroot}/etc/profile.d/%{name}.sh
 cp -a src/human-theme/        %{buildroot}%{_datadir}/themes/
 cp -a src/human-theme-blue/   %{buildroot}%{_datadir}/themes/
 cp -a src/human-theme-green/  %{buildroot}%{_datadir}/themes/
@@ -52,36 +53,11 @@ cp -a src/human-theme-orange/ %{buildroot}%{_datadir}/themes/
 %{_datadir}/themes/human-theme-green/
 %{_datadir}/themes/human-theme-orange/
 
-%triggerin -- pango
-currentver=`rpm -qa --queryformat '%{VERSION}' pango`
-required50=1.50
-required44=1.44
-# https://unix.stackexchange.com/a/285928
-if [ "$(printf '%s\n' "$required50" "$currentver" | sort -V | head -n1)" = "$required50" ]; then
-  # Pango >= 1.50 (same as Pango < 1.44)
-  echo "Update %{name} for Pango >= 1.50"
-  sed -i 's/<border name="title_border" left="2" right="2" top="4" bottom="4"/<border name="title_border" left="2" right="2" top="4" bottom="3"/g' /usr/share/themes/human-theme/metacity-1/metacity-theme-1.xml
-  sed -i 's/padding: 4px 3px 2px; \/\* WARNING/padding: 4px 3px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-  sed -i 's/padding: 3px 3px 2px; \/\* WARNING/padding: 3px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-  sed -i 's/margin: -7px -10px -5px; \/\* WARNING/margin: -7px -10px -4px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-elif [ "$(printf '%s\n' "$required44" "$currentver" | sort -V | head -n1)" = "$required44" ]; then
-  # Pango 1.44..1.49
-  echo "Update %{name} for Pango >= 1.44 and < 1.50"
-  sed -i 's/<border name="title_border" left="2" right="2" top="4" bottom="3"/<border name="title_border" left="2" right="2" top="4" bottom="4"/g' /usr/share/themes/human-theme/metacity-1/metacity-theme-1.xml
-  sed -i 's/padding: 4px 3px; \/\* WARNING/padding: 4px 3px 2px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-  sed -i 's/padding: 3px; \/\* WARNING/padding: 3px 3px 2px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-  sed -i 's/margin: -7px -10px -4px; \/\* WARNING/margin: -7px -10px -5px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-else
-  # Pango < 1.44 (original behavior, same as Pango >= 1.50)
-  echo "Update %{name} for Pango < 1.44"
-  sed -i 's/<border name="title_border" left="2" right="2" top="4" bottom="4"/<border name="title_border" left="2" right="2" top="4" bottom="3"/g' /usr/share/themes/human-theme/metacity-1/metacity-theme-1.xml
-  sed -i 's/padding: 4px 3px 2px; \/\* WARNING/padding: 4px 3px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-  sed -i 's/padding: 3px 3px 2px; \/\* WARNING/padding: 3px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-  sed -i 's/margin: -7px -10px -5px; \/\* WARNING/margin: -7px -10px -4px; \/\* WARNING/g' /usr/share/themes/human-theme/gtk-3.0/base.css
-fi
-
 
 %changelog
+* Fri Feb 02 2024 Fabrice Creuzot <code@luigifab.fr> - 2.2.0-1
+- New upstream release
+
 * Tue Oct 10 2023 Fabrice Creuzot <code@luigifab.fr> - 2.1.0-1
 - New upstream release
 

fedora/rpm.sh

@@ -3,11 +3,11 @@
 # Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
 
 cd "$(dirname "$0")"
-version="2.1.0"
+version="2.2.0"
 
 
-rm -rf builder/
 mkdir -p builder ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+find builder/* ! -name "*$version*.rpm" ! -name "*$version*.gz" -exec rm -rf {} + 2>/dev/null
 
 # copy to a tmp directory
 if [ true ]; then
@@ -20,7 +20,7 @@ else
 	rm -rf /tmp/$temp/*/builder/
 
 	mv /tmp/$temp builder/
-	cp /usr/share/licenses/linux-firmware/GPL-3 builder/$temp/LICENSE
+	cp /usr/share/licenses/*-firmware/GPL-3 builder/$temp/LICENSE # * = linux
 
 	cd builder/
 	tar czf $temp.tar.gz $temp
@@ -32,10 +32,10 @@ fi
 
 # create package (rpm sign https://access.redhat.com/articles/3359321)
 rpmbuild -ba human-theme-gtk.spec
-rpm --addsign ~/rpmbuild/RPMS/*/*.rpm
-rpm --addsign ~/rpmbuild/SRPMS/*.rpm
-mv ~/rpmbuild/RPMS/*/*.rpm builder/
-mv ~/rpmbuild/SRPMS/*.rpm builder/
+rpm --addsign ~/rpmbuild/RPMS/*/human-theme-gtk*.rpm
+rpm --addsign ~/rpmbuild/SRPMS/human-theme-gtk*.rpm
+mv ~/rpmbuild/RPMS/*/human-theme-gtk*.rpm builder/
+mv ~/rpmbuild/SRPMS/human-theme-gtk*.rpm builder/
 echo "==========================="
 rpm --checksig builder/*.rpm
 echo "==========================="