Version 2.4.0

luigifab · May 5, 2021 · c59d6a6 · c59d6a6
1 parent 00ab49a
commit c59d6a6
Show file tree

Hide file tree

Showing 39 changed files with 1,487 additions and 754 deletions.
diff --git a/README.md b/README.md
@@ -12,15 +12,15 @@ GTK 3\
 [![Preview with GTK 3 - Main window](images/thumbs/gtk3.png?raw=true)](images/gtk3.png?raw=true)
 [![Preview with GTK 3 - Menu](images/thumbs/gtk3-menu.png?raw=true)](images/gtk3-menu.png?raw=true)
 
-GTK 4 (experimental)\
+GTK 4\
 [![Preview with GTK 4 - Main window](images/thumbs/gtk4.png?raw=true)](images/gtk4.png?raw=true)
 [![Preview with GTK 4 - Menu](images/thumbs/gtk4-menu.png?raw=true)](images/gtk4-menu.png?raw=true)
 
-The theme used for the screenshots is available [here](https://github.com/luigifab/human-theme). Pango 1.42 for screenshots with GTK 2 and 3, Pango 1.48 for screenshots with GTK 4.
+Theme used for the screenshots is available [here](https://github.com/luigifab/human-theme). Pango 1.42 for screenshots with GTK 2 and 3, Pango 1.48 for screenshots with GTK 4.
 
 * Some options are available from command line (read -h).
 * The options menu allow to run some standard dialogs.
-* The plus toolbar button allow to show or hide: arrows on notebooks, text on progress bars and scales, marks on scales.
+* The plus toolbar button allow to show or hide: arrows on notebooks, text and marks on progress bars and scales.
 * The refresh toolbar button and the refresh menu item allow to reload the current theme (like the sighup signal).
 * The menu items keyboard shortcut can be updated on hover (GTK 2.24 and 3.0-3.24, *gtk-can-change-accels*).
 * For Ubuntu, the menu items keyboard shortcut can be updated on hover with: `export UBUNTU_MENUPROXY= && awf-gtk3`
@@ -33,31 +33,34 @@ It require **GTK 2.24+** or **GTK 3.0+** *(including 3.24)* or **GTK 4.0+** *(ex
 
 * Fedora: `sudo dnf install awf-gtk2 awf-gtk3 awf-gtk4`
 
-* The *build.sh* script will compile the program with all major GTK versions available: `sudo apt install build-essential dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev` or `sudo dnf install autoconf automake gtk2-devel gtk3-devel gtk4-devel` then: `bash build.sh`
+* OpenSuse: `sudo zypper install awf-gtk2 awf-gtk3 awf-gtk4`
 
-* The *debian-gtkx/deb.sh* scripts will compile the program and create Debian packages: `sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev` then: `bash debian-gtkx/deb.sh`
+* The *build.sh* script will compile the program with all major GTK versions available.
 
-* The *fedora-gtkx/rpm.sh* scripts will compile the program and create Fedora packages: `sudo dnf install rpmdevtools rpm-sign autoconf automake gtk2-devel gtk3-devel gtk4-devel` then: `bash fedora-gtkx/rpm.sh`
+* The *debian-gtkx/deb.sh* scripts will compile the program and create packages for Debian and Ubuntu.
+
+* The *fedora-gtkx/rpm.sh* scripts will compile the program and create packages for Fedora.
+
+* The *opensuse-gtkx/rpm.sh* scripts will compile the program and create packages for OpenSuse.
 
 ## PPA
 
 Installation for Debian and Ubuntu with [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages):
-```
+```bash
 sudo add-apt-repository ppa:luigifab/packages
 sudo apt update
 sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
- -- or --
+# or
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys FFE5BD439356DF7D
 echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
 sudo apt update
 sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
- -- or --
+# 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 hirsute main" | sudo tee -a /etc/apt/sources.list
 sudo apt update
 sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
 ```
-
 ```bash
 # sha256sum /etc/apt/trusted.gpg.d/luigifab.gpg
 578c89a677048e38007462d543686b53587efba9f93814601169253c45ff9213
@@ -71,14 +74,14 @@ pub   rsa4096 2020-10-31 [SC]
 
 To reload theme when source files change, you can use [Entr](https://github.com/eradman/entr) with the *sighup* signal:
 ```
-sudo apt install entr  or  sudo dnf install entr
+sudo apt install entr  or  sudo dnf install entr  or  sudo zypper install entr
 ls ~/.themes/yourtheme/gtk-3.0/*.css | entr killall -s SIGHUP awf-gtk3
 ```
 
 ## Copyright
 
-- Current version: 2.3.0 (04/04/2021)
-- Compatibility: GTK 2.24 / 3.0 / 3.2 / 3.4 / 3.6 / 3.8 / 3.10 / 3.12 / 3.14 / 3.16 / 3.18 / 3.20 / 3.22 / 3.24 / 4.0
+- Current version: 2.4.0 (05/05/2021)
+- Compatibility: GTK 2.24 / 3.0 / 3.2 / 3.4 / 3.6 / 3.8 / 3.10 / 3.12 / 3.14 / 3.16 / 3.18 / 3.20 / 3.22 / 3.24 / 4.0 / 4.2
 - Translations: English (en), French (fr)
 - Links: [luigifab.fr](https://www.luigifab.fr/gtk/awf-extended) - [github.com](https://github.com/luigifab/awf-extended)\
 [debian awf-gtk2.deb](https://tracker.debian.org/pkg/awf-gtk2)
@@ -91,12 +94,12 @@ ls ~/.themes/yourtheme/gtk-3.0/*.css | entr killall -s SIGHUP awf-gtk3
   *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959433),
    [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986360))*\
 [fedora awf-gtk2.rpm](https://src.fedoraproject.org/rpms/awf-gtk2)
-  *([RR](https://bugzilla.redhat.com/show_bug.cgi?id=1893321))*
 ; [fedora awf-gtk3.rpm](https://src.fedoraproject.org/rpms/awf-gtk3)
-  *([RR](https://bugzilla.redhat.com/show_bug.cgi?id=1893323))*
-; [fedora awf-gtk4.rpm](https://src.fedoraproject.org/rpms/awf-gtk4)
-  *([RR](https://bugzilla.redhat.com/show_bug.cgi?id=1946092))*\
-[launchpad PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
+; [fedora awf-gtk4.rpm](https://src.fedoraproject.org/rpms/awf-gtk4)\
+[opensuse awf-gtk2.rpm](https://software.opensuse.org/package/awf-gtk2)
+; [opensuse awf-gtk3.rpm](https://software.opensuse.org/package/awf-gtk3)
+; [opensuse awf-gtk4.rpm](https://software.opensuse.org/package/awf-gtk4)\
+[ubuntu PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
 
 This program is provided under the terms of the **GNU GPLv3+** license.\
 If you like, take some of your time to improve the translations, go to https://bit.ly/2HyCCEc.

diff --git a/build.sh b/build.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
-# debian: sudo apt install build-essential dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev
-# fedora: sudo dnf install autoconf automake gtk2-devel gtk3-devel gtk4-devel
+# debian: sudo apt install build-essential dh-make dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev
+# fedora: sudo dnf install autoconf automake gtk2-devel gtk3-devel gtk4-devel desktop-file-utils
+# opensuse: sudo zypper install autoconf automake gtk2-devel gtk3-devel gtk4-devel desktop-file-utils
 
 # remove old builds
 rm -f awf-gtk2 awf-gtk3 awf-gtk4
 
 # copy to a tmp directory
 mkdir builder builder/src
-
 touch builder/ChangeLog
 touch builder/NEWS
 touch builder/AUTHORS
@@ -18,19 +18,14 @@ cp Makefile.am     builder/
 cp src/Makefile.am builder/src/
 cp src/awf.c       builder/src/
 
+# build
 cd builder/
-
-# reconfigure all
 autoreconf -f -i
-
-# build
 ./configure
-make > ../log
+make
 
 # final
 cp src/awf-gtk* ..
-
-# copy
 cd ..
 ls -altrh awf-gtk4 awf-gtk3 awf-gtk2
 rm -rf builder/
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([A widget factory], [2.3.0])
+AC_INIT([A widget factory], [2.4.0])
 AC_CONFIG_SRCDIR([src/awf.c])
 
 AM_INIT_AUTOMAKE

diff --git a/debian-gtk2/changelog b/debian-gtk2/changelog
@@ -1,5 +1,5 @@
-awf-gtk2 (2.3.0-1) unstable; urgency=low
+awf-gtk2 (2.4.0-1) unstable; urgency=low
 
   * Initial debian package release (Closes: #959434)
 
- -- Fabrice Creuzot <code@luigifab.fr>  Sun, 04 Apr 2021 20:00:00 +0000
+ -- Fabrice Creuzot <code@luigifab.fr>  Wed, 05 May 2021 20:00:00 +0000
diff --git a/debian-gtk2/control b/debian-gtk2/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Fabrice Creuzot <code@luigifab.fr>
 Build-Depends: debhelper-compat (= 13), libgtk2.0-dev
 Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: https://github.com/luigifab/awf-extended
 Vcs-Browser: https://github.com/luigifab/awf-extended
 Vcs-Git: https://github.com/luigifab/awf-extended.git

diff --git a/debian-gtk2/deb.sh b/debian-gtk2/deb.sh
@@ -2,9 +2,8 @@
 # debian: sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk2.0-dev
 
 
-
 cd "$(dirname "$0")"
-version="2.3.0"
+version="2.4.0"
 gtk="gtk2"
 
 rm -rf builder/
@@ -105,7 +104,7 @@ for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
 	cd ..
 done
 
-ls -dltrh $PWD/builder/*.deb $PWD/builder/*.changes
+ls -dltrh builder/*.deb builder/*.changes
 echo "==========================="
 
 # cleanup

diff --git a/debian-gtk3/changelog b/debian-gtk3/changelog
@@ -1,5 +1,5 @@
-awf-gtk3 (2.3.0-1) unstable; urgency=low
+awf-gtk3 (2.4.0-1) unstable; urgency=low
 
   * Initial debian package release (Closes: #959436)
 
- -- Fabrice Creuzot <code@luigifab.fr>  Sun, 04 Apr 2021 20:00:00 +0000
+ -- Fabrice Creuzot <code@luigifab.fr>  Wed, 05 May 2021 20:00:00 +0000
diff --git a/debian-gtk3/control b/debian-gtk3/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Fabrice Creuzot <code@luigifab.fr>
 Build-Depends: debhelper-compat (= 13), libgtk-3-dev
 Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: https://github.com/luigifab/awf-extended
 Vcs-Browser: https://github.com/luigifab/awf-extended
 Vcs-Git: https://github.com/luigifab/awf-extended.git

diff --git a/debian-gtk3/deb.sh b/debian-gtk3/deb.sh
@@ -2,9 +2,8 @@
 # debian: sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk-3-dev
 
 
-
 cd "$(dirname "$0")"
-version="2.3.0"
+version="2.4.0"
 gtk="gtk3"
 
 rm -rf builder/
@@ -105,7 +104,7 @@ for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
 	cd ..
 done
 
-ls -dltrh $PWD/builder/*.deb $PWD/builder/*.changes
+ls -dltrh builder/*.deb builder/*.changes
 echo "==========================="
 
 # cleanup

diff --git a/debian-gtk4/changelog b/debian-gtk4/changelog
@@ -1,5 +1,5 @@
-awf-gtk4 (2.3.0-1) experimental; urgency=low
+awf-gtk4 (2.4.0-1) experimental; urgency=low
 
-  * Initial debian package release (Closes: #986360)
+  * Initial debian package release (Closes: #959433)
 
- -- Fabrice Creuzot <code@luigifab.fr>  Sun, 04 Apr 2021 20:00:00 +0000
+ -- Fabrice Creuzot <code@luigifab.fr>  Wed, 05 May 2021 20:00:00 +0000
diff --git a/debian-gtk4/control b/debian-gtk4/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Fabrice Creuzot <code@luigifab.fr>
 Build-Depends: debhelper-compat (= 13), libgtk-4-dev
 Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: https://github.com/luigifab/awf-extended
 Vcs-Browser: https://github.com/luigifab/awf-extended
 Vcs-Git: https://github.com/luigifab/awf-extended.git

diff --git a/debian-gtk4/deb.sh b/debian-gtk4/deb.sh
@@ -2,9 +2,8 @@
 # debian: sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk-4-dev
 
 
-
 cd "$(dirname "$0")"
-version="2.3.0"
+version="2.4.0"
 gtk="gtk4"
 
 rm -rf builder/
@@ -31,7 +30,7 @@ else
 fi
 
 
-# create packages for debian and ubuntu (groovy focal bionic xenial trusty precise)
+# create packages for debian and ubuntu
 for serie in experimental hirsute; do
 
 	if [ $serie = "experimental" ]; then
@@ -105,7 +104,7 @@ for serie in experimental hirsute; do
 	cd ..
 done
 
-ls -dltrh $PWD/builder/*.deb $PWD/builder/*.changes
+ls -dltrh builder/*.deb builder/*.changes
 echo "==========================="
 
 # cleanup

diff --git a/fedora-gtk2/awf-gtk2.spec b/fedora-gtk2/awf-gtk2.spec
@@ -1,11 +1,11 @@
-Name:        awf-gtk2
-Version:     2.3.0
-Release:     1%{?dist}
-Summary:     Theme preview application for GTK
-Summary(fr): Application d'aperçu de thème pour GTK
-License:     GPLv3+
-URL:         https://github.com/luigifab/awf-extended
-Source0:     %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Name:          awf-gtk2
+Version:       2.4.0
+Release:       1%{?dist}
+Summary:       Theme preview application for GTK
+Summary(fr):   Application d'aperçu de thème pour GTK
+License:       GPLv3+
+URL:           https://github.com/luigifab/awf-extended
+Source0:       %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext
@@ -14,8 +14,8 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: hunspell-fr
-Requires: gtk2
-Requires: hicolor-icon-theme
+Requires:      gtk2
+Requires:      hicolor-icon-theme
 
 %description %{expand:
 A widget factory is a theme preview application for GTK. It displays the
@@ -34,7 +34,6 @@ Ce paquet fournit la version gtk2.}
 
 %prep
 %setup -q -n awf-extended-%{version}
-%autosetup -n awf-extended-%{version}
 sed -i 's/ -eq 3/ -eq -1/g' configure.ac
 sed -i 's/ -eq 4/ -eq -1/g' configure.ac
 touch {NEWS,AUTHORS,README,ChangeLog}
@@ -69,8 +68,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{
 
 
 %changelog
+* Wed May 05 2021 Fabrice Creuzot <code@luigifab.fr> - 2.4.0-1
+- New upstream version
+
 * Sun Apr 04 2021 Fabrice Creuzot <code@luigifab.fr> - 2.3.0-1
 - New upstream version
 
 * Wed Nov 11 2020 Fabrice Creuzot <code@luigifab.fr> - 2.2.0-1
-- Initial fedora package release (Closes: #1893321)
+- Initial fedora package release (Closes: rhbz#1893321)
diff --git a/fedora-gtk2/rpm.sh b/fedora-gtk2/rpm.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-# debian: sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk2.0-dev rpm
-# fedora: sudo dnf install rpmdevtools rpm-sign autoconf automake gtk2-devel
+# fedora: sudo dnf install rpmdevtools rpm-sign autoconf automake gtk2-devel desktop-file-utils hunspell-fr
 # fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc
 
 cd "$(dirname "$0")"
-version="2.3.0"
+version="2.4.0"
 gtk="gtk2"
 
 rm -rf builder/ ~/rpmbuild/
@@ -21,7 +20,7 @@ else
 	rm -rf /tmp/${temp}/*/builder/
 
 	mv /tmp/${temp} builder/
-	cp /usr/share/common-licenses/GPL-3 builder/${temp}/LICENSE
+	cp /usr/share/licenses/linux-firmware/GPL-3 builder/${temp}/LICENSE
 
 	cd builder/
 	tar czf ${temp}.tar.gz ${temp}
@@ -32,7 +31,7 @@ else
 fi
 
 # create package (rpm sign https://access.redhat.com/articles/3359321)
-rpmbuild --nodeps -ba awf-${gtk}.spec
+rpmbuild -ba awf-${gtk}.spec
 rpm --addsign ~/rpmbuild/RPMS/*/*.rpm
 rpm --addsign ~/rpmbuild/SRPMS/*.rpm
 mv ~/rpmbuild/RPMS/*/*.rpm builder/
@@ -42,7 +41,7 @@ rpm --checksig builder/*.rpm
 echo "==========================="
 rpmlint awf-${gtk}.spec builder/*.rpm
 echo "==========================="
-ls -dltrh $PWD/builder/*.rpm
+ls -dltrh builder/*.rpm
 echo "==========================="
 
 # cleanup