Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=903aa522e389822e73ce4626260650857eec6dce
commit 903aa522e389822e73ce4626260650857eec6dce
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sat Jul 3 00:58:55 2010 +0000
gtk+2-2.20.1-4-i686
*fixed conflict
*use standalone gdk-pixbuf2
diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild
index 5ba4851..e651618 100644
--- a/source/xlib/gtk+2/FrugalBuild
+++ b/source/xlib/gtk+2/FrugalBuild
@@ -4,14 +4,13 @@
pkgname=gtk+2
_F_gnome_name=gtk+
pkgver=2.20.1
-pkgrel=3
+pkgrel=4
pkgdesc="The GTK+ Toolkit (2.x series)"
depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a'
'libtiff' 'libcups>=1.3.11-4')
-rodepends=('gnome-icon-theme' 'shared-mime-info')
+rodepends=('gnome-icon-theme' 'shared-mime-info' 'gdk-pixbuf2')
groups=('xlib')
makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection')
archs=('i686' 'x86_64' 'ppc')
-conflicts=("gdk-pixbuf2")
Finclude gnome
up2date=$pkgver
url="http://www.gtk.org/";
@@ -95,6 +94,16 @@ build() {
Fmkdir /etc/gtk-2.0
echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie
Fsplit $pkgname-docs usr/share/gtk-doc
+
+ #drop gdk-pixbuf2 conflict for use gdk-pixbuf2
+ #gnome have explode gtk :)
+ Frm /usr/share/man/man1/gdk-pixbuf*
+ Frm /usr/share/gtk-doc/html/gdk-pixbuf
+ Frm /usr/share/gir-1.0/GdkPixbuf-2.0.gir
+ Frm /usr/lib/pkgconfig/gdk-pixbuf*
+ Frm /usr/lib/libgdk_pixbuf*
+ Frm /usr/lib/girepository-1.0/GdkPixbuf-2.0.typelib
+ Frm /usr/bin/gdk-pixbuf*
}
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
