wok diff gtk+/receipt @ rev 14623

merge
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Jun 01 10:16:08 2013 +0000 (2013-06-01)
parents 5b67942406c8
children a28eeb5b8fcd
line diff
     1.1 --- a/gtk+/receipt	Sat Oct 20 06:16:34 2012 +0000
     1.2 +++ b/gtk+/receipt	Sat Jun 01 10:16:08 2013 +0000
     1.3 @@ -17,8 +17,8 @@
     1.4  xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
     1.5  xorg-libXfixes xorg-libXinerama xorg-libXrender xorg-libXrandr"
     1.6  BUILD_DEPENDS="bash pkg-config xorg-xextproto cups-dev libcomerr3 cups dbus-dev \
     1.7 -gobject-introspection gobject-introspection-dev libffi-dev perl gdk-pixbuf-dev \
     1.8 -atk-dev pango-dev cairo-dev libgio-dev xorg-dev"
     1.9 +gobject-introspection gobject-introspection-dev libffi-dev perl atk-dev \
    1.10 +pango-dev cairo-dev gdk-pixbuf-dev"
    1.11  
    1.12  # Rules to configure and make the package.
    1.13  compile_rules()
    1.14 @@ -41,17 +41,17 @@
    1.15  	mkdir -p $fs/usr/lib/gtk-2.0 $fs/usr/share $fs/usr/bin
    1.16  
    1.17  	# Libs.
    1.18 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.19 -	cp -a $_pkg/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
    1.20 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.21 +	cp -a $install/usr/lib/gtk-2.0/2.10.0 $fs/usr/lib/gtk-2.0
    1.22  	rm -rf $fs/usr/lib/gtk-2.0/2.10.0/*/*.la
    1.23  
    1.24  	# Themes
    1.25 -	cp -a $_pkg/usr/share/themes $fs/usr/share
    1.26 +	cp -a $install/usr/share/themes $fs/usr/share
    1.27  
    1.28  	# Apps.
    1.29 -	cp  $_pkg/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
    1.30 -	cp  $_pkg/usr/bin/gtk-update-icon-cache $fs/usr/bin
    1.31 -	cp  $_pkg/usr/bin/gtk-builder-convert $fs/usr/bin
    1.32 +	cp -a $install/usr/bin/gtk-query-immodules-2.0 $fs/usr/bin
    1.33 +	cp -a $install/usr/bin/gtk-update-icon-cache $fs/usr/bin
    1.34 +	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
    1.35  
    1.36  	mkdir -p $fs/etc/gtk-2.0
    1.37  	touch $fs/etc/gtk-2.0/gtk.immodules