Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=52b928f09421ac94e0a45f2e7235feea2af48f11
commit 52b928f09421ac94e0a45f2e7235feea2af48f11 Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Oct 2 14:12:13 2010 +0200 gtk+2-2.22.0-2-x86_64 *conflict is useless since 2.22.0 \o/ diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 94c535e..055017c 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -4,12 +4,12 @@ pkgname=gtk+2 _F_gnome_name=gtk+ pkgver=2.22.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (2.x series)" -depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2') +depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4') rodepends=('gnome-icon-theme' 'shared-mime-info') groups=('xlib') -makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection') +makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection' 'gdk-pixbuf2') archs=('i686' 'x86_64' 'ppc') Finclude gnome up2date=$pkgver @@ -22,6 +22,7 @@ subdescs=("${subdes...@]}" "GTK+2 core libraries.") subdepends=("${subdepen...@]}" "libxinerama libxi libxrandr libxcursor pango>=1.28.0-2 libstdc++ libxcomposite libxdamage atk>=1.28.0 libxau libxdmcp libxml2") subrodepends=("${subrodepen...@]}" "") +subconflicts=("${subconflic...@]}" "") subgroups=("${subgrou...@]}" 'xlib') subarchs=("${subarc...@]}" 'i686 x86_64 ppc') @@ -30,6 +31,7 @@ subpkgs=("${subpk...@]}" "$pkgname-tools") subdescs=("${subdes...@]}" "GTK+2 commandline tools.") subdepends=("${subdepen...@]}" "glib2>=2.22.4") subrodepends=("${subrodepen...@]}" "$pkgname-libs>=$pkgver") +subconflicts=("${subconflic...@]}" "") subgroups=("${subgrou...@]}" 'xapps') subarchs=("${subarc...@]}" 'i686 x86_64 ppc') @@ -41,6 +43,7 @@ subpkgs=("${subpk...@]}" "gail") subdescs=("${subdes...@]}" "Accessibility support for GTK+2 and libgnomecanvas") subdepends=("${subdepen...@]}" "libxext libxfixes cairo>=1.8.8 zlib libgcc") subrodepends=("${subrodepen...@]}" "$pkgname-libs>=$pkgver") +subconflicts=("${subconflic...@]}" "") subgroups=("${subgrou...@]}" 'xlib') subarchs=("${subarc...@]}" 'i686 x86_64 ppc') @@ -48,6 +51,7 @@ subpkgs=("${subpk...@]}" "$pkgname-docs") subdescs=("${subdes...@]}" "GTK+2 Documentation.") subdepends=("${subdepen...@]}" "") subrodepends=("${subrodepen...@]}" "") +subconflicts=("${subconflic...@]}" "") subgroups=("${subgrou...@]}" 'docs-extra') subarchs=("${subarc...@]}" 'i686 x86_64 ppc') @@ -55,10 +59,10 @@ subpkgs=("${subpk...@]}" "$pkgname-demos") subdescs=("${subdes...@]}" "GTK+2 Demos.") subdepends=("${subdepen...@]}" "") subrodepends=("${subrodepen...@]}" "$pkgname>=$pkgver") +subconflicts=("${subconflic...@]}" "") subgroups=("${subgrou...@]}" 'xapps-extra') subarchs=("${subarc...@]}" 'i686 x86_64 ppc') - build() { Fbuild \ @@ -69,17 +73,6 @@ build() { --with-libpng \ --disable-dependency-tracking \ --with-x - #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/girepository-1.0/GdkPixbuf-2.0.typelib - Frm /usr/lib/libgdk_pixbuf-2.0.* - Frm /usr/lib/libgdk_pixbuf_xlib-2.0.* - Frm /usr/lib/pkgconfig/gdk-pixbuf-2.0.* - Frm /usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.* - Frm /usr/bin/gdk-pixbuf* #Split gail Fsplit gail usr/include/gail-* _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git