wok rev 22893

updated gtk+, gtk+-dev and gtk+-demo (2.24.24 -> 2.24.32)
author Hans-G?nter Theisgen
date Sun Feb 23 10:37:39 2020 +0100 (19 months ago)
parents 6a74e77788e6
children 3a6b4742a70c 1805c677ac71
files gtk+-demo/receipt gtk+-dev/receipt gtk+/receipt
line diff
     1.1 --- a/gtk+-demo/receipt	Sun Feb 23 08:33:38 2020 +0100
     1.2 +++ b/gtk+-demo/receipt	Sun Feb 23 10:37:39 2020 +0100
     1.3 @@ -1,22 +1,25 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="gtk+-demo"
     1.7 -VERSION="2.24.24"
     1.8 +VERSION="2.24.32"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="The GIMP Toolkit example code and demo."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 -WANTED="gtk+"
    1.14  WEB_SITE="https://www.gtk.org/"
    1.15 -HOST_ARCH="i486 arm"
    1.16  
    1.17  DEPENDS="gtk+"
    1.18 +WANTED="gtk+"
    1.19 +
    1.20 +HOST_ARCH="i486 arm"
    1.21  
    1.22  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.23  genpkg_rules()
    1.24  {
    1.25 -	mkdir -p $fs/usr/bin $fs/usr/share/applications
    1.26 -	cp -a $install/usr/bin/gtk-demo $fs/usr/bin
    1.27 -	cp -a $install/usr/share/gtk-2.0 $fs/usr/share
    1.28 -	cp $stuff/*.desktop $fs/usr/share/applications
    1.29 +	mkdir -p $fs/usr/bin
    1.30 +	mkdir -p $fs/usr/share/applications
    1.31 +
    1.32 +	cp -a $install/usr/bin/gtk-demo		$fs/usr/bin
    1.33 +	cp -a $install/usr/share/gtk-2.0	$fs/usr/share
    1.34 +	cp $stuff/*.desktop			$fs/usr/share/applications
    1.35  }
     2.1 --- a/gtk+-dev/receipt	Sun Feb 23 08:33:38 2020 +0100
     2.2 +++ b/gtk+-dev/receipt	Sun Feb 23 10:37:39 2020 +0100
     2.3 @@ -1,29 +1,32 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="gtk+-dev"
     2.7 -VERSION="2.24.24"
     2.8 +VERSION="2.24.32"
     2.9  CATEGORY="development"
    2.10 -SHORT_DESC="The GIMP Toolkit."
    2.11 +SHORT_DESC="The GIMP Toolkit - development files."
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14 +WEB_SITE="https://www.gtk.org/"
    2.15 +
    2.16 +DEPENDS="atk-dev cairo-dev gdk-pixbuf-dev glib-dev gtk+ jpeg-dev 
    2.17 +	libgio-dev libpng-dev libxml2-dev pango-dev pkg-config tiff-dev"
    2.18  WANTED="gtk+"
    2.19 -WEB_SITE="https://www.gtk.org/"
    2.20 +
    2.21  HOST_ARCH="i486 arm"
    2.22  
    2.23 -DEPENDS="cairo-dev glib-dev pango-dev atk-dev tiff-dev pkg-config \
    2.24 -libpng-dev jpeg-dev libgio-dev gtk+ gdk-pixbuf-dev libxml2-dev"
    2.25 -
    2.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.27  genpkg_rules()
    2.28  {
    2.29 -	mkdir -p $fs/usr/lib $fs/usr/share
    2.30 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    2.31 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    2.32 -	cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    2.33 -	# Copy all libs and remove the shared.
    2.34 -	cp -a $install/usr/lib/gtk-2.0 $fs/usr/lib
    2.35 -	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.so*
    2.36 -	cp -a $install/usr/include $fs/usr
    2.37 -	cp -a $install/usr/share/gir-1.0 $fs/usr/share
    2.38 -	cp -a $install/usr/share/aclocal $fs/usr/share
    2.39 +	mkdir -p $fs/usr/lib
    2.40 +	mkdir -p $fs/usr/share
    2.41 +
    2.42 +	cp -a $install/usr/lib/*.*a		$fs/usr/lib
    2.43 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    2.44 +	cp -a $install/usr/lib/girepository-1.0	$fs/usr/lib
    2.45 +	# Copy all libraries and remove the shared.
    2.46 +	cp -a $install/usr/lib/gtk-2.0		$fs/usr/lib
    2.47 +	rm -rf					$fs/usr/lib/gtk-2.0/2.10.0/*/*.so*
    2.48 +	cp -a $install/usr/include		$fs/usr
    2.49 +	cp -a $install/usr/share/gir-1.0	$fs/usr/share
    2.50 +	cp -a $install/usr/share/aclocal	$fs/usr/share
    2.51  }
     3.1 --- a/gtk+/receipt	Sun Feb 23 08:33:38 2020 +0100
     3.2 +++ b/gtk+/receipt	Sun Feb 23 10:37:39 2020 +0100
     3.3 @@ -1,32 +1,36 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="gtk+"
     3.7 -VERSION="2.24.24"
     3.8 +VERSION="2.24.32"
     3.9  CATEGORY="x-window"
    3.10  SHORT_DESC="The GIMP Toolkit."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  LICENSE="GPL2"
    3.13 +WEB_SITE="https://www.gtk.org/"
    3.14 +
    3.15 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    3.16 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    3.17 +
    3.18  SUGGESTED="cups gnutls libgcrypt libgpg-error"
    3.19 -TARBALL="$PACKAGE-$VERSION.tar.xz"
    3.20 -WEB_SITE="https://www.gtk.org/"
    3.21 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    3.22 +DEPENDS="atk cairo expat fontconfig freetype gdk-pixbuf glib glibc-base 
    3.23 +	harfbuzz jpeg libgio libpng libxcb pango pixman tiff xcb-util 
    3.24 +	xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor 
    3.25 +	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes 
    3.26 +	xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
    3.27 +
    3.28 +BUILD_DEPENDS="atk-dev automake dbus-dev dbus-glib-dev faenza-icon-theme 
    3.29 +	fontconfig-dev freetype-dev gdk-pixbuf-dev harfbuzz-dev libffi-dev 
    3.30 +	libpng-dev libxcb-dev libxml2-dev optipng pango-dev pixman-dev 
    3.31 +	xorg-inputproto xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev 
    3.32 +	xorg-xextproto"
    3.33 +
    3.34  HOST_ARCH="i486 arm"
    3.35  
    3.36 -DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \
    3.37 -jpeg tiff gdk-pixbuf fontconfig freetype pixman libgio xorg-libX11 xorg-libXau \
    3.38 -xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
    3.39 -xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr harfbuzz"
    3.40 -
    3.41 -BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
    3.42 -xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \
    3.43 -libpng-dev libffi-dev xorg-xextproto harfbuzz-dev faenza-icon-theme optipng \
    3.44 -xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev automake"
    3.45 -
    3.46  # Handle cross compilation.
    3.47  case "$ARCH" in
    3.48  	i?86)
    3.49 -		BUILD_DEPENDS="$BUILD_DEPENDS bash pkg-config cups-dev perl \
    3.50 -		gobject-introspection-dev" ;;
    3.51 +		BUILD_DEPENDS="$BUILD_DEPENDS bash cups-dev gobject-introspection-dev \
    3.52 +		perl pkg-config" ;;
    3.53  	arm*)
    3.54  		ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
    3.55  		--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
    3.56 @@ -38,14 +42,15 @@
    3.57  # Rules to configure and make the package.
    3.58  compile_rules()
    3.59  {
    3.60 -	. $stuff/replace-icons; cd $src
    3.61 +	. $stuff/replace-icons
    3.62 +	cd $src
    3.63  	patch -p0 < $stuff/undo_gen_icons.patch
    3.64 +	find . -name Makefile.in | xargs sed -i 's|@AUTOMAKE@|automake|'
    3.65  
    3.66 -	find . -name Makefile.in | xargs sed -i 's|@AUTOMAKE@|automake|'
    3.67 -	./configure \
    3.68 -		--prefix=/usr \
    3.69 -		--sysconfdir=/etc \
    3.70 -		--with-html-dir=/usr/share/doc \
    3.71 +	./configure				\
    3.72 +		--prefix=/usr			\
    3.73 +		--sysconfdir=/etc		\
    3.74 +		--with-html-dir=/usr/share/doc	\
    3.75  		$CONFIGURE_ARGS ${ARCH_ARGS} &&
    3.76  	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
    3.77  	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool &&
    3.78 @@ -56,27 +61,28 @@
    3.79  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.80  genpkg_rules()
    3.81  {
    3.82 -	mkdir -p $fs/usr/lib/gtk-2.0 $fs/usr/share $fs/usr/bin
    3.83 +	mkdir -p $fs/usr/lib/gtk-2.0
    3.84 +	mkdir -p $fs/usr/share $fs/usr/bin
    3.85  
    3.86 -	# Libs.
    3.87 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.88 -	cp -a $install/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
    3.89 -	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.la
    3.90 +	# Libraries.
    3.91 +	cp -a $install/usr/lib/*.so*		$fs/usr/lib
    3.92 +	cp -a $install/usr/lib/gtk-2.0/2.10.0	$fs/usr/lib/gtk-2.0
    3.93 +	rm -rf					$fs/usr/lib/gtk-2.0/2.10.0/*/*.la
    3.94  
    3.95  	# Themes
    3.96 -	cp -a $install/usr/share/themes $fs/usr/share
    3.97 +	cp -a $install/usr/share/themes		$fs/usr/share
    3.98  
    3.99 -	# Apps.
   3.100 -	cp -a $install/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
   3.101 -	cp -a $install/usr/bin/gtk-update-icon-cache $fs/usr/bin
   3.102 -	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
   3.103 +	# Applications.
   3.104 +	cp -a $install/usr/bin/gtk-query-immodules-2.0	$fs/usr/bin
   3.105 +	cp -a $install/usr/bin/gtk-update-icon-cache	$fs/usr/bin
   3.106 +	cp -a $install/usr/bin/gtk-builder-convert	$fs/usr/bin
   3.107  
   3.108  	mkdir -p $fs/etc/gtk-2.0
   3.109  	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
   3.110  		$fs/etc/gtk-2.0/gdk-pixbuf.loaders
   3.111  }
   3.112  
   3.113 -# Pre and post install commands for Tazpkg.
   3.114 +# Post install commands for Tazpkg.
   3.115  post_install()
   3.116  {
   3.117  	mkdir -p "$1/etc/gtk-2.0"