# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1543652690 -7200
# Node ID adb36dd69239945158377349a486acdf4ec6c21a
# Parent  defb272852f070a3c87a186c44a30271166f0945
Small updates

diff -r defb272852f0 -r adb36dd69239 elementary-xfce/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/elementary-xfce/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -0,0 +1,30 @@
+# SliTaz package receipt v2.
+
+PACKAGE="elementary-xfce"
+VERSION="0.13.1"
+CATEGORY="customization"
+SHORT_DESC="Elementary icons forked from upstream, extended and maintained for Xfce"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL2"
+WEB_SITE="https://github.com/shimmerproject/elementary-xfce"
+HOST_ARCH="any"
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/shimmerproject/elementary-xfce/archive/v$VERSION.tar.gz"
+
+BUILD_DEPENDS="gtk3-dev gdk-pixbuf-dev findutils coreutils-multicall optipng \
+librsvg-dev"
+
+TAGS_std="Shimmer icons theme"
+
+compile_rules() {
+	./configure --prefix=/usr &&
+
+	# move `svgtopng` to system-wide path and run it from there later
+	make -C svgtopng &&
+	install svgtopng/svgtopng /usr/bin/ &&
+	sed -i 's|svgtopng/svgtopng|svgtopng|' svgtopng/pngtheme.sh &&
+
+	make &&
+	make DESTDIR=$install install
+}
diff -r defb272852f0 -r adb36dd69239 gtk-theme-albatross/receipt
--- a/gtk-theme-albatross/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/gtk-theme-albatross/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -3,25 +3,20 @@
 PACKAGE="gtk-theme-albatross"
 VERSION="1.7.4"
 CATEGORY="customization"
-SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="Desktop suite for Xfce"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Albatross"
+HOST_ARCH="any"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/shimmerproject/Albatross/archive/v$VERSION.tar.gz"
 
+DEPENDS_std="gtk2-engine-murrine"
+TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4 Unity"
+
 compile_rules() {
-	T='/usr/share/themes/Albatross'
-	mkdir -p $install/$T
-	cp -a \
-		$src/gtk-2.0 \
-		$src/gtk-3.0 \
-		$src/index.theme \
-		$install/$T
+	T="$install/usr/share/themes/Albatross"
+	mkdir -p $T
+	cp -r gtk-2.0/ gtk-3.0/ metacity-1/ xfwm4/ index.theme $T
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2-engine-murrine"
-}
diff -r defb272852f0 -r adb36dd69239 gtk-theme-blackbird/receipt
--- a/gtk-theme-blackbird/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/gtk-theme-blackbird/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -3,21 +3,20 @@
 PACKAGE="gtk-theme-blackbird"
 VERSION="0.4"
 CATEGORY="customization"
-SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="Dark Desktop suite for Xfce"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Blackbird"
+HOST_ARCH="any"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/shimmerproject/Blackbird/archive/v$VERSION.tar.gz"
 
+DEPENDS_std="gtk2-engine-murrine"
+TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4"
+
 compile_rules() {
 	T="$install/usr/share/themes/Blackbird"
 	mkdir -p $T
-	cp -r gtk-2.0 gtk-3.0 metacity-1 xfce-notify-4.0 xfwm4 $T
+	cp -r gtk-2.0/ gtk-3.0/ metacity-1/ xfce-notify-4.0/ xfwm4/ $T
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2-engine-murrine"
-}
diff -r defb272852f0 -r adb36dd69239 gtk-theme-bluebird/receipt
--- a/gtk-theme-bluebird/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/gtk-theme-bluebird/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -1,29 +1,26 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gtk-theme-bluebird"
-VERSION="1.2"
+VERSION="1.3"
 CATEGORY="customization"
-SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="Desktop suite for Xfce"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Bluebird"
+HOST_ARCH="any"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/shimmerproject/Bluebird/archive/v$VERSION.tar.gz"
 
+BUILD_DEPENDS="automake ruby-sass glib libxml2-tools gdk-pixbuf librsvg-dev"
+
+DEPENDS_std="gtk2-engine-murrine"
+TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4"
+
 compile_rules() {
-	dos2unix $src/gtk-2.0/bars.rc
-	dos2unix $src/gtk-2.0/gtkrc
+	sed -i 's|sassc|scss|; s|-M||' parse-sass.sh
 
-	T='/usr/share/themes/Bluebird'
-	mkdir -p $install/$T
-	cp -a \
-		$src/gtk-2.0 \
-		$src/gtk-3.0 \
-		$install/$T
+	./autogen.sh &&
+	make &&
+	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2-engine-murrine"
-}
diff -r defb272852f0 -r adb36dd69239 gtk-theme-greybird/receipt
--- a/gtk-theme-greybird/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/gtk-theme-greybird/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -1,29 +1,26 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gtk-theme-greybird"
-VERSION="1.6.2"
+VERSION="3.22.9"
 CATEGORY="customization"
-SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="Desktop suite for Xfce"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Greybird"
+HOST_ARCH="any"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/shimmerproject/Greybird/archive/v$VERSION.tar.gz"
 
+BUILD_DEPENDS="automake ruby-sass glib libxml2-tools gdk-pixbuf librsvg-dev"
+
+DEPENDS_std="gtk2-engine-murrine"
+TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4 Plank Unity"
+
 compile_rules() {
-	T='/usr/share/themes/Greybird'
-	mkdir -p $install/$T
-	cp -a \
-		$src/gtk-2.0 \
-		$src/gtk-3.0 \
-		$src/xfce-notify-4.0 \
-		$src/xfce-notify-4.0_bright \
-		$src/index.theme \
-		$install/$T
+	sed -i 's|sassc|scss|; s|-M||' parse-sass.sh
+
+	./autogen.sh &&
+	make &&
+	make install
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2-engine-murrine"
-}
diff -r defb272852f0 -r adb36dd69239 gtk-theme-greybird/stuff/patches/0001-Use-Adwaita-icons-and-cursors.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk-theme-greybird/stuff/patches/0001-Use-Adwaita-icons-and-cursors.patch	Sat Dec 01 10:24:50 2018 +0200
@@ -0,0 +1,25 @@
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Sun, 3 Jul 2016 15:18:29 -0400
+Subject: Use Adwaita icons and cursors
+
+Adwaita icon and cursor themes are already installed as dependencies of
+GTK+3. I believe MATE's theme chooser (mate-appearance-properties) is the
+only thing that uses these defaults and it shows an ugly warning banner if
+any of the defaults aren't installed.
+---
+ index.theme | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/index.theme b/index.theme
+index b524dc0..b72c63f 100644
+--- a/index.theme
++++ b/index.theme
+@@ -7,6 +7,6 @@ Encoding=UTF-8
+ [X-GNOME-Metatheme]
+ GtkTheme=Greybird
+ MetacityTheme=Greybird
+-IconTheme=elementary-xfce-dark
+-CursorTheme=DMZ-White
++IconTheme=Adwaita
++CursorTheme=Adwaita
+ ButtonLayout=:minimize,maximize,close
diff -r defb272852f0 -r adb36dd69239 gtk-theme-greybird/stuff/patches/series
--- a/gtk-theme-greybird/stuff/patches/series	Fri Nov 30 01:41:54 2018 +0200
+++ b/gtk-theme-greybird/stuff/patches/series	Sat Dec 01 10:24:50 2018 +0200
@@ -1,1 +1,2 @@
--p1|define-sizes.patch
+define-sizes.patch
+0001-Use-Adwaita-icons-and-cursors.patch
diff -r defb272852f0 -r adb36dd69239 gtk-theme-orion/receipt
--- a/gtk-theme-orion/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/gtk-theme-orion/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -3,25 +3,20 @@
 PACKAGE="gtk-theme-orion"
 VERSION="1.5"
 CATEGORY="customization"
-SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="Modern light theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Orion"
+HOST_ARCH="any"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/shimmerproject/Orion/archive/v$VERSION.tar.gz"
 
+DEPENDS_std="gtk2-engine-murrine"
+TAGS_std="Shimmer theme GTK2 GTK3 Metacity Openbox Xfwm4 Unity"
+
 compile_rules() {
-	T='/usr/share/themes/Orion'
-	mkdir -p $install/$T
-	cp -a \
-		$src/gtk-2.0 \
-		$src/gtk-3.0 \
-		$src/index.theme \
-		$install/$T
+	T="$install/usr/share/themes/Orion"
+	mkdir -p $T
+	cp -r gtk-2.0/ gtk-3.0/ metacity-1/ openbox-3/ xfwm4/ index.theme $T
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="gtk2-engine-murrine"
-}
diff -r defb272852f0 -r adb36dd69239 pngquant/.icon.png
Binary file pngquant/.icon.png has changed
diff -r defb272852f0 -r adb36dd69239 pngquant/receipt
--- a/pngquant/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/pngquant/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -1,28 +1,30 @@
 # SliTaz package receipt v2.
 
 PACKAGE="pngquant"
-VERSION="2.9.1"
+VERSION="2.12.2"
 CATEGORY="graphics"
-SHORT_DESC="Lossy compression of PNG images"
+SHORT_DESC="Lossy PNG compressor"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://pngquant.org/"
 
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$GITHUB/pornel/pngquant/tarball/$VERSION"
+# libimagequant added as git submodule, so better to use git instead of
+# getting 2 tarballs and putting one to another...
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="git|https://github.com/kornelski/pngquant.git"
 
-EXTRA_TARBALL="libimagequant-$VERSION"
-EXTRA_WGET_URL="$GITHUB/ImageOptim/libimagequant/tarball/$VERSION"
-
-BUILD_DEPENDS="lcms2-dev libpng16-dev zlib-dev"
+BUILD_DEPENDS="git lcms2-dev libpng16-dev zlib-dev"
 SPLIT="$PACKAGE-static:static"
 
