Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a06ffb3b02834694b829f4e291e7780a2b294b92
commit a06ffb3b02834694b829f4e291e7780a2b294b92
Merge: 2d60527 70ad903
Author: bouleetbil <bouleet...@frogdev.info>
Date: Thu Jan 13 12:22:46 2011 +0000
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/devel-extra/vala/FrugalBuild
source/gnome/gnome-settings-daemon/FrugalBuild
source/gnome/nautilus/FrugalBuild
source/xapps/vte/FrugalBuild
source/xlib/libnotify/FrugalBuild
diff --cc source/devel-extra/vala/FrugalBuild
index 421da3f,eea1fb4..639acc8
--- a/source/devel-extra/vala/FrugalBuild
+++ b/source/devel-extra/vala/FrugalBuild
@@@ -3,10 -3,11 +3,11 @@@
# Contributor: jedifox <j3d1...@free.fr>
pkgname=vala
-pkgver=0.10.2
-pkgrel=2
+pkgver=0.11.2
+pkgrel=1
pkgdesc="Vala is a prgramming language that aims to bring modern programming
language features to GNOME developers"
depends=('glib2>=2.20.1')
+ makedepends=('libxslt')
groups=('devel-extra')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
diff --cc source/devel/json-glib/FrugalBuild
index be7b575,4aa29cf..e0dd163
--- a/source/devel/json-glib/FrugalBuild
+++ b/source/devel/json-glib/FrugalBuild
@@@ -8,8 -8,8 +8,8 @@@ pkgdesc="JSON library built on GLib
url="http://live.gnome.org/JsonGlib";
Finclude gnome
depends=('glib2')
-groups=('devel-extra')
+groups=('devel')
archs=('i686' 'x86_64' 'ppc')
- sha1sums=('2295a704d4e45a4e5333ea9eeda9b9c413b118d1')
+ sha1sums=('7689c9ec00940b3271cddb60d48fdd426b78785f')
# optimization OK
diff --cc source/gnome-extra/gtk+2-engines-equinox/FrugalBuild
index 90031fb,7dda172..359d319
--- a/source/gnome-extra/gtk+2-engines-equinox/FrugalBuild
+++ b/source/gnome-extra/gtk+2-engines-equinox/FrugalBuild
@@@ -3,16 -3,16 +3,16 @@@
pkgname=gtk+2-engines-equinox
pkgver=1.30
-pkgrel=2
+pkgrel=3
pkgdesc="A heavily modified version of the beautiful Aurora engine"
depends=('gtk+2>=2.20.1-1' 'cairo>=1.8.10-2' 'zlib' 'libxext' 'libxfixes'
'libgcc')
makedepends=('pkgconfig')
options=('scriptlet')
-groups=('gnome')
+groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
- up2date="$pkgver"
-
source=(http://gnome-look.org/CONTENT/content-files/121881-equinox-${pkgver}.tar.bz2)
+ _F_gnome_look_id="121881"
+ Finclude gnome-look
+
source=(http://gnome-look.org/CONTENT/content-files/$_F_gnome_look_id-equinox-${pkgver}.tar.bz2)
sha1sums=('4dd568b5f9bf55f1760081e1534dcb0c9fe9a82c')
build() {
diff --cc source/gnome/gnome-settings-daemon/FrugalBuild
index e60b539,16dff76..10c8ae9
--- a/source/gnome/gnome-settings-daemon/FrugalBuild
+++ b/source/gnome/gnome-settings-daemon/FrugalBuild
@@@ -14,8 -20,13 +14,9 @@@ _F_gnome_glib="y
_F_gnome_scrollkeeper="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-source=(${source[@]} gnome-settings-daemon-2.30.0-gst-vol-control-support.patch
- $pkgname-xres-lcdfilter.patch)
-sha1sums=('c4cc7035909843472e9a5060e5cd294322999a32' \
- '8db1dde75b1866619d6589e989ed27fc45050c50' \
- '8fd41db394be5681e0f2024d9665d6bc7d2c6f36')
-Fconfopts="$Fconfopts --enable-gstreamer"
+sha1sums=('96db767ed56eedd1693cb222eeae6b23cd3ea1eb')
+
+
build() {
Fcd
Fpatchall
diff --cc source/gnome/nautilus/FrugalBuild
index b17d949,7b6abf2..799961a
--- a/source/gnome/nautilus/FrugalBuild
+++ b/source/gnome/nautilus/FrugalBuild
@@@ -17,9 -17,10 +17,8 @@@ _F_gnome_desktop="y
_F_gnome_mime="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-
-source=(${source[@]} $pkgname-2.16.0-frugalware_defaults.patch)
Fconfopts="$Fconfopts --disable-packagekit"
-sha1sums=('7b0a89cd965f4ca1531115d353b208bb2ba9db33' \
- 'e859475c48401f91516e52f5ffd0d17421a999ae')
+sha1sums=('24a07ac5da936a8b40261faa161848a00d3573dc')
provides=('eel')
replaces=('eel' 'nautilus-wallpaper')
diff --cc source/xapps/vte/FrugalBuild
index 352b74c,4f3b47d..31c4c88
--- a/source/xapps/vte/FrugalBuild
+++ b/source/xapps/vte/FrugalBuild
@@@ -11,10 -11,9 +11,11 @@@ makedepends=('gtk-doc>=1.11' 'perl-xml-
groups=('xapps')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
-sha1sums=('4c8fb07403538b7f743ec1d7af7b127683c7b9c2')
-Fconfopts="$Fconfopts --disable-gtk-doc"
+sha1sums=('63ff8e66d4f884b2f0f9693d30ea8ab90bd68f21')
+#as pygtk don't works with gtk3 should use gtk2
+Fconfopts="$Fconfopts --disable-gtk-doc --with-gtk=2.0 --enable-python"
+
+
subpkgs=('vte-python')
subdescs=('Python bindings for VTE')
subdepends=("pygtk>=2.22.0")
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
