Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=50e5960e866356d482c9baeac569bcd2343bbce7
commit 50e5960e866356d482c9baeac569bcd2343bbce7 Merge: 40f43a9 739212d Author: bouleetbil <bouleet...@frogdev.info> Date: Sun Dec 4 18:13:03 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/cheese/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-shell/FrugalBuild source/xlib/clutter/FrugalBuild diff --cc source/gnome/gnome-desktop/FrugalBuild index deaf25f,5242581..c46b191 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@@ -8,14 -8,13 +8,14 @@@ pkgdesc="The GNOME Desktop url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3' 'startup-notification>=0.10-2' 'rarian>=0.8.0' 'libxrandr' 'gsettings-desktop-schemas' \ 'xcb-util>=0.3.8') - makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'gtk-doc') + makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'gtk-doc' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware --enable-gtk-doc" -sha1sums=('17f0d22a8781fed451619a73732c0231dcdf953f') +sha1sums=('34966c3c438bb6412f79ac465e38dae27525c862') 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-shell/FrugalBuild index cf913a8,a6adb91..655b8b5 --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -5,12 -5,12 +5,12 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"y" USE_REPLACEEXTENSIONS=${USE_REPLACEEXTENSIONS:-"y"} pkgname=gnome-shell -pkgver=3.2.1 -pkgrel=6 +pkgver=3.3.2 - pkgrel=2 ++pkgrel=3 pkgdesc="Window management and application launching for GNOME" url="http://www.gnome.org/"; -depends=('libxml2>=2.7.8' 'mutter>=3.2.1' 'gnome-desktop>=3.2.1' 'gjs>=1.30.0' \ - 'gnome-menus' 'librsvg' 'evolution-data-server' 'gconf' \ +depends=('libxml2>=2.7.8' 'mutter>=3.3.2-2' 'gnome-desktop>=3.3.2' 'gjs>=1.30.0' \ + 'gnome-menus' 'librsvg' 'evolution-data-server>=3.3.2' \ 'xulrunner' 'gst-plugins-base' 'pulseaudio>=1.1' \ 'gnome-themes-standard' 'ca-certificates' \ 'gnome-bluetooth' 'gtk+3>=3.0.8' 'telepathy-glib' 'nm-applet' \ @@@ -26,10 -28,10 +26,10 @@@ els provides=("${provides[@]}" "gnome-shell-frugalware-theme") removes=("${removes[@]}" "/usr/share/gnome-shell/theme") fi -#remove gnome-contacts gnome-documents depend after 1.6 + #HERE ADDED gnome-shell-extensions/themes ... incompatible replaces=("${replaces[@]}" "gnome-shell-extension-systray" "gnome-shell-extension-frugalware-logo" \ - "gnome-shell-theme-selector" "gnome-shell-extension-autohidetopbar" "gnome-shell-extension-screen-off"\ + "gnome-shell-theme-selector" "gnome-shell-extension-screen-off"\ "gnome-shell-extensions-mediaplayer" "gnome-shell-extensions-mediasplayers" \ "gnome-shell-extensions-workspace-indicator" "gnome-shell-extension-windowoverlay-icons" \ "gnome-shell-extension-cpu-temperature" "gnome-shell-extension-cpufreq" "gnome-shell-extension-arrow-key-window-selector") @@@ -47,12 -49,13 +47,14 @@@ _F_gnome_glib="y _F_gnome_desktop="y" _F_gnome_glib="y" _F_gnome_git="n" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/xulrunner/ - source=($source enable_shutdown.diff) - sha1sums=('bad322b4d334b2f5ea20e95ec157aadd9c79c496' \ - '1cf799b5d64f260222c316622715950c69671ffe') + source=($source fw_theme.diff enable_shutdown.diff revert_utf8hack.diff) + sha1sums=('d648d079acf6cbfd71e59ba37d675a1c4c0dd7b8' \ + 'cd1efc33adceca32ec8ac7b606b81bd6bd05b8b4' \ + '1cf799b5d64f260222c316622715950c69671ffe' \ + '866a8e9d9d5e1a86fd63c8a362f580362cd1d4dd') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
