wok-next rev 21053

Small updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Dec 01 10:24:50 2018 +0200 (2018-12-01)
parents defb272852f0
children 053a334547a1
files elementary-xfce/receipt gtk-theme-albatross/receipt gtk-theme-blackbird/receipt gtk-theme-bluebird/receipt gtk-theme-greybird/receipt gtk-theme-greybird/stuff/patches/0001-Use-Adwaita-icons-and-cursors.patch gtk-theme-greybird/stuff/patches/series gtk-theme-orion/receipt pngquant/.icon.png pngquant/receipt ruby-sass/receipt shimmer-themes/receipt slitaz-base-files/stuff/overrides xorg-xkeyboard-config/receipt xpenguins/.icon.png xpenguins/receipt xpenguins_themes/.icon.png
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/elementary-xfce/receipt	Sat Dec 01 10:24:50 2018 +0200
     1.3 @@ -0,0 +1,30 @@
     1.4 +# SliTaz package receipt v2.
     1.5 +
     1.6 +PACKAGE="elementary-xfce"
     1.7 +VERSION="0.13.1"
     1.8 +CATEGORY="customization"
     1.9 +SHORT_DESC="Elementary icons forked from upstream, extended and maintained for Xfce"
    1.10 +MAINTAINER="al.bobylev@gmail.com"
    1.11 +LICENSE="GPL2"
    1.12 +WEB_SITE="https://github.com/shimmerproject/elementary-xfce"
    1.13 +HOST_ARCH="any"
    1.14 +
    1.15 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.16 +WGET_URL="https://github.com/shimmerproject/elementary-xfce/archive/v$VERSION.tar.gz"
    1.17 +
    1.18 +BUILD_DEPENDS="gtk3-dev gdk-pixbuf-dev findutils coreutils-multicall optipng \
    1.19 +librsvg-dev"
    1.20 +
    1.21 +TAGS_std="Shimmer icons theme"
    1.22 +
    1.23 +compile_rules() {
    1.24 +	./configure --prefix=/usr &&
    1.25 +
    1.26 +	# move `svgtopng` to system-wide path and run it from there later
    1.27 +	make -C svgtopng &&
    1.28 +	install svgtopng/svgtopng /usr/bin/ &&
    1.29 +	sed -i 's|svgtopng/svgtopng|svgtopng|' svgtopng/pngtheme.sh &&
    1.30 +
    1.31 +	make &&
    1.32 +	make DESTDIR=$install install
    1.33 +}
     2.1 --- a/gtk-theme-albatross/receipt	Fri Nov 30 01:41:54 2018 +0200
     2.2 +++ b/gtk-theme-albatross/receipt	Sat Dec 01 10:24:50 2018 +0200
     2.3 @@ -3,25 +3,20 @@
     2.4  PACKAGE="gtk-theme-albatross"
     2.5  VERSION="1.7.4"
     2.6  CATEGORY="customization"
     2.7 -SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
     2.8 +SHORT_DESC="Desktop suite for Xfce"
     2.9  MAINTAINER="al.bobylev@gmail.com"
    2.10  LICENSE="GPL2 CC-BY-SA-3"
    2.11  WEB_SITE="https://github.com/shimmerproject/Albatross"
    2.12 +HOST_ARCH="any"
    2.13  
    2.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.15  WGET_URL="https://github.com/shimmerproject/Albatross/archive/v$VERSION.tar.gz"
    2.16  
    2.17 +DEPENDS_std="gtk2-engine-murrine"
    2.18 +TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4 Unity"
    2.19 +
    2.20  compile_rules() {
    2.21 -	T='/usr/share/themes/Albatross'
    2.22 -	mkdir -p $install/$T
    2.23 -	cp -a \
    2.24 -		$src/gtk-2.0 \
    2.25 -		$src/gtk-3.0 \
    2.26 -		$src/index.theme \
    2.27 -		$install/$T
    2.28 +	T="$install/usr/share/themes/Albatross"
    2.29 +	mkdir -p $T
    2.30 +	cp -r gtk-2.0/ gtk-3.0/ metacity-1/ xfwm4/ index.theme $T
    2.31  }
    2.32 -
    2.33 -genpkg_rules() {
    2.34 -	copy @std
    2.35 -	DEPENDS="gtk2-engine-murrine"
    2.36 -}
     3.1 --- a/gtk-theme-blackbird/receipt	Fri Nov 30 01:41:54 2018 +0200
     3.2 +++ b/gtk-theme-blackbird/receipt	Sat Dec 01 10:24:50 2018 +0200
     3.3 @@ -3,21 +3,20 @@
     3.4  PACKAGE="gtk-theme-blackbird"
     3.5  VERSION="0.4"
     3.6  CATEGORY="customization"
     3.7 -SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
     3.8 +SHORT_DESC="Dark Desktop suite for Xfce"
     3.9  MAINTAINER="al.bobylev@gmail.com"
    3.10  LICENSE="GPL2 CC-BY-SA-3"
    3.11  WEB_SITE="https://github.com/shimmerproject/Blackbird"
    3.12 +HOST_ARCH="any"
    3.13  
    3.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.15  WGET_URL="https://github.com/shimmerproject/Blackbird/archive/v$VERSION.tar.gz"
    3.16  
    3.17 +DEPENDS_std="gtk2-engine-murrine"
    3.18 +TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4"
    3.19 +
    3.20  compile_rules() {
    3.21  	T="$install/usr/share/themes/Blackbird"
    3.22  	mkdir -p $T
    3.23 -	cp -r gtk-2.0 gtk-3.0 metacity-1 xfce-notify-4.0 xfwm4 $T
    3.24 +	cp -r gtk-2.0/ gtk-3.0/ metacity-1/ xfce-notify-4.0/ xfwm4/ $T
    3.25  }
    3.26 -
    3.27 -genpkg_rules() {
    3.28 -	copy @std
    3.29 -	DEPENDS="gtk2-engine-murrine"
    3.30 -}
     4.1 --- a/gtk-theme-bluebird/receipt	Fri Nov 30 01:41:54 2018 +0200
     4.2 +++ b/gtk-theme-bluebird/receipt	Sat Dec 01 10:24:50 2018 +0200
     4.3 @@ -1,29 +1,26 @@
     4.4  # SliTaz package receipt v2.
     4.5  
     4.6  PACKAGE="gtk-theme-bluebird"
     4.7 -VERSION="1.2"
     4.8 +VERSION="1.3"
     4.9  CATEGORY="customization"
    4.10 -SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
    4.11 +SHORT_DESC="Desktop suite for Xfce"
    4.12  MAINTAINER="al.bobylev@gmail.com"
    4.13  LICENSE="GPL2 CC-BY-SA-3"
    4.14  WEB_SITE="https://github.com/shimmerproject/Bluebird"
    4.15 +HOST_ARCH="any"
    4.16  
    4.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.18  WGET_URL="https://github.com/shimmerproject/Bluebird/archive/v$VERSION.tar.gz"
    4.19  
    4.20 +BUILD_DEPENDS="automake ruby-sass glib libxml2-tools gdk-pixbuf librsvg-dev"
    4.21 +
    4.22 +DEPENDS_std="gtk2-engine-murrine"
    4.23 +TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4"
    4.24 +
    4.25  compile_rules() {
    4.26 -	dos2unix $src/gtk-2.0/bars.rc
    4.27 -	dos2unix $src/gtk-2.0/gtkrc
    4.28 +	sed -i 's|sassc|scss|; s|-M||' parse-sass.sh
    4.29  
    4.30 -	T='/usr/share/themes/Bluebird'
    4.31 -	mkdir -p $install/$T
    4.32 -	cp -a \
    4.33 -		$src/gtk-2.0 \
    4.34 -		$src/gtk-3.0 \
    4.35 -		$install/$T
    4.36 +	./autogen.sh &&
    4.37 +	make &&
    4.38 +	make install
    4.39  }
    4.40 -
    4.41 -genpkg_rules() {
    4.42 -	copy @std
    4.43 -	DEPENDS="gtk2-engine-murrine"
    4.44 -}
     5.1 --- a/gtk-theme-greybird/receipt	Fri Nov 30 01:41:54 2018 +0200
     5.2 +++ b/gtk-theme-greybird/receipt	Sat Dec 01 10:24:50 2018 +0200
     5.3 @@ -1,29 +1,26 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="gtk-theme-greybird"
     5.7 -VERSION="1.6.2"
     5.8 +VERSION="3.22.9"
     5.9  CATEGORY="customization"
    5.10 -SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
    5.11 +SHORT_DESC="Desktop suite for Xfce"
    5.12  MAINTAINER="al.bobylev@gmail.com"
    5.13  LICENSE="GPL2 CC-BY-SA-3"
    5.14  WEB_SITE="https://github.com/shimmerproject/Greybird"
    5.15 +HOST_ARCH="any"
    5.16  
    5.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.18  WGET_URL="https://github.com/shimmerproject/Greybird/archive/v$VERSION.tar.gz"
    5.19  
    5.20 +BUILD_DEPENDS="automake ruby-sass glib libxml2-tools gdk-pixbuf librsvg-dev"
    5.21 +
    5.22 +DEPENDS_std="gtk2-engine-murrine"
    5.23 +TAGS_std="Shimmer theme GTK2 GTK3 Metacity Xfwm4 Plank Unity"
    5.24 +
    5.25  compile_rules() {
    5.26 -	T='/usr/share/themes/Greybird'
    5.27 -	mkdir -p $install/$T
    5.28 -	cp -a \
    5.29 -		$src/gtk-2.0 \
    5.30 -		$src/gtk-3.0 \
    5.31 -		$src/xfce-notify-4.0 \
    5.32 -		$src/xfce-notify-4.0_bright \
    5.33 -		$src/index.theme \
    5.34 -		$install/$T
    5.35 +	sed -i 's|sassc|scss|; s|-M||' parse-sass.sh
    5.36 +
    5.37 +	./autogen.sh &&
    5.38 +	make &&
    5.39 +	make install
    5.40  }
    5.41 -
    5.42 -genpkg_rules() {
    5.43 -	copy @std
    5.44 -	DEPENDS="gtk2-engine-murrine"
    5.45 -}
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/gtk-theme-greybird/stuff/patches/0001-Use-Adwaita-icons-and-cursors.patch	Sat Dec 01 10:24:50 2018 +0200
     6.3 @@ -0,0 +1,25 @@
     6.4 +From: Jeremy Bicha <jbicha@ubuntu.com>
     6.5 +Date: Sun, 3 Jul 2016 15:18:29 -0400
     6.6 +Subject: Use Adwaita icons and cursors
     6.7 +
     6.8 +Adwaita icon and cursor themes are already installed as dependencies of
     6.9 +GTK+3. I believe MATE's theme chooser (mate-appearance-properties) is the
    6.10 +only thing that uses these defaults and it shows an ugly warning banner if
    6.11 +any of the defaults aren't installed.
    6.12 +---
    6.13 + index.theme | 4 ++--
    6.14 + 1 file changed, 2 insertions(+), 2 deletions(-)
    6.15 +
    6.16 +diff --git a/index.theme b/index.theme
    6.17 +index b524dc0..b72c63f 100644
    6.18 +--- a/index.theme
    6.19 ++++ b/index.theme
    6.20 +@@ -7,6 +7,6 @@ Encoding=UTF-8
    6.21 + [X-GNOME-Metatheme]
    6.22 + GtkTheme=Greybird
    6.23 + MetacityTheme=Greybird
    6.24 +-IconTheme=elementary-xfce-dark
    6.25 +-CursorTheme=DMZ-White
    6.26 ++IconTheme=Adwaita
    6.27 ++CursorTheme=Adwaita
    6.28 + ButtonLayout=:minimize,maximize,close
     7.1 --- a/gtk-theme-greybird/stuff/patches/series	Fri Nov 30 01:41:54 2018 +0200
     7.2 +++ b/gtk-theme-greybird/stuff/patches/series	Sat Dec 01 10:24:50 2018 +0200
     7.3 @@ -1,1 +1,2 @@
     7.4 --p1|define-sizes.patch
     7.5 +define-sizes.patch
     7.6 +0001-Use-Adwaita-icons-and-cursors.patch
     8.1 --- a/gtk-theme-orion/receipt	Fri Nov 30 01:41:54 2018 +0200
     8.2 +++ b/gtk-theme-orion/receipt	Sat Dec 01 10:24:50 2018 +0200
     8.3 @@ -3,25 +3,20 @@
     8.4  PACKAGE="gtk-theme-orion"
     8.5  VERSION="1.5"
     8.6  CATEGORY="customization"
     8.7 -SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
     8.8 +SHORT_DESC="Modern light theme"
     8.9  MAINTAINER="al.bobylev@gmail.com"
    8.10  LICENSE="GPL2 CC-BY-SA-3"
    8.11  WEB_SITE="https://github.com/shimmerproject/Orion"
    8.12 +HOST_ARCH="any"
    8.13  
    8.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.15  WGET_URL="https://github.com/shimmerproject/Orion/archive/v$VERSION.tar.gz"
    8.16  
    8.17 +DEPENDS_std="gtk2-engine-murrine"
    8.18 +TAGS_std="Shimmer theme GTK2 GTK3 Metacity Openbox Xfwm4 Unity"
    8.19 +
    8.20  compile_rules() {
    8.21 -	T='/usr/share/themes/Orion'
    8.22 -	mkdir -p $install/$T
    8.23 -	cp -a \
    8.24 -		$src/gtk-2.0 \
    8.25 -		$src/gtk-3.0 \
    8.26 -		$src/index.theme \
    8.27 -		$install/$T
    8.28 +	T="$install/usr/share/themes/Orion"
    8.29 +	mkdir -p $T
    8.30 +	cp -r gtk-2.0/ gtk-3.0/ metacity-1/ openbox-3/ xfwm4/ index.theme $T
    8.31  }
    8.32 -
    8.33 -genpkg_rules() {
    8.34 -	copy @std
    8.35 -	DEPENDS="gtk2-engine-murrine"
    8.36 -}
     9.1 Binary file pngquant/.icon.png has changed
    10.1 --- a/pngquant/receipt	Fri Nov 30 01:41:54 2018 +0200
    10.2 +++ b/pngquant/receipt	Sat Dec 01 10:24:50 2018 +0200
    10.3 @@ -1,28 +1,30 @@
    10.4  # SliTaz package receipt v2.
    10.5  
    10.6  PACKAGE="pngquant"
    10.7 -VERSION="2.9.1"
    10.8 +VERSION="2.12.2"
    10.9  CATEGORY="graphics"
   10.10 -SHORT_DESC="Lossy compression of PNG images"
   10.11 +SHORT_DESC="Lossy PNG compressor"
   10.12  MAINTAINER="al.bobylev@gmail.com"
   10.13  LICENSE="GPL3"
   10.14  WEB_SITE="https://pngquant.org/"
   10.15  
   10.16 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   10.17 -WGET_URL="$GITHUB/pornel/pngquant/tarball/$VERSION"
   10.18 +# libimagequant added as git submodule, so better to use git instead of
   10.19 +# getting 2 tarballs and putting one to another...
   10.20 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   10.21 +WGET_URL="git|https://github.com/kornelski/pngquant.git"
   10.22  
   10.23 -EXTRA_TARBALL="libimagequant-$VERSION"
   10.24 -EXTRA_WGET_URL="$GITHUB/ImageOptim/libimagequant/tarball/$VERSION"
   10.25 -
   10.26 -BUILD_DEPENDS="lcms2-dev libpng16-dev zlib-dev"
   10.27 +BUILD_DEPENDS="git lcms2-dev libpng16-dev zlib-dev"
   10.28  SPLIT="$PACKAGE-static:static"
   10.29  
   10.30 +DEPENDS_std="lcms2 libpng16 zlib"
   10.31 +DEPENDS_static=" "
   10.32 +
   10.33 +COPY_static="@std"
   10.34 +CAT_static="graphics|static binary"
   10.35 +PROVIDE_static="pngquant"
   10.36 +
   10.37  compile_rules() {
   10.38 -	if [ ! -e "$SRC/$EXTRA_TARBALL" ]; then
   10.39 -		wget -O $SRC/$EXTRA_TARBALL $EXTRA_WGET_URL
   10.40 -	fi
   10.41 -	tar -xf $SRC/$EXTRA_TARBALL -C $src
   10.42 -	mv $src/ImageOptim-*/* $src/lib/
   10.43 +	git checkout tags/$VERSION
   10.44  
   10.45  	case $SET in
   10.46  		static)
   10.47 @@ -40,18 +42,3 @@
   10.48  	make &&
   10.49  	make install
   10.50  }
   10.51 -
   10.52 -genpkg_rules() {
   10.53 -	case $PACKAGE in
   10.54 -		pngquant)
   10.55 -			copy pngquant
   10.56 -			DEPENDS="lcms2 libpng16 zlib"
   10.57 -			;;
   10.58 -		pngquant-static)
   10.59 -			copy pngquant
   10.60 -			CAT="graphics|static binary"
   10.61 -			PROVIDE="pngquant"
   10.62 -			DEPENDS=" "
   10.63 -			;;
   10.64 -	esac
   10.65 -}
    11.1 --- a/ruby-sass/receipt	Fri Nov 30 01:41:54 2018 +0200
    11.2 +++ b/ruby-sass/receipt	Sat Dec 01 10:24:50 2018 +0200
    11.3 @@ -14,8 +14,8 @@
    11.4  WGET_URL="https://rubygems.org/downloads/$TARBALL"
    11.5  
    11.6  BUILD_DEPENDS="ruby-dev"
    11.7 -COPY_std="@ruby"
    11.8 -DEPENDS_std="ruby ruby-sass-listen"
    11.9 +COPY_std="@ruby REVISION VERSION*"
   11.10 +DEPENDS_std="ruby ruby-stdlib ruby-sass-listen"
   11.11  
   11.12  compile_rules() {
   11.13  	gem install \
   11.14 @@ -23,6 +23,16 @@
   11.15  		--ignore-dependencies \
   11.16  		--no-user-install \
   11.17  		--build-root $install \
   11.18 -		$src/$TARBALL &&
   11.19 +		$src/$TARBALL || return 1
   11.20 +
   11.21 +	# Keep some files from being moved to docdir by `fix gem`:
   11.22 +	t=$(mktemp -d)
   11.23 +	find $install/usr/lib/ruby/gems/*/gems/${PACKAGE#*-}-$VERSION/ \
   11.24 +		\( -name 'REVISION' -o -name 'VERSION*' \) -exec mv '{}' $t \;
   11.25 +
   11.26  	fix gem
   11.27 +
   11.28 +	# Return files back:
   11.29 +	mv $t/* $install/usr/lib/ruby/gems/*/gems/${PACKAGE#*-}-$VERSION/
   11.30 +	rm -r $t
   11.31  }
    12.1 --- a/shimmer-themes/receipt	Fri Nov 30 01:41:54 2018 +0200
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,13 +0,0 @@
    12.4 -# SliTaz package receipt.
    12.5 -
    12.6 -PACKAGE="shimmer-themes"
    12.7 -VERSION="1.0"
    12.8 -CATEGORY="meta"
    12.9 -SHORT_DESC="The set of GTK+2 and GTK+3 themes from the Shimmer Project"
   12.10 -MAINTAINER="al.bobylev@gmail.com"
   12.11 -LICENSE="GPL2 CC-BY-SA-3"
   12.12 -WEB_SITE="https://shimmerproject.org/"
   12.13 -HOST_ARCH="any"
   12.14 -
   12.15 -DEPENDS="gtk-theme-albatross gtk-theme-blackbird gtk-theme-bluebird \
   12.16 -gtk-theme-greybird gtk-theme-orion"
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/slitaz-base-files/stuff/overrides	Sat Dec 01 10:24:50 2018 +0200
    13.3 @@ -0,0 +1,4 @@
    13.4 +0640 /etc/shadow
    13.5 +0640 /etc/gshadow
    13.6 +0750 /root/
    13.7 +1777 /tmp/
    14.1 --- a/xorg-xkeyboard-config/receipt	Fri Nov 30 01:41:54 2018 +0200
    14.2 +++ b/xorg-xkeyboard-config/receipt	Sat Dec 01 10:24:50 2018 +0200
    14.3 @@ -1,7 +1,7 @@
    14.4  # SliTaz package receipt v2.
    14.5  
    14.6  PACKAGE="xorg-xkeyboard-config"
    14.7 -VERSION="2.24"
    14.8 +VERSION="2.25"
    14.9  CATEGORY="x-window"
   14.10  SHORT_DESC="Keyboard configuration database for the X Window System"
   14.11  MAINTAINER="devel@slitaz.org"
    15.1 Binary file xpenguins/.icon.png has changed
    16.1 --- a/xpenguins/receipt	Fri Nov 30 01:41:54 2018 +0200
    16.2 +++ b/xpenguins/receipt	Sat Dec 01 10:24:50 2018 +0200
    16.3 @@ -12,6 +12,7 @@
    16.4  WGET_URL="${WEB_SITE}$TARBALL"
    16.5  
    16.6  BUILD_DEPENDS="xorg-libXpm-dev xorg-libX11-dev xorg-libXext-dev xorg-libXt-dev"
    16.7 +DEPENDS_std="xorg-libXpm xorg-libX11 xorg-libXext"
    16.8  
    16.9  compile_rules() {
   16.10  	./configure \
   16.11 @@ -23,8 +24,3 @@
   16.12  	install -Dm644 $stuff/xpenguins.desktop $install/usr/share/applications/xpenguins.desktop
   16.13  	install -Dm755 $stuff/xpenguins.sh      $install/usr/bin/xpenguins.sh
   16.14  }
   16.15 -
   16.16 -genpkg_rules() {
   16.17 -	copy @std
   16.18 -	DEPENDS="xorg-libXpm xorg-libX11 xorg-libXext"
   16.19 -}
    17.1 Binary file xpenguins_themes/.icon.png has changed