Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c9c9777e3caa93cb9500ae69f409c0adf9158a77
commit c9c9777e3caa93cb9500ae69f409c0adf9158a77 Author: DeX77 <[email protected]> Date: Wed Aug 20 14:57:25 2014 +0200 gnome-python-desktop-2.32.0-8-x86_64 * rebuilt to fix : gnome-python-desktop-evolution gnome-python-desktop-gtop gnome-python-desktop-keyring gnome-python-desktop-totem diff --git a/source/gnome-extra/gnome-python-desktop/FrugalBuild b/source/gnome-extra/gnome-python-desktop/FrugalBuild index cc2139e..b826f63 100644 --- a/source/gnome-extra/gnome-python-desktop/FrugalBuild +++ b/source/gnome-extra/gnome-python-desktop/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gnome-python-desktop pkgver=2.32.0 -pkgrel=7 +pkgrel=8 pkgdesc="Python bindings for GNOME desktop" url="http://www.pygtk.org/"; depends=('gnome-python>=2.28.1-2') @@ -15,6 +15,8 @@ Finclude gnome python replaces=("$pkgname-nautilusburn" "$pkgname-mediaprofiles" "$pkgname-evince" "$pkgname-brasero" "$pkgname-applet" "$pkgname-bugbuddy") provides=("$pkgname-nautilusburn" "$pkgname-mediaprofiles" "$pkgname-evince" "$pkgname-brasero" "$pkgname-applet" "$pkgname-bugbuddy") +source+=('gnome-python-desktop-2.32.0-metacity-build.patch') + #subpkgs=("${subpkgs[@]}" "$pkgname-applet") #subdescs=("${subdescs[@]}" 'Gnome panel applet python module') #subdepends=("${subdepends[@]}" "gnome-panel>=2.32.0") @@ -31,7 +33,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') subpkgs=("${subpkgs[@]}" "$pkgname-keyring") subdescs=("${subdescs[@]}" 'Gnome keyring python module') -subdepends=("${subdepends[@]}" "gnome-keyring>=2.32.0") +subdepends=("${subdepends[@]}" "gnome-keyring>=3.12") subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subgroups=("${subgroups[@]}" 'gnome-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') @@ -52,7 +54,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') subpkgs=("${subpkgs[@]}" "$pkgname-gtop") subdescs=("${subdescs[@]}" 'Gtop python module') -subdepends=("${subdepends[@]}" "libgtop>=2.28.0") +subdepends=("${subdepends[@]}" "libgtop>=2.30") subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subgroups=("${subgroups[@]}" 'gnome-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') @@ -80,7 +82,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') subpkgs=("${subpkgs[@]}" "$pkgname-totem") subdescs=("${subdescs[@]}" 'Totem python module') -subdepends=("${subdepends[@]}" "totem>=2.90.0") +subdepends=("${subdepends[@]}" "totem>=3.12.1") subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subgroups=("${subgroups[@]}" 'gnome-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') @@ -107,12 +109,12 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') #subgroups=("${subgroups[@]}" 'gnome') #subarchs=("${subarchs[@]}" 'i686 x86_64') -subpkgs=("${subpkgs[@]}" "$pkgname-evolution") -subdescs=("${subdescs[@]}" 'evolution python module') -subdepends=("${subdepends[@]}" "evolution>=3.2.0 openssl>=1.0.0-2") -subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") -subgroups=("${subgroups[@]}" 'gnome-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') +#subpkgs=("${subpkgs[@]}" "$pkgname-evolution") +#subdescs=("${subdescs[@]}" 'evolution python module') +#subdepends=("${subdepends[@]}" "evolution>=3.12.3 openssl>=1.0.1") +#subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") +#subgroups=("${subgroups[@]}" 'gnome-extra') +#subarchs=("${subarchs[@]}" 'i686 x86_64') #subpkgs=("${subpkgs[@]}" "$pkgname-nautilusburn") #subdescs=("${subdescs[@]}" 'nautilus-cd-burner python module') @@ -128,13 +130,20 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') #subgroups=("${subgroups[@]}" 'gnome') #subarchs=("${subarchs[@]}" 'i686 x86_64') +Fconfopts+="--enable-metacity \ + --disable-nautilusburn \ + --disable-evince \ + --disable-braseromedia \ + --disable-evolution \ + --disable-evolution_ecal" + ## NOTE: the depends are not really right for gnome-python-desktop-wnck , $pkgname depends/rodepends got removed ## to make some rox crap happy. So you have to add gnome-python{-desktop} depends to any gnome* package need ## gnome-python-desktop-wnck build() { - Fbuild --enable-metacity -disable-nautilusburn --disable-evince --disable-braseromedia + Fbuild # Split all this crap off, seriously, a menu editor pulls in hundreds of unnecessary depends @@ -202,7 +211,7 @@ build() { #Fsplit $pkgname-evince $_F_python_libdir/gtk-2.0/evince.so # -evolution - Fsplit $pkgname-evolution $_F_python_libdir/gtk-2.0/evolution + #Fsplit $pkgname-evolution $_F_python_libdir/gtk-2.0/evolution # -nautilusburn #Fsplit $pkgname-nautilusburn $_F_python_libdir/gtk-2.0/nautilusburn.la @@ -217,6 +226,7 @@ build() { Frm $_F_python_libdir/gtk-2.0/bugbudd* } -sha1sums=('dae15fe9fea61ecbde5af513c94de2ff1a66369c') +sha1sums=('dae15fe9fea61ecbde5af513c94de2ff1a66369c' \ + 'f4f66ee6d1d2489a495194efb49983c1ab6042fa') # optimization OK diff --git a/source/gnome-extra/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/source/gnome-extra/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch new file mode 100644 index 0000000..5054dd2 --- /dev/null +++ b/source/gnome-extra/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch @@ -0,0 +1,42 @@ +From: Daniel Drake <[email protected]> + +Fix build against metacity-2.34.2. The port to GSettings +removed these constants from the codebase. + +Index: gnome-python-desktop-2.32.0/metacity/metacity.defs +=================================================================== +--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs ++++ gnome-python-desktop-2.32.0/metacity/metacity.defs +@@ -120,32 +120,6 @@ + ) + ) + +-(define-enum FocusMode +- (in-module "Meta") +- (c-name "MetaFocusMode") +-; (gtype-id "META_TYPE_FOCUS_MODE") +- (values +- '("click" "META_FOCUS_MODE_CLICK") +- '("sloppy" "META_FOCUS_MODE_SLOPPY") +- '("mouse" "META_FOCUS_MODE_MOUSE") +- ) +-) +- +-(define-enum ActionTitlebar +- (in-module "Meta") +- (c-name "MetaActionTitlebar") +-; (gtype-id "META_TYPE_ACTION_TITLEBAR") +- (values +- '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE") +- '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE") +- '("minimize" "META_ACTION_TITLEBAR_MINIMIZE") +- '("none" "META_ACTION_TITLEBAR_NONE") +- '("lower" "META_ACTION_TITLEBAR_LOWER") +- '("menu" "META_ACTION_TITLEBAR_MENU") +- '("last" "META_ACTION_TITLEBAR_LAST") +- ) +-) +- + (define-enum FrameType + (in-module "Meta") + (c-name "MetaFrameType") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