+DEPENDS_std="lcms2 libpng16 zlib"
+DEPENDS_static=" "
+
+COPY_static="@std"
+CAT_static="graphics|static binary"
+PROVIDE_static="pngquant"
+
 compile_rules() {
-	if [ ! -e "$SRC/$EXTRA_TARBALL" ]; then
-		wget -O $SRC/$EXTRA_TARBALL $EXTRA_WGET_URL
-	fi
-	tar -xf $SRC/$EXTRA_TARBALL -C $src
-	mv $src/ImageOptim-*/* $src/lib/
+	git checkout tags/$VERSION
 
 	case $SET in
 		static)
@@ -40,18 +42,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		pngquant)
-			copy pngquant
-			DEPENDS="lcms2 libpng16 zlib"
-			;;
-		pngquant-static)
-			copy pngquant
-			CAT="graphics|static binary"
-			PROVIDE="pngquant"
-			DEPENDS=" "
-			;;
-	esac
-}
diff -r defb272852f0 -r adb36dd69239 ruby-sass/receipt
--- a/ruby-sass/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/ruby-sass/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -14,8 +14,8 @@
 WGET_URL="https://rubygems.org/downloads/$TARBALL"
 
 BUILD_DEPENDS="ruby-dev"
-COPY_std="@ruby"
-DEPENDS_std="ruby ruby-sass-listen"
+COPY_std="@ruby REVISION VERSION*"
+DEPENDS_std="ruby ruby-stdlib ruby-sass-listen"
 
 compile_rules() {
 	gem install \
@@ -23,6 +23,16 @@
 		--ignore-dependencies \
 		--no-user-install \
 		--build-root $install \
-		$src/$TARBALL &&
+		$src/$TARBALL || return 1
+
+	# Keep some files from being moved to docdir by `fix gem`:
+	t=$(mktemp -d)
+	find $install/usr/lib/ruby/gems/*/gems/${PACKAGE#*-}-$VERSION/ \
+		\( -name 'REVISION' -o -name 'VERSION*' \) -exec mv '{}' $t \;
+
 	fix gem
+
+	# Return files back:
+	mv $t/* $install/usr/lib/ruby/gems/*/gems/${PACKAGE#*-}-$VERSION/
+	rm -r $t
 }
diff -r defb272852f0 -r adb36dd69239 shimmer-themes/receipt
--- a/shimmer-themes/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="shimmer-themes"
-VERSION="1.0"
-CATEGORY="meta"
-SHORT_DESC="The set of GTK+2 and GTK+3 themes from the Shimmer Project"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="GPL2 CC-BY-SA-3"
-WEB_SITE="https://shimmerproject.org/"
-HOST_ARCH="any"
-
-DEPENDS="gtk-theme-albatross gtk-theme-blackbird gtk-theme-bluebird \
-gtk-theme-greybird gtk-theme-orion"
diff -r defb272852f0 -r adb36dd69239 slitaz-base-files/stuff/overrides
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slitaz-base-files/stuff/overrides	Sat Dec 01 10:24:50 2018 +0200
@@ -0,0 +1,4 @@
+0640 /etc/shadow
+0640 /etc/gshadow
+0750 /root/
+1777 /tmp/
diff -r defb272852f0 -r adb36dd69239 xorg-xkeyboard-config/receipt
--- a/xorg-xkeyboard-config/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/xorg-xkeyboard-config/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xkeyboard-config"
-VERSION="2.24"
+VERSION="2.25"
 CATEGORY="x-window"
 SHORT_DESC="Keyboard configuration database for the X Window System"
 MAINTAINER="devel@slitaz.org"
diff -r defb272852f0 -r adb36dd69239 xpenguins/.icon.png
Binary file xpenguins/.icon.png has changed
diff -r defb272852f0 -r adb36dd69239 xpenguins/receipt
--- a/xpenguins/receipt	Fri Nov 30 01:41:54 2018 +0200
+++ b/xpenguins/receipt	Sat Dec 01 10:24:50 2018 +0200
@@ -12,6 +12,7 @@
 WGET_URL="${WEB_SITE}$TARBALL"
 
 BUILD_DEPENDS="xorg-libXpm-dev xorg-libX11-dev xorg-libXext-dev xorg-libXt-dev"
+DEPENDS_std="xorg-libXpm xorg-libX11 xorg-libXext"
 
 compile_rules() {
 	./configure \
@@ -23,8 +24,3 @@
 	install -Dm644 $stuff/xpenguins.desktop $install/usr/share/applications/xpenguins.desktop
 	install -Dm755 $stuff/xpenguins.sh      $install/usr/bin/xpenguins.sh
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="xorg-libXpm xorg-libX11 xorg-libXext"
-}
diff -r defb272852f0 -r adb36dd69239 xpenguins_themes/.icon.png
Binary file xpenguins_themes/.icon.png has changed