- From 3b5169a6793958a11bab784df9cf647da211e4bf Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 15:29:45 +0200
- Subject: [PATCH 1/8] gnome-desktop: bump to 3.5.2
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- metadata/repository_mask.conf | 1 +
- .../{gnome-desktop-3.4.2.exheres-0 => gnome-desktop-3.5.2.exheres-0} | 2 ++
- 2 files changed, 3 insertions(+)
- copy packages/gnome-desktop/gnome-desktop/{gnome-desktop-3.4.2.exheres-0 => gnome-desktop-3.5.2.exheres-0} (95%)
- diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
- index 53788fa..c10e2c5 100644
- --- a/metadata/repository_mask.conf
- +++ b/metadata/repository_mask.conf
- @@ -112,6 +112,7 @@
- (
- dev-libs/gtk-vnc[>=0.5&<scm]
- + gnome-desktop/gnome-desktop[>=3.5&<scm]
- gnome-desktop/libgdata[>=0.13&<scm]
- ) [[
- *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
- diff --git a/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.4.2.exheres-0 b/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.5.2.exheres-0
- similarity index 95%
- copy from packages/gnome-desktop/gnome-desktop/gnome-desktop-3.4.2.exheres-0
- copy to packages/gnome-desktop/gnome-desktop/gnome-desktop-3.5.2.exheres-0
- index 243dec3..4bebfca 100644
- --- a/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.4.2.exheres-0
- +++ b/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.5.2.exheres-0
- @@ -25,6 +25,8 @@ DEPENDENCIES="
- dev-libs/glib:2[>=2.19.1]
- gnome-desktop/gsettings-desktop-schemas[>=0.1.4]
- x11-libs/libXext[>=1.2]
- + x11-apps/xkeyboard-config
- + x11-libs/libxkbfile
- gobject-introspection? ( gnome-desktop/gobject-introspection:1[>=0.9.7] )
- run:
- sys-apps/pnp-data
- --
- 1.7.10.4
- From 43185adf8f19c5d9b466cd9531a32c6593c8f09a Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 15:43:49 +0200
- Subject: [PATCH 2/8] add evolution-data-server scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- metadata/repository_mask.conf | 1 +
- ...xheres-0 => evolution-data-server-scm.exheres-0} | 19 +++++++++++++++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
- copy packages/gnome-desktop/evolution-data-server/{evolution-data-server-3.5.1.exheres-0 => evolution-data-server-scm.exheres-0} (82%)
- diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
- index c10e2c5..54ed661 100644
- --- a/metadata/repository_mask.conf
- +++ b/metadata/repository_mask.conf
- @@ -1,6 +1,7 @@
- (
- dev-libs/libpeas[~scm]
- gnome-bindings/gjs[~scm]
- + gnome-desktop/evolution-data-server[~scm]
- gnome-desktop/gcr[~scm]
- gnome-desktop/gdm[~scm]
- gnome-desktop/gnome-keyring[~scm]
- diff --git a/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.5.1.exheres-0 b/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0
- similarity index 82%
- copy from packages/gnome-desktop/evolution-data-server/evolution-data-server-3.5.1.exheres-0
- copy to packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0
- index 18a96b4..27b4aef 100644
- --- a/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.5.1.exheres-0
- +++ b/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0
- @@ -1,7 +1,8 @@
- # Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
- # Distributed under the terms of the GNU General Purpose License v2
- -require gnome.org [ suffix=.tar.xz ] gsettings
- +require gnome.org gsettings
- +require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.12 ] ]
- SUMMARY="Backend store for contact data"
- HOMEPAGE="http://projects.gnome.org/evolution"
- @@ -23,6 +24,7 @@ MYOPTIONS="
- DEPENDENCIES="
- build:
- + app-doc/gtk-doc-autotools
- dev-util/intltool[>=0.35.5]
- dev-util/pkg-config[>=0.20]
- gtk-doc? ( dev-doc/gtk-doc[>=1.14] )
- @@ -30,14 +32,14 @@ DEPENDENCIES="
- build+run:
- dev-libs/glib:2[>=2.32.0]
- x11-libs/gtk+:3[>=3.2.0]
- - gnome-platform/GConf:2[>=2.0.0]
- dev-libs/libxml2:2.0[>=2.0.0]
- - gnome-desktop/libsoup:2.4[>=2.37.91]
- + gnome-desktop/libsoup:2.4[>=2.38.1]
- gnome-desktop/libgdata[>=0.10]
- dev-libs/dbus-glib:1[>=0.6]
- office-libs/libical[>=0.43]
- dev-libs/liboauth[>=0.9.4]
- - gnome-desktop/gnome-online-accounts[>=3.1.1]
- + gnome-desktop/gnome-online-accounts[>=3.5]
- + gnome-desktop/gcr[>=3.4]
- gnome-desktop/libgnome-keyring:1[>=2.20.1]
- sys-libs/db:=
- dev-libs/nspr
- @@ -57,3 +59,12 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection'
- 'gtk-doc' 'vapi vala-bindings' 'weather' )
- DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'ldap openldap' 'kerberos krb5' )
- +AT_M4DIR=( m4 )
- +
- +src_prepare() {
- + edo gtkdocize --copy
- + edo autopoint
- + edo intltoolize --force --copy --automake
- + autotools_src_prepare
- +}
- +
- --
- 1.7.10.4
- From bad7f2e69cd5abb1767c1ee3e1a0b80831a95e6a Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 15:44:06 +0200
- Subject: [PATCH 3/8] update gnome-shell scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0 | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
- diff --git a/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0 b/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0
- index 612f2ec..122c713 100644
- --- a/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0
- +++ b/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0
- @@ -23,7 +23,7 @@ DEPENDENCIES="
- dev-libs/glib[>=2.31.6]
- dev-libs/libcroco[>=0.6.2]
- dev-libs/libxml2
- - gnome-desktop/evolution-data-server[>=2.91.6][calendar(+)][gobject-introspection]
- + gnome-desktop/evolution-data-server[~scm][calendar(+)][gobject-introspection]
- gnome-desktop/gnome-bluetooth:1[>=3.1.0][gobject-introspection] [[
- note = [ automagic and crashes without introspection ]
- ]]
- @@ -31,7 +31,7 @@ DEPENDENCIES="
- gnome-desktop/gobject-introspection:1[>=0.10.1]
- gnome-desktop/gsettings-desktop-schemas[~scm]
- gnome-desktop/libsoup:2.4
- - gnome-desktop/mutter[>=3.4.0][gobject-introspection]
- + gnome-desktop/mutter[~scm][gobject-introspection]
- media-libs/gstreamer:0.10[>=0.10.16] [[ note = automagic ]]
- media-libs/libcanberra
- media-plugins/gst-plugins-base:0.10[>=0.10.16] [[ note = automagic ]]
- @@ -47,6 +47,7 @@ DEPENDENCIES="
- net-apps/NetworkManager[>=0.8.999][gobject-introspection]
- gnome-desktop/gnome-keyring:1
- gnome-desktop/gcr[>=3.3.90][gobject-introspection]
- + gnome-desktop/gnome-desktop[>=3.5.1]
- x11-libs/startup-notification[>=0.11]
- base/libgee:1.0[gobject-introspection]
- core/json-glib[>=0.13.2]
- @@ -81,8 +82,7 @@ DEPENDENCIES="
- ]]
- "
- -DEFAULT_SRC_CONFIGURE_PARAMS=( '--enable-introspection' '--disable-jhbuild-wrapper-script'
- - '--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt' )
- +DEFAULT_SRC_CONFIGURE_PARAMS=( '--enable-introspection' '--disable-jhbuild-wrapper-script' )
- DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' )
- DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( systemd )
- --
- 1.7.10.4
- From 4ac81a816eb21995106e39f2f267e947f2ab572c Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 16:00:03 +0200
- Subject: [PATCH 4/8] update libpeas scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- packages/dev-libs/libpeas/libpeas-scm.exheres-0 | 24 ++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
- diff --git a/packages/dev-libs/libpeas/libpeas-scm.exheres-0 b/packages/dev-libs/libpeas/libpeas-scm.exheres-0
- index 78d8bca..048ddca 100644
- --- a/packages/dev-libs/libpeas/libpeas-scm.exheres-0
- +++ b/packages/dev-libs/libpeas/libpeas-scm.exheres-0
- @@ -9,28 +9,34 @@ require scm-git
- require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.12 1.11 ] ]
- SUMMARY="A GObject plugins library"
- -HOMEPAGE="http://git.gnome.org/browse/libpeas"
- +HOMEPAGE="http://live.gnome.org/Libpeas"
- DOWNLOADS=""
- LICENCES="LGPL-2.1"
- SLOT="1.0"
- -PLATFORMS="~amd64"
- -MYOPTIONS="doc"
- +PLATFORMS="~amd64 ~x86"
- +MYOPTIONS="doc gjs python seed"
- DEPENDENCIES="
- build:
- app-doc/gtk-doc-autotools
- - dev-util/pkg-config[>=0.20]
- dev-util/intltool[>=0.40.0]
- - gnome-desktop/gobject-introspection:1[>=0.6.7]
- + dev-util/pkg-config[>=0.20]
- doc? ( dev-doc/gtk-doc[>=1.11] )
- build+run:
- - dev-libs/glib:2[>=2.18.0]
- - x11-libs/gtk+:3[gobject-introspection]
- + dev-libs/glib:2[>=2.31.2]
- + gnome-desktop/gobject-introspection:1[>=0.10.1]
- + x11-libs/gtk+:3[>=3.0.0][gobject-introspection]
- + gjs? ( gnome-bindings/gjs:1[>=1.31.11] )
- + python? ( dev-lang/python:*[>=2.5.2]
- + gnome-bindings/pygobject:3[>=2.90.2] )
- + seed? ( gnome-bindings/seed[>=2.91.91] )
- "
- -DEFAULT_SRC_CONFIGURE_PARAMS=( '--disable-seed' '--disable-python' )
- -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' )
- +RESTRICT="test" # requires X
- +
- +DEFAULT_SRC_CONFIGURE_PARAMS=( '--disable-glade-catalog' '--disable-vala' '--enable-gtk' )
- +DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' 'gjs' 'python' 'seed' )
- src_prepare() {
- edo sed -e 's/GNOME_COMPILE_WARNINGS/dnl &/' \
- --
- 1.7.10.4
- From 706ca31db6ca069547fd5d6378a0dfad5a46ba84 Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 16:05:02 +0200
- Subject: [PATCH 5/8] update gnome-online-accounts scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- .../gnome-online-accounts/gnome-online-accounts-scm.exheres-0 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- diff --git a/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0 b/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0
- index f2e767e..6f14371 100644
- --- a/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0
- +++ b/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0
- @@ -19,7 +19,7 @@ DEPENDENCIES="
- doc? ( dev-doc/gtk-doc[>=1.3] )
- build+run:
- dev-libs/glib:2[>=2.32]
- - x11-libs/gtk+:3[>=3.0.0]
- + x11-libs/gtk+:3[~scm]
- net-libs/webkit:3.0
- gnome-desktop/libsoup:2.4[>=2.38]
- core/json-glib
- --
- 1.7.10.4
- From ec6c67fb3d73951784e7f205d958ccf2e3ac9f53 Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 16:08:07 +0200
- Subject: [PATCH 6/8] update network-manager-applet scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- .../network-manager-applet-scm.exheres-0 | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
- diff --git a/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0 b/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0
- index 3764562..85fff32 100644
- --- a/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0
- +++ b/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0
- @@ -7,10 +7,6 @@ require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.10 1.12 1.
- SUMMARY="A panel applet to configure networking via NetworkManager"
- HOMEPAGE="http://www.gnome.org/projects/NetworkManager"
- DOWNLOADS=""
- -SCM_REPOSITORY="git://git.gnome.org/network-manager-applet"
- -
- -require scm-git
- -
- LICENCES="GPL-2"
- SLOT="0"
- PLATFORMS="~amd64 ~x86"
- @@ -18,18 +14,19 @@ MYOPTIONS="bluetooth [[ description = [ add support for bluetooth DUN ] ]]"
- DEPENDENCIES="
- build:
- - sys-devel/gettext
- + dev-util/pkg-config
- dev-util/intltool[>=0.40.0]
- + sys-devel/gettext
- build+run:
- + app-text/iso-codes
- dev-libs/glib:2[>=2.16]
- dev-libs/dbus-glib:1[>=0.74]
- - net-apps/NetworkManager[>=0.8.992]
- + net-apps/NetworkManager[>=0.9.4]
- x11-libs/gtk+:3[>=2.91.4]
- gnome-platform/GConf:2
- gnome-desktop/libgnome-keyring:1
- x11-libs/libnotify[>=0.7]
- sys-apps/dbus[>=1.2.6]
- - sys-auth/polkit:1[>=0.92]
- bluetooth? ( gnome-desktop/gnome-bluetooth:1[>=2.27.6] )
- recommendation:
- gnome-desktop/gnome-keyring:1
- --
- 1.7.10.4
- From 27969868c7684eb8fff8745c26c0d48f09bebd1e Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 16:15:40 +0200
- Subject: [PATCH 7/8] update mutter scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- packages/gnome-desktop/mutter/mutter-scm.exheres-0 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- diff --git a/packages/gnome-desktop/mutter/mutter-scm.exheres-0 b/packages/gnome-desktop/mutter/mutter-scm.exheres-0
- index e336c25..66600f4 100644
- --- a/packages/gnome-desktop/mutter/mutter-scm.exheres-0
- +++ b/packages/gnome-desktop/mutter/mutter-scm.exheres-0
- @@ -9,7 +9,7 @@ SUMMARY="Clutter and metacity based compositing window manager"
- LICENCES="GPL-2"
- SLOT="0"
- PLATFORMS="~amd64"
- -MYOPTIONS="gobject-introspection xinerama
- +MYOPTIONS="gobject-introspection
- sound [[ description = [ Enable the use of libcanberra for event sounds ] ]]
- "
- @@ -43,7 +43,7 @@ DEPENDENCIES="
- gnome-desktop/zenity
- gobject-introspection? ( gnome-desktop/gobject-introspection:1[>=0.9.5] )
- sound? ( media-libs/libcanberra[gtk3][>=0.26] )
- - xinerama? ( x11-libs/libXinerama )
- + x11-libs/libXinerama
- recommendation:
- gnome-desktop/gnome-themes-standard [[
- description = [ Provides default GNOME 3 theme (Adwaita) ]
- @@ -55,7 +55,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=( '--enable-sm' '--enable-startup-notification' '--
- '--disable-static'
- # need to reduce default compiler warnings due to deprecation errors
- '--enable-compile-warnings=maximum' )
- -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection' 'xinerama' )
- +DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection' )
- DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'sound libcanberra' )
- src_prepare() {
- --
- 1.7.10.4
- From 253ca8ec3f122cf7d41d9f74ab140ddef8bcf48b Mon Sep 17 00:00:00 2001
- From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- Date: Thu, 14 Jun 2012 16:20:29 +0200
- Subject: [PATCH 8/8] update empathy scm
- Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
- ---
- packages/net-im/empathy/empathy-scm.exheres-0 | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
- diff --git a/packages/net-im/empathy/empathy-scm.exheres-0 b/packages/net-im/empathy/empathy-scm.exheres-0
- index 97857dc..5c9034f 100644
- --- a/packages/net-im/empathy/empathy-scm.exheres-0
- +++ b/packages/net-im/empathy/empathy-scm.exheres-0
- @@ -1,6 +1,10 @@
- # Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
- # Distributed under the terms of the GNU General Purpose License v2
- +SCM_SECONDARY_REPOSITORIES="egglistbox"
- +SCM_egglistbox_REPOSITORY="git://git.gnome.org/egg-list-box"
- +SCM_EXTERNAL_REFS="libempathy-gtk/egg-list-box:egglistbox"
- +
- require gnome.org [ suffix='.tar.xz' ] gsettings gtk-icon-cache freedesktop-desktop
- require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.12 1.11 ] ]
- @@ -11,7 +15,6 @@ LICENCES="GPL-2"
- SLOT="0"
- PLATFORMS="~amd64 ~x86"
- MYOPTIONS="
- - eds [[ description = [ use evolution-data-server for salut ] ]]
- cheese [[ description = [ enable webcam support for avatars ] ]]
- geolocation [[ description = [ Displays your buddies on a map and transmit your position, for
- now just the display part ] ]]
- @@ -22,6 +25,7 @@ MYOPTIONS="
- DEPENDENCIES="
- build:
- + dev-lang/vala:*[>=0.16] [[ note = [ for egg-list-box ] ]]
- dev-libs/libxslt
- dev-util/itstool [[ note = [ from YELP_HELP_INIT in configure.ac ] ]]
- dev-lang/python:*[>=2.3]
- @@ -45,10 +49,10 @@ DEPENDENCIES="
- x11-libs/clutter:1[>=1.10.0]
- x11-libs/clutter-gtk:1.0[>=1.1.2]
- media-libs/clutter-gst:1.0[>=1.5.2]
- - net-im/telepathy-glib[>=0.19.0]
- + net-im/telepathy-glib[~scm]
- net-im/telepathy-logger:0.2[>=0.2.13]
- x11-libs/libX11
- - x11-libs/gtk+:3[>=3.3.6]
- + x11-libs/gtk+:3[>=3.5.1]
- media-libs/libcanberra[>=0.25][gtk3]
- x11-libs/libnotify[>=0.7.0]
- media-sound/pulseaudio
- @@ -56,7 +60,6 @@ DEPENDENCIES="
- gnome-desktop/libsoup:2.4
- gnome-desktop/gnome-online-accounts[>=3.5.1]
- cheese? ( gnome-desktop/cheese[>=3.4.0] )
- - eds? ( gnome-desktop/evolution-data-server:1.2 )
- geolocation? ( x11-libs/libchamplain:0.12[>=0.12.1] )
- nautilus-sendto? ( gnome-desktop/nautilus-sendto[>=2.90] )
- spell? ( app-spell/enchant[>=1.2.0]
- @@ -79,10 +82,14 @@ DEPENDENCIES="
- AT_M4DIR=( m4 )
- DEFAULT_SRC_CONFIGURE_PARAMS=( --disable-geocode --disable-location --enable-goa )
- -DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'eds' )
- DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'geolocation map' 'nautilus-sendto' spell 'udev gudev' )
- src_prepare() {
- + edo pushd libempathy-gtk/egg-list-box
- + mkdir m4
- + eautoreconf
- + edo popd
- +
- edo gnome-doc-prepare --automake --force --copy
- autotools_src_prepare
- edo intltoolize --force
- --
- 1.7.10.4