Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9470fb081d5acc47dcc5054cd2dcd94f7e07149
commit b9470fb081d5acc47dcc5054cd2dcd94f7e07149 Author: crazy <[email protected]> Date: Tue Nov 8 20:18:43 2016 +0100 xlib - fix subpkgs diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index a046950..6910114 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -23,40 +23,40 @@ sha1sums=('c3d828135994a52cc9428a60175bd2b294656611' \ '75c461740e18696a792739cd1f9a20327dbb23bb' \ 'a11a695c99225a802860ceabaf670101d1aef9dc') -subpkgs=("${subpkgs[@]}" "$pkgname-libs") -subdescs=("${subdescs[@]}" "GTK+2 core libraries.") -subdepends=("${subdepends[@]}" "pango>=1.40.3-2 libxinerama>=1.1.3-3 libxi>=1.7.6-2 libxrandr>=1.5.0-5 \ +subpkgs=("$pkgname-libs") +subdescs=("GTK+2 core libraries.") +subdepends=("pango>=1.40.3-2 libxinerama>=1.1.3-3 libxi>=1.7.6-2 libxrandr>=1.5.0-5 \ libxcursor>=1.1.14-3 libxcomposite>=0.4.4-3 gdk-pixbuf2>=2.36.0 atk>=2.22.0") -subrodepends=("${subrodepends[@]}" "") -subconflicts=("${subconflicts[@]}" "") -subgroups=("${subgroups[@]}" 'xlib') +subrodepends=("") +subconflicts=("") +subgroups=('xlib') subarchs=("x86_64") -subpkgs=("${subpkgs[@]}" "gail") -subdescs=("${subdescs[@]}" "Accessibility support for GTK+2 and libgnomecanvas") -subdepends=("${subdepends[@]}" "pango>=1.40.3-2 gdk-pixbuf2>=2.36.0 atk>=2.22.0 \ +subpkgs+=("gail") +subdescs+=("Accessibility support for GTK+2 and libgnomecanvas") +subdepends+=("pango>=1.40.3-2 gdk-pixbuf2>=2.36.0 atk>=2.22.0 \ libffi>=3.2.1-2 libpng>=1.6.25") -subrodepends=("${subrodepends[@]}" "$pkgname-libs>=$pkgver") -subconflicts=("${subconflicts[@]}" "") -subgroups=("${subgroups[@]}" 'xlib') -subarchs=("x86_64") +subrodepends+=("$pkgname-libs>=$pkgver") +subconflicts+=("") +subgroups+=('xlib') +subarchs+=("x86_64") -subpkgs=("${subpkgs[@]}" "$pkgname-docs") -subdescs=("${subdescs[@]}" "GTK+2 Documentation.") -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "") -subconflicts=("${subconflicts[@]}" "") -subgroups=("${subgroups[@]}" 'gnome-extra docs-extra') -subarchs=("x86_64") +subpkgs+=("$pkgname-docs") +subdescs+=("GTK+2 Documentation.") +subdepends+=("") +subrodepends+=("") +subconflicts+=("") +subgroups+=('gnome-extra docs-extra') +subarchs+=("x86_64") -subpkgs=("${subpkgs[@]}" "$pkgname-demos") -subdescs=("${subdescs[@]}" "GTK+2 Demos.") -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subconflicts=("${subconflicts[@]}" "pango>=1.40.3-2 gdk-pixbuf2>=2.36.0 libffi>=3.2.1-2 libpng>=1.6.25") -subgroups=("${subgroups[@]}" 'xapps-extra') -subarchs=("x86_64") +subpkgs+=("$pkgname-demos") +subdescs+=("GTK+2 Demos.") +subdepends+=("") +subrodepends+=("$pkgname>=$pkgver") +subconflicts+=("pango>=1.40.3-2 gdk-pixbuf2>=2.36.0 libffi>=3.2.1-2 libpng>=1.6.25") +subgroups+=('xapps-extra') +subarchs+=("x86_64") build() { Fcd diff --git a/source/xlib/gtk+3/FrugalBuild b/source/xlib/gtk+3/FrugalBuild index 1d79142..a235b49 100644 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@ -49,7 +49,7 @@ subdescs+=("The GTK+ update icon cache tool.") subdepends+=("gdk-pixbuf2>=2.36.0 pango>=1.40.3-2 libffi>=3.2.1-2") subrodepends+=("") subgroups+=('xapps') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subreplaces+=('gtk+2-tools') subprovides+=('') subconflicts+=('') @@ -59,7 +59,7 @@ subdescs+=("Input methods for GTK3+.") subdepends+=("glib2>=2.50.0 pango>=1.40.3-2 libffi>=3.2.1-2") subrodepends+=("$pkgname>=$pkgver") subgroups+=('xlib') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subreplaces+=('immodules') subprovides+=('immodules') subconflicts+=('immodules') @@ -69,7 +69,7 @@ subdescs+=("The gtk3-immodule-xim package contains XIM support for GTK+ 3.") subdepends+=("glib2>=2.50.0 pango>=1.40.3-2 libffi>=3.2.1-2") subrodepends+=("$pkgname>=$pkgver") subgroups+=('xlib') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subreplaces+=('immodules-xim') subprovides+=('immodules-xim') subconflicts+=('immodules-xim') @@ -79,7 +79,7 @@ subdescs+=("GTK+3 Demos.") subdepends+=("gdk-pixbuf2>=2.36.0 pango>=1.40.3-2 libffi>=3.2.1-2 libepoxy>=1.3.1-3") subrodepends+=("$pkgname>=$pkgver") subgroups+=('xapps-extra') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subreplaces+=('') subprovides+=('') subconflicts+=('') @@ -89,7 +89,7 @@ subdescs+=("$pkgname documention") subrodepends+=("$pkgname>=$pkgver") subdepends+=('') subgroups+=('gnome-extra gnome-docs') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subreplaces+=('') subprovides+=('') subconflicts+=('') diff --git a/source/xlib/libdbusmenu/FrugalBuild b/source/xlib/libdbusmenu/FrugalBuild index 0d96dea..8e6d8aa 100644 --- a/source/xlib/libdbusmenu/FrugalBuild +++ b/source/xlib/libdbusmenu/FrugalBuild @@ -18,22 +18,22 @@ Finclude launchpad Fconfopts+="--disable-static --enable-introspection=yes --disable-tests --disable-dumper --disable-scrollkeeper" sha1sums=('f88fc666609ed486a968fd6c8b739dff07d50bdd') -subpkgs+=("$pkgname-gtk2") -subdescs+=("GTK2 bindings for libdbusmenu") -subdepends+=("gtk+2-libs") -subrodepends+=("$pkgname") -subgroups+=('xlib') -subarchs+=('i686 x86_64') -subprovides+=("${subprovides[@]}" 'libdbusmenu-gtk') -subconflicts+=("${subconflicts[@]}" 'libdbusmenu-gtk') -subreplaces+=("${subreplaces[@]}" 'libdbusmenu-gtk') +subpkgs=("$pkgname-gtk2") +subdescs=("GTK2 bindings for libdbusmenu") +subdepends=("gtk+2-libs") +subrodepends=("$pkgname") +subgroups=('xlib') +subarchs=('x86_64') +subprovides=("${subprovides[@]}" 'libdbusmenu-gtk') +subconflicts=("${subconflicts[@]}" 'libdbusmenu-gtk') +subreplaces=("${subreplaces[@]}" 'libdbusmenu-gtk') subpkgs+=("$pkgname-gtk3") subdescs+=("GTK3 bindings for libdbusmenu") subdepends+=("gtk+3") subrodepends+=("$pkgname") subgroups+=('xlib') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subprovides+=('') subconflicts+=('') subreplaces+=('') diff --git a/source/xlib/libproxy/FrugalBuild b/source/xlib/libproxy/FrugalBuild index db1c5d4..92bc62b 100644 --- a/source/xlib/libproxy/FrugalBuild +++ b/source/xlib/libproxy/FrugalBuild @@ -18,33 +18,33 @@ up2date="$up2date | sed 's/libproxy_//'" sha1sums=('fadd9e3c9c418496b0836527c89ac6d84f0e37c9') -subpkgs=("${subpkgs[@]}" "$pkgname-python") -subdescs=("${subdescs[@]}" "$pkgname python binding") -subdepends=("${subdepends[@]}" "python>=2.7.12-2") -subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subgroups=("${subgroups[@]}" 'xlib') +subpkgs=("$pkgname-python") +subdescs=("$pkgname python binding") +subdepends=("python>=2.7.12-2") +subrodepends=("$pkgname>=$pkgver") +subgroups=('xlib') subarchs=("x86_64") -subpkgs=("${subpkgs[@]}" "$pkgname-gnome") -subdescs=("${subdescs[@]}" "$pkgname gnome support") -subdepends=("${subdepends[@]}" "glib2>=2.50.0") -subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subgroups=("${subgroups[@]}" 'gnome') -subarchs=("x86_64") +subpkgs+=("$pkgname-gnome") +subdescs+=("$pkgname gnome support") +subdepends+=("glib2>=2.50.0") +subrodepends+=("$pkgname>=$pkgver") +subgroups+=('gnome') +subarchs+=("x86_64") -subpkgs=("${subpkgs[@]}" "$pkgname-networkmanager") -subdescs=("${subdescs[@]}" "$pkgname networkmanager support") -subdepends=("${subdepends[@]}" "dbus>=1.10.10-4") -subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subgroups=("${subgroups[@]}" 'xlib-extra') -subarchs=("x86_64") +subpkgs+=("$pkgname-networkmanager") +subdescs+=("$pkgname networkmanager support") +subdepends+=("dbus>=1.10.10-4") +subrodepends+=("$pkgname>=$pkgver") +subgroups+=('xlib-extra') +subarchs+=("x86_64") -subpkgs=("${subpkgs[@]}" "$pkgname-vala") -subdescs=("${subdescs[@]}" "$pkgname vala support") -subdepends=("${subdepends[@]}" "vala>=0.30.0-3") -subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") -subgroups=("${subgroups[@]}" 'xlib-extra') -subarchs=("x86_64") +subpkgs+=("$pkgname-vala") +subdescs+=("$pkgname vala support") +subdepends+=("vala>=0.30.0-3") +subrodepends+=("$pkgname>=$pkgver") +subgroups+=('xlib-extra') +subarchs+=("x86_64") build() { diff --git a/source/xlib/libsecret/FrugalBuild b/source/xlib/libsecret/FrugalBuild index 026ef32..2a81c10 100644 --- a/source/xlib/libsecret/FrugalBuild +++ b/source/xlib/libsecret/FrugalBuild @@ -15,13 +15,13 @@ _F_gnome_devel="n" Finclude gnome gnome-scriptlet sha1sums=('65d80307756ef45f7c282098c48125ef41f56acd') -subpkgs=("${subpkgs[@]}" 'libsecret-vala') -subdescs=("${subdescs[@]}" 'Libsecret Vala Bindings') -subdepends=("${subdepends[@]}" 'vala>=0.32.0') -subrodepends=("${subrodepends[@]}" '') -subprovides=("${subprovides[@]}" '') -subreplaces=("${subreplaces[@]}" '') -subgroups=("${subgroups[@]}" 'gnome-extra') +subpkgs=('libsecret-vala') +subdescs=('Libsecret Vala Bindings') +subdepends=('vala>=0.32.0') +subrodepends=('') +subprovides=('') +subreplaces=('') +subgroups=('gnome-extra') subarchs=("x86_64") diff --git a/source/xlib/openal/FrugalBuild b/source/xlib/openal/FrugalBuild index 3118ae9..7a73387 100644 --- a/source/xlib/openal/FrugalBuild +++ b/source/xlib/openal/FrugalBuild @@ -20,13 +20,13 @@ up2date="Flasttar http://kcat.strangesoft.net/openal.html"; source=(http://kcat.strangesoft.net/$pkgname-releases/$_F_archive_name-$pkgver.tar.bz2) sha1sums=('5d6151b544caaf53a15b798a495308e421044b0d') -subpkgs=("${subpkgs[@]}" "lib32-$pkgname") -subdescs=("${subdescs[@]}" "A cross-platform 3D audio API appropriate for use with gaming applications. (32-bit)") -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") -subgroups=("${subgroups[@]}" 'lib32-extra') +subpkgs=("lib32-$pkgname") +subdescs=("A cross-platform 3D audio API appropriate for use with gaming applications. (32-bit)") +subdepends=("") +subrodepends=("$pkgname=$pkgver") +subgroups=('lib32-extra') subarchs=("x86_64") -suboptions+=('force') +suboptions=('force') build() { # 32-bit diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index 79df6ea..2fbc500 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -27,38 +27,39 @@ conflicts=('poppler-qt' 'poppler-qt4') provides=('poppler-qt' 'poppler-qt4') replaces=('poppler-qt' 'poppler-qt4') + +subpkgs=('poppler-pdftools') +subdescs=('Poppler xpdf tools') +subgroups=('xapps') +subdepends=('lcms2>=2.8-2 cairo>=1.14.6-4 libffi>=3.2.1-2 libpng>=1.6.25 libstdc++>=6.2.1-5') +subrodepends=('poppler') +subarchs=("x86_64") +subreplaces=('xpdf') +subprovides=('xpdf') + if Fuse $USE_GLIB; then ## builds gtk-test and demo app we don't even install it ## than need gtk+3 Fconfopts+=" --disable-gtk-test" - subpkgs=("${subpkgs[@]}" 'poppler-glib') - subdescs=("${subdescs[@]}" 'Poppler glib bindings') - subgroups=("${subgroups[@]}" 'xlib') - subdepends=("${subdepends[@]}" 'cairo>=1.14.6-4 libffi>=3.2.1-2 libpng>=1.6.25 libstdc++>=6.2.1-5') - subrodepends=("${subrodepends[@]}" "poppler>=$pkgver") - subarchs=("x86_64") - subreplaces=("${subreplaces[@]}" '') - subprovides=("${subprovides[@]}" '') + subpkgs+=('poppler-glib') + subdescs+=('Poppler glib bindings') + subgroups+=('xlib') + subdepends+=('cairo>=1.14.6-4 libffi>=3.2.1-2 libpng>=1.6.25 libstdc++>=6.2.1-5') + subrodepends+=("poppler>=$pkgver") + subarchs+=("x86_64") + subreplaces+=('') + subprovides+=('') fi -subpkgs=("${subpkgs[@]}" 'poppler-pdftools') -subdescs=("${subdescs[@]}" 'Poppler xpdf tools') -subgroups=("${subgroups[@]}" 'xapps') -subdepends=("${subdepends[@]}" 'lcms2>=2.8-2 cairo>=1.14.6-4 libffi>=3.2.1-2 libpng>=1.6.25 libstdc++>=6.2.1-5') -subrodepends=("${subrodepends[@]}" 'poppler') -subarchs=("x86_64") -subreplaces=("${subreplaces[@]}" 'xpdf') -subprovides=("${subprovides[@]}" 'xpdf') - if Fuse $USE_QT5; then - subpkgs=("${subpkgs[@]}" 'poppler-qt5') - subdescs=("${subdescs[@]}" 'Poppler QT5 bindings') - subgroups=("${subgroups[@]}" 'xlib') - subdepends=("${subdepends[@]}" 'qt5-base>=5.7.0-2') - subrodepends=("${subrodepends[@]}" 'poppler') - subarchs=("x86_64") - subreplaces=("${subreplaces[@]}" '') - subprovides=("${subprovides[@]}" '') + subpkgs+=('poppler-qt5') + subdescs+=('Poppler QT5 bindings') + subgroups+=('xlib') + subdepends+=('qt5-base>=5.7.0-2') + subrodepends+=('poppler') + subarchs+=("x86_64") + subreplaces+=('') + subprovides+=('') fi build() { diff --git a/source/xlib/pygobject3/FrugalBuild b/source/xlib/pygobject3/FrugalBuild index d7c7645..00197d5 100644 --- a/source/xlib/pygobject3/FrugalBuild +++ b/source/xlib/pygobject3/FrugalBuild @@ -17,26 +17,26 @@ _F_gnome_ext=".tar.xz" Finclude gnome python sha1sums=('a8eb98b56defa47fa0644a7a1c5578973e02137b') -subpkgs+=("pygobject3-cairo") -subdescs+=('pygobject3 with cairo support') -subdepends+=('cairo>=1.14.6-4 gobject-introspection>=1.49.2 python>=2.7.12-2 libffi>=3.2.1-2 pycairo>=1.10.0-3') -subrodepends+=("pygobject3>=$pkgver") -subgroups+=('xlib') -subarchs+=('i686 x86_64') +subpkgs=("pygobject3-cairo") +subdescs=('pygobject3 with cairo support') +subdepends=('cairo>=1.14.6-4 gobject-introspection>=1.49.2 python>=2.7.12-2 libffi>=3.2.1-2 pycairo>=1.10.0-3') +subrodepends=("pygobject3>=$pkgver") +subgroups=('xlib') +subarchs=('x86_64') subpkgs+=("python3-$pkgname") subdescs+=("pygobject python 3 support") subdepends+=("python3>=3.5.2-2 cairo>=1.14.6-4 gobject-introspection>=1.49.2 libffi>=3.2.1-2 python3-pycairo>=1.10.0-6") subrodepends+=("$pkgname-devel") subgroups+=('xlib') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') subpkgs+=("$pkgname-devel") subdescs+=("pygobject devel") subdepends+=("") subrodepends+=("") subgroups+=('xlib') -subarchs+=('i686 x86_64') +subarchs+=('x86_64') build() { #python3 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
