Version 1.5.0

luigifab · Sep 9, 2021 · 34ffa22 · 34ffa22
1 parent 4de7929
commit 34ffa22
Show file tree

Hide file tree

Showing 106 changed files with 42 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -92,12 +92,12 @@ sudo apt update
 sudo apt install human-theme-gtk
 # or
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys FFE5BD439356DF7D
-echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list
+echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
 sudo apt update
 sudo apt install human-theme-gtk
 # or
 sudo wget -O /etc/apt/trusted.gpg.d/luigifab.gpg https://www.luigifab.fr/apt.gpg
-echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list
+echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
 sudo apt update
 sudo apt install human-theme-gtk
 ```
@@ -200,7 +200,7 @@ Run *svg.sh* to update SVG images. See also [technical informations](https://git
 
 ## Copyright
 
-- Current version: 1.4.0 (07/07/2021)
+- Current version: 1.5.0 (09/09/2021)
 - Compatibility: GTK 2.24 / 3.20 / 3.22 / 3.24 / 4.0 / 4.2
 - 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/)\
 [Debian human-theme-gtk.deb](https://tracker.debian.org/pkg/human-theme-gtk)

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-human-theme-gtk (1.4.0-1) unstable; urgency=low
+human-theme-gtk (1.5.0-1) unstable; urgency=low
 
   * Initial debian package release (Closes: #973445)
 
- -- Fabrice Creuzot <[email protected]>  Wed, 07 Jul 2021 20:00:00 +0000
+ -- Fabrice Creuzot <[email protected]>  Thu, 09 Sep 2021 20:00:00 +0000
diff --git a/debian/control b/debian/control
@@ -14,7 +14,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Recommends: gtk3-nocsd, gtk2-engines-murrine, gnome-icon-theme, dmz-cursor-theme
 Suggests: qt5-gtk2-platformtheme, qt5-gtk-platformtheme
-Description: Human theme for GTK
+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 Desktop Environment.

diff --git a/debian/deb.sh b/debian/deb.sh
@@ -3,7 +3,7 @@
 
 
 cd "$(dirname "$0")"
-version="1.4.0"
+version="1.5.0"
 
 
 rm -rf builder/
@@ -31,7 +31,7 @@ fi
 
 
 # create packages for debian and ubuntu
-for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do
+for serie in unstable impish hirsute focal bionic xenial trusty; do
 
 	if [ $serie = "unstable" ]; then
 		# for ubuntu
@@ -46,7 +46,7 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise;
 
 	dh_make -a -s -y -f ../human-theme-$version.tar.gz -p human-theme-gtk
 
-	rm -f debian/*ex debian/*EX debian/README* debian/*doc*
+	rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh
 	mkdir debian/upstream
 	mv debian/metadata debian/upstream/metadata
 
@@ -56,7 +56,7 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise;
 	if [ $serie = "unstable" ]; then
 		dpkg-buildpackage -us -uc
 	else
-		# debhelper: unstable:13 hirsute:13 groovy:13 focal:12 bionic:9 xenial:9 trusty:9 precise:9
+		# debhelper: unstable:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9
 		if [ $serie = "focal" ]; then
 			sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control
 		fi
@@ -75,13 +75,6 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise;
 			sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control
 			echo 9 > debian/compat
 		fi
-		if [ $serie = "precise" ]; then
-			sed -i 's/dh $@/dh $@ --with autotools_dev/g' debian/rules
-			sed -i 's/override_dh_update_autotools_config/override_dh_autotools-dev_updateconfig/g' debian/rules
-			sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), autotools-dev/g' debian/control
-			sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control
-			echo 9 > debian/compat
-		fi
 		sed -i 's/unstable/'$serie'/g' debian/changelog
 		sed -i 's/-1) /-1+'$serie') /' debian/changelog
 		dpkg-buildpackage -us -uc -ui -d -S

diff --git a/fedora/human-theme-gtk.spec b/fedora/human-theme-gtk.spec
@@ -1,5 +1,5 @@
 Name:          human-theme-gtk
-Version:       1.4.0
+Version:       1.5.0
 Release:       1%{?dist}
 Summary:       Human theme for GTK
 Summary(fr):   Thème Human pour GTK
@@ -59,6 +59,9 @@ cp -a src/human-theme-orange/ %{buildroot}%{_datadir}/themes/
 
 
 %changelog
+* Thu Sep 09 2021 Fabrice Creuzot <[email protected]> - 1.5.0-1
+- New upstream version
+
 * Wed Jul 07 2021 Fabrice Creuzot <[email protected]> - 1.4.0-1
 - New upstream version
 

diff --git a/fedora/rpm.sh b/fedora/rpm.sh
@@ -3,7 +3,7 @@
 # Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
 
 cd "$(dirname "$0")"
-version="1.4.0"
+version="1.5.0"
 
 
 rm -rf builder/ ~/rpmbuild/

diff --git a/images/gtk2-blue-menu.png b/images/gtk2-blue-menu.png
diff --git a/images/gtk2-blue.png b/images/gtk2-blue.png
diff --git a/images/gtk2-green-menu.png b/images/gtk2-green-menu.png
diff --git a/images/gtk2-green.png b/images/gtk2-green.png
diff --git a/images/gtk2-menu.png b/images/gtk2-menu.png
diff --git a/images/gtk2-orange-menu.png b/images/gtk2-orange-menu.png
diff --git a/images/gtk2-orange.png b/images/gtk2-orange.png
diff --git a/images/gtk2-rtl-blue-menu.png b/images/gtk2-rtl-blue-menu.png
diff --git a/images/gtk2-rtl-blue.png b/images/gtk2-rtl-blue.png
diff --git a/images/gtk2-rtl-green-menu.png b/images/gtk2-rtl-green-menu.png
diff --git a/images/gtk2-rtl-green.png b/images/gtk2-rtl-green.png
diff --git a/images/gtk2-rtl-menu.png b/images/gtk2-rtl-menu.png
diff --git a/images/gtk2-rtl-orange-menu.png b/images/gtk2-rtl-orange-menu.png
diff --git a/images/gtk2-rtl-orange.png b/images/gtk2-rtl-orange.png
diff --git a/images/gtk2-rtl.png b/images/gtk2-rtl.png
diff --git a/images/gtk2.png b/images/gtk2.png
diff --git a/images/gtk3-blue-menu.png b/images/gtk3-blue-menu.png
diff --git a/images/gtk3-blue.png b/images/gtk3-blue.png
diff --git a/images/gtk3-green-menu.png b/images/gtk3-green-menu.png
diff --git a/images/gtk3-green.png b/images/gtk3-green.png
diff --git a/images/gtk3-menu.png b/images/gtk3-menu.png
diff --git a/images/gtk3-orange-menu.png b/images/gtk3-orange-menu.png
diff --git a/images/gtk3-orange.png b/images/gtk3-orange.png
diff --git a/images/gtk3-rtl-blue-menu.png b/images/gtk3-rtl-blue-menu.png
diff --git a/images/gtk3-rtl-blue.png b/images/gtk3-rtl-blue.png
diff --git a/images/gtk3-rtl-green-menu.png b/images/gtk3-rtl-green-menu.png
diff --git a/images/gtk3-rtl-green.png b/images/gtk3-rtl-green.png
diff --git a/images/gtk3-rtl-menu.png b/images/gtk3-rtl-menu.png
diff --git a/images/gtk3-rtl-orange-menu.png b/images/gtk3-rtl-orange-menu.png
diff --git a/images/gtk3-rtl-orange.png b/images/gtk3-rtl-orange.png
diff --git a/images/gtk3-rtl.png b/images/gtk3-rtl.png
diff --git a/images/gtk3.png b/images/gtk3.png
diff --git a/images/gtk4-blue-menu.png b/images/gtk4-blue-menu.png
diff --git a/images/gtk4-blue.png b/images/gtk4-blue.png
diff --git a/images/gtk4-green-menu.png b/images/gtk4-green-menu.png
diff --git a/images/gtk4-green.png b/images/gtk4-green.png
diff --git a/images/gtk4-menu.png b/images/gtk4-menu.png
diff --git a/images/gtk4-orange-menu.png b/images/gtk4-orange-menu.png
diff --git a/images/gtk4-orange.png b/images/gtk4-orange.png
diff --git a/images/gtk4-rtl-blue-menu.png b/images/gtk4-rtl-blue-menu.png
diff --git a/images/gtk4-rtl-blue.png b/images/gtk4-rtl-blue.png
diff --git a/images/gtk4-rtl-green-menu.png b/images/gtk4-rtl-green-menu.png
diff --git a/images/gtk4-rtl-green.png b/images/gtk4-rtl-green.png
diff --git a/images/gtk4-rtl-menu.png b/images/gtk4-rtl-menu.png
diff --git a/images/gtk4-rtl-orange-menu.png b/images/gtk4-rtl-orange-menu.png
diff --git a/images/gtk4-rtl-orange.png b/images/gtk4-rtl-orange.png
diff --git a/images/gtk4-rtl.png b/images/gtk4-rtl.png
diff --git a/images/gtk4.png b/images/gtk4.png
diff --git a/images/thumbs/gtk2-blue-menu.png b/images/thumbs/gtk2-blue-menu.png
diff --git a/images/thumbs/gtk2-blue.png b/images/thumbs/gtk2-blue.png
diff --git a/images/thumbs/gtk2-green-menu.png b/images/thumbs/gtk2-green-menu.png
diff --git a/images/thumbs/gtk2-green.png b/images/thumbs/gtk2-green.png
diff --git a/images/thumbs/gtk2-menu.png b/images/thumbs/gtk2-menu.png
diff --git a/images/thumbs/gtk2-orange-menu.png b/images/thumbs/gtk2-orange-menu.png
diff --git a/images/thumbs/gtk2-orange.png b/images/thumbs/gtk2-orange.png
diff --git a/images/thumbs/gtk2-rtl-blue-menu.png b/images/thumbs/gtk2-rtl-blue-menu.png
diff --git a/images/thumbs/gtk2-rtl-blue.png b/images/thumbs/gtk2-rtl-blue.png
diff --git a/images/thumbs/gtk2-rtl-green-menu.png b/images/thumbs/gtk2-rtl-green-menu.png
diff --git a/images/thumbs/gtk2-rtl-green.png b/images/thumbs/gtk2-rtl-green.png
diff --git a/images/thumbs/gtk2-rtl-menu.png b/images/thumbs/gtk2-rtl-menu.png
diff --git a/images/thumbs/gtk2-rtl-orange-menu.png b/images/thumbs/gtk2-rtl-orange-menu.png
diff --git a/images/thumbs/gtk2-rtl-orange.png b/images/thumbs/gtk2-rtl-orange.png
diff --git a/images/thumbs/gtk2-rtl.png b/images/thumbs/gtk2-rtl.png
diff --git a/images/thumbs/gtk2.png b/images/thumbs/gtk2.png
diff --git a/images/thumbs/gtk3-blue-menu.png b/images/thumbs/gtk3-blue-menu.png
diff --git a/images/thumbs/gtk3-blue.png b/images/thumbs/gtk3-blue.png
diff --git a/images/thumbs/gtk3-green-menu.png b/images/thumbs/gtk3-green-menu.png
diff --git a/images/thumbs/gtk3-green.png b/images/thumbs/gtk3-green.png
diff --git a/images/thumbs/gtk3-menu.png b/images/thumbs/gtk3-menu.png
diff --git a/images/thumbs/gtk3-orange-menu.png b/images/thumbs/gtk3-orange-menu.png
diff --git a/images/thumbs/gtk3-orange.png b/images/thumbs/gtk3-orange.png
diff --git a/images/thumbs/gtk3-rtl-blue-menu.png b/images/thumbs/gtk3-rtl-blue-menu.png
diff --git a/images/thumbs/gtk3-rtl-blue.png b/images/thumbs/gtk3-rtl-blue.png
diff --git a/images/thumbs/gtk3-rtl-green-menu.png b/images/thumbs/gtk3-rtl-green-menu.png
diff --git a/images/thumbs/gtk3-rtl-green.png b/images/thumbs/gtk3-rtl-green.png
diff --git a/images/thumbs/gtk3-rtl-menu.png b/images/thumbs/gtk3-rtl-menu.png
diff --git a/images/thumbs/gtk3-rtl-orange-menu.png b/images/thumbs/gtk3-rtl-orange-menu.png
diff --git a/images/thumbs/gtk3-rtl-orange.png b/images/thumbs/gtk3-rtl-orange.png
diff --git a/images/thumbs/gtk3-rtl.png b/images/thumbs/gtk3-rtl.png
diff --git a/images/thumbs/gtk3.png b/images/thumbs/gtk3.png
diff --git a/images/thumbs/gtk4-blue-menu.png b/images/thumbs/gtk4-blue-menu.png
diff --git a/images/thumbs/gtk4-blue.png b/images/thumbs/gtk4-blue.png
diff --git a/images/thumbs/gtk4-green-menu.png b/images/thumbs/gtk4-green-menu.png
diff --git a/images/thumbs/gtk4-green.png b/images/thumbs/gtk4-green.png
diff --git a/images/thumbs/gtk4-menu.png b/images/thumbs/gtk4-menu.png
diff --git a/images/thumbs/gtk4-orange-menu.png b/images/thumbs/gtk4-orange-menu.png
diff --git a/images/thumbs/gtk4-orange.png b/images/thumbs/gtk4-orange.png
diff --git a/images/thumbs/gtk4-rtl-blue-menu.png b/images/thumbs/gtk4-rtl-blue-menu.png
diff --git a/images/thumbs/gtk4-rtl-blue.png b/images/thumbs/gtk4-rtl-blue.png
diff --git a/images/thumbs/gtk4-rtl-green-menu.png b/images/thumbs/gtk4-rtl-green-menu.png
diff --git a/images/thumbs/gtk4-rtl-green.png b/images/thumbs/gtk4-rtl-green.png
diff --git a/images/thumbs/gtk4-rtl-menu.png b/images/thumbs/gtk4-rtl-menu.png
diff --git a/images/thumbs/gtk4-rtl-orange-menu.png b/images/thumbs/gtk4-rtl-orange-menu.png
diff --git a/images/thumbs/gtk4-rtl-orange.png b/images/thumbs/gtk4-rtl-orange.png
diff --git a/images/thumbs/gtk4-rtl.png b/images/thumbs/gtk4-rtl.png
diff --git a/images/thumbs/gtk4.png b/images/thumbs/gtk4.png
diff --git a/opensuse/human-theme-gtk.spec b/opensuse/human-theme-gtk.spec
@@ -1,5 +1,5 @@
 Name:          human-theme-gtk
-Version:       1.4.0
+Version:       1.5.0
 Release:       0
 Summary:       Human theme for GTK
 Summary(fr):   Thème Human pour GTK
@@ -63,6 +63,9 @@ cp -a src/human-theme-orange/ %{buildroot}%{_datadir}/themes/
 
 
 %changelog
+* Thu Sep 09 2021 Fabrice Creuzot <[email protected]> - 1.5.0-1
+- New upstream version
+
 * Wed Jul 07 2021 Fabrice Creuzot <[email protected]> - 1.4.0-1
 - New upstream version
 

diff --git a/opensuse/rpm.sh b/opensuse/rpm.sh
@@ -3,7 +3,7 @@
 
 
 cd "$(dirname "$0")"
-version="1.4.0"
+version="1.5.0"
 
 
 rm -rf builder/ ~/rpmbuild/

diff --git a/src/human-theme/gtk-3.0/base.css b/src/human-theme/gtk-3.0/base.css
@@ -1875,6 +1875,10 @@ scale.vertical trough highlight.bottom {
 	margin-bottom: -11px;
 }
 
+scale.vertical:dir(rtl) trough highlight.bottom {
+	margin-top: -11px; /* gtk3 only, quick fix, but not really good, there are no .top */
+}
+
 scale.horizontal trough highlight {
 	min-height: 5px;
 	background:
@@ -2247,6 +2251,10 @@ printdialog scrolledwindow viewport {
 	border: 0;
 }
 
+printdialog stack grid.vertical {
+	color: @theme_text; /* to fix white color */
+}
+
 filechooser placessidebar,
 filechooser scrolledwindow {
 	border: 1px solid @dialog_border;

diff --git a/src/human-theme/gtk-4.0/base.css b/src/human-theme/gtk-4.0/base.css
@@ -1781,6 +1781,14 @@ scale.horizontal value {
 
 /* --- scale mark --- */
 
+scale.vertical.marks-before {
+	padding: 2px 7px 2px 10px;
+}
+
+scale.vertical.marks-after {
+	padding: 2px 10px 2px 7px;
+}
+
 scale.vertical.marks-before indicator,
 scale.vertical.marks-after indicator {
 	min-width: 5px;
@@ -1796,15 +1804,15 @@ scale.horizontal.marks-after indicator {
 }
 
 scale.vertical.marks-before marks.top indicator {
-	margin: 1px 1px 0 2px;
+	margin: 1px 8px 0 -8px;
 }
 
 scale.vertical.marks-before marks.top label {
 	margin: 0 1px 0 -1px;
 }
 
 scale.vertical.marks-after marks.bottom indicator {
-	margin: 1px 2px 0 1px;
+	margin: 1px -8px 0 8px;
 }
 
 scale.vertical.marks-after marks.bottom label {
@@ -2060,6 +2068,10 @@ printdialog scrolledwindow viewport {
 	border: 0;
 }
 
+printdialog stack grid.vertical {
+	color: @theme_text; /* to fix white color */
+}
+
 filechooser placessidebar,
 filechooser scrolledwindow {
 	border: 1px solid @dialog_border;