wok-next rev 21005

Small updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Oct 08 11:41:17 2018 +0300 (2018-10-08)
parents e43c543a4c5b
children 690e7cc036d5
files cpu-g/receipt cpu-g/stuff/cpu-g.desktop dconf-editor/.icon.png dconf-editor/receipt gtk+3/receipt gtk+3/stuff/patches/gtk3-misc.patch gtk+3/stuff/patches/series gtk+3/stuff/settings.ini gtk3/.icon.png gtk3/receipt gtk3/stuff/settings.ini
line diff
     1.1 --- a/cpu-g/receipt	Sun Oct 07 11:36:30 2018 +0300
     1.2 +++ b/cpu-g/receipt	Mon Oct 08 11:41:17 2018 +0300
     1.3 @@ -1,4 +1,4 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="cpu-g"
     1.8  VERSION="0.9.0"
     1.9 @@ -6,31 +6,27 @@
    1.10  SHORT_DESC="Shows useful information about your hardware"
    1.11  MAINTAINER="al.bobylev@gmail.com"
    1.12  LICENSE="GPL3"
    1.13 -WEB_SITE="http://cpug.sourceforge.net/"
    1.14 +WEB_SITE="https://sourceforge.net/projects/cpug/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.17  WGET_URL="$SF_MIRROR/cpug/$TARBALL"
    1.18  
    1.19 -DEPENDS="python-pygtk"
    1.20 +compile_rules() {
    1.21 +	sed -i 's|data/logos/|/usr/share/cpu-g/logos/|'         cpu-g
    1.22 +	sed -i 's|cpu-g.glade|/usr/share/cpu-g/cpu-g.glade|'    cpu-g
    1.23 +	sed -i 's|data/cpu-g.png|/usr/share/pixmaps/cpu-g.png|' cpu-g.glade
    1.24  
    1.25 -# Rules to configure and make the package.
    1.26 -compile_rules()
    1.27 -{
    1.28 -	cook_pick_manpages doc/*
    1.29 +	install -Dm755 cpu-g          $install/usr/bin/cpu-g
    1.30 +	install -Dm644 cpu-g.glade    $install/usr/share/cpu-g/cpu-g.glade
    1.31 +	install -Dm644 data/cpu-g.png $install/usr/share/pixmaps/cpu-g.png
    1.32 +	mkdir -p          $install/usr/share/cpu-g/
    1.33 +	cp -r data/logos/ $install/usr/share/cpu-g/
    1.34 +
    1.35 +	cook_pick_manpages doc/cpu-g.1
    1.36 +	cook_pick_docs README
    1.37  }
    1.38  
    1.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.40 -genpkg_rules()
    1.41 -{
    1.42 -	sed -i 's|data/logos/|/usr/share/cpu-g/logos/|' $src/cpu-g
    1.43 -	sed -i 's|cpu-g.glade|/usr/share/cpu-g/cpu-g.glade|' $src/cpu-g
    1.44 -	sed -i 's|data/cpu-g.png|/usr/share/pixmaps/cpu-g.png|' $src/cpu-g.glade
    1.45 -	mkdir -p \
    1.46 -		$fs/usr/bin \
    1.47 -		$fs/usr/share/applications \
    1.48 -		$fs/usr/share/cpu-g \
    1.49 -		$fs/usr/share/pixmaps
    1.50 -	cp -a $src/cpu-g $fs/usr/bin
    1.51 -	cp -a $src/cpu-g.glade $fs/usr/share/cpu-g
    1.52 -	cp -a $src/data/logos $fs/usr/share/cpu-g
    1.53 -	cp -a $src/data/cpu-g.png $fs/usr/share/pixmaps
    1.54 +genpkg_rules() {
    1.55 +	copy @std
    1.56 +	DEPENDS="python-pygtk"
    1.57  }
     2.1 Binary file dconf-editor/.icon.png has changed
     3.1 --- a/dconf-editor/receipt	Sun Oct 07 11:36:30 2018 +0300
     3.2 +++ b/dconf-editor/receipt	Mon Oct 08 11:41:17 2018 +0300
     3.3 @@ -1,30 +1,29 @@
     3.4  # SliTaz package receipt v2.
     3.5  
     3.6  PACKAGE="dconf-editor"
     3.7 -VERSION="3.22.3"
     3.8 +VERSION="3.30.2"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="A low-level configuration system (graphical editor)"
    3.11  MAINTAINER="al.bobylev@gmail.com"
    3.12  LICENSE="LGPL2.1"
    3.13  WEB_SITE="https://wiki.gnome.org/Projects/dconf"
    3.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/dconf.html"
    3.15 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/dconf.html"
    3.16  
    3.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    3.18  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    3.19  
    3.20 -BUILD_DEPENDS="vala glib-dev gtk+3-dev dconf-dev gettext intltool"
    3.21 +BUILD_DEPENDS="meson ninja vala libxml2-tools dconf-dev gtk3-dev gettext"
    3.22  
    3.23  compile_rules() {
    3.24 -	# sdft can't process keywords
    3.25 -	sed -i '/_Keywords=/d' editor/ca.desrt.dconf-editor.desktop.in.in
    3.26 +	mkdir build
    3.27 +	cd    build
    3.28  
    3.29 -	./configure $CONFIGURE_ARGS &&
    3.30 -	make &&
    3.31 -	make install
    3.32 +	meson-wrapper &&
    3.33 +	ninja &&
    3.34 +	ninja install
    3.35  }
    3.36  
    3.37  genpkg_rules() {
    3.38  	copy @std @ico # only 16 and 48 icons
    3.39 -	rm -r $fs/usr/share/appdata
    3.40 -	DEPENDS="atk cairo dconf gdk-pixbuf glib gtk+3 pango   dbus"
    3.41 +	DEPENDS="dconf glib gtk3   dbus"
    3.42  }
     4.1 --- a/gtk+3/receipt	Sun Oct 07 11:36:30 2018 +0300
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,103 +0,0 @@
     4.4 -# SliTaz package receipt v2.
     4.5 -
     4.6 -PACKAGE="gtk+3"
     4.7 -VERSION="3.22.8"
     4.8 -CATEGORY="x-window"
     4.9 -SHORT_DESC="The GIMP Toolkit 3.x"
    4.10 -MAINTAINER="pankso@slitaz.org"
    4.11 -LICENSE="LGPL2"
    4.12 -WEB_SITE="https://www.gtk.org/"
    4.13 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html"
    4.14 -REPOLOGY="gtk3"
    4.15 -
    4.16 -TARBALL="gtk+-$VERSION.tar.xz"
    4.17 -WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
    4.18 -
    4.19 -BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
    4.20 -xorg-xorgproto"
    4.21 -BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev gettext \
    4.22 -xorg-libXinerama-dev xorg-libXi-dev xorg-libXrandr-dev xorg-libXcomposite-dev \
    4.23 -xorg-libXdamage-dev libepoxy-dev at-spi2-atk-dev cups-dev colord-dev gtk-doc \
    4.24 -libxslt gobject-introspection-dev xorg-libSM-dev"
    4.25 -SPLIT="gtk+3-demo gtk+3-widget-factory gtk+3-icon-browser gtk+3 gtk+3-dev"
    4.26 -COOKOPTS="skip-log-errors" # Failed to open file ?./gdk.gresource.xml?: No such file or directory
    4.27 -CROSS_BUGS="bug: /bin/bash: no: command not found"
    4.28 -
    4.29 -compile_rules() {
    4.30 -	# Handle cross compilation.
    4.31 -	case "$ARCH" in
    4.32 -		arm*)
    4.33 -			ARCH_ARGS="--enable-introspection=no --disable-glibtest \
    4.34 -			--disable-cups --disable-papi --with-xinput gio_can_sniff=yes"
    4.35 -			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
    4.36 -			export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include"
    4.37 -			;;
    4.38 -	esac
    4.39 -
    4.40 -	./configure \
    4.41 -		--disable-debug \
    4.42 -		--enable-xkb \
    4.43 -		--enable-xinerama \
    4.44 -		--enable-xrandr \
    4.45 -		--enable-xfixes \
    4.46 -		--enable-xcomposite \
    4.47 -		--enable-xdamage \
    4.48 -		--enable-x11-backend \
    4.49 -		--enable-introspection \
    4.50 -		--enable-colord \
    4.51 -		--disable-wayland-backend \
    4.52 -		--disable-broadway-backend \
    4.53 -		--with-x \
    4.54 -		$CONFIGURE_ARGS $ARCH_ARGS &&
    4.55 -	fix libtool &&
    4.56 -	make $MAKEFLAGS &&
    4.57 -	make DESTDIR=$DESTDIR install || return 1
    4.58 -
    4.59 -	cp -f $stuff/settings.ini $install/etc/gtk-3.0
    4.60 -	find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d'
    4.61 -}
    4.62 -
    4.63 -genpkg_rules() {
    4.64 -	case $PACKAGE in
    4.65 -		gtk+3-demo)
    4.66 -			copy gtk3-demo* *Demo* *exampleapp*
    4.67 -			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
    4.68 -			CAT="development|example code and demo"
    4.69 -			DEPENDS="cairo gdk-pixbuf glib gtk+3 libepoxy libharfbuzz pango"
    4.70 -			;;
    4.71 -		gtk+3-widget-factory)
    4.72 -			copy gtk3-widget*
    4.73 -			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
    4.74 -			CAT="development|widget factory"
    4.75 -			DEPENDS="atk cairo gdk-pixbuf glib gtk+3"
    4.76 -			;;
    4.77 -		gtk+3-icon-browser)
    4.78 -			copy gtk3-icon-browser gtk3-icon-browser.desktop
    4.79 -			CAT="development|icon browser"
    4.80 -			DEPENDS="glib gtk+3"
    4.81 -			;;
    4.82 -		gtk+3)
    4.83 -			COOKOPTS="!menus"
    4.84 -			copy etc/ bin/ themes/ *.so* *.xml @rm
    4.85 -			DEPENDS="at-spi2-atk atk cairo colord fontconfig gdk-pixbuf glib \
    4.86 -			libcups libepoxy pango xorg-libX11 xorg-libXcomposite \
    4.87 -			xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi \
    4.88 -			xorg-libXinerama xorg-libXrandr"
    4.89 -			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
    4.90 -			SUGGESTED="cups"
    4.91 -			;;
    4.92 -		gtk+3-dev)
    4.93 -			copy @dev *.its *.loc *.rng
    4.94 -			DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \
    4.95 -			at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \
    4.96 -			glib-dev libepoxy-dev pango-dev xorg-libX11-dev \
    4.97 -			xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
    4.98 -			xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \
    4.99 -			xorg-libXrandr-dev"
   4.100 -			;;
   4.101 -	esac
   4.102 -}
   4.103 -
   4.104 -post_install_gtk_3() {
   4.105 -	chroot "$1/" /usr/bin/gtk-query-immodules-3.0 --update-cache
   4.106 -}
     5.1 --- a/gtk+3/stuff/patches/gtk3-misc.patch	Sun Oct 07 11:36:30 2018 +0300
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,14 +0,0 @@
     5.4 ---- a/gtk/gtktextview.h
     5.5 -+++ b/gtk/gtktextview.h
     5.6 -@@ -56,9 +56,9 @@
     5.7 -  */
     5.8 - typedef enum
     5.9 - {
    5.10 --  /*< private >*/
    5.11 -+  /* < private > */
    5.12 -   GTK_TEXT_WINDOW_PRIVATE,
    5.13 --  /*< public >*/
    5.14 -+  /* < public > */
    5.15 -   GTK_TEXT_WINDOW_WIDGET,
    5.16 -   GTK_TEXT_WINDOW_TEXT,
    5.17 -   GTK_TEXT_WINDOW_LEFT,
     6.1 --- a/gtk+3/stuff/patches/series	Sun Oct 07 11:36:30 2018 +0300
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,1 +0,0 @@
     6.4 -gtk3-misc.patch
     7.1 --- a/gtk+3/stuff/settings.ini	Sun Oct 07 11:36:30 2018 +0300
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,16 +0,0 @@
     7.4 -[Settings]
     7.5 -gtk-theme-name = SliTaz
     7.6 -gtk-icon-theme-name = SliTaz
     7.7 -gtk-font-name = DejaVu Sans 9
     7.8 -gtk-cursor-theme-name = slitaz-polar
     7.9 -gtk-cursor-theme-size = 0
    7.10 -gtk-toolbar-style = GTK_TOOLBAR_ICONS
    7.11 -gtk-toolbar-icon-size = GTK_ICON_SIZE_SMALL_TOOLBAR
    7.12 -gtk-button-images = 1
    7.13 -gtk-menu-images = 1
    7.14 -gtk-enable-event-sounds = 1
    7.15 -gtk-enable-input-feedback-sounds = 1
    7.16 -gtk-xft-antialias = 1
    7.17 -gtk-xft-hinting = 1
    7.18 -gtk-xft-hintstyle = hintfull
    7.19 -gtk-xft-rgba = rgb
     8.1 Binary file gtk3/.icon.png has changed
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/gtk3/receipt	Mon Oct 08 11:41:17 2018 +0300
     9.3 @@ -0,0 +1,106 @@
     9.4 +# SliTaz package receipt v2.
     9.5 +
     9.6 +PACKAGE="gtk3"
     9.7 +VERSION="3.24.1"
     9.8 +CATEGORY="x-window"
     9.9 +SHORT_DESC="GNOME Toolkit 3" # it isn't GIMP Toolkit, don't try to convince me
    9.10 +MAINTAINER="al.bobylev@gmail.com"
    9.11 +LICENSE="LGPL2"
    9.12 +WEB_SITE="https://www.gtk.org/"
    9.13 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gtk3.html"
    9.14 +REPOLOGY="gtk3"
    9.15 +
    9.16 +TARBALL="gtk+-$VERSION.tar.xz"
    9.17 +WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
    9.18 +
    9.19 +BUILD_DEPENDS="xorg-libSM-dev"
    9.20 +BUILD_DEPENDS="gettext wayland-protocols-dev wayland-dev glib-dev atk-dev \
    9.21 +pango-dev cairo-dev gdk-pixbuf-dev xorg-libXinerama-dev xorg-libXi-dev \
    9.22 +xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXdamage-dev libxkbcommon-dev \
    9.23 +mesa-dev libepoxy-dev at-spi2-atk-dev iso-codes-dev cups-dev rest-dev \
    9.24 +json-glib-dev gobject-introspection-dev colord-dev gtk-doc libxslt "
    9.25 +SPLIT="$PACKAGE-demo $PACKAGE-widget-factory $PACKAGE-icon-browser \
    9.26 +$PACKAGE-broadwayd $PACKAGE-dev $PACKAGE"
    9.27 +
    9.28 +COOKOPTS="skip-log-errors" # Failed to open file ?./gdk.gresource.xml?: No such file or directory
    9.29 +
    9.30 +compile_rules() {
    9.31 +	./configure \
    9.32 +		--disable-debug \
    9.33 +		--enable-xkb \
    9.34 +		--enable-xinerama \
    9.35 +		--enable-xrandr \
    9.36 +		--enable-xfixes \
    9.37 +		--enable-xcomposite \
    9.38 +		--enable-xdamage \
    9.39 +		--enable-x11-backend \
    9.40 +		--enable-broadway-backend \
    9.41 +		--enable-wayland-backend \
    9.42 +		--enable-introspection \
    9.43 +		--enable-colord \
    9.44 +		--enable-man \
    9.45 +		--with-x \
    9.46 +		$CONFIGURE_ARGS &&
    9.47 +	fix libtool &&
    9.48 +	make &&
    9.49 +	make install || return 1
    9.50 +
    9.51 +	cp -f $stuff/settings.ini $install/etc/gtk-3.0
    9.52 +#	find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d'
    9.53 +}
    9.54 +
    9.55 +genpkg_rules() {
    9.56 +	case $PACKAGE in
    9.57 +		*-demo)
    9.58 +			copy gtk3-demo* *Demo* *exampleapp*
    9.59 +			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
    9.60 +			CAT="development|example code and demo"
    9.61 +			DEPENDS="cairo gdk-pixbuf glib gtk3 libepoxy libharfbuzz pango"
    9.62 +			PROVIDE="gtk+3-demo"
    9.63 +			;;
    9.64 +		*-widget-factory)
    9.65 +			copy gtk3-widget*
    9.66 +			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
    9.67 +			CAT="development|widget factory"
    9.68 +			DEPENDS="atk cairo gdk-pixbuf glib gtk3"
    9.69 +			PROVIDE="gtk+3-widget-factory"
    9.70 +			;;
    9.71 +		*-icon-browser)
    9.72 +			copy gtk3-icon-browser gtk3-icon-browser.desktop
    9.73 +			CAT="development|icon browser"
    9.74 +			DEPENDS="glib gtk3"
    9.75 +			PROVIDE="gtk+3-icon-browser"
    9.76 +			;;
    9.77 +		*-broadwayd)
    9.78 +			copy broadwayd
    9.79 +			CAT="x-window|HTML5 GTK backend"
    9.80 +			DEPENDS="cairo glib"
    9.81 +			;;
    9.82 +		*-dev)
    9.83 +			copy @dev *.its *.loc *.rng
    9.84 +			DEPENDS="gtk3 \
    9.85 +			at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \
    9.86 +			glib-dev libepoxy-dev libxkbcommon-dev mesa-dev pango-dev \
    9.87 +			wayland-dev wayland-protocols-dev xorg-libX11-dev \
    9.88 +			xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
    9.89 +			xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \
    9.90 +			xorg-libXrandr-dev"
    9.91 +			PROVIDE="gtk+3-dev"
    9.92 +			;;
    9.93 +		*)
    9.94 +			COOKOPTS="!menus"
    9.95 +			copy etc/ bin/ themes/ *.so* *.xml @rm
    9.96 +			DEPENDS="at-spi2-atk atk cairo colord fontconfig freetype \
    9.97 +			gdk-pixbuf glib json-glib libcups libepoxy libharfbuzz \
    9.98 +			libxkbcommon mesa-libwayland-egl pango rest wayland xorg-libX11 \
    9.99 +			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
   9.100 +			xorg-libXi xorg-libXinerama xorg-libXrandr"
   9.101 +			PROVIDE="gtk+3"
   9.102 +			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
   9.103 +			;;
   9.104 +	esac
   9.105 +}
   9.106 +
   9.107 +post_install_gtk3() {
   9.108 +	chroot "$1/" /usr/bin/gtk-query-immodules-3.0 --update-cache
   9.109 +}
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/gtk3/stuff/settings.ini	Mon Oct 08 11:41:17 2018 +0300
    10.3 @@ -0,0 +1,16 @@
    10.4 +[Settings]
    10.5 +gtk-theme-name = SliTaz
    10.6 +gtk-icon-theme-name = SliTaz
    10.7 +gtk-font-name = DejaVu Sans 9
    10.8 +gtk-cursor-theme-name = slitaz-polar
    10.9 +gtk-cursor-theme-size = 0
   10.10 +gtk-toolbar-style = GTK_TOOLBAR_ICONS
   10.11 +gtk-toolbar-icon-size = GTK_ICON_SIZE_SMALL_TOOLBAR
   10.12 +gtk-button-images = 1
   10.13 +gtk-menu-images = 1
   10.14 +gtk-enable-event-sounds = 1
   10.15 +gtk-enable-input-feedback-sounds = 1
   10.16 +gtk-xft-antialias = 1
   10.17 +gtk-xft-hinting = 1
   10.18 +gtk-xft-hintstyle = hintfull
   10.19 +gtk-xft-rgba = rgb