Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=8737f55b6acaf8cdcec4aa9cb986723a66976395
commit 8737f55b6acaf8cdcec4aa9cb986723a66976395 Author: crazy <[email protected]> Date: Tue Jan 5 18:16:27 2016 +0100 gtk+3-3.18.6-2-x86_64 * rebuild with tc/png/ffi * fix all subpackages * removed -docs subpackage , just use _F_gnome_doc=y * renamed immodules* in gtk+3-... * fix depends() / subdepends() * FB cleanup * uses minimal and not full debug diff --git a/source/xlib/gtk+3/FrugalBuild b/source/xlib/gtk+3/FrugalBuild index 9a3b6ef..9e00177 100644 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@ -2,17 +2,18 @@ # Maintainer: Baste <[email protected]> # Contributor: bouleetbil <[email protected]> + +## TODO: split cups and whever other optional stuff + pkgname=gtk+3 _F_gnome_name=gtk+ pkgver=3.18.6 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (3.x series)" -depends=('atk>=2.18.0' 'cairo' 'libcups>=2.0.3-4' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' \ - 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk>=2.18.0' \ - 'wayland>=1.7.0' 'libxkbcommon' 'libepoxy' 'libwayland-egl' 'adwaita-icon-theme') -makedepends=('gobject-introspection' 'gtk-doc>=1.24' 'cups') -#rodepends=('gnome-icon-theme' 'gtk+3-tools' 'gnome-themes-standard') -rodepends=('gtk+3-tools') +depends=('gdk-pixbuf2>=2.32.3-2' 'pango>=1.38.1-2' 'libxcursor>=1.1.14-2' 'libxcomposite>=0.4.4-2' 'libxkbcommon>=0.5.0-3' 'libwayland-egl>=11.1.0-2' \ + 'libepoxy>=1.3.1-3' 'at-spi2-atk' 'colord>=1.2.12-5' 'libcups>=2.1.2-2' 'libpng>=1.6.20' 'libffi>=3.2.1') +makedepends=('gobject-introspection>=1.46.0-2' 'gtk-doc>=1.24' 'cups>=2.1.2-2' 'json-glib>=1.0.4-2' 'shared-mime-info') +rodepends=('gtk+3-tools' 'gtk-update-icon-cache' 'adwaita-icon-theme' 'shared-mime-info') groups=('xlib') archs=('i686' 'x86_64' 'arm') @@ -21,6 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_ext=".tar.xz" _F_gnome_devel="n" _F_gnome_immodules="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" @@ -36,112 +38,89 @@ fi subpkgs=("${subpkgs[@]}" "$pkgname-tools") subdescs=("${subdescs[@]}" "GTK+3 commandline tools.") -subdepends=("${subdepends[@]}" "glib2>=2.46.0 libxrandr") +subdepends=("${subdepends[@]}" "glib2>=2.46.2-3 pango>=1.38.1-2 libffi>=3.2.1") subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") subgroups=("${subgroups[@]}" 'xapps') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') subreplaces=("${subreplaces[@]}" '') +subprovides=("${subprovides[@]}" '') +subconflicts=("${subconflicts[@]}" '') subpkgs=("${subpkgs[@]}" "gtk-update-icon-cache") subdescs=("${subdescs[@]}" "The GTK+ update icon cache tool.") -subdepends=("${subdepends[@]}" "gdk-pixbuf2") +subdepends=("${subdepends[@]}" "gdk-pixbuf2>=2.32.3-2 pango>=1.38.1-2 libffi>=3.2.1") subrodepends=("${subrodepends[@]}" "") subgroups=("${subgroups[@]}" 'xapps') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') subreplaces=("${subreplaces[@]}" 'gtk+2-tools') -subprovides=("${subreplaces[@]}" '') -subconflicts=("${subreplaces[@]}" '') - -rodepends=("${rodepends[@]}" "${subpkgs[@]}") +subprovides=("${subprovides[@]}" '') +subconflicts=("${subconflicts[@]}" '') -subpkgs=("${subpkgs[@]}" "immodules") +subpkgs=("${subpkgs[@]}" "$pkgname-immodules") subdescs=("${subdescs[@]}" "Input methods for GTK3+.") -subdepends=("${subdepends[@]}" "") +subdepends=("${subdepends[@]}" "glib2>=2.46.2-3 pango>=1.38.1-2 libffi>=3.2.1") subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") subgroups=("${subgroups[@]}" 'xlib') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') -subreplaces=("${subreplaces[@]}" '') +subreplaces=("${subreplaces[@]}" 'immodules') +subprovides=("${subprovides[@]}" 'immodules') +subconflicts=("${subconflicts[@]}" 'immodules') -subpkgs=("${subpkgs[@]}" "immodules-xim") +subpkgs=("${subpkgs[@]}" "$pkgname-immodules-xim") subdescs=("${subdescs[@]}" "The gtk3-immodule-xim package contains XIM support for GTK+ 3.") -subdepends=("${subdepends[@]}" "") +subdepends=("${subdepends[@]}" "glib2>=2.46.2-3 pango>=1.38.1-2 libffi>=3.2.1") subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") subgroups=("${subgroups[@]}" 'xlib') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') -subreplaces=("${subreplaces[@]}" '') - -subpkgs=("${subpkgs[@]}" "$pkgname-docs") -subdescs=("${subdescs[@]}" "GTK+3 Documentation.") -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "") -subgroups=("${subgroups[@]}" 'docs-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64 arm') -subreplaces=("${subreplaces[@]}" '') +subreplaces=("${subreplaces[@]}" 'immodules-xim') +subprovides=("${subprovides[@]}" 'immodules-xim') +subconflicts=("${subconflicts[@]}" 'immodules-xim') subpkgs=("${subpkgs[@]}" "$pkgname-demos") subdescs=("${subdescs[@]}" "GTK+3 Demos.") -subdepends=("${subdepends[@]}" "") +subdepends=("${subdepends[@]}" "gdk-pixbuf2>=2.32.3-2 pango>=1.38.1-2 libffi>=3.2.1 libepoxy>=1.3.1-3") subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subgroups=("${subgroups[@]}" 'xapps') +subgroups=("${subgroups[@]}" 'xapps-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') subreplaces=("${subreplaces[@]}" '') - -subprovides=("${subreplaces[@]}") -subconflicts=("${subreplaces[@]}") +subprovides=("${subprovides[@]}" '') +subconflicts=("${subconflicts[@]}" '') build() { + + if [ "$_F_gnome_git" != "n" ]; then Funpack_scm Fcd $pkgname sh ./autogen.sh || Fdie else - Fcd - #rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c} - #Fpatchall - #Fautoreconf + + Fbuild \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-schemas-compile \ + --enable-x11-backend \ + --enable-broadway-backend \ + --enable-wayland-backend + ##--enable-debug=yes fi - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-gtk2-dependency \ - --disable-schemas-compile \ - --enable-x11-backend \ - --enable-broadway-backend \ - --enable-wayland-backend \ - --enable-debug=yes - - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make - #make DESTDIR="$Fdestdir" install - Fmakeinstall + # gtk-update-icon-cache Fsplit gtk-update-icon-cache usr/bin/gtk-update-icon-cache Fsplit gtk-update-icon-cache usr/share/man/man1/gtk-update-icon-cache* - #Frm usr/share/man/man1/gtk-update-icon-cache* - #Frm usr/bin/gtk-update-icon-cache - - #Fmv usr/bin/gtk-update-icon-cache usr/bin/gtk-update-icon-cache-3.0 - #Fsplit $pkgname-tools usr/bin/gtk-update-icon-cache-3.0 Fsplit $pkgname-tools usr/bin/gtk-query-immodules-3.0 Fsplit $pkgname-tools usr/share/man ## -demos - #Fsplit $pkgname-demos usr/share/gtk-3.0/demo Fsplit $pkgname-demos usr/bin/*-demo* - Fsplit $pkgname-docs usr/share/gtk-doc - - Fsplit immodules-xim usr/lib/gtk-3.0/3.0.0/immodules/im-xim.so + Fsplit $pkgname-immodules-xim usr/lib/gtk-3.0/3.0.0/immodules/im-xim.so touch $Fdestdir/usr/lib/gtk-3.0/3.0.0/immodules.cache - Fsplit immodules usr/lib/gtk-3.0/3.0.0/immodules - #Fmkdir etc/X11/xinit/xinput.d/ - #Fcp im-cedilla.conf etc/X11/xinit/xinput.d/im-cedilla.conf - #Fsplit immodules etc/X11/xinit/xinput.d/im-cedilla.conf + Fsplit $pkgname-immodules usr/lib/gtk-3.0/3.0.0/immodules - #Fmkdir /etc/gtk-3.0 - #echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-3.0/gtkrc || Fdie Fcp settings.ini usr/share/gtk-3.0/settings.ini || Fdie Fbuild_gnome_scriptlet _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
