Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=4d607c176dcd2d918076c0e8498c1d977ed282da
commit 4d607c176dcd2d918076c0e8498c1d977ed282da Merge: 5e09f38 4c4c631 Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Dec 15 18:24:45 2010 +0000 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/base/glib2/FrugalBuild source/gnome-extra/gnome-applets/FrugalBuild source/gnome-extra/gtkhtml/FrugalBuild source/gnome/at-spi2-atk/FrugalBuild source/gnome/brasero/FrugalBuild source/gnome/eog/FrugalBuild source/gnome/evolution-data-server/FrugalBuild source/gnome/gcalctool/FrugalBuild source/gnome/gnome-control-center/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-session/FrugalBuild source/gnome/gnome-terminal/FrugalBuild source/gnome/gsettings-desktop-schemas/FrugalBuild source/gnome/gucharmap/FrugalBuild source/xlib/librsvg/FrugalBuild diff --cc source/gnome-extra/gnome-applets/FrugalBuild index e547aeb,8250870..18ea356 --- a/source/gnome-extra/gnome-applets/FrugalBuild +++ b/source/gnome-extra/gnome-applets/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gnome-applets - pkgver=2.32.0 - pkgrel=3 + pkgver=2.32.1.1 -pkgrel=1 ++pkgrel=2 pkgdesc="Applets for use with the GNOME panel" url="http://www.gnome.org/"; depends=('gail>=2.22.0' 'gnome-panel>=2.32.0' 'libgtop>=2.28.0' 'libxklavier>=5.0' 'libwnck>=2.28.0' \ diff --cc source/gnome-extra/gtkhtml/FrugalBuild index a13978a,2268b69..2e85710 --- a/source/gnome-extra/gtkhtml/FrugalBuild +++ b/source/gnome-extra/gtkhtml/FrugalBuild @@@ -2,21 -2,22 +2,21 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gtkhtml - pkgver=3.32.0 + pkgver=3.32.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight HTML rendering/printing/editing engine" depends=('libgnomeui>=2.24.0' 'gtk+2' \ 'libsoup>=2.32.0' 'gnome-icon-theme>=2.30.0' \ 'libbonobo>=2.32.0' 'enchant' 'iso-codes') makedepends=('intltool') -groups=('gnome' 'gnome-minimal') +groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') Finclude gnome - sha1sums=('0f011a8b201fbef01c0959a929bade27a3ed4bcb') + sha1sums=('8f89cfe44de2ef9fe6c25064ba03761292f525aa') replaces=('gtkhtml312') provides=('gtkhtml312') -# TODO : switch to gtk3 -# broken with gtk3 2.90.7 -# --disable-deprecated-warning-flags should be remove for stable release +#block up2date don't bump it !!! +up2date=$pkgver Fconfopts="$Fconfopts --enable-gtk2 --disable-deprecated-warning-flags" build() { diff --cc source/gnome/gnome-control-center/FrugalBuild index 0bcb964,917806a..6cd177c --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@@ -21,11 -22,9 +21,10 @@@ _F_gnome_mime="y _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome gnome-scriptlet -Fconfopts="$Fconfopts --enable-gstreamer --disable-schemas-install --enable-aboutme --disable-doc" -sha1sums=('1e5ba3117aba7f939de25dbed13e430b90968561') - +source=($source gnome_bg.diff) +Fconfopts="$Fconfopts --enable-aboutme --disable-doc --with-libsocialweb" +sha1sums=('979dd6c72627c1d04bafc4e132591081f3904153' \ + 'f73c4a798ef16fc7aaa6d25cd30eabe684cb836c') - build() { export CFLAGS="$CFLAGS -fno-strict-aliasing" Fcd diff --cc source/gnome/gnome-session/FrugalBuild index c228d15,fa9866a..89c412d --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@@ -16,7 -17,23 +16,8 @@@ _F_gnome_schemas=('/etc/gconf/schemas/g _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -source=(${sour...@]} enable_splash.diff \ - http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.4.png ) -sha1sums=('7d4c7652247606a972a2f1e50a6a6339809a5b9e' \ - '1c2b3b009b06be2c320dad87868f42c56166641e' \ - '2b7333abd13aab895f3fdd79d526a649c4759cf8') - -build() { - Fpatchall - Fmake --disable-schemas-install --enable-splash - Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 - Fbuild_gnome_scriptlet - - # Drop old splash screen - Frm usr/share/pixmaps/splash/gnome-splash.png - - # Frugalware Splash screen - Ffile GNOME-Splash-1.4.png /usr/share/pixmaps/splash/gnome-splash.png -} +sha1sums=('71c24928d1e6b69c29712916d153f85eb25e9df5') +Fconfopts="$Fconfopts --with-gtk=3.0" ++sha1sums=('7d4c7652247606a972a2f1e50a6a6339809a5b9e') # optimization OK diff --cc source/gnome/gucharmap/FrugalBuild index 4c7df8a,7a5c9e7..6f1e139 --- a/source/gnome/gucharmap/FrugalBuild +++ b/source/gnome/gucharmap/FrugalBuild @@@ -14,7 -14,6 +14,7 @@@ _F_gnome_scrollkeeper="y _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet - sha1sums=('b77de139d6f2853475971e3c0efdeead0d025e27') +Fconfopts="$Fconfopts --with-gtk=3.0" + sha1sums=('4cb86f114e4ed2921fb4ffa58caa0370e4f82f0c') # optimization OK diff --cc source/xlib/librsvg/FrugalBuild index e458ee3,1510e5a..902c451 --- a/source/xlib/librsvg/FrugalBuild +++ b/source/xlib/librsvg/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ # Contributor: VMiklos <vmik...@frugalware.org> pkgname=librsvg - pkgver=2.32.0 - pkgrel=3 + pkgver=2.32.1 -pkgrel=1 ++pkgrel=2 pkgdesc="A high performance SVG rendering library for GNOME" -depends=('gtk+2>=2.22.0' 'gdk-pixbuf2' 'libxml2' 'popt' 'libart_lgpl' 'libcroco>=0.6.1-4' 'libgsf>=1.14.8') +depends=('gtk+3>=2.22.0' 'gdk-pixbuf2' 'libxml2' 'popt' 'libart_lgpl' 'libcroco>=0.6.1-4' 'libgsf>=1.14.8') makedepends=('gtk-doc') groups=('xlib') archs=('i686' 'x86_64' 'ppc') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
