Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=68da6e1a8a5272c78dc0fdea8acec1722db2a108
commit 68da6e1a8a5272c78dc0fdea8acec1722db2a108 Merge: 69c788f 749b5f4 Author: Baste <[email protected]> Date: Fri Oct 5 09:08:34 2012 +0200 Merge ../current Conflicts: source/gnome/evolution-data-server/FrugalBuild source/gnome/folks/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/gnome-menus/FrugalBuild source/gnome/gnome-online-accounts/FrugalBuild source/gnome/gnome-session/FrugalBuild source/gnome/gnome-terminal/FrugalBuild source/gnome/libgnomekbd/FrugalBuild source/gnome/libsocialweb/FrugalBuild source/gnome/metacity/FrugalBuild source/gnome/mutter/FrugalBuild source/gnome/nautilus/FrugalBuild source/gnome/nm-applet/FrugalBuild source/gnome/zenity/FrugalBuild source/lib/accountsservice/FrugalBuild source/lib/atk/FrugalBuild source/lib/p11-kit/FrugalBuild source/network/modemmanager/FrugalBuild source/xapps/gvfs/FrugalBuild source/xapps/vte3/FrugalBuild source/xlib/clutter/FrugalBuild source/xlib/librsvg/FrugalBuild source/xlib/libwnck/FrugalBuild source/xlib/libxklavier/FrugalBuild source/xlib/pango/FrugalBuild source/xlib/shared-mime-info/FrugalBuild diff --cc source/gnome/folks/FrugalBuild index 2583433,32b710d..de55281 --- a/source/gnome/folks/FrugalBuild +++ b/source/gnome/folks/FrugalBuild @@@ -13,7 -13,7 +13,7 @@@ archs=('i686' 'x86_64' options=('scriptlet') _F_gnome_ext=".tar.xz" Finclude gnome -sha1sums=('6fd125898c5c02894a61f7a8a0ca6562bb426b99') +sha1sums=('3b432a4b284ab94c6e4cab583339d1c838a136ab') - Fconfopts="$Fconfopts --enable-vala" + Fconfopts+=" --enable-vala" # optimization OK diff --cc source/gnome/gnome-desktop/FrugalBuild index ea36429,cf0171a..ef127f4 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@@ -16,8 -16,8 +16,8 @@@ _F_gnome_scrollkeeper="y _F_gnome_doc="y" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet - Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware --enable-gtk-doc" + Fconfopts+=" --with-gnome-distributor=Frugalware --enable-gtk-doc" -sha1sums=('b6a03bed9dbb93acef686de83685393f6b94743a') +sha1sums=('73f389a7c92b99ce269bbbca7d7905f778dd8693') replaces=('desktop-data-model' 'gnome-volume-manager' 'gnome-spell' 'gnome-art' 'xournal' 'keytouch' \ 'system-tools-backends' 'liboobs'\ 'gnome-theme-airlines' 'gnome-theme-aquadreams' \ diff --cc source/gnome/gnome-keyring/FrugalBuild index 5eae4ec,f55af8d..1703fcd --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@@ -16,19 -16,20 +16,20 @@@ archs=('i686' 'x86_64' _F_gnome_iconcache="y" _F_gnome_mime="y" _F_gnome_glib="y" -#_F_gnome_doc="y" +_F_gnome_doc="n" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet - Fconfopts="$Fconfopts --with-pam-dir=/lib/security \ -Fconfopts+=" --with-pam-dir=/lib/security --with-gtk=3.0 \ - --disable-update-mime --enable-pam --with-root-certs=/etc/ssl/certs" -sha1sums=('51c70f5c8d9e6776ab711dda8f1eecf676dbd1c9') ++Fconfopts+=" --with-pam-dir=/lib/security \ + --enable-pam --with-root-certs=/etc/ssl/certs" +sha1sums=('2871f554c89b3581b5b5431f148370706e537ea2') + build() { - Fcd - Fautoreconf - Fbuild - Fbuild_gnome_scriptlet - #disable setuid for gnome-keyring-daemon Oo - chmod u-s $Fdestdir/usr/bin/gnome-keyring-daemon || Fdie + Fcd + Fautoreconf + Fbuild + Fbuild_gnome_scriptlet + #disable setuid for gnome-keyring-daemon Oo + #chmod u-s $Fdestdir/usr/bin/gnome-keyring-daemon || Fdie } # optimization OK diff --cc source/gnome/gnome-terminal/FrugalBuild index 7c7ab5b,f2776122..e245e82 --- a/source/gnome/gnome-terminal/FrugalBuild +++ b/source/gnome/gnome-terminal/FrugalBuild @@@ -19,7 -19,7 +19,7 @@@ _F_gnome_ext=".tar.xz Finclude gnome gnome-scriptlet # For test #source=(${source[@]} 00-$pkgname-2.12.0-prompt.patch) -sha1sums=('2738a31a80d00efe5d398910b6064d116a0f6e52') +sha1sums=('30860ff106088388ef164f05be86b048be19fe19') - Fconfopts="$Fconfopts --with-gtk=3.0" + Fconfopts+=" --with-gtk=3.0" # optimization OK diff --cc source/gnome/libsocialweb/FrugalBuild index 67be52b,1466482..db15b53 --- a/source/gnome/libsocialweb/FrugalBuild +++ b/source/gnome/libsocialweb/FrugalBuild @@@ -13,8 -12,8 +13,8 @@@ archs=('i686' 'x86_64' _F_gnome_devel="y" _F_gnome_doc="y" Finclude gnome gnome-scriptlet -source=($source lastfm flickr twitpic twitter) -Fconfopts+="--with-gnome --with-online=networkmanager --disable-static \ +source=($source lastfm flickr twitpic twitter git.patch git2.patch) - Fconfopts="$Fconfopts--with-gnome --with-online=networkmanager --disable-static \ ++Fconfopts+=" --with-gnome --with-online=networkmanager --disable-static \ --enable-introspection=yes \ --enable-facebook \ --enable-flickr \ diff --cc source/gnome/metacity/FrugalBuild index d234600,f5f5b32..1f8e4cb --- a/source/gnome/metacity/FrugalBuild +++ b/source/gnome/metacity/FrugalBuild @@@ -15,8 -15,8 +15,8 @@@ _F_gnome_schemas=('/etc/gconf/schemas/m _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet source=(${source[@]} DisableUselessAlert.diff 06_Add_UXD_shadows_and_borders.patch) - Fconfopts="$Fconfopts --enable-compositor" + Fconfopts+=" --enable-compositor" -sha1sums=('bff0aef175a6a32d0ea20e5253bd9ed602db849d' \ +sha1sums=('9c206e61258e8a3621a766fe2169b4dbf917baf1' \ '7c76fd762b76fc4b4425e87af6f645d4b18b6175' \ '96f77077e77efdc98f479442aff082164471e95e') diff --cc source/gnome/nautilus/FrugalBuild index 8524541,c2e8f98..a5ebee3 --- a/source/gnome/nautilus/FrugalBuild +++ b/source/gnome/nautilus/FrugalBuild @@@ -23,9 -23,9 +23,8 @@@ _F_gnome_iconcache="y _F_gnome_doc="y" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet - Fconfopts="$Fconfopts --disable-packagekit --disable-nst-extension" + Fconfopts+=" --disable-packagekit --disable-nst-extension" -sha1sums=('72e2fee2f9caad339f98e9bff5fbdea2b14607a5') -provides=('eel' 'nautilus-sendto') +sha1sums=('a819a8efd8c3f0c7cd1feccbcf1ff54e1bb4be2c') - provides=('eel' 'nautilus-sendto') replaces=('eel' 'nautilus-wallpaper' 'nautilus-sendto' 'file-browser-applet' 'nautilus-image-converter') conflicts=('nautilus-sendto') diff --cc source/lib/atk/FrugalBuild index 311a672,3733309..cc16d85 --- a/source/lib/atk/FrugalBuild +++ b/source/lib/atk/FrugalBuild @@@ -13,7 -12,7 +13,7 @@@ groups=('lib' archs=('i686' 'x86_64' 'arm') _F_gnome_ext=".tar.xz" Finclude gnome -sha1sums=('ca13d01660bdcd5262ef6cedb8a64542ff8aa804') +sha1sums=('951f9cd195dcab855c7779cfcba21153106cb754') - Fconfopts="$Fconfopts --disable-gtk-doc" + Fconfopts+=" --disable-gtk-doc" # optimization OK diff --cc source/lib/libvpx/FrugalBuild index f8ac1e0,acdc182..41d82da --- a/source/lib/libvpx/FrugalBuild +++ b/source/lib/libvpx/FrugalBuild @@@ -16,9 -16,9 +16,9 @@@ Finclude googlecod export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" source=($source shared.diff) -sha1sums=('2919e11074fef72fc61ef1a75160050ffaad6074' \ +sha1sums=('356af5f770c50cd021c60863203d8f30164f6021' \ '4be26baed5d133b7db742364ba0bf385b0b8d206') - Fconfopts="$Fconfopts --enable-vp8 \ + Fconfopts+=" --enable-vp8 \ --enable-runtime-cpu-detect \ --enable-shared \ --enable-postproc \ diff --cc source/lib/p11-kit/FrugalBuild index 99618ee,ab626ce..51257c5 --- a/source/lib/p11-kit/FrugalBuild +++ b/source/lib/p11-kit/FrugalBuild @@@ -12,7 -11,7 +12,7 @@@ groups=('lib' archs=('i686' 'x86_64' 'arm') up2date="Flasttar http://p11-glue.freedesktop.org/releases/"; source=(http://p11-glue.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('50983f9d70930f739f93e5e626580c8781d886cf') +sha1sums=('02f7139fb1ee3a0d6ef4566f05630bfa4c5606c9') - Fconfopts="$Fconfopts --disable-static" + Fconfopts+=" --disable-static" # optimization OK diff --cc source/network/modemmanager/FrugalBuild index 89b43c2,d941bab..df6ab1b --- a/source/network/modemmanager/FrugalBuild +++ b/source/network/modemmanager/FrugalBuild @@@ -15,6 -14,6 +15,6 @@@ archs=('i686' 'x86_64' _F_gnome_ext=".tar.xz" Finclude gnome options=('scriptlet') - Fconfopts="$Fconfopts --with-tests=yes --disable-more-warnings --with-polkit=no \ -Fconfopts+=" --with-tests=yes --disable-more-warnings --with-polkit=yes \ ++Fconfopts+=" --with-tests=yes --disable-more-warnings --with-polkit=no \ --with-pppd-plugin-dir=/usr/lib/pppd/$pppVer --with-udev-base-dir=/lib/udev/" -sha1sums=('44775ec78bda336e0e6abb1dea60744b033412db') +sha1sums=('0cf3605a0a83ee4352a480252f8ffa981c1e3a97') diff --cc source/xapps/gvfs/FrugalBuild index 9bb4a14,4c5d28b..76b1bab --- a/source/xapps/gvfs/FrugalBuild +++ b/source/xapps/gvfs/FrugalBuild @@@ -63,10 -60,31 +63,9 @@@ subrodepends=("${subrodepends[@]}" "gvf subgroups=("${subgroups[@]}" "xapps") subarchs=("${subarchs[@]}" "i686 x86_64") - Fconfopts="$Fconfopts \ - --disable-gdu \ -subpkgs=("${subpkgs[@]}" "gvfs-gconf") -subdescs=("${subdescs[@]}" "gvfs gconf support") -subdepends=("${subdepends[@]}" "") -subrodepends=("${subrodepends[@]}" "gvfs=$pkgver") -subgroups=("${subgroups[@]}" "xapps") -subarchs=("${subarchs[@]}" "i686 x86_64") - - -Fconfopts+=" \ - --enable-http \ - --enable-avahi \ - --enable-udev \ - --enable-fuse \ - --enable-gdu \ - --disable-hal \ - --enable-gudev \ - --enable-cdda \ - --enable-afc \ - --enable-obexftp \ - --enable-gphoto2 \ - --enable-keyring \ - --enable-samba \ - --enable-archive \ - --enable-bash-completion \ - --enable-gdu" ++Fconfopts+=" --disable-gdu \ + --enable-udisks2 \ + --enable-keyring" build(){ Fcd diff --cc source/xapps/vte3/FrugalBuild index 086c558,2503a05..97b68b2 --- a/source/xapps/vte3/FrugalBuild +++ b/source/xapps/vte3/FrugalBuild @@@ -14,8 -14,8 +14,8 @@@ groups=('xapps' archs=('i686' 'x86_64') _F_gnome_ext=".tar.xz" Finclude gnome -sha1sums=('a58569a99ac06a240bdda3ec7353f2626145852d') +sha1sums=('4b3fc889e053ec05025e6822d66e6b0d8ff69d1e') - Fconfopts="$Fconfopts --enable-gtk-doc --enable-introspection" + Fconfopts+=" --enable-gtk-doc --enable-introspection" build() { Fbuild diff --cc source/xlib/libwnck/FrugalBuild index a10bd9b,dad898e..b99d0df --- a/source/xlib/libwnck/FrugalBuild +++ b/source/xlib/libwnck/FrugalBuild @@@ -14,8 -14,8 +14,8 @@@ makedepends=('gtk-doc' 'perl-xml-parser archs=('i686' 'x86_64' 'arm') _F_gnome_ext=".tar.xz" Finclude gnome - Fconfopts="$Fconfopts --enable-gtk-doc" + Fconfopts+=" --enable-gtk-doc" -sha1sums=('986f4da25c696f19e4b0d7159757d94ec5617c46') +sha1sums=('2b80f865f7c37cfe5a49a8f19c3a6b2a2606e6d4') export CFLAGS="$CFLAGS -fno-strict-aliasing" # optimization OK diff --cc source/xlib/pango/FrugalBuild index 3ee5fb1,0ca2cd7..25f8979 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@@ -7,13 -7,13 +7,14 @@@ pkgver=1.32. pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/"; -depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.30.0' 'libxft>=2.1.13-2' 'libxmu' 'libxi') +depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.34.0' 'libxft>=2.1.13-2' 'libxmu' 'libxi' 'libxrender' 'harfbuzz' 'libxft') groups=('xlib') makedepends=('gtk-doc' 'perl' 'gobject-introspection>=0.9.6' 'dri2proto') -archs=('i686' 'x86_64' 'arm') +archs=('i686' 'x86_64') _F_gnome_ext=".tar.xz" Finclude gnome -Fconfopts+=" --enable-gtk-doc --enable-debug=minimum" -sha1sums=('f853a35758bed6aba6101e027ba7b4411448236f') ++ +Fconfopts+=" --enable-gtk-doc --enable-debug=minimum --with-included-modules=basic-fc" +sha1sums=('a29a17eae7117a1330aaa7b01795322a6ef966b6') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
