wok diff gtk+/receipt @ rev 23244

updated ninja (1.9.0 -> 1.10.0)
author Hans-G?nter Theisgen
date Wed Mar 25 10:19:28 2020 +0100 (2020-03-25)
parents 41a551d8ddd5
children 3e2a0347b2f1
line diff
     1.1 --- a/gtk+/receipt	Tue Mar 19 20:36:17 2019 +0100
     1.2 +++ b/gtk+/receipt	Wed Mar 25 10:19:28 2020 +0100
     1.3 @@ -1,32 +1,36 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="gtk+"
     1.7 -VERSION="2.24.24"
     1.8 +VERSION="2.24.32"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="The GIMP Toolkit."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 +WEB_SITE="https://www.gtk.org/"
    1.14 +
    1.15 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.16 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    1.17 +
    1.18  SUGGESTED="cups gnutls libgcrypt libgpg-error"
    1.19 -TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.20 -WEB_SITE="https://www.gtk.org/"
    1.21 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    1.22 +DEPENDS="atk cairo expat fontconfig freetype gdk-pixbuf glib glibc-base 
    1.23 +	harfbuzz jpeg libgio libpng libxcb pango pixman tiff xcb-util 
    1.24 +	xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor 
    1.25 +	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes 
    1.26 +	xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
    1.27 +
    1.28 +BUILD_DEPENDS="atk-dev automake dbus-dev dbus-glib-dev faenza-icon-theme 
    1.29 +	fontconfig-dev freetype-dev gdk-pixbuf-dev harfbuzz-dev libffi-dev 
    1.30 +	libpng-dev libxcb-dev libxml2-dev optipng pango-dev pixman-dev 
    1.31 +	xorg-inputproto xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev 
    1.32 +	xorg-xextproto"
    1.33 +
    1.34  HOST_ARCH="i486 arm"
    1.35  
    1.36 -DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \
    1.37 -jpeg tiff gdk-pixbuf fontconfig freetype pixman libgio xorg-libX11 xorg-libXau \
    1.38 -xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
    1.39 -xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr harfbuzz"
    1.40 -
    1.41 -BUILD_DEPENDS="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
    1.42 -xorg-inputproto libxcb-dev fontconfig-dev freetype-dev pixman-dev libxml2-dev \
    1.43 -libpng-dev libffi-dev xorg-xextproto harfbuzz-dev faenza-icon-theme optipng \
    1.44 -xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev automake"
    1.45 -
    1.46  # Handle cross compilation.
    1.47  case "$ARCH" in
    1.48  	i?86)
    1.49 -		BUILD_DEPENDS="$BUILD_DEPENDS bash pkg-config cups-dev perl \
    1.50 -		gobject-introspection-dev" ;;
    1.51 +		BUILD_DEPENDS="$BUILD_DEPENDS bash cups-dev gobject-introspection-dev \
    1.52 +		perl pkg-config" ;;
    1.53  	arm*)
    1.54  		ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
    1.55  		--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
    1.56 @@ -38,14 +42,15 @@
    1.57  # Rules to configure and make the package.
    1.58  compile_rules()
    1.59  {
    1.60 -	. $stuff/replace-icons; cd $src
    1.61 +	. $stuff/replace-icons
    1.62 +	cd $src
    1.63  	patch -p0 < $stuff/undo_gen_icons.patch
    1.64 +	find . -name Makefile.in | xargs sed -i 's|@AUTOMAKE@|automake|'
    1.65  
    1.66 -	find . -name Makefile.in | xargs sed -i 's|@AUTOMAKE@|automake|'
    1.67 -	./configure \
    1.68 -		--prefix=/usr \
    1.69 -		--sysconfdir=/etc \
    1.70 -		--with-html-dir=/usr/share/doc \
    1.71 +	./configure				\
    1.72 +		--prefix=/usr			\
    1.73 +		--sysconfdir=/etc		\
    1.74 +		--with-html-dir=/usr/share/doc	\
    1.75  		$CONFIGURE_ARGS ${ARCH_ARGS} &&
    1.76  	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
    1.77  	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool &&
    1.78 @@ -56,27 +61,28 @@
    1.79  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.80  genpkg_rules()
    1.81  {
    1.82 -	mkdir -p $fs/usr/lib/gtk-2.0 $fs/usr/share $fs/usr/bin
    1.83 +	mkdir -p $fs/usr/lib/gtk-2.0
    1.84 +	mkdir -p $fs/usr/share $fs/usr/bin
    1.85  
    1.86 -	# Libs.
    1.87 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.88 -	cp -a $install/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
    1.89 -	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.la
    1.90 +	# Libraries.
    1.91 +	cp -a $install/usr/lib/*.so*		$fs/usr/lib
    1.92 +	cp -a $install/usr/lib/gtk-2.0/2.10.0	$fs/usr/lib/gtk-2.0
    1.93 +	rm -rf					$fs/usr/lib/gtk-2.0/2.10.0/*/*.la
    1.94  
    1.95  	# Themes
    1.96 -	cp -a $install/usr/share/themes $fs/usr/share
    1.97 +	cp -a $install/usr/share/themes		$fs/usr/share
    1.98  
    1.99 -	# Apps.
   1.100 -	cp -a $install/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
   1.101 -	cp -a $install/usr/bin/gtk-update-icon-cache $fs/usr/bin
   1.102 -	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
   1.103 +	# Applications.
   1.104 +	cp -a $install/usr/bin/gtk-query-immodules-2.0	$fs/usr/bin
   1.105 +	cp -a $install/usr/bin/gtk-update-icon-cache	$fs/usr/bin
   1.106 +	cp -a $install/usr/bin/gtk-builder-convert	$fs/usr/bin
   1.107  
   1.108  	mkdir -p $fs/etc/gtk-2.0
   1.109  	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
   1.110  		$fs/etc/gtk-2.0/gdk-pixbuf.loaders
   1.111  }
   1.112  
   1.113 -# Pre and post install commands for Tazpkg.
   1.114 +# Post install commands for Tazpkg.
   1.115  post_install()
   1.116  {
   1.117  	mkdir -p "$1/etc/gtk-2.0"