Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=4b2c1b4fd1bbe2401cf40b5829f5f4ce17fa2e2f
commit 4b2c1b4fd1bbe2401cf40b5829f5f4ce17fa2e2f Author: crazy <[email protected]> Date: Tue Jan 5 20:15:52 2016 +0100 gtk+2-2.24.29-2-x86_64 * rebuild with tc/ffi/png * depends() / subdepends() / makedepends() fixes * FB cleanup diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 4d21ec1..370c33e 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.24.29 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (2.x series)" -depends=('libxext' 'libxfixes' 'cairo>=1.14.2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2>=2.31.3') -rodepends=('adwaita-icon-theme' 'shared-mime-info') +depends=('pango>=1.38.1-2' 'libcups>=2.1.2-2' 'gdk-pixbuf2>=2.32.3-2' 'libffi>=3.2.1' 'libpng>=1.6.20') +rodepends=('adwaita-icon-theme' 'shared-mime-info' 'gtk+2-libs') groups=('xlib') -makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection' 'shared-mime-info') +makedepends=('gtk-doc' 'cups>=2.1.2-2' 'gobject-introspection' 'shared-mime-info') archs=('i686' 'x86_64' 'arm') replaces=('libgail-gnome') provides=('libgail-gnome') @@ -18,39 +18,25 @@ Finclude gnome up2date=$pkgver url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" -source=($source \ - xid-collision-debug.patch \ - gtkrc ) - +source=($source xid-collision-debug.patch gtkrc) sha1sums=('23eab0093cf3cd91b36ac0dbe21e1f0f85adb6af' \ '75c461740e18696a792739cd1f9a20327dbb23bb' \ 'a11a695c99225a802860ceabaf670101d1aef9dc') subpkgs=("${subpkgs[@]}" "$pkgname-libs") subdescs=("${subdescs[@]}" "GTK+2 core libraries.") -subdepends=("${subdepends[@]}" "libxinerama libxi libxrandr libxcursor pango>=1.36.8-3 libstdc++ - libxcomposite libxdamage atk>=2.16.0 libxau libxdmcp libxml2>=2.7.8") +subdepends=("${subdepends[@]}" "pango>=1.38.1-2 libxinerama>=1.1.3-2 libxi>=1.7.6 libxrandr>=1.5.0-4 \ + libxcursor>=1.1.14-2 libxcomposite>=0.4.4-2 gdk-pixbuf2>=2.32.3-2 atk>=2.18.0-3") subrodepends=("${subrodepends[@]}" "") subconflicts=("${subconflicts[@]}" "") subgroups=("${subgroups[@]}" 'xlib') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') -## split more maybe ? -#subpkgs=("${subpkgs[@]}" "$pkgname-tools") -#subdescs=("${subdescs[@]}" "GTK+2 commandline tools.") -#subdepends=("${subdepends[@]}" "glib2>=2.44.0 gdk-pixbuf2>=2.31.3") -#subrodepends=("${subrodepends[@]}" "") -#subconflicts=("${subconflicts[@]}" "") -#subgroups=("${subgroups[@]}" 'xapps') -#subarchs=("${subarchs[@]}" 'i686 x86_64 arm') - -## for now so it won't break anything ... -## for >1.3 scripts / schemas should be fixed -rodepends=("${rodepends[@]}" "${subpkgs[@]}") subpkgs=("${subpkgs[@]}" "gail") subdescs=("${subdescs[@]}" "Accessibility support for GTK+2 and libgnomecanvas") -subdepends=("${subdepends[@]}" "libxext libxfixes cairo>=1.14.2 zlib libgcc") +subdepends=("${subdepends[@]}" "pango>=1.38.1-2 gdk-pixbuf2>=2.32.3-2 atk>=2.18.0-3 \ + libffi>=3.2.1 libpng>=1.6.20") subrodepends=("${subrodepends[@]}" "$pkgname-libs>=$pkgver") subconflicts=("${subconflicts[@]}" "") subgroups=("${subgroups[@]}" 'xlib') @@ -61,31 +47,32 @@ subdescs=("${subdescs[@]}" "GTK+2 Documentation.") subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "") subconflicts=("${subconflicts[@]}" "") -subgroups=("${subgroups[@]}" 'docs-extra') +subgroups=("${subgroups[@]}" 'gnome-extra docs-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') subpkgs=("${subpkgs[@]}" "$pkgname-demos") subdescs=("${subdescs[@]}" "GTK+2 Demos.") subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subconflicts=("${subconflicts[@]}" "") +subconflicts=("${subconflicts[@]}" "pango>=1.38.1-2 gdk-pixbuf2>=2.32.3-2 libffi>=3.2.1 libpng>=1.6.20") subgroups=("${subgroups[@]}" 'xapps-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') build() { + + Fcd Fpatchall - #mkdir -p m4 Fautoreconf Fmake \ --with-xinput=yes \ --enable-gtk-doc \ --enable-man \ --with-gdktarget=x11 \ - --with-libpng \ --disable-dependency-tracking \ --with-x Fmakeinstall + #Split gail Fsplit gail usr/include/gail-* Fsplit gail usr/lib/gtk-2.0/modules/libferret* @@ -98,20 +85,13 @@ build() { Fsplit $pkgname-libs usr/lib/lib*-x11* Fsplit $pkgname-libs usr/lib/pkgconfig/g*-x11-*.pc - ## split also gtk-update-icon-cache , install scripts need that - #Fsplit $pkgname-tools usr/bin/gtk-update-icon-cache - #Fsplit $pkgname-tools usr/share/man/man1/gtk-update-icon-cache* - #Fsplit $pkgname-tools usr/bin/gtk-builder-convert - #Fsplit $pkgname-tools usr/share/man/man1/gtk-builder-convert* Frm usr/bin/gtk-update-icon-cache Frm usr/share/man/man1/gtk-update-icon-cache* - + ## -demos Fsplit $pkgname-demos usr/share/gtk-2.0/demo Fsplit $pkgname-demos usr/bin/*-demo* - #Fmkdir /etc/gtk-2.0 - #echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie Fcp gtkrc usr/share/gtk-2.0/gtkrc Fsplit $pkgname-docs usr/share/gtk-doc } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
