wok-next rev 21113

Update gtk2
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jan 12 15:23:59 2019 +0200 (2019-01-12)
parents 95afb7884ec0
children 742d2b96f24d
files gtk2/receipt gtk2/stuff/README gtk2/stuff/gtk+-demo.desktop gtk2/stuff/gtk2-demo.desktop retawq/receipt
line diff
     1.1 --- a/gtk2/receipt	Sat Jan 12 13:31:42 2019 +0200
     1.2 +++ b/gtk2/receipt	Sat Jan 12 15:23:59 2019 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="gtk2"
     1.7 -VERSION="2.24.31"
     1.8 +VERSION="2.24.32"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="The GIMP Toolkit"
    1.11  MAINTAINER="devel@slitaz.org"
    1.12 @@ -11,61 +11,42 @@
    1.13  
    1.14  TARBALL="gtk+-$VERSION.tar.xz"
    1.15  WGET_URL="$GNOME_MIRROR/gtk+/${VERSION:0:4}/$TARBALL"
    1.16 +TARBALL_SHA1="c885ade62b06854590822c8eb906daf7dd15d90a"
    1.17  
    1.18  COOKOPTS="force-arch" # different .pc
    1.19  
    1.20 -BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
    1.21 -symlinks \
    1.22 -glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
    1.23 -gobject-introspection-dev gtk-doc automake gettext-dev libxinerama-dev"
    1.24  BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
    1.25  gobject-introspection-dev gtk-doc gettext-dev libxinerama-dev \
    1.26  shared-mime-info-dev"
    1.27  SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
    1.28  
    1.29 +COPY_demo="gtk-demo demo/ *.desktop"
    1.30 +CAT_demo="development|example code and demo"
    1.31 +
    1.32 +DEPENDS_demo="$PACKAGE gdk-pixbuf glib libcairo pango"
    1.33 +DEPENDS_std="atk fontconfig gdk-pixbuf glib libcairo libcups libx11 libxext \
    1.34 +libxinerama libxrender pango"
    1.35 +DEPENDS_dev="$PACKAGE atk-dev cairo-dev gdk-pixbuf-dev glib-dev pango-dev"
    1.36 +
    1.37 +CONFIG_FILES_std="/etc/gtk-2.0/im-multipress.conf"
    1.38 +
    1.39 +COOKOPTS="!menus"
    1.40 +
    1.41  compile_rules() {
    1.42 -#	. $stuff/replace-icons-paper; cd $src
    1.43 -
    1.44 -#	find $src -type f -name 'Makefile.in' -exec sed -i 's|1.15|1.15.1|' '{}' \;
    1.45 -# or
    1.46 -#	autoreconf -fi && # fix 'version mismatch' between 1.15 and 1.15.1
    1.47  	./configure \
    1.48  		--enable-debug=no \
    1.49  		$CONFIGURE_ARGS &&
    1.50  	fix libtool &&
    1.51 -	make $MAKEFLAGS $LIBTOOL &&
    1.52 +	make &&
    1.53  	make install || return 1
    1.54  
    1.55 -	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
    1.56 +	touch $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
    1.57 +	ln -s ../../usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
    1.58  		$install/etc/gtk-2.0/gdk-pixbuf.loaders
    1.59 -
    1.60 -	mkdir -p $install/usr/share/applications
    1.61 -	cp $stuff/*.desktop $install/usr/share/applications
    1.62 +	install -Dm644 $stuff/gtk2-demo.desktop \
    1.63 +		$install/usr/share/applications/gtk2-demo.desktop
    1.64  }
    1.65  
    1.66 -genpkg_rules() {
    1.67 -	case $PACKAGE in
    1.68 -		*-demo)
    1.69 -			copy gtk-demo demo/ *.desktop
    1.70 -			CAT="development|example code and demo"
    1.71 -			DEPENDS="libcairo gdk-pixbuf glib gtk2 pango"
    1.72 -			;;
    1.73 -		gtk2)
    1.74 -			COOKOPTS="!menus"
    1.75 -			copy @std @rm
    1.76 -			DEPENDS="atk libcairo fontconfig gdk-pixbuf glib libcups pango \
    1.77 -			libx11 libxext libxinerama libxrender"
    1.78 -			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
    1.79 -			SUGGESTED="cups gnutls libgcrypt libgpg-error"
    1.80 -			;;
    1.81 -		*-dev)
    1.82 -			copy @dev
    1.83 -			DEPENDS="gtk2 \
    1.84 -			atk-dev cairo-dev gdk-pixbuf-dev glib-dev pango-dev"
    1.85 -			;;
    1.86 -	esac
    1.87 -}
    1.88 -
    1.89 -post_install_gtk_() {
    1.90 +post_install_gtk2() {
    1.91  	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache
    1.92  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/gtk2/stuff/README	Sat Jan 12 15:23:59 2019 +0200
     2.3 @@ -0,0 +1,19 @@
     2.4 +Attempt to replace default stock icons with the icons from the currently used
     2.5 +icon theme (paper-icon-theme) will allow to slim down the icon theme removing
     2.6 +these icons from there leaving them only inside gtk.
     2.7 +
     2.8 +To try:
     2.9 +
    2.10 +  1. Add to BUILD_DEPENDS:
    2.11 +     * paper-icon-theme
    2.12 +     * rsvg-convert
    2.13 +     * optipng-static
    2.14 +     * pngquant-static
    2.15 +     * symlinks
    2.16 +     * automake
    2.17 +  2. Call the script in the beginning of compile_rules():
    2.18 +     . $stuff/replace-icons-paper
    2.19 +     cd $src
    2.20 +  3. Regenerate the sources using:
    2.21 +     autoreconf -fi
    2.22 +  4. Then, as usual, configure - make - make install
     3.1 --- a/gtk2/stuff/gtk+-demo.desktop	Sat Jan 12 13:31:42 2019 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,6 +0,0 @@
     3.4 -[Desktop Entry]
     3.5 -Type=Application
     3.6 -Name=GTK+ Code demo
     3.7 -Exec=gtk-demo
     3.8 -Icon=gtk
     3.9 -Categories=GTK;Development;
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/gtk2/stuff/gtk2-demo.desktop	Sat Jan 12 15:23:59 2019 +0200
     4.3 @@ -0,0 +1,6 @@
     4.4 +[Desktop Entry]
     4.5 +Type=Application
     4.6 +Name=GTK+ Code demo
     4.7 +Exec=gtk-demo
     4.8 +Icon=gtk
     4.9 +Categories=GTK;Development;
     5.1 --- a/retawq/receipt	Sat Jan 12 13:31:42 2019 +0200
     5.2 +++ b/retawq/receipt	Sat Jan 12 15:23:59 2019 +0200
     5.3 @@ -10,6 +10,7 @@
     5.4  
     5.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     5.6  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     5.7 +TARBALL_SHA1="ac99979e99ae3b3edba547dd23d54c8f5fb3c6f5"
     5.8  
     5.9  BUILD_DEPENDS="ncurses-dev openssl-dev gettext-dev"
    5.10  DEPENDS="ncurses openssl"