From c56efc0af5855285ad783babdf2d5989ece2f115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20G=C4=85sior?= Date: Tue, 6 Jun 2017 22:30:40 +0200 Subject: [PATCH] Small update. - Wayland backend reenabled in PKGBUILD. - Checking whether compile workaround works in PKGBUILD. - "smaller-adwaita.css" stylesheet updated. --- PKGBUILD | 16 +++++++++++----- README.md | 4 ++-- smaller-adwaita.css | 28 +++++++++++++++++++++------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f20170e..8b66e56 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gtk3-mushrooms pkgver=3.22.15 -pkgrel=3 +pkgrel=4 pkgdesc="GTK3 library with my modifications (see README)." url="http://www.gtk.org/" install=gtk3.install @@ -42,7 +42,7 @@ sha256sums=( "cfb3121fb174ea8718a0dc184417338c5dfd819237e233d78bf43fb51bb06c91" "ac119908c6a763ece6114ae3b5cd5d8c232207ce734d975e0ada22379610fc7d" "be7800734fc59e49c34ee2f806738eba8b606d46ac61bc3f50fa3cc69ae594f0" - "1784e29ce5b811ed8673a29a89903751abb8bf68b3793f2e635c99851c165245" + "0afbd995148ce6e03010b572d69533e4d250a2e5f60323422b16a407ff162885" "c3ab786779a6a74765a56e31aaa0fe9123feee222185f0c3ae94acfb2e61a0dd" "01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202" @@ -69,22 +69,28 @@ build() { cd "$srcdir/gtk-$pkgver" CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-x11-backend --disable-schemas-compile --disable-gtk-doc-html --disable-man \ - --disable-installed-tests --disable-colord --disable-maintainer-mode + --enable-x11-backend --enable-wayland-backend --disable-schemas-compile --disable-gtk-doc-html \ + --disable-man --disable-installed-tests --disable-colord --disable-maintainer-mode #https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Make GTK building faster by skipping tests and examples. + compatible="no" IFS=; while read -r line; do if [[ $line = "SUBDIRS = po po-properties \$(SRC_SUBDIRS) docs m4macros build" ]]; then - echo "SUBDIRS = po po-properties gdk gtk libgail-util modules m4macros build" + echo "SUBDIRS = po gdk gtk libgail-util modules m4macros build" + compatible="yes" else echo $line fi; done < Makefile > Makefile.modified mv Makefile Makefile.original mv Makefile.modified Makefile + if [[ $compatible = "no" ]]; then + echo "Makefile is not compatible." + exit 1 + fi make -j 15 } diff --git a/README.md b/README.md index baee519..fa9b3c4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This is a set of patches for GTK3 library that makes it better for me and maybe for you too. ;-) I have not wide knowledge about programming in C, so quality of this patches can be not good. But it works! See list of patches below. -This package is based on official GTK3 package from Arch Linux. In my version library is compiled without Broadway backend, Wayland support, documentation and example applications. Using this package with GNOME desktop is not recommended. It is for classic GTK-based environments like MATE or XFCE. +This package is based on official GTK3 package from Arch Linux. In my version library is compiled without Broadway backend, documentation and example applications. Using this package with GNOME desktop is not recommended. It is for classic GTK-based environments like MATE or XFCE. Client Side Decorations --- @@ -58,4 +58,4 @@ Credits --- * https://launchpad.net/~gnome3-team — file chooser single-click patch. -* https://aur.archlinux.org/packages/gtk3-typeahead — file chooser typeahead patch. \ No newline at end of file +* https://aur.archlinux.org/packages/gtk3-typeahead — file chooser typeahead patch. diff --git a/smaller-adwaita.css b/smaller-adwaita.css index 684651c..01f02a3 100644 --- a/smaller-adwaita.css +++ b/smaller-adwaita.css @@ -1,28 +1,36 @@ /* GTK3-mushrooms */ -button { +button, +button.titlebutton { padding: 3px 7px; min-height: 20px; min-width: 15px; } -notebook > header.top tab, notebook > header.bottom tab { +notebook > header.top tab, +notebook > header.bottom tab { padding: 0 5px; } -notebook > header.left tab, notebook > header.right tab { +notebook > header.left tab, +notebook > header.right tab { padding: 0 8px; } notebook tab button { padding: 0px; min-height: 15px; } -entry, spinbutton:not(.vertical) { +entry, +spinbutton:not(.vertical) { min-height: 26px; } treeview button { padding: 0 7px; min-height: 23px; } -progressbar.horizontal trough, progressbar.horizontal progress, progressbar.vertical trough, progressbar.vertical progress, levelbar trough { +progressbar.horizontal trough, +progressbar.horizontal progress, +progressbar.vertical trough, +progressbar.vertical progress, +levelbar trough { min-height: 9px; min-width: 9px; } @@ -35,7 +43,13 @@ headerbar, switch slider { popover > * { margin: -4px; } -.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { +tooltip * { + padding: 0px; +} +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar, +.titlebar:not(headerbar), +headerbar { background-image: none; border-radius: 0; } @@ -46,4 +60,4 @@ placessidebar row button.sidebar-button { min-height: 20px; min-width: 20px; padding: 0; -} +} \ No newline at end of file