diff options
Diffstat (limited to 'gnome-unstable')
102 files changed, 0 insertions, 5866 deletions
diff --git a/gnome-unstable/anjuta-extras/PKGBUILD b/gnome-unstable/anjuta-extras/PKGBUILD deleted file mode 100644 index 4ddfa9f55..000000000 --- a/gnome-unstable/anjuta-extras/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 167364 2012-10-01 14:56:44Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=anjuta-extras -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Anjuta Integrated Development Environment extra plugins" -arch=('i686' 'x86_64') -license=('GPL') -depends=('anjuta') -makedepends=('intltool' 'gnome-doc-utils') -install=anjuta-extras.install -url="http://www.anjuta.org/" -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -options=('!libtool' '!emptydirs') -sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/anjuta-extras/anjuta-extras.install b/gnome-unstable/anjuta-extras/anjuta-extras.install deleted file mode 100644 index a96048c1d..000000000 --- a/gnome-unstable/anjuta-extras/anjuta-extras.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/gnome-unstable/anjuta/PKGBUILD b/gnome-unstable/anjuta/PKGBUILD deleted file mode 100644 index 320888b6e..000000000 --- a/gnome-unstable/anjuta/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 167359 2012-10-01 14:54:15Z heftig $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Harley Laue <losinggeneration@yahoo.com> - -pkgbase=anjuta -pkgname=('libanjuta' 'anjuta') -pkgver=3.6.0 -pkgrel=1 -pkgdesc="GNOME Integrated Development Environment (IDE)" -arch=('i686' 'x86_64') -license=('GPL') -makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool') -url="http://www.anjuta.org/" -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -options=('!libtool' '!emptydirs') -sha256sums=('e810213e2f2847b71e05eb21cdaff6b946e9511cef2105158b428eee47be787a') - -build() { - cd "$pkgbase-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package_libanjuta(){ - pkgdesc="Anjuta runtime library" - depends=('gdl') - conflicts=('anjuta<3.4.4') - - cd "$pkgbase-$pkgver/libanjuta" - - # j1: Race during linking - make -j1 DESTDIR="$pkgdir" install -} - -package_anjuta(){ - pkgdesc="GNOME Integrated Development Environment (IDE)" - depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') - - install=anjuta.install - - cd "$pkgbase-$pkgver" - make -j1 DESTDIR="$pkgdir" install - - cd libanjuta - make -j1 DESTDIR="$pkgdir" uninstall - - sed -i "1s|#!/usr/bin/python$|&2|" \ - $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py -} diff --git a/gnome-unstable/anjuta/anjuta.install b/gnome-unstable/anjuta/anjuta.install deleted file mode 100644 index 5608d35be..000000000 --- a/gnome-unstable/anjuta/anjuta.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f /usr/share/icons/gnome - update-mime-database /usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/banshee/PKGBUILD b/gnome-unstable/banshee/PKGBUILD deleted file mode 100644 index 0cce416cd..000000000 --- a/gnome-unstable/banshee/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=banshee -pkgver=2.6.0 -pkgrel=1 -pkgdesc="Music management and playback for GNOME" -arch=('i686' 'x86_64') -url="http://banshee.fm/" -license=('MIT') -depends=(libxxf86vm gst-plugins-base mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gst-plugins-bad mono-upnp) -makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common') -optdepends=('gst-plugins-good: Extra media codecs' - 'gst-plugins-ugly: Extra media codecs' - 'gst-libav: Extra media codecs' - 'brasero: CD burning') -options=('!libtool') -install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz - gst-1.0.patch) -sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a' - 'eddf696b0be91331fae8d63c23277a355e94539a3436a8619dab2d732b30234e') - -build() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p "$MONO_SHARED_DIR" - - cd "$srcdir/$pkgname-$pkgver" - #https://bugzilla.gnome.org/show_bug.cgi?id=679433 - patch -Np1 -i "${srcdir}/gst-1.0.patch" - - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-docs \ - --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-install \ - --with-vendor-build-id=ArchLinux - make -} - -package() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p "$MONO_SHARED_DIR" - - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/gnome-unstable/banshee/banshee-recent-gpod.patch b/gnome-unstable/banshee/banshee-recent-gpod.patch deleted file mode 100644 index afb3a0fd1..000000000 --- a/gnome-unstable/banshee/banshee-recent-gpod.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001 -From: William Witt <william@witt-family.net> -Date: Sat, 30 Jul 2011 21:54:41 -0500 -Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp - ---- - .../AppleDeviceTrackInfo.cs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs -index 178266d..b8549f7 100644 ---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs -+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs -@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice - track.CDs = DiscCount; - track.CDNumber = DiscNumber; - track.TrackLength = (int) Duration.TotalMilliseconds; -- track.Size = (int)FileSize; -+ track.Size = (uint)FileSize; - track.Grouping = Grouping; - try { - track.TimePlayed = LastPlayed; --- -1.7.3.4 diff --git a/gnome-unstable/banshee/banshee.install b/gnome-unstable/banshee/banshee.install deleted file mode 100644 index 1d0fd332b..000000000 --- a/gnome-unstable/banshee/banshee.install +++ /dev/null @@ -1,15 +0,0 @@ -pkgname=banshee - -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/gnome-unstable/banshee/gst-1.0.patch b/gnome-unstable/banshee/gst-1.0.patch deleted file mode 100644 index f8fa7a7c2..000000000 --- a/gnome-unstable/banshee/gst-1.0.patch +++ /dev/null @@ -1,1025 +0,0 @@ -From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> -Date: Wed, 19 Sep 2012 11:34:06 +0200 -Subject: [PATCH] Initial port to GStreamer 1.0 - ---- - build/m4/banshee/gstreamer.m4 | 19 +++--- - data/audio-profiles/wav.xml.in | 5 +- - libbanshee/banshee-bpmdetector.c | 11 ++-- - libbanshee/banshee-gst.h | 4 +- - libbanshee/banshee-player-cdda.c | 5 +- - libbanshee/banshee-player-dvd.c | 4 +- - libbanshee/banshee-player-equalizer.c | 4 +- - libbanshee/banshee-player-missing-elements.c | 2 +- - libbanshee/banshee-player-pipeline.c | 37 ++++++----- - libbanshee/banshee-player-private.h | 13 ++-- - libbanshee/banshee-player-replaygain.c | 29 ++++----- - libbanshee/banshee-player-video.c | 89 +++++++++++++------------- - libbanshee/banshee-player-vis.c | 88 ++++++++----------------- - libbanshee/banshee-player.c | 11 ++-- - libbanshee/banshee-ripper.c | 16 ++--- - libbanshee/banshee-tagger.c | 2 +- - libbanshee/banshee-transcoder.c | 19 +++--- - 17 files changed, 156 insertions(+), 202 deletions(-) - -diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 -index 6267cce..917cf58 100644 ---- a/build/m4/banshee/gstreamer.m4 -+++ b/build/m4/banshee/gstreamer.m4 -@@ -1,17 +1,18 @@ - AC_DEFUN([BANSHEE_CHECK_GSTREAMER], - [ -- GSTREAMER_REQUIRED_VERSION=0.10.26 -+ GSTREAMER_REQUIRED_VERSION=0.11.99 - AC_SUBST(GSTREAMER_REQUIRED_VERSION) - - PKG_CHECK_MODULES(GST, -- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION) -- -- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10" -+ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION) - - AC_SUBST(GST_CFLAGS) - AC_SUBST(GST_LIBS) -diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in -index 35cd1d2..6dc1bab 100644 ---- a/data/audio-profiles/wav.xml.in -+++ b/data/audio-profiles/wav.xml.in -@@ -14,10 +14,7 @@ - "audioresample" - "audioconvert" - (+ "audio/x-raw-int, " -- "endianness=(int)1234, " -- "width=(int)16, " -- "depth=(int)16, " -- "signed=(boolean)true, " -+ "format=(string)S16LE, " - "rate=(int)44100, " - "channels=(int)2" ) - "wavenc") -diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c -index c06ffcb..68b0419 100644 ---- a/libbanshee/banshee-bpmdetector.c -+++ b/libbanshee/banshee-bpmdetector.c -@@ -30,6 +30,7 @@ - # include "config.h" - #endif - -+#include <stdio.h> - #include <string.h> - #include <glib/gi18n.h> - -@@ -50,7 +51,7 @@ struct BansheeBpmDetector { - - /* - * You can run this pipeline on the cmd line with: -- * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \ -+ * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \ - * audioconvert ! bpmdetect ! fakesink - */ - -@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, - - g_return_if_fail(detector != NULL); - -- audiopad = gst_element_get_pad(detector->audioconvert, "sink"); -+ audiopad = gst_element_get_static_pad(detector->audioconvert, "sink"); - - if(GST_PAD_IS_LINKED(audiopad)) { - g_object_unref(audiopad); - return; - } - -- caps = gst_pad_get_caps(pad); -+ caps = gst_pad_query_caps(pad, NULL); - str = gst_caps_get_structure(caps, 0); - - if(!g_strrstr(gst_structure_get_name(str), "audio")) { -@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) - return FALSE; - } - -- detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2"); -+ detector->decodebin = gst_element_factory_make ("decodebin", "decodebin"); - if (detector->decodebin == NULL) { -- bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL); -+ bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL); - return FALSE; - } - -diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h -index 85662cf..332f356 100644 ---- a/libbanshee/banshee-gst.h -+++ b/libbanshee/banshee-gst.h -@@ -41,9 +41,11 @@ - #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \ - gboolean iter##_done = FALSE; \ - while (!iter##_done) { \ -+ GValue child_value = {0, }; \ - child_type child_name; \ -- switch (gst_iterator_next (iter, (gpointer)&child_name)) { \ -+ switch (gst_iterator_next (iter, &child_value)) { \ - case GST_ITERATOR_OK: { \ -+ child_name = (child_type) g_value_get_object(&child_value); \ - { block; } \ - break; \ - } \ -diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c -index 8be2bdd..401edf0 100644 ---- a/libbanshee/banshee-player-cdda.c -+++ b/libbanshee/banshee-player-cdda.c -@@ -28,7 +28,8 @@ - // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - // - --#include <gst/cdda/gstcddabasesrc.h> -+#include <stdlib.h> -+#include <gst/audio/gstaudiocdsrc.h> - #include "banshee-player-cdda.h" - - // --------------------------------------------------------------------------- -@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin) - - g_object_get (playbin, "source", &source, NULL); - -- if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) { -+ if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) { - if (source != NULL) { - g_object_unref (source); - } -diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c -index 55d499c..991b506 100644 ---- a/libbanshee/banshee-player-dvd.c -+++ b/libbanshee/banshee-player-dvd.c -@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player) - { - gint64 index; - GstFormat format = gst_format_get_by_nick ("chapter"); -- gst_element_query_position (player->playbin, &format, &index); -+ gst_element_query_position (player->playbin, format, &index); - gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0); - } -@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player) - { - gint64 index; - GstFormat format = gst_format_get_by_nick ("chapter"); -- gst_element_query_position (player->playbin, &format, &index); -+ gst_element_query_position (player->playbin, format, &index); - gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0); - } -diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c -index a496ada..0cbb3b7 100644 ---- a/libbanshee/banshee-player-equalizer.c -+++ b/libbanshee/banshee-player-equalizer.c -@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain) - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - if (player->equalizer != NULL) { -- GstObject *band; -+ GObject *band; - - g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer))); - -@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq) - count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)); - - for (i = 0; i < count; i++) { -- GstObject *band; -+ GObject *band; - - band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i); - g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL); -diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c -index 20804c4..30118c5 100644 ---- a/libbanshee/banshee-player-missing-elements.c -+++ b/libbanshee/banshee-player-missing-elements.c -@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, - } - #endif - -- install_return = gst_install_plugins_async (details, player->install_plugins_context, -+ install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, - bp_missing_elements_handle_install_result, player); - - if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) { -diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c -index ed845f3..6c2af35 100644 ---- a/libbanshee/banshee-player-pipeline.c -+++ b/libbanshee/banshee-player-pipeline.c -@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player) - GstMessage *msg; - - // We're being called from the streaming thread, so don't do anything here -- msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL)); -+ msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed")); - gst_element_post_message (player->playbin, msg); - } - -@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) - break; - } - -+ case GST_MESSAGE_STREAM_START: { -+ bp_next_track_starting (player); -+ break; -+ } -+ - case GST_MESSAGE_APPLICATION: { - const gchar * name; - const GstStructure * s = gst_message_get_structure (message); -@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player) - - // Playbin is the core element that handles autoplugging (finding the right - // source and decoder elements) based on source URI and stream content -- player->playbin = gst_element_factory_make ("playbin2", "playbin"); -+ player->playbin = gst_element_factory_make ("playbin", "playbin"); - - #ifdef ENABLE_GAPLESS - // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. -- // This can be removed once playbin2 generates its own next-track signal. -+ // This can be removed once playbin generates its own next-track signal. - // bgo#584987 - this is included in >= 0.10.26 - g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); - #endif //ENABLE_GAPLESS -@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player) - g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player); - g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player); - -- // Try to find an audio sink, prefer gconf, which typically is set to auto these days, -- // fall back on auto, which should work on windows, and as a last ditch, try alsa -- audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink"); -- if (audiosink == NULL) { -- audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); -- if (audiosink != NULL) { -- g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); -- } else { -- audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); -- if (audiosink == NULL) { -- audiosink = gst_element_factory_make ("alsasink", "audiosink"); -- } -+ audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); -+ if (audiosink != NULL) { -+ g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); -+ } else { -+ audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); -+ if (audiosink == NULL) { -+ audiosink = gst_element_factory_make ("alsasink", "audiosink"); - } - } - -@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player) - GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink)); - BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, { - player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL; -- gst_object_unref (element); - }); - } - bp_debug ("Audiosink has volume: %s", -@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player) - } - - // Ghost pad the audio bin so audio is passed from the bin into the tee -- teepad = gst_element_get_pad (player->audiotee, "sink"); -+ teepad = gst_element_get_static_pad (player->audiotee, "sink"); - gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad)); - gst_object_unref (teepad); - -@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player) - gst_bus_add_watch (bus, bp_pipeline_bus_callback, player); - - // Link the first tee pad to the primary audio sink queue -- GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink"); -- pad = gst_element_get_request_pad (player->audiotee, "src%d"); -+ GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink"); -+ pad = gst_element_get_request_pad (player->audiotee, "src_%u"); - g_object_set(player->audiotee, "alloc-pad", pad, NULL); - gst_pad_link (pad, sinkpad); - gst_object_unref (GST_OBJECT (pad)); -diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h -index 9fed356..9346911 100644 ---- a/libbanshee/banshee-player-private.h -+++ b/libbanshee/banshee-player-private.h -@@ -42,14 +42,14 @@ - #include <gst/fft/gstfftf32.h> - #include <gst/pbutils/pbutils.h> - #include <gst/tag/tag.h> --#include <gst/interfaces/navigation.h> -+#include <gst/video/navigation.h> - - #if defined(GDK_WINDOWING_X11) - # include <gdk/gdkx.h> --# include <gst/interfaces/xoverlay.h> -+# include <gst/video/videooverlay.h> - #elif defined(GDK_WINDOWING_WIN32) - # include <gdk/gdkwin32.h> --# include <gst/interfaces/xoverlay.h> -+# include <gst/video/videooverlay.h> - #endif - - #include "banshee-gst.h" -@@ -155,11 +155,11 @@ struct BansheePlayer { - // Video State - BpVideoDisplayContextType video_display_context_type; - #if defined(GDK_WINDOWING_X11) -- GstXOverlay *xoverlay; -+ GstVideoOverlay *video_overlay; - GdkWindow *video_window; - XID video_window_xid; - #elif defined(GDK_WINDOWING_WIN32) -- GstXOverlay *xoverlay; -+ GstVideoOverlay *video_overlay; - GdkWindow *video_window; - HWND video_window_xid; - #endif -@@ -179,6 +179,8 @@ struct BansheePlayer { - GstFFTF32 *vis_fft; - GstFFTF32Complex *vis_fft_buffer; - gfloat *vis_fft_sample_buffer; -+ GstPad *vis_event_probe_pad; -+ gulong vis_event_probe_id; - - // Plugin Installer State - GdkWindow *window; -@@ -197,6 +199,7 @@ struct BansheePlayer { - // http://replaygain.hydrogenaudio.org/player_scale.html - gdouble rg_gain_history[10]; - gint history_size; -+ gulong rg_pad_block_id; - - //dvd navigation - GstNavigation *navigation; -diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c -index a479d4a..e42b197 100644 ---- a/libbanshee/banshee-player-replaygain.c -+++ b/libbanshee/banshee-player-replaygain.c -@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban - _bp_rgvolume_print_volume (player); - } - --static void --pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) -+static GstPadProbeReturn -+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data) - { - BansheePlayer* player; - -- if (!blocked) { -- return; -- } -- - player = (BansheePlayer*) user_data; -- g_return_if_fail (IS_BANSHEE_PLAYER (player)); -+ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK); - - // The pad_block_cb can get triggered multiple times, on different threads. - // Lock around the link/unlink code, so we don't end up going through here -@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) - if ((player->replaygain_enabled && player->rgvolume_in_pipeline) || - (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) { - // The pipeline is already in the correct state. Unblock the pad, and return. -+ player->rg_pad_block_id = 0; - g_mutex_unlock (player->replaygain_mutex); -- if (gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); -- } -- return; -+ return GST_PAD_PROBE_REMOVE; - } - - if (player->rgvolume_in_pipeline) { -@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) - } - - // Our state is now consistent -+ player->rg_pad_block_id = 0; - g_mutex_unlock (player->replaygain_mutex); - -- if (gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); -- } -- - _bp_rgvolume_print_volume (player); -+ -+ return GST_PAD_PROBE_REMOVE; - } - - // --------------------------------------------------------------------------- -@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player) - srcPad = gst_element_get_static_pad (player->before_rgvolume, "src"); - - if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) { -- gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player); -- } else if (srcPad->block_callback == NULL) { -- pad_block_cb (srcPad, TRUE, player); -+ player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL); -+ } else if (!player->rg_pad_block_id) { -+ pad_block_cb (srcPad, NULL, player); - } - } - -diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c -index b901354..eb95c3f 100644 ---- a/libbanshee/banshee-player-video.c -+++ b/libbanshee/banshee-player-video.c -@@ -37,54 +37,54 @@ - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - - static gboolean --bp_video_find_xoverlay (BansheePlayer *player) -+bp_video_find_video_overlay (BansheePlayer *player) - { - GstElement *video_sink = NULL; -- GstElement *xoverlay; -- GstXOverlay *previous_xoverlay; -- gboolean found_xoverlay; -+ GstElement *video_overlay; -+ GstVideoOverlay *previous_video_overlay; -+ gboolean found_video_overlay; - - g_object_get (player->playbin, "video-sink", &video_sink, NULL); - - g_mutex_lock (player->video_mutex); -- previous_xoverlay = player->xoverlay; -+ previous_video_overlay = player->video_overlay; - - if (video_sink == NULL) { -- player->xoverlay = NULL; -- if (previous_xoverlay != NULL) { -- gst_object_unref (previous_xoverlay); -+ player->video_overlay = NULL; -+ if (previous_video_overlay != NULL) { -+ gst_object_unref (previous_video_overlay); - } - g_mutex_unlock (player->video_mutex); - return FALSE; - } - -- xoverlay = GST_IS_BIN (video_sink) -- ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY) -+ video_overlay = GST_IS_BIN (video_sink) -+ ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY) - : video_sink; - -- player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL; -+ player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL; - -- if (previous_xoverlay != NULL) { -- gst_object_unref (previous_xoverlay); -+ if (previous_video_overlay != NULL) { -+ gst_object_unref (previous_video_overlay); - } - - #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink -- if (player->xoverlay != NULL && g_object_class_find_property ( -- G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) { -- g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL); -+ if (player->video_overlay != NULL && g_object_class_find_property ( -+ G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) { -+ g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL); - } - #endif - -- if (player->xoverlay != NULL && g_object_class_find_property ( -- G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) { -- g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL); -+ if (player->video_overlay != NULL && g_object_class_find_property ( -+ G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) { -+ g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL); - } - - gst_object_unref (video_sink); -- found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; -+ found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE; - - g_mutex_unlock (player->video_mutex); -- return found_xoverlay; -+ return found_video_overlay; - } - - #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ -@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) -- bp_video_find_xoverlay (player); -+ bp_video_find_video_overlay (player); - #endif - } - - static void - bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player) - { -- gboolean found_xoverlay; -+ gboolean found_video_overlay; - - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) - -- if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) { -+ if (!gst_is_video_overlay_prepare_window_handle_message (message)) { - return; - } - -- found_xoverlay = bp_video_find_xoverlay (player); -+ found_video_overlay = bp_video_find_video_overlay (player); - -- if (found_xoverlay) { -- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); -+ if (found_video_overlay) { -+ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); - } - - #endif -@@ -164,7 +164,7 @@ static void - cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p) - { - GstStructure * s = NULL; -- GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj)); -+ GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj)); - - if (G_UNLIKELY (!caps)) { - return; -@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player) - } - - if (G_LIKELY (vpad)) { -- GstCaps *caps = gst_pad_get_negotiated_caps (vpad); -+ GstCaps *caps = gst_pad_get_current_caps (vpad); - if (G_LIKELY (caps)) { - cb_caps_set (G_OBJECT (vpad), NULL, player); - gst_caps_unref (caps); -@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) - - player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW; - -- videosink = gst_element_factory_make ("gconfvideosink", "videosink"); -+ videosink = gst_element_factory_make ("autovideosink", "videosink"); - if (videosink == NULL) { -- videosink = gst_element_factory_make ("autovideosink", "videosink"); -- if (videosink == NULL) { -- player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; -- videosink = gst_element_factory_make ("fakesink", "videosink"); -- if (videosink != NULL) { -- g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); -- } -+ player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; -+ videosink = gst_element_factory_make ("fakesink", "videosink"); -+ if (videosink != NULL) { -+ g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); - } - } - - g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL); - -- gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player); -+ gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL); - g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player); - - if (GST_IS_BIN (videosink)) { -@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc - { - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - -- if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) { -- gst_x_overlay_expose (player->xoverlay); -+ if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) { -+ gst_video_overlay_expose (player->video_overlay); - return; - } - -- if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { -+ if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) { - return; - } - -- gst_object_ref (player->xoverlay); -+ gst_object_ref (player->video_overlay); - -- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); -- gst_x_overlay_expose (player->xoverlay); -+ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); -+ gst_video_overlay_expose (player->video_overlay); - -- gst_object_unref (player->xoverlay); -+ gst_object_unref (player->video_overlay); - } - - // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing. -@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window) - // //Explicitly create the native window. GDK_WINDOW_XWINDOW will call this - // //function anyway, but this way we can raise a more useful message should it fail. - // if (!gdk_window_ensure_native (window)) { --// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!"); -+// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!"); - // } - //#endif - -diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c -index 5787c87..7e7dc78 100644 ---- a/libbanshee/banshee-player-vis.c -+++ b/libbanshee/banshee-player-vis.c -@@ -27,17 +27,17 @@ - // - - #include <math.h> -+#include <gst/audio/audio.h> - - #include "banshee-player-vis.h" - - #define SLICE_SIZE 735 - - static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS ( -- "audio/x-raw-float, " -+ "audio/x-raw, " -+ "format = (string) " GST_AUDIO_NE(F32) ", " - "rate = (int) 44100, " -- "channels = (int) 2, " -- "endianness = (int) BYTE_ORDER, " -- "width = (int) 32" -+ "channels = (int) 2" - ); - - // --------------------------------------------------------------------------- -@@ -48,6 +48,7 @@ static void - bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata) - { - BansheePlayer *player = (BansheePlayer*)userdata; -+ GstCaps *caps; - GstStructure *structure; - gint channels, wanted_size; - gfloat *data; -@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - player->vis_thawing = FALSE; - } - -- structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0); -+ caps = gst_pad_get_current_caps (pad); -+ structure = gst_caps_get_structure (caps, 0); - gst_structure_get_int (structure, "channels", &channels); -+ gst_caps_unref (caps); - - wanted_size = channels * SLICE_SIZE * sizeof (gfloat); - -- gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer)); -+ gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer)); - -- while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) { -+ while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) { - gfloat *deinterlaced = g_malloc (wanted_size); - gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2); - -@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - g_free (deinterlaced); - g_free (specbuf); - -+ gst_adapter_unmap (player->vis_buffer); - gst_adapter_flush (player->vis_buffer, wanted_size); - } - } -@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u - // Internal Functions - // --------------------------------------------------------------------------- - --static void --_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data) -+static GstPadProbeReturn -+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data) - { - BansheePlayer *player = (BansheePlayer *) data; -+ GstEvent *event; - -- if (!blocked) { -- // Set thawing mode (discards buffers that are too old from the queue). -- player->vis_thawing = TRUE; -- } --} -- --static void --_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked) --{ -- GstPad *queue_sink; -- -- if (player->vis_resampler == NULL) -- return; -- -- queue_sink = gst_element_get_static_pad (player->vis_resampler, "src"); -- -- gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player); -- -- gst_object_unref (GST_OBJECT (queue_sink)); --} -- --static gboolean --_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data) --{ -- BansheePlayer *player = (BansheePlayer *) data; -+ if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0) -+ return GST_PAD_PROBE_PASS; - -+ event = GST_EVENT (info->data); - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_FLUSH_START: - case GST_EVENT_FLUSH_STOP: - case GST_EVENT_SEEK: -- case GST_EVENT_NEWSEGMENT: -+ case GST_EVENT_SEGMENT: - case GST_EVENT_CUSTOM_DOWNSTREAM: - player->vis_thawing = TRUE; - - default: break; - } - -- if (player->vis_enabled) -- return TRUE; -- -- switch (GST_EVENT_TYPE (event)) { -- case GST_EVENT_EOS: -- case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: -- _bp_vis_pipeline_set_blocked (player, FALSE); -- break; -- case GST_EVENT_CUSTOM_DOWNSTREAM: -- case GST_EVENT_NEWSEGMENT: -- _bp_vis_pipeline_set_blocked (player, TRUE); -- break; -- -- default: break; -- } -- -- return TRUE; -+ return GST_PAD_PROBE_PASS; - } - - void -@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - // Core elements, if something fails here, it's the end of the world - audiosinkqueue = gst_element_factory_make ("queue", "vis-queue"); - -- pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -- gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player); -- gst_object_unref (GST_OBJECT (pad)); -+ player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -+ player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL); - - resampler = gst_element_factory_make ("audioresample", "vis-resample"); - converter = gst_element_factory_make ("audioconvert", "vis-convert"); -@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - converter, fakesink, NULL); - - pad = gst_element_get_static_pad (audiosinkqueue, "sink"); -- teepad = gst_element_get_request_pad (player->audiotee, "src%d"); -+ teepad = gst_element_get_request_pad (player->audiotee, "src_%u"); - gst_pad_link (teepad, pad); - gst_object_unref (GST_OBJECT (teepad)); - gst_object_unref (GST_OBJECT (pad)); -@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player) - player->vis_resampler = resampler; - player->vis_thawing = FALSE; - player->vis_enabled = FALSE; -- -- // Disable the pipeline till we hear otherwise from managed land. -- _bp_vis_pipeline_set_blocked (player, TRUE); - } - - void - _bp_vis_pipeline_destroy (BansheePlayer *player) - { -+ if (player->vis_event_probe_pad) { -+ gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id); -+ gst_object_unref (GST_OBJECT (player->vis_event_probe_pad)); -+ player->vis_event_probe_pad = NULL; -+ } -+ - if (player->vis_buffer != NULL) { - gst_object_unref (player->vis_buffer); - player->vis_buffer = NULL; -@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb - - player->vis_data_cb = cb; - -- _bp_vis_pipeline_set_blocked (player, cb == NULL); - player->vis_enabled = cb != NULL; - } -diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c -index c655a72..b8f98b8 100644 ---- a/libbanshee/banshee-player.c -+++ b/libbanshee/banshee-player.c -@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms) - P_INVOKE guint64 - bp_get_position (BansheePlayer *player) - { -- static GstFormat format = GST_FORMAT_TIME; - gint64 position; - - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); - -- if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) { -+ if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) { - return position / GST_MSECOND; - } - -@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player) - P_INVOKE guint64 - bp_get_duration (BansheePlayer *player) - { -- static GstFormat format = GST_FORMAT_TIME; - gint64 duration; - - g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); - -- if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) { -+ if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) { - return duration / GST_MSECOND; - } - -@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - g_return_if_fail (IS_BANSHEE_PLAYER (player)); - gint64 pos = -1; - GstState state; -- GstFormat format = GST_FORMAT_BYTES; - gboolean paused = FALSE; - - // Gstreamer playbin do not support to set suburi during playback -@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - gst_element_get_state (player->playbin, &state, NULL, 0); - paused = (state == GST_STATE_PAUSED); - if (state >= GST_STATE_PAUSED) { -- gst_element_query_position (player->playbin, &format, &pos); -+ gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos); - gst_element_set_state (player->playbin, GST_STATE_READY); - // Force to wait asynch operation - gst_element_get_state (player->playbin, &state, NULL, -1); -@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) - gst_element_get_state (player->playbin, &state, NULL, -1); - - if (pos != -1) { -- gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); -+ gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); - } - } - -diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c -index e0e8c85..b3f8fed 100644 ---- a/libbanshee/banshee-ripper.c -+++ b/libbanshee/banshee-ripper.c -@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug) - static gboolean - br_iterate_timeout (BansheeRipper *ripper) - { -- GstFormat format = GST_FORMAT_TIME; - GstState state; - gint64 position; - -@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper) - return TRUE; - } - -- if (!gst_element_query_position (ripper->cddasrc, &format, &position)) { -+ if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) { - return TRUE; - } - -@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin) - GstIterator *pad_iter = gst_element_iterate_src_pads (element); - - BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, { -- GstStructure *str = GST_PAD_CAPS (pad) != NULL -- ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0) -+ GstCaps *caps = gst_pad_get_current_caps (pad); -+ GstStructure *str = caps != NULL -+ ? gst_caps_get_structure (caps, 0) - : NULL; - - if (str != NULL) { -@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin) - preferred_mimetype = mimetype; - } - } -- -- gst_object_unref (pad); -+ gst_caps_unref (caps); - }); -- -- gst_object_unref (element); - }); - - return preferred_mimetype; -@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper) - return FALSE; - } - -- ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc"); -+ ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL); - if (ripper->cddasrc == NULL) { - br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL); - return FALSE; -@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path, - - // We'll warn the user in the UI if we can't tag the encoded audio files - *tagging_supported = TRUE; -- gst_object_unref (element); - } - }); - -diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c -index ca15e8f..762dfa9 100644 ---- a/libbanshee/banshee-tagger.c -+++ b/libbanshee/banshee-tagger.c -@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata - GstTagList * - bt_tag_list_new () - { -- return gst_tag_list_new (); -+ return gst_tag_list_new_empty (); - } - - void -diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c -index 10fc35c..0e241f0 100644 ---- a/libbanshee/banshee-transcoder.c -+++ b/libbanshee/banshee-transcoder.c -@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const - static gboolean - gst_transcoder_iterate_timeout(GstTranscoder *transcoder) - { -- GstFormat format = GST_FORMAT_TIME; - gint64 position; - gint64 duration; - - g_return_val_if_fail(transcoder != NULL, FALSE); - -- if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) || -- !gst_element_query_position(transcoder->sink_bin, &format, &position)) { -+ if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) || -+ !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) { - return TRUE; - } - -@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, - - g_return_if_fail(transcoder != NULL); - -- audiopad = gst_element_get_pad(transcoder->sink_bin, "sink"); -+ audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink"); - - if(GST_PAD_IS_LINKED(audiopad)) { - g_object_unref(audiopad); - return; - } - -- caps = gst_pad_get_caps(pad); -+ caps = gst_pad_query_caps(pad, NULL); - str = gst_caps_get_structure(caps, 0); - - if(!g_strrstr(gst_structure_get_name(str), "audio")) { -@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, - - transcoder->pipeline = gst_pipeline_new("pipeline"); - -- source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source"); -+ source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL); - if(source_elem == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL); - return FALSE; - } - -- decoder_elem = gst_element_factory_make("decodebin2", "decodebin2"); -+ decoder_elem = gst_element_factory_make("decodebin", "decodebin"); - if(decoder_elem == NULL) { -- gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL); -+ gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL); - return FALSE; - } - -- sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink"); -+ sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL); - if(sink_elem == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL); - return FALSE; -@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, - return FALSE; - } - -- encoder_pad = gst_element_get_pad(conv_elem, "sink"); -+ encoder_pad = gst_element_get_static_pad(conv_elem, "sink"); - if(encoder_pad == NULL) { - gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL); - return FALSE; --- -1.7.10.4
\ No newline at end of file diff --git a/gnome-unstable/brasero/PKGBUILD b/gnome-unstable/brasero/PKGBUILD deleted file mode 100644 index 13831b8d1..000000000 --- a/gnome-unstable/brasero/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 167336 2012-10-01 12:07:27Z jgc $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=brasero -pkgver=3.6.0 -pkgrel=1 -pkgdesc="A disc burning application for Gnome" -arch=('i686' 'x86_64') -url="http://www.gnome.org/projects/brasero" -license=('GPL') -options=('!libtool' '!emptydirs') -depends=('gtk3' 'gst-plugins-base' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql') -makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl') -optdepends=('libburn: alternative back-end' - 'libisofs: libburn back-end' - 'dvdauthor: video project' - 'gstreamer0.10-bad-plugins: video project' - 'vcdimager: video project') -replaces=('nautilus-cd-burner') -install=brasero.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1eb16f85c5663f3f38ee60516759c0980024b893af9ec7875d31208a53c12b3b') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-caches \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR=$pkgdir install -} - diff --git a/gnome-unstable/brasero/brasero.install b/gnome-unstable/brasero/brasero.install deleted file mode 100644 index 9248062f7..000000000 --- a/gnome-unstable/brasero/brasero.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q - update-mime-database /usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD deleted file mode 100644 index 7dfb23c44..000000000 --- a/gnome-unstable/cheese/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168959 2012-10-16 22:57:07Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=cheese -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" -arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop') -makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto') -optdepends=('nautilus-sendto: Send snapshots' - 'frei0r-plugins: More camera effects') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org/projects/cheese/" -install=cheese.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2db101cd16ce41764eb2f676c1bed94e58e4a89141785b95ff088b60bcf6abef') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/cheese/cheese.install b/gnome-unstable/cheese/cheese.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/gnome-unstable/cheese/cheese.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD deleted file mode 100644 index 4538f2a5e..000000000 --- a/gnome-unstable/dconf/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 167916 2012-10-03 20:02:18Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=dconf -pkgver=0.14.0 -pkgrel=1 -pkgdesc="A low-level configuration system." -arch=(i686 x86_64) -url="http://live.gnome.org/dconf" -license=('LGPL2.1') -depends=('glib2' 'gtk-update-icon-cache') -makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl') -optdepends=('gtk3: for dconf-editor') -install=dconf.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33') - -build() { - cd "$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/dconf - make -} - -package() { - cd "$pkgname-$pkgver" - make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/dconf/dconf.install b/gnome-unstable/dconf/dconf.install deleted file mode 100644 index 75d713d64..000000000 --- a/gnome-unstable/dconf/dconf.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade(){ - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD deleted file mode 100644 index f193fd00c..000000000 --- a/gnome-unstable/empathy/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 168311 2012-10-08 12:42:52Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=empathy -pkgver=3.6.0.2 -pkgrel=1 -pkgdesc="A GNOME instant messaging client using the Telepathy framework." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Empathy" -license=('GPL2') -depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') -makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto') -optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-idle: IRC support' - 'telepathy-salut: Link-local XMPP support' - 'telepathy-rakia: SIP support' - 'telepathy-haze: libpurple support' - 'nautilus-sendto: Send files from nautilus') -options=('!libtool') -groups=('gnome-extra') -install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('3c27db67236249e60ee0439d6a1098729939731ce597b724a058c8ce2eb659f9') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/empathy \ - --disable-static \ - --disable-schemas-compile \ - --enable-gst-1.0=yes - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/eog-plugins/PKGBUILD b/gnome-unstable/eog-plugins/PKGBUILD deleted file mode 100644 index fb0e2b4cd..000000000 --- a/gnome-unstable/eog-plugins/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168987 2012-10-17 09:54:32Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=eog-plugins -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Plugins for Eye of Gnome" -arch=('i686' 'x86_64') -url="http://www.gnome.org/" -license=('GPL2') -depends=('eog' 'libchamplain' 'libgdata') -makedepends=('intltool') -install=eog-plugins.install -options=('!libtool') -groups=(gnome-extra) -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/eog-plugins/eog-plugins.install b/gnome-unstable/eog-plugins/eog-plugins.install deleted file mode 100644 index 24072f316..000000000 --- a/gnome-unstable/eog-plugins/eog-plugins.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/epiphany-extensions/PKGBUILD b/gnome-unstable/epiphany-extensions/PKGBUILD deleted file mode 100644 index 4fac3a868..000000000 --- a/gnome-unstable/epiphany-extensions/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 168276 2012-10-07 15:06:59Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=epiphany-extensions -pkgver=3.6.0 -pkgrel=1 -url="http://www.gnome.org/projects/epiphany/" -pkgdesc="Various extentions for the Epiphany web browser" -arch=('i686' 'x86_64') -license=('GPL') -depends=('epiphany' 'opensp' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -options=('!libtool' '!emptydirs') -install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/epiphany-extensions/epiphany-extensions.install b/gnome-unstable/epiphany-extensions/epiphany-extensions.install deleted file mode 100644 index c0ed9a0d7..000000000 --- a/gnome-unstable/epiphany-extensions/epiphany-extensions.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/evolution-ews/PKGBUILD b/gnome-unstable/evolution-ews/PKGBUILD deleted file mode 100644 index 004aeb10b..000000000 --- a/gnome-unstable/evolution-ews/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 167902 2012-10-03 17:04:25Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=evolution-ews -pkgver=3.6.0 -pkgrel=1 -pkgdesc="MS Exchange integration through Exchange Web Services" -arch=('i686' 'x86_64') -license=('LGPL2.1') -url="http://www.gnome.org" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') -makedepends=('intltool' 'evolution') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a1d40971f47bfd947349f48a86f8a5ec7252db41b9b0d19204b4e28f2408a96a') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD deleted file mode 100644 index 2c9bf363c..000000000 --- a/gnome-unstable/farstream/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168361 2012-10-09 07:21:08Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=farstream -pkgver=0.2.1 -pkgrel=1 -pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" -arch=(i686 x86_64) -url="http://www.freedesktop.org/wiki/Software/Farstream" -license=('LGPL2.1') -depends=('gst-plugins-base-libs' 'libnice') -makedepends=('gobject-introspection') -optdepends=('gst-plugins-good' 'gst-plugins-bad') -conflicts=('farsight2') -replaces=('farsight2') -options=(!libtool) -source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('479c42adf5cc606abcb47d58ed542414') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ - --with-package-name='Arch Linux farstream package' \ - --with-package-origin='http://archlinux.org' \ - --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gdk-pixbuf2/PKGBUILD b/gnome-unstable/gdk-pixbuf2/PKGBUILD deleted file mode 100644 index 514681b1e..000000000 --- a/gnome-unstable/gdk-pixbuf2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 167531 2012-10-02 10:18:16Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gdk-pixbuf2 -pkgver=2.26.4 -pkgrel=1 -pkgdesc="An image loading library" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') -makedepends=('gtk-doc' 'gobject-introspection') -options=('!libtool') -install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be') - -build() { - cd gdk-pixbuf-$pkgver - - ./configure --prefix=/usr \ - --without-libjasper \ - --with-x11 \ - --with-included-loaders=png - make -} - -package() { - cd gdk-pixbuf-$pkgver - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install b/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install deleted file mode 100644 index f04c0967a..000000000 --- a/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache -} diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD deleted file mode 100644 index a39a2d421..000000000 --- a/gnome-unstable/gedit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168973 2012-10-17 07:09:38Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=gedit -pkgver=3.6.1 -pkgrel=1 -pkgdesc="A text editor for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('yelp-tools' 'intltool') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gedit.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('75fb18e32a7571900dda8cbd3a71212bded1ef714d3aa9f9513296eea02779a4') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ - --enable-python - make -} - -package(){ - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gedit/gedit.install b/gnome-unstable/gedit/gedit.install deleted file mode 100644 index 606920688..000000000 --- a/gnome-unstable/gedit/gedit.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then - gconfpkg --uninstall gedit - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/gnome-unstable/ghex/PKGBUILD b/gnome-unstable/ghex/PKGBUILD deleted file mode 100644 index ebad92cf0..000000000 --- a/gnome-unstable/ghex/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168936 2012-10-16 15:56:20Z jgc $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=ghex -pkgver=3.6.1 -pkgrel=1 -pkgdesc="A simple binary editor for the Gnome desktop" -arch=('i686' 'x86_64') -license=('GPL') -url="http://live.gnome.org/Ghex" -depends=('gtk3' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -options=('!libtool' '!emptydirs') -install=ghex.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/ghex/ghex.install b/gnome-unstable/ghex/ghex.install deleted file mode 100644 index 084bc82ee..000000000 --- a/gnome-unstable/ghex/ghex.install +++ /dev/null @@ -1,20 +0,0 @@ -pkgname=ghex - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/gnome-unstable/glade/PKGBUILD b/gnome-unstable/glade/PKGBUILD deleted file mode 100644 index cf8779f39..000000000 --- a/gnome-unstable/glade/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 167894 2012-10-03 15:58:19Z jgc $ -# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=glade -pkgver=3.14.0 -pkgrel=1 -pkgdesc="User interface builder for GTK+ and GNOME." -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl') -optdepends=('python2: Python widgets support') -options=('!libtool') -url="http://glade.gnome.org/" -install=glade.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8848d0ae3548e32a8ec385f50c15eb34ed7f13d7f451760d974a0858dbfe93b2') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/glade/glade.install b/gnome-unstable/glade/glade.install deleted file mode 100644 index bce670aff..000000000 --- a/gnome-unstable/glade/glade.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules deleted file mode 100644 index d7d9650dc..000000000 --- a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules +++ /dev/null @@ -1,7 +0,0 @@ -# Get access to /dev/rfkill for users -# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 -# -# Simplified by Kay Sievers -# https://bugzilla.redhat.com/show_bug.cgi?id=733326 - -KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess" diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD deleted file mode 100644 index 2061d3231..000000000 --- a/gnome-unstable/gnome-bluetooth/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 167914 2012-10-03 19:43:31Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=gnome-bluetooth -pkgver=3.6.0 -pkgrel=2 -pkgdesc="The GNOME Bluetooth Subsystem" -arch=('i686' 'x86_64') -url="http://live.gnome.org/GnomeBluetooth" -license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') -makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl') -options=('!libtool' '!emptydirs') -install=gnome-bluetooth.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - 61-gnome-bluetooth-rfkill.rules) -sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306' - '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-desktop-update \ - --disable-icon-update \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -m644 -D ../61-gnome-bluetooth-rfkill.rules \ - "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" -} diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD deleted file mode 100644 index b8b7089ac..000000000 --- a/gnome-unstable/gnome-color-manager/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 167683 2012-10-03 00:26:49Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-color-manager -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Color profile manager for the GNOME desktop" -arch=(i686 x86_64) -url="http://projects.gnome.org/gnome-color-manager/" -license=(GPL2) -depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' - 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk') -makedepends=('intltool' 'yelp-tools') -install=gnome-color-manager.install -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9') - -build(){ - cd $pkgname-$pkgver - - # man pages need docbook-sgml, which we don't have - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-color-manager/gnome-color-manager.install b/gnome-unstable/gnome-color-manager/gnome-color-manager.install deleted file mode 100644 index 04fda0ddc..000000000 --- a/gnome-unstable/gnome-color-manager/gnome-color-manager.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-color-manager - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-contacts/PKGBUILD b/gnome-unstable/gnome-contacts/PKGBUILD deleted file mode 100644 index 4c3ac48c8..000000000 --- a/gnome-unstable/gnome-contacts/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 167540 2012-10-02 11:23:59Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gnome-contacts -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Contacts Manager for GNOME" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL2') -groups=(gnome-extra) -depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese') -makedepends=('intltool' 'vala') -install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('203ed52fbdad3412fa88ae011c0d1cf94e8fe15c13dc192e8be554a1268614a5') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-contacts/gnome-contacts.install b/gnome-unstable/gnome-contacts/gnome-contacts.install deleted file mode 100644 index c19349f72..000000000 --- a/gnome-unstable/gnome-contacts/gnome-contacts.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD deleted file mode 100644 index a6021f1f3..000000000 --- a/gnome-unstable/gnome-disk-utility/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 167922 2012-10-03 20:26:57Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Silvio Knizek (killermoehre) - -pkgname=gnome-disk-utility -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Disk Management Utility for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -groups=('gnome-extra') -depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils') -makedepends=('intltool' 'docbook-xsl') -options=('!libtool' '!emptydirs') -install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install deleted file mode 100644 index 8b17fa3d4..000000000 --- a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD deleted file mode 100644 index 7cb5fb873..000000000 --- a/gnome-unstable/gnome-documents/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 167688 2012-10-03 00:43:15Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-documents -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Documents Manager for GNOME" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL') -groups=('gnome-extra') -depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' - 'tracker' 'libzapojit') -makedepends=('intltool') -optdepends=('unoconv: Support for Libreoffice document types') -options=('!libtool') -install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a4a5c525cba047a6c8f712f8a0d73fc26dc0445d4c8278c10ecbeac4efd342e2') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-documents - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install deleted file mode 100644 index 1571179ca..000000000 --- a/gnome-unstable/gnome-documents/gnome-documents.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD deleted file mode 100644 index 95a3a8f6b..000000000 --- a/gnome-unstable/gnome-menus/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 167714 2012-10-03 10:12:02Z jgc $ -# Maintainer: Jan de Groot <jan@archlinux.org> - -pkgname=gnome-menus -pkgver=3.6.0 -pkgrel=1 -pkgdesc="GNOME menu specifications" -arch=('i686' 'x86_64') -depends=('glib2' 'python2-gobject') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -license=('GPL' 'LGPL') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - menus.patch) -sha256sums=('523ac10729e28f9acde4785e61dcb895828fd89e39b38b68f6c14ec815805a0b' - 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') - -build() { - cd "$pkgname-$pkgver" - - patch -Np0 -i "$srcdir/menus.patch" - - PYTHON=/usr/bin/python2 ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package(){ - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - sed -i "1s|#!/usr/bin/env python$|&2|" \ - "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" -} diff --git a/gnome-unstable/gnome-nettool/PKGBUILD b/gnome-unstable/gnome-nettool/PKGBUILD deleted file mode 100644 index 1ab02baea..000000000 --- a/gnome-unstable/gnome-nettool/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 167877 2012-10-03 15:12:25Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Kritoke <kritoke@nospam.gmail.com> - -pkgname=gnome-nettool -pkgver=3.2.0 -pkgrel=1 -pkgdesc="A Collection of GNOME3 Networking Tools." -arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') -optdepends=('nmap: Port scanning' - 'net-tools: Network statistics') -groups=('gnome-extra') -url="http://www.gnome.org" -install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-nettool/gnome-nettool.install b/gnome-unstable/gnome-nettool/gnome-nettool.install deleted file mode 100644 index e5dfaf4a5..000000000 --- a/gnome-unstable/gnome-nettool/gnome-nettool.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD deleted file mode 100644 index c03259efa..000000000 --- a/gnome-unstable/gnome-panel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 167752 2012-10-03 14:30:00Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-panel -pkgver=3.6.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -pkgdesc="The GNOME Panel" -url="http://www.gnome.org" -depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' - 'gconf' 'telepathy-glib') -makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') -install=gnome-panel.install -groups=('gnome') -provides=("gnome-panel-bonobo=${pkgver}") -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6a8058df6263af35b0e430514f7e16d1b4df095365242d39e170cfc451a328b6') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-panel \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/gnome-unstable/gnome-panel/gnome-panel.install b/gnome-unstable/gnome-panel/gnome-panel.install deleted file mode 100644 index 0f9324937..000000000 --- a/gnome-unstable/gnome-panel/gnome-panel.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gnome-panel - -post_install() { - gconfpkg --install $pkgname - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/gnome-unstable/gnome-power-manager/PKGBUILD b/gnome-unstable/gnome-power-manager/PKGBUILD deleted file mode 100644 index 7e39538f6..000000000 --- a/gnome-unstable/gnome-power-manager/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 167704 2012-10-03 09:51:18Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-power-manager -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Power management tools." -arch=(i686 x86_64) -url="http://www.gnome.org/projects/gnome-power-manager/" -license=('GPL') -depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') -makedepends=('intltool') -options=(!emptydirs) -install=gnome-power-manager.install -groups=(gnome-extra) -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-power-manager \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-power-manager/gnome-power-manager.install b/gnome-unstable/gnome-power-manager/gnome-power-manager.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/gnome-unstable/gnome-power-manager/gnome-power-manager.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-search-tool/PKGBUILD b/gnome-unstable/gnome-search-tool/PKGBUILD deleted file mode 100644 index 76258f361..000000000 --- a/gnome-unstable/gnome-search-tool/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 167757 2012-10-03 14:37:08Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gnome-search-tool -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Utility to search for files" -arch=(i686 x86_64) -url="http://gnome.org" -license=('GPL2') -depends=('gtk3' 'libsm') -makedepends=('intltool' 'yelp-tools') -install=$pkgname.install -options=('!emptydirs') -groups=('gnome-extra') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-search-tool/gnome-search-tool.install b/gnome-unstable/gnome-search-tool/gnome-search-tool.install deleted file mode 100644 index b631b6a89..000000000 --- a/gnome-unstable/gnome-search-tool/gnome-search-tool.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - (( $(vercmp $2 3.6.0) < 0 )) && gconfpkg --uninstall gnome-search-tool - return 0 -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch deleted file mode 100644 index d744eff56..000000000 --- a/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ /dev/null @@ -1,1472 +0,0 @@ -From a26f7c5190ebc82f9f17e0446159311377b20d3f Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Fri, 21 Sep 2012 11:56:53 +0100 -Subject: [PATCH] power and media-keys: Use logind for suspending and - rebooting the system - -Use the new logind features to suspend and resume but making sure we opt out -of logind handling the sleep and power keys, and also inhibiting for lid close -auto-suspend if there is an external monitor connected. - -Also use a delay inihibit for logind so that we can do actions on suspend like -blanking the screen using the screensaver and also poking the screensaver on -resume. - -https://bugzilla.gnome.org/show_bug.cgi?id=680689 ---- - plugins/common/Makefile.am | 4 +- - plugins/common/gsd-power-helper.c | 203 -------- - plugins/common/gsd-power-helper.h | 35 -- - plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- - plugins/power/gsd-power-manager.c | 699 +++++++++++++++++++--------- - 5 files changed, 595 insertions(+), 502 deletions(-) - delete mode 100644 plugins/common/gsd-power-helper.c - delete mode 100644 plugins/common/gsd-power-helper.h - -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 7e50db4..b0e907c 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ - gsd-keygrab.c \ - gsd-keygrab.h \ - gsd-input-helper.c \ -- gsd-input-helper.h \ -- gsd-power-helper.c \ -- gsd-power-helper.h -+ gsd-input-helper.h - - libcommon_la_CPPFLAGS = \ - $(AM_CPPFLAGS) -diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c -deleted file mode 100644 -index 27d0eda..0000000 ---- a/plugins/common/gsd-power-helper.c -+++ /dev/null -@@ -1,203 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- * -- */ -- --#include "config.h" -- --#include "gsd-power-helper.h" -- --#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" --#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" --#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -- --#define CONSOLEKIT_DBUS_NAME "org.freedesktop.ConsoleKit" --#define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" --#define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" -- --#ifdef HAVE_SYSTEMD --static void --systemd_stop (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "PowerOff", -- g_variant_new ("(b)", FALSE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_suspend (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Suspend", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_hibernate (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Hibernate", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --#else /* HAVE_SYSTEMD */ -- --static void --consolekit_stop_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't stop using ConsoleKit: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --consolekit_stop (void) --{ -- GError *error = NULL; -- GDBusProxy *proxy; -- -- /* power down the machine in a safe way */ -- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- CONSOLEKIT_DBUS_NAME, -- CONSOLEKIT_DBUS_PATH_MANAGER, -- CONSOLEKIT_DBUS_INTERFACE_MANAGER, -- NULL, &error); -- if (proxy == NULL) { -- g_warning ("cannot connect to ConsoleKit: %s", -- error->message); -- g_error_free (error); -- return; -- } -- g_dbus_proxy_call (proxy, -- "Stop", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- consolekit_stop_cb, NULL); -- g_object_unref (proxy); --} --static void --upower_sleep_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't sleep using UPower: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --upower_suspend (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Suspend", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} -- --static void --upower_hibernate (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Hibernate", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} --#endif /* HAVE_SYSTEMD */ -- --void --gsd_power_suspend (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_suspend (); --#else -- upower_suspend (upower_proxy); --#endif --} -- --void --gsd_power_poweroff (void) --{ --#ifdef HAVE_SYSTEMD -- systemd_stop (); --#else -- consolekit_stop (); --#endif --} -- --void --gsd_power_hibernate (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_hibernate (); --#else -- upower_hibernate (upower_proxy); --#endif --} -diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h -deleted file mode 100644 -index e3be14f..0000000 ---- a/plugins/common/gsd-power-helper.h -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- */ -- --#ifndef __GSD_POWER_HELPER_H --#define __GSD_POWER_HELPER_H -- --#include <glib.h> -- --G_BEGIN_DECLS -- --#include <gio/gio.h> -- --void gsd_power_suspend (GDBusProxy *upower_proxy); --void gsd_power_hibernate (GDBusProxy *upower_proxy); --void gsd_power_poweroff (void); -- --G_END_DECLS -- --#endif /* __GSD_POWER_HELPER_H */ -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 9c84d7f..a2f277e 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -39,6 +39,7 @@ - #include <gdk/gdkx.h> - #include <gtk/gtk.h> - #include <gio/gdesktopappinfo.h> -+#include <gio/gunixfdlist.h> - - #ifdef HAVE_GUDEV - #include <gudev/gudev.h> -@@ -51,7 +52,6 @@ - #include "shortcuts-list.h" - #include "gsd-osd-window.h" - #include "gsd-input-helper.h" --#include "gsd-power-helper.h" - #include "gsd-enums.h" - - #include <canberra.h> -@@ -105,6 +105,10 @@ static const gchar introspection_xml[] = - #define KEY_CURRENT_INPUT_SOURCE "current" - #define KEY_INPUT_SOURCES "sources" - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - - typedef struct { -@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate - - /* Power stuff */ - GSettings *power_settings; -- GDBusProxy *upower_proxy; - GDBusProxy *power_screen_proxy; - GDBusProxy *power_keyboard_proxy; - -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_keys_fd; -+ - /* Multihead stuff */ - GdkScreen *current_screen; - GSList *screens; -@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) - } - - static void -+power_action_suspend (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void -+power_action_hibernate (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void - do_config_power_action (GsdMediaKeysManager *manager, - const gchar *config_key) - { -@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager, - config_key); - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ power_action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - case GSD_POWER_ACTION_SHUTDOWN: - gnome_session_shutdown (manager); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ power_action_hibernate (manager); - break; - case GSD_POWER_ACTION_BLANK: - case GSD_POWER_ACTION_NOTHING: -@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - } - #endif /* HAVE_GUDEV */ - -+ g_clear_object (&priv->logind_proxy); - if (priv->settings) { - g_object_unref (priv->settings); - priv->settings = NULL; -@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - priv->power_keyboard_proxy = NULL; - } - -- if (priv->upower_proxy) { -- g_object_unref (priv->upower_proxy); -- priv->upower_proxy = NULL; -- } -- - if (priv->cancellable != NULL) { - g_cancellable_cancel (priv->cancellable); - g_object_unref (priv->cancellable); -@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) - } - - static void -+inhibit_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit keypresses: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_keys_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void - gsd_media_keys_manager_init (GsdMediaKeysManager *manager) - { -+ GError *error; -+ GDBusConnection *bus; -+ -+ error = NULL; - manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager); -+ -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -+ if (bus == NULL) { -+ g_warning ("Failed to connect to system bus: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_sync (bus, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ &error); -+ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("Failed to connect to systemd: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ g_object_unref (bus); -+ -+ g_debug ("Adding system inhibitors for power keys"); -+ manager->priv->inhibit_keys_fd = -1; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "handle-power-key:handle-suspend-key:handle-hibernate-key", -+ g_get_user_name (), -+ "GNOME handling keypresses", -+ "block"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_done, -+ manager); -+ - } - - static void -@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) - - if (media_keys_manager->priv->start_idle_id != 0) - g_source_remove (media_keys_manager->priv->start_idle_id); -+ if (media_keys_manager->priv->inhibit_keys_fd != -1) -+ close (media_keys_manager->priv->inhibit_keys_fd); - - G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); - } -@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, - } - - static void --upower_ready_cb (GObject *source_object, -- GAsyncResult *res, -- GsdMediaKeysManager *manager) --{ -- GError *error = NULL; -- -- manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error); -- if (manager->priv->upower_proxy == NULL) { -- g_warning ("Failed to get proxy for upower: %s", -- error->message); -- g_error_free (error); -- } --} -- --static void - power_screen_ready_cb (GObject *source_object, - GAsyncResult *res, - GsdMediaKeysManager *manager) -@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager) - manager->priv->bus_cancellable, - (GAsyncReadyCallback) on_bus_gotten, - manager); -- -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.UPower", -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower", -- NULL, -- (GAsyncReadyCallback) upower_ready_cb, -- manager); - } - - GsdMediaKeysManager * -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 0e06495..7c120c4 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -1,7 +1,7 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com> -+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com> - * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com> - * - * This program is free software; you can redistribute it and/or modify -@@ -31,6 +31,7 @@ - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> - #include <canberra-gtk.h> -+#include <gio/gunixfdlist.h> - - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include <libgnome-desktop/gnome-rr.h> -@@ -42,7 +43,6 @@ - #include "gnome-settings-session.h" - #include "gsd-enums.h" - #include "gsd-power-manager.h" --#include "gsd-power-helper.h" - - #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" - #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" -@@ -77,6 +77,10 @@ - #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ - #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - /* Keep this in sync with gnome-shell */ - #define SCREENSAVER_FADE_TIME 10 /* seconds */ - -@@ -190,13 +194,19 @@ struct GsdPowerManagerPrivate - ca_context *canberra_context; - ca_proplist *critical_alert_loop_props; - guint32 critical_alert_timeout_id; -- GDBusProxy *screensaver_proxy; - GDBusProxy *session_proxy; - GDBusProxy *session_presence_proxy; - GpmIdletime *idletime; - GsdPowerIdleMode current_idle_mode; -- guint lid_close_safety_timer_id; - GtkStatusIcon *status_icon; -+ -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_lid_switch_fd; -+ gboolean inhibit_lid_switch_taken; -+ gint inhibit_suspend_fd; -+ gboolean inhibit_suspend_taken; -+ guint inhibit_lid_switch_timer_id; - }; - - enum { -@@ -213,8 +223,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); - static gchar *engine_get_summary (GsdPowerManager *manager); - static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); - static void do_lid_closed_action (GsdPowerManager *manager); --static void lock_screensaver (GsdPowerManager *manager); --static void kill_lid_close_safety_timer (GsdPowerManager *manager); -+static void uninhibit_lid_switch (GsdPowerManager *manager); -+static gboolean external_monitor_is_connected (GnomeRRScreen *screen); - - G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) - -@@ -2044,6 +2054,57 @@ gnome_session_shutdown (void) - } - - static void -+action_poweroff (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "PowerOff", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_hibernate (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void - do_power_action_type (GsdPowerManager *manager, - GsdPowerActionType action_type) - { -@@ -2052,19 +2113,19 @@ do_power_action_type (GsdPowerManager *manager, - - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - gnome_session_shutdown (); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ action_hibernate (manager); - break; - case GSD_POWER_ACTION_SHUTDOWN: - /* this is only used on critically low battery where - * hibernate is not available and is marginally better - * than just powering down the computer mid-write */ -- gsd_power_poweroff (); -+ action_poweroff (manager); - break; - case GSD_POWER_ACTION_BLANK: - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -2136,85 +2197,20 @@ upower_kbd_toggle (GsdPowerManager *manager, - return ret; - } - --static void --do_lid_open_action (GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* play a sound, using sounds from the naming spec */ -- ca_context_play (manager->priv->canberra_context, 0, -- CA_PROP_EVENT_ID, "lid-open", -- /* TRANSLATORS: this is the sound description */ -- CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -- NULL); -- -- /* ensure we turn the panel back on after lid open */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after lid open: %s", -- error->message); -- g_clear_error (&error); -- } -- -- /* only toggle keyboard if present and already toggled off */ -- if (manager->priv->upower_kdb_proxy != NULL && -- manager->priv->kbd_brightness_old != -1) { -- ret = upower_kbd_toggle (manager, &error); -- if (!ret) { -- g_warning ("failed to turn the kbd backlight on: %s", -- error->message); -- g_error_free (error); -- } -- } -- -- kill_lid_close_safety_timer (manager); --} -- - static gboolean --is_on (GnomeRROutput *output) -+inhibit_lid_switch_timer_cb (GsdPowerManager *manager) - { -- GnomeRRCrtc *crtc; -- -- crtc = gnome_rr_output_get_crtc (output); -- if (!crtc) -- return FALSE; -- return gnome_rr_crtc_get_current_mode (crtc) != NULL; --} -- --static gboolean --non_laptop_outputs_are_all_off (GnomeRRScreen *screen) --{ -- GnomeRROutput **outputs; -- int i; -- -- outputs = gnome_rr_screen_list_outputs (screen); -- for (i = 0; outputs[i] != NULL; i++) { -- if (gnome_rr_output_is_laptop (outputs[i])) -- continue; -- -- if (is_on (outputs[i])) -- return FALSE; -+ if (!external_monitor_is_connected (manager->priv->x11_screen) || -+ g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ g_debug ("no external monitors for a while; uninhibiting lid close"); -+ uninhibit_lid_switch (manager); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ return G_SOURCE_REMOVE; - } - -- return TRUE; --} -- --/* Timeout callback used to check conditions when the laptop's lid is closed but -- * the machine is not suspended yet. We try to suspend again, so that the laptop -- * won't overheat if placed in a backpack. -- */ --static gboolean --lid_close_safety_timer_cb (GsdPowerManager *manager) --{ -- manager->priv->lid_close_safety_timer_id = 0; -- -- g_debug ("lid has been closed for a while; trying to suspend again"); -- do_lid_closed_action (manager); -- -- return FALSE; -+ g_debug ("external monitor still there; trying again later"); -+ return G_SOURCE_CONTINUE; - } - - /* Sets up a timer to be triggered some seconds after closing the laptop lid -@@ -2222,82 +2218,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) - * again in the timeout handler to see if we can suspend then. - */ - static void --setup_lid_close_safety_timer (GsdPowerManager *manager) -+setup_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("lid close safety timer already set up"); - return; -+ } -+ -+ g_debug ("setting up lid close safety timer"); - -- manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -- (GSourceFunc) lid_close_safety_timer_cb, -+ manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -+ (GSourceFunc) inhibit_lid_switch_timer_cb, - manager); -- g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); -+ g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); - } - - static void --kill_lid_close_safety_timer (GsdPowerManager *manager) -+restart_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) { -- g_source_remove (manager->priv->lid_close_safety_timer_id); -- manager->priv->lid_close_safety_timer_id = 0; -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("restarting lid close safety timer"); -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ setup_inhibit_lid_switch_timer (manager); - } - } - - static void --suspend_with_lid_closed (GsdPowerManager *manager) -+do_lid_open_action (GsdPowerManager *manager) - { - gboolean ret; - GError *error = NULL; -- GsdPowerActionType action_type; - -- /* maybe lock the screen if the lid is closed */ -- lock_screensaver (manager); -- -- /* we have different settings depending on AC state */ -- if (up_client_get_on_battery (manager->priv->up_client)) { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-battery-action"); -- } else { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-ac-action"); -- } -- -- /* check we won't melt when the lid is closed */ -- if (action_type != GSD_POWER_ACTION_SUSPEND && -- action_type != GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_lid_force_sleep (manager->priv->up_client)) { -- g_warning ("to prevent damage, now forcing suspend"); -- do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND); -- return; -- } -- } -+ /* play a sound, using sounds from the naming spec */ -+ ca_context_play (manager->priv->canberra_context, 0, -+ CA_PROP_EVENT_ID, "lid-open", -+ /* TRANSLATORS: this is the sound description */ -+ CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -+ NULL); - -- /* ensure we turn the panel back on after resume */ -+ /* ensure we turn the panel back on after lid open */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_OFF, -+ GNOME_RR_DPMS_ON, - &error); - if (!ret) { -- g_warning ("failed to turn the panel off after lid close: %s", -+ g_warning ("failed to turn the panel on after lid open: %s", - error->message); -- g_error_free (error); -+ g_clear_error (&error); - } - -- /* only toggle keyboard if present and not already toggled */ -- if (manager->priv->upower_kdb_proxy && -- manager->priv->kbd_brightness_old == -1) { -+ /* only toggle keyboard if present and already toggled off */ -+ if (manager->priv->upower_kdb_proxy != NULL && -+ manager->priv->kbd_brightness_old != -1) { - ret = upower_kbd_toggle (manager, &error); - if (!ret) { -- g_warning ("failed to turn the kbd backlight off: %s", -+ g_warning ("failed to turn the kbd backlight on: %s", - error->message); - g_error_free (error); - } - } -- -- do_power_action_type (manager, action_type); - } - - static void - do_lid_closed_action (GsdPowerManager *manager) - { -+ gboolean ret; -+ GError *error = NULL; -+ - /* play a sound, using sounds from the naming spec */ - ca_context_play (manager->priv->canberra_context, 0, - CA_PROP_EVENT_ID, "lid-close", -@@ -2305,21 +2292,22 @@ do_lid_closed_action (GsdPowerManager *manager) - CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), - NULL); - -+ /* turn the panel off if the lid is closed (mainly for Dells...) */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_OFF, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel off after lid close: %s", -+ error->message); -+ g_error_free (error); -+ } -+ - /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ - gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ - -- /* perform policy action */ -- if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") -- || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { -- g_debug ("lid is closed; suspending or hibernating"); -- suspend_with_lid_closed (manager); -- } else { -- g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active"); -- setup_lid_close_safety_timer (manager); -- } -+ restart_inhibit_lid_switch_timer (manager); - } - -- - static void - up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - { -@@ -2339,6 +2327,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - if (manager->priv->lid_is_closed == tmp) - return; - manager->priv->lid_is_closed = tmp; -+ g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); - - /* fake a keypress */ - if (tmp) -@@ -3290,30 +3279,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) - } - - static void --sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GError *error = NULL; -- GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -- -- manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); -- if (manager->priv->screensaver_proxy == NULL) { -- g_warning ("Could not connect to gnome-screensaver: %s", -- error->message); -- g_error_free (error); -- return; -- } -- -- /* Finish the upower_notify_sleep_cb() call by locking the screen */ -- g_debug ("gnome-screensaver activated, doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); --} -- --static void - idle_dbus_signal_cb (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, -@@ -3465,75 +3430,38 @@ out: - } - - static void --lock_screensaver (GsdPowerManager *manager) -+lock_screensaver (GsdPowerManager *manager, -+ GSourceFunc done_cb) - { - gboolean do_lock; - - do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, - "lock-enabled"); -- if (!do_lock) -+ if (!do_lock && done_cb) { -+ done_cb (manager); - return; -- -- if (manager->priv->screensaver_proxy != NULL) { -- g_debug ("doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); -- } else { -- /* connect to the screensaver first */ -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- GS_DBUS_NAME, -- GS_DBUS_PATH, -- GS_DBUS_INTERFACE, -- NULL, -- sleep_cb_screensaver_proxy_ready_cb, -- manager); - } --} -- --static void --upower_notify_sleep_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- lock_screensaver (manager); --} -- --static void --upower_notify_resume_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* this displays the unlock dialogue so the user doesn't have -- * to move the mouse or press any key before the window comes up */ -- if (manager->priv->screensaver_proxy != NULL) { -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "SimulateUserActivity", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, NULL, NULL); -- } -- -- /* close existing notifications on resume, the system power -- * state is probably different now */ -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_discharging); - -- /* ensure we turn the panel back on after resume */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after resume: %s", -- error->message); -- g_error_free (error); -- } -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "Lock", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* Wait until gnome-shell shield animation is done -+ * -+ * FIXME: the shell should mark the lock as active -+ * when the shield is down, then we could wait for -+ * that. This would also fix the problem that we wait -+ * needlessly when the shell has already locked the -+ * screen because it is initiating the suspend. -+ * -+ * https://bugzilla.gnome.org/show_bug.cgi?id=685053 -+ */ -+ g_timeout_add (500, done_cb, manager); - } - - static void -@@ -3621,6 +3549,287 @@ engine_session_active_changed_cb (GnomeSettingsSession *session, - idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); - } - -+static void -+inhibit_lid_switch_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit lid switch: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void -+inhibit_lid_switch (GsdPowerManager *manager) -+{ -+ GVariant *params; -+ -+ if (manager->priv->inhibit_lid_switch_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding lid switch system inhibitor"); -+ manager->priv->inhibit_lid_switch_taken = TRUE; -+ -+ params = g_variant_new ("(ssss)", -+ "handle-lid-switch", -+ g_get_user_name (), -+ "Multiple displays attached", -+ "block"); -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ params, -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_lid_switch_done, -+ manager); -+} -+ -+static void -+uninhibit_lid_switch (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_debug ("no lid-switch inhibitor"); -+ return; -+ } -+ g_debug ("Removing lid switch system inhibitor"); -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+} -+ -+static void -+inhibit_suspend_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit suspend: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+/* We take a delay inhibitor here, which causes logind to send a -+ * PrepareToSleep signal, which gives us a chance to lock the screen -+ * and do some other preparations. -+ */ -+static void -+inhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding suspend delay inhibitor"); -+ manager->priv->inhibit_suspend_taken = TRUE; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "sleep", -+ g_get_user_name (), -+ "GNOME needs to lock the screen", -+ "delay"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_suspend_done, -+ manager); -+} -+ -+static void -+uninhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_debug ("no suspend delay inhibitor"); -+ return; -+ } -+ g_debug ("Removing suspend delay inhibitor"); -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = TRUE; -+} -+ -+static gboolean -+randr_output_is_on (GnomeRROutput *output) -+{ -+ GnomeRRCrtc *crtc; -+ -+ crtc = gnome_rr_output_get_crtc (output); -+ if (!crtc) -+ return FALSE; -+ return gnome_rr_crtc_get_current_mode (crtc) != NULL; -+} -+ -+static gboolean -+external_monitor_is_connected (GnomeRRScreen *screen) -+{ -+ GnomeRROutput **outputs; -+ guint i; -+ -+ if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS)) -+ return TRUE; -+ -+ /* see if we have more than one screen plugged in */ -+ outputs = gnome_rr_screen_list_outputs (screen); -+ for (i = 0; outputs[i] != NULL; i++) { -+ if (randr_output_is_on (outputs[i]) && -+ !gnome_rr_output_is_laptop (outputs[i])) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static void -+on_randr_event (GnomeRRScreen *screen, gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ -+ /* when a second monitor is plugged in, we take the -+ * handle-lid-switch inhibitor lock of logind to prevent -+ * it from suspending. -+ * -+ * Uninhibiting is done in the inhibit_lid_switch_timer, -+ * since we want to give users a few seconds when unplugging -+ * and replugging an external monitor, not suspend right away. -+ */ -+ if (external_monitor_is_connected (screen) && -+ !g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ inhibit_lid_switch (manager); -+ setup_inhibit_lid_switch_timer (manager); -+ } -+ else { -+ restart_inhibit_lid_switch_timer (manager); -+ } -+} -+ -+static gboolean -+screen_lock_done_cb (gpointer data) -+{ -+ GsdPowerManager *manager = data; -+ -+ /* lift the delay inhibit, so logind can proceed */ -+ uninhibit_suspend (manager); -+ -+ return FALSE; -+} -+ -+static void -+handle_suspend_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ lock_screensaver (manager, screen_lock_done_cb); -+} -+ -+static void -+handle_resume_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* this displays the unlock dialogue so the user doesn't have -+ * to move the mouse or press any key before the window comes up */ -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "SimulateUserActivity", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* close existing notifications on resume, the system power -+ * state is probably different now */ -+ notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (manager->priv->notification_discharging); -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ /* set up the delay again */ -+ inhibit_suspend (manager); -+} -+ -+static void -+logind_proxy_signal_cb (GDBusProxy *proxy, -+ const gchar *sender_name, -+ const gchar *signal_name, -+ GVariant *parameters, -+ gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ gboolean is_about_to_suspend; -+ -+ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0) -+ return; -+ g_variant_get (parameters, "(b)", &is_about_to_suspend); -+ if (is_about_to_suspend) { -+ handle_suspend_actions (manager); -+ } else { -+ handle_resume_actions (manager); -+ } -+} -+ - gboolean - gsd_power_manager_start (GsdPowerManager *manager, - GError **error) -@@ -3630,6 +3839,25 @@ gsd_power_manager_start (GsdPowerManager *manager, - g_debug ("Starting power manager"); - gnome_settings_profile_start (NULL); - -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ error); -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return FALSE; -+ } -+ g_signal_connect (manager->priv->logind_proxy, "g-signal", -+ G_CALLBACK (logind_proxy_signal_cb), -+ manager); -+ /* Set up a delay inhibitor to be informed about suspend attempts */ -+ inhibit_suspend (manager); -+ - /* track the active session */ - manager->priv->session = gnome_settings_session_new (); - g_signal_connect (manager->priv->session, "notify::state", -@@ -3644,10 +3872,6 @@ gsd_power_manager_start (GsdPowerManager *manager, - G_CALLBACK (engine_settings_key_changed_cb), manager); - manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); - manager->priv->up_client = up_client_new (); -- g_signal_connect (manager->priv->up_client, "notify-sleep", -- G_CALLBACK (upower_notify_sleep_cb), manager); -- g_signal_connect (manager->priv->up_client, "notify-resume", -- G_CALLBACK (upower_notify_resume_cb), manager); - manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); - g_signal_connect (manager->priv->up_client, "device-added", - G_CALLBACK (engine_device_added_cb), manager); -@@ -3761,6 +3985,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; -+ g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); -+ /* set up initial state */ -+ on_randr_event (manager->priv->x11_screen, manager); - - /* ensure the default dpms timeouts are cleared */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -3787,6 +4014,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) - { - g_debug ("Stopping power manager"); - -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ } -+ - if (manager->priv->bus_cancellable != NULL) { - g_cancellable_cancel (manager->priv->bus_cancellable); - g_object_unref (manager->priv->bus_cancellable); -@@ -3798,8 +4030,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) - manager->priv->introspection_data = NULL; - } - -- kill_lid_close_safety_timer (manager); -- - g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); - - g_clear_object (&manager->priv->connection); -@@ -3807,6 +4037,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) - g_clear_object (&manager->priv->settings); - g_clear_object (&manager->priv->settings_screensaver); - g_clear_object (&manager->priv->up_client); -+ -+ if (manager->priv->inhibit_lid_switch_fd != -1) { -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+ } -+ if (manager->priv->inhibit_suspend_fd != -1) { -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = FALSE; -+ } -+ -+ g_clear_object (&manager->priv->logind_proxy); - g_clear_object (&manager->priv->x11_screen); - - g_ptr_array_unref (manager->priv->devices_array); -@@ -3835,6 +4078,8 @@ static void - gsd_power_manager_init (GsdPowerManager *manager) - { - manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_suspend_fd = -1; - } - - static void --- -1.7.12.1 - diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD deleted file mode 100644 index 411564527..000000000 --- a/gnome-unstable/gnome-shell/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168833 2012-10-16 11:21:12Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Flamelab <panosfilip@gmail.com - -pkgname=gnome-shell -pkgver=3.6.1 -pkgrel=1 -pkgdesc="The next generation GNOME Shell" -arch=('i686' 'x86_64') -url="http://live.gnome.org/GnomeShell" -license=('GPL2') -depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip') -makedepends=('intltool' 'gnome-doc-utils') -optdepends=('network-manager-applet: shell integration for networkmanager') -options=('!libtool' '!emptydirs') -install=gnome-shell.install -groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-shell \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-terminal/PKGBUILD b/gnome-unstable/gnome-terminal/PKGBUILD deleted file mode 100644 index b5c5f6bb8..000000000 --- a/gnome-unstable/gnome-terminal/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 167769 2012-10-03 14:39:33Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-terminal -pkgver=3.6.0 -pkgrel=1 -pkgdesc="The GNOME Terminal Emulator" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm') -makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl') -options=('!emptydirs') -url="http://www.gnome.org" -groups=('gnome') -install=gnome-terminal.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/gnome-unstable/gnome-terminal/gnome-terminal.install b/gnome-unstable/gnome-terminal/gnome-terminal.install deleted file mode 100644 index 1d8510f06..000000000 --- a/gnome-unstable/gnome-terminal/gnome-terminal.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=gnome-terminal - -post_install() { - gconfpkg --install $pkgname -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} diff --git a/gnome-unstable/gnome-user-share/PKGBUILD b/gnome-unstable/gnome-user-share/PKGBUILD deleted file mode 100644 index db00ff47f..000000000 --- a/gnome-unstable/gnome-user-share/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 167785 2012-10-03 14:41:05Z heftig $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> - -pkgname=gnome-user-share -pkgver=3.0.4 -pkgrel=1 -pkgdesc="Easy to use user-level file sharing for GNOME." -arch=('i686' 'x86_64') -url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" -license=('GPL') -depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') -makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl') -options=('!emptydirs' '!libtool') -install=gnome-user-share.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-user-share \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/gnome-user-share/gnome-user-share.install b/gnome-unstable/gnome-user-share/gnome-user-share.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/gnome-unstable/gnome-user-share/gnome-user-share.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD deleted file mode 100644 index 972566440..000000000 --- a/gnome-unstable/grilo-plugins/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 167998 2012-10-04 23:16:55Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=grilo-plugins -pkgver=0.2.2 -pkgrel=1 -pkgdesc="Plugins for Grilo" -url="http://www.gnome.org" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('grilo' 'sqlite' 'libgcrypt') -makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing - json-glib) -optdepends=('gupnp-av: uPnP plugin' - 'libgdata: Youtube plugin' - 'libquvi: Youtube plugin' - 'sqlite: Podcasts plugin' - 'gmime: Podcasts plugin' - 'rest: Blip.tv plugin' - 'libtracker-sparql: Tracker plugin' - 'totem-plparser: Optical media plugin' - 'libdmapsharing: DMAP sharing plugin' - 'json-glib: TMDb plugin') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --enable-shoutcast - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD deleted file mode 100644 index 024f59890..000000000 --- a/gnome-unstable/grilo/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 167997 2012-10-04 23:14:47Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=grilo -pkgver=0.2.2 -pkgrel=1 -pkgdesc="Framework that provides access to various sources of multimedia content" -url="http://www.gnome.org" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gtk3' 'libxml2' 'libsoup') -makedepends=('gobject-introspection' 'gtk-doc' 'vala') -optdepends=('grilo-plugins: Plugins for grilo') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e98d86e9c26dc444f43782e68f44a90da47f69da8a4ac313da9a3795fb72271f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/gssdp/PKGBUILD b/gnome-unstable/gssdp/PKGBUILD deleted file mode 100644 index 222da9525..000000000 --- a/gnome-unstable/gssdp/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 167730 2012-10-03 12:52:04Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=gssdp -pkgver=0.12.2.1 -pkgrel=1 -pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" -arch=('i686' 'x86_64') -url="http://gupnp.org/" -license=('LGPL') -depends=('libsoup') -makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') -optdepends=('gtk2: gssdp-device-sniffer') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gst-libav/PKGBUILD b/gnome-unstable/gst-libav/PKGBUILD deleted file mode 100644 index 67f877215..000000000 --- a/gnome-unstable/gst-libav/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 168815 2012-10-16 09:05:59Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-libav -pkgver=1.0.1 -pkgrel=1 -pkgdesc="Gstreamer libav Plugin" -arch=('i686' 'x86_64') -license=('GPL') -url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base-libs' 'bzip2') -makedepends=('yasm') -options=(!libtool !emptydirs) -provides=("gst-ffmpeg=$pkgver-pkgrel") -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('7c998468ffa57b5d1c2c76d6857dbc0c4ed87fd207ef71bf96aeaada6a1cfa89') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ - --with-package-name="GStreamer libav Plugin (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/gst-plugins-bad/PKGBUILD b/gnome-unstable/gst-plugins-bad/PKGBUILD deleted file mode 100644 index 1326152c6..000000000 --- a/gnome-unstable/gst-plugins-bad/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-plugins-bad -pkgver=1.0.1 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Bad Plugins" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'faac' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus') -makedepends=('gstreamer' 'schroedinger' 'gtk3' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('5e3cffcd258c4c722c880a52ebc9920d6b38aa4153bbc49d1b5a9893885d45f3') - -build() { - cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Bad Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" \ - --with-gtk=3.0 - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/gst-plugins-good/PKGBUILD b/gnome-unstable/gst-plugins-good/PKGBUILD deleted file mode 100644 index 159322646..000000000 --- a/gnome-unstable/gst-plugins-good/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-plugins-good -pkgver=1.0.1 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Good Plugins" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883') -makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('30bc72d77d274289844e2138ca79c840') - -build() { - cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Good Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/gst-plugins-ugly/PKGBUILD b/gnome-unstable/gst-plugins-ugly/PKGBUILD deleted file mode 100644 index e54276afd..000000000 --- a/gnome-unstable/gst-plugins-ugly/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 168810 2012-10-16 08:45:47Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gst-plugins-ugly -pkgver=1.0.1 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Ugly Plugins" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('378952a36e553f65fc1fcbcb0cc445304337e2e75503fb6b5f0ca2c05405e4f0') - -build() { - cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD deleted file mode 100644 index 6af778627..000000000 --- a/gnome-unstable/gthumb/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 167923 2012-10-03 20:33:57Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gthumb -pkgver=3.1.1 -pkgrel=1 -pkgdesc="Image browser and viewer for the GNOME Desktop" -arch=(i686 x86_64) -license=('GPL') -url="http://live.gnome.org/gthumb" -depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' - 'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp') -makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' - 'brasero' 'librsvg' 'libopenraw' 'liboauth') -optdepends=('libopenraw: read RAW files' - 'exiv2: metadata support' - 'libchamplain: map viewer' - 'brasero: burn discs' - 'libsoup-gnome: web albums' - 'liboauth: web albums') -options=('!libtool' '!emptydirs') -install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7e725ba38d1220ed09d0657dd365982547856aa0d03c775891de33d04c31e332') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-libchamplain --enable-libopenraw - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install deleted file mode 100644 index 9d4e7822f..000000000 --- a/gnome-unstable/gthumb/gthumb.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.1) < 0 )); then - gconfpkg --uninstall gthumb - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gtkmm3/PKGBUILD b/gnome-unstable/gtkmm3/PKGBUILD deleted file mode 100644 index 63ec30798..000000000 --- a/gnome-unstable/gtkmm3/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 167340 2012-10-01 14:04:39Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=gtkmm3 -_pkgbasename=gtkmm -pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.5.13 -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') -license=('LGPL') -options=('!libtool' '!emptydirs') -url="http://www.gtkmm.org/" -source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('2dcd3654f1e88cd80d1641e91bb9bceb10216ee74ec400c14f7bb7c5e4cecbfc') - -build() { - cd "$_pkgbasename-$pkgver" - ./configure --prefix=/usr - make -} - -package_gtkmm3() { - pkgdesc="C++ bindings for gtk3" - depends=('gtk3' 'pangomm' 'atkmm') - cd "$_pkgbasename-$pkgver" - - sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile - - make DESTDIR="$pkgdir" install -} - -package_gtkmm3-docs() { - pkgdesc="Developer documentation for gtkmm v3" - - cd "$_pkgbasename-$pkgver" - make -C docs DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD deleted file mode 100644 index c2416d321..000000000 --- a/gnome-unstable/gtksourceview3/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 167744 2012-10-03 14:04:40Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtksourceview3 -_pkgbasename=gtksourceview -pkgver=3.6.0 -pkgrel=1 -pkgdesc="A text widget adding syntax highlighting and more to GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'libxml2') -makedepends=('intltool' 'gobject-introspection' 'glade') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a') - -build() { - cd "$_pkgbasename-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-glade-catalog - make -} - -package() { - cd "$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gucharmap/PKGBUILD b/gnome-unstable/gucharmap/PKGBUILD deleted file mode 100644 index cb002ec81..000000000 --- a/gnome-unstable/gucharmap/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168934 2012-10-16 15:45:21Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan De Groot <jgc@archlinux.org> - -pkgname=gucharmap -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Gnome Unicode Charmap" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -depends=('dconf' 'gtk3' 'hicolor-icon-theme') -makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') -options=('!libtool' '!emptydirs') -install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('778bbc61bedcb6c573800ccebc56d360d988a156727b5a8f8bac9787c1fe7fb4') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile --enable-introspection - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gucharmap/gucharmap.install b/gnome-unstable/gucharmap/gucharmap.install deleted file mode 100644 index 0a9ddf4c2..000000000 --- a/gnome-unstable/gucharmap/gucharmap.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap - return 0 -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gupnp/PKGBUILD b/gnome-unstable/gupnp/PKGBUILD deleted file mode 100644 index 31020ff1f..000000000 --- a/gnome-unstable/gupnp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 167735 2012-10-03 13:16:53Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=gupnp -pkgver=0.18.4 -pkgrel=1 -pkgdesc="An object-oriented UPNP framework" -arch=('i686' 'x86_64') -url="http://gupnp.org/" -license=('LGPL') -depends=('gssdp' 'util-linux') -makedepends=('gobject-introspection' 'gtk-doc') -optdepends=('python2: gupnp-binding-tool') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1') - -build() { - cd $pkgname-$pkgver - sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-context-manager=linux - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/libcroco/PKGBUILD b/gnome-unstable/libcroco/PKGBUILD deleted file mode 100644 index f25316ba6..000000000 --- a/gnome-unstable/libcroco/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 168930 2012-10-16 15:30:37Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libcroco -pkgver=0.6.7 -pkgrel=1 -pkgdesc="A CSS parsing library" -arch=('x86_64' 'i686') -depends=('glib2' 'libxml2') -makedepends=('intltool') -license=('LGPL') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) -url="http://www.gnome.org" -sha256sums=('892b8a7e311b80d0a5a633b8204fed5656d7af20e884719e5ec6e340e1f0cd88') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/libnice/PKGBUILD b/gnome-unstable/libnice/PKGBUILD deleted file mode 100644 index 05890543b..000000000 --- a/gnome-unstable/libnice/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 500 2009-08-01 11:44:28Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: William DÃaz <wdiaz@archlinux.us> - -pkgname=libnice -pkgver=0.1.3 -pkgrel=1 -pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)" -arch=('i686' 'x86_64') -url="http://nice.freedesktop.org" -license=('LGPL') -depends=('glib2') -makedepends=('gstreamer' 'gstreamer0.10') -optdepends=('gstreamer' 'gstreamer0.10') -options=('!libtool') -source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -md5sums=('1a0907605f852dcda32a3b3daf38d36c') diff --git a/gnome-unstable/librsvg/PKGBUILD b/gnome-unstable/librsvg/PKGBUILD deleted file mode 100644 index 8acf2ed45..000000000 --- a/gnome-unstable/librsvg/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 168932 2012-10-16 15:37:33Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=librsvg -pkgver=2.36.4 -pkgrel=1 -pkgdesc="A SVG viewing library" -arch=(i686 x86_64) -license=('LGPL') -depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') -optdepends=('gtk3: for rsvg-view-3' - 'gtk2: gtk2 SVG engine module') -options=('!libtool' '!emptydirs') -url="http://librsvg.sourceforge.net/" -install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/librsvg/librsvg.install b/gnome-unstable/librsvg/librsvg.install deleted file mode 100644 index 8852ebf28..000000000 --- a/gnome-unstable/librsvg/librsvg.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/libzapojit/PKGBUILD b/gnome-unstable/libzapojit/PKGBUILD deleted file mode 100644 index af49e2190..000000000 --- a/gnome-unstable/libzapojit/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 167689 2012-10-03 00:44:12Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=libzapojit -pkgver=0.0.2 -pkgrel=1 -pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libsoup' 'gnome-online-accounts') -makedepends=('intltool' 'gobject-introspection') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/nautilus-open-terminal/PKGBUILD b/gnome-unstable/nautilus-open-terminal/PKGBUILD deleted file mode 100644 index bb24ee9eb..000000000 --- a/gnome-unstable/nautilus-open-terminal/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 167897 2012-10-03 16:24:35Z jgc $ -# Maintainer : Biru Ionut <ionut@archlinux.ro> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> -pkgname=nautilus-open-terminal -pkgver=0.19 -pkgrel=3 -pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths" -arch=('i686' 'x86_64') -url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal" -license=('GPL') -depends=('nautilus' 'gconf') -makedepends=('pkgconfig' 'gettext' 'intltool') -install=nautilus-open-terminal.install -source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool' '!emptydirs') -sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -dm755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}"/etc/gconf/schemas -} diff --git a/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install b/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install deleted file mode 100644 index f7cdb9507..000000000 --- a/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=nautilus-open-terminal - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/gnome-unstable/networkmanager/systemd-sleep.patch b/gnome-unstable/networkmanager/systemd-sleep.patch deleted file mode 100644 index 3470d4654..000000000 --- a/gnome-unstable/networkmanager/systemd-sleep.patch +++ /dev/null @@ -1,616 +0,0 @@ -From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Tue, 9 Oct 2012 00:36:35 -0400 -Subject: [PATCH] core: factor out the upower suspend/resume code (bgo - #677694) - -Factor the code that listens for upower sleeping and resuming -signals out into a class code NMSleepMonitor. - -core: add a systemd suspend/resume monitor (bgo #677694) - -This implementation uses a delay inhibitor to get systemd to -emit PrepareForSleep, and then emits ::Sleeping and ::Resuming -when receiving the before/after PrepareForSleep emissions. - -core: DBusGConnections are not GObjects - -Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2. - -core: fix suspend/resume signal names which the manager listens for - -Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly -I also thought GObject lower-cased signal names since it munges them -for - and _ too. Apparently not. ---- - configure.ac | 2 +- - src/Makefile.am | 9 +- - src/nm-manager.c | 40 +++----- - src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++ - src/nm-sleep-monitor-upower.c | 151 ++++++++++++++++++++++++++++ - src/nm-sleep-monitor.h | 46 +++++++++ - 6 files changed, 437 insertions(+), 28 deletions(-) - create mode 100644 src/nm-sleep-monitor-systemd.c - create mode 100644 src/nm-sleep-monitor-upower.c - create mode 100644 src/nm-sleep-monitor.h - -diff --git a/configure.ac b/configure.ac -index e76e193..9152c23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) - AC_SUBST(GUDEV_CFLAGS) - AC_SUBST(GUDEV_LIBS) - --PKG_CHECK_MODULES(GIO, gio-2.0) -+PKG_CHECK_MODULES(GIO, gio-unix-2.0) - AC_SUBST(GIO_CFLAGS) - AC_SUBST(GIO_LIBS) - -diff --git a/src/Makefile.am b/src/Makefile.am -index b155209..ba7d2d6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \ - nm-session-monitor.h \ - nm-session-utils.c \ - nm-session-utils.h \ -+ nm-sleep-monitor.h \ - nm-connection-provider.h \ - nm-connection-provider.c \ - nm-dispatcher.c \ -@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h - endif - - if SESSION_TRACKING_SYSTEMD --NetworkManager_SOURCES += nm-session-monitor-systemd.c -+NetworkManager_SOURCES += \ -+ nm-session-monitor-systemd.c \ -+ nm-sleep-monitor-systemd.c - else - if SESSION_TRACKING_CK - NetworkManager_SOURCES += nm-session-monitor-ck.c - else - NetworkManager_SOURCES += nm-session-monitor-null.c - endif -+ -+# UPower suspend/resume used whenever systemd is not enabled -+NetworkManager_SOURCES += nm-sleep-monitor-upower.c - endif - - nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml -@@ -283,6 +289,7 @@ BUILT_SOURCES = \ - NetworkManager_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ -+ $(GIO_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(GMODULE_CFLAGS) \ -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 618c4ed..c8ce115 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -69,6 +69,7 @@ - #include "nm-device-factory.h" - #include "wifi-utils.h" - #include "nm-enum-types.h" -+#include "nm-sleep-monitor.h" - - #if WITH_CONCHECK - #include "nm-connectivity.h" -@@ -78,8 +79,6 @@ - #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd" - #define NM_AUTOIP_DBUS_IFACE "org.freedesktop.nm_avahi_autoipd" - --#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" -- - static gboolean impl_manager_get_devices (NMManager *manager, - GPtrArray **devices, - GError **err); -@@ -228,7 +227,7 @@ typedef struct { - guint modem_removed_id; - - DBusGProxy *aipd_proxy; -- DBusGProxy *upower_proxy; -+ NMSleepMonitor *sleep_monitor; - - GSList *auth_chains; - -@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self, - } - - static void --upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) -+sleeping_cb (DBusGProxy *proxy, gpointer user_data) - { -- nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal"); -+ nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal"); - _internal_sleep (NM_MANAGER (user_data), TRUE); - } - - static void --upower_resuming_cb (DBusGProxy *proxy, gpointer user_data) -+resuming_cb (DBusGProxy *proxy, gpointer user_data) - { -- nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal"); -+ nm_log_dbg (LOGD_SUSPEND, "Received resuming signal"); - _internal_sleep (NM_MANAGER (user_data), FALSE); - } - -@@ -4049,8 +4048,8 @@ dispose (GObject *object) - if (priv->aipd_proxy) - g_object_unref (priv->aipd_proxy); - -- if (priv->upower_proxy) -- g_object_unref (priv->upower_proxy); -+ if (priv->sleep_monitor) -+ g_object_unref (priv->sleep_monitor); - - if (priv->fw_monitor) { - if (priv->fw_monitor_id) -@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager) - } else - nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy"); - -- /* upower sleep/wake handling */ -- priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection, -- UPOWER_DBUS_SERVICE, -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower"); -- if (priv->upower_proxy) { -- dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID); -- dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping", -- G_CALLBACK (upower_sleeping_cb), -- manager, NULL); -- -- dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID); -- dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming", -- G_CALLBACK (upower_resuming_cb), -- manager, NULL); -- } else -- nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); -+ /* sleep/wake handling */ -+ priv->sleep_monitor = nm_sleep_monitor_get (); -+ g_signal_connect (priv->sleep_monitor, "sleeping", -+ G_CALLBACK (sleeping_cb), manager); -+ g_signal_connect (priv->sleep_monitor, "resuming", -+ G_CALLBACK (resuming_cb), manager); - - /* Listen for authorization changes */ - nm_auth_changed_func_register (authority_changed_cb, manager); -diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c -new file mode 100644 -index 0000000..70adc89 ---- /dev/null -+++ b/src/nm-sleep-monitor-systemd.c -@@ -0,0 +1,217 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2012 Red Hat, Inc. -+ * Author: Matthias Clasen <mclasen@redhat.com> -+ */ -+ -+#include "config.h" -+#include <errno.h> -+#include <string.h> -+#include <sys/stat.h> -+#include <dbus/dbus-glib-lowlevel.h> -+#include <dbus/dbus-glib.h> -+#include <gio/gio.h> -+#include <gio/gunixfdlist.h> -+ -+#include "nm-logging.h" -+#include "nm-dbus-manager.h" -+ -+#include "nm-sleep-monitor.h" -+ -+#define SD_NAME "org.freedesktop.login1" -+#define SD_PATH "/org/freedesktop/login1" -+#define SD_INTERFACE "org.freedesktop.login1.Manager" -+ -+ -+struct _NMSleepMonitor { -+ GObject parent_instance; -+ -+ GDBusProxy *sd_proxy; -+ gint inhibit_fd; -+}; -+ -+struct _NMSleepMonitorClass { -+ GObjectClass parent_class; -+ -+ void (*sleeping) (NMSleepMonitor *monitor); -+ void (*resuming) (NMSleepMonitor *monitor); -+}; -+ -+ -+enum { -+ SLEEPING, -+ RESUMING, -+ LAST_SIGNAL, -+}; -+static guint signals[LAST_SIGNAL] = {0}; -+ -+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); -+ -+/********************************************************************/ -+ -+static void -+inhibit_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *sd_proxy = G_DBUS_PROXY (source); -+ NMSleepMonitor *self = user_data; -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error); -+ if (!res) { -+ nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message); -+ g_error_free (error); -+ } else { -+ if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1) -+ nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back"); -+ -+ self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL); -+ -+ nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void -+take_inhibitor (NMSleepMonitor *self) -+{ -+ g_assert (self->inhibit_fd == -1); -+ -+ nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor"); -+ g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "sleep", -+ g_get_user_name (), -+ "inhibited", -+ "delay"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_done, -+ self); -+} -+ -+static gboolean -+drop_inhibitor (NMSleepMonitor *self) -+{ -+ if (self->inhibit_fd >= 0) { -+ nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor"); -+ close (self->inhibit_fd); -+ self->inhibit_fd = -1; -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+static void -+signal_cb (GDBusProxy *proxy, -+ const gchar *sendername, -+ const gchar *signalname, -+ GVariant *args, -+ gpointer data) -+{ -+ NMSleepMonitor *self = data; -+ gboolean is_about_to_suspend; -+ -+ if (strcmp (signalname, "PrepareForSleep") != 0) -+ return; -+ -+ g_variant_get (args, "(b)", &is_about_to_suspend); -+ nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend); -+ -+ if (is_about_to_suspend) { -+ g_signal_emit (self, signals[SLEEPING], 0); -+ drop_inhibitor (self); -+ } else { -+ take_inhibitor (self); -+ g_signal_emit (self, signals[RESUMING], 0); -+ } -+} -+ -+static void -+nm_sleep_monitor_init (NMSleepMonitor *self) -+{ -+ GDBusConnection *bus; -+ -+ self->inhibit_fd = -1; -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -+ self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL, -+ SD_NAME, SD_PATH, SD_INTERFACE, -+ NULL, NULL); -+ g_object_unref (bus); -+ g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self); -+ take_inhibitor (self); -+} -+ -+static void -+finalize (GObject *object) -+{ -+ NMSleepMonitor *self = NM_SLEEP_MONITOR (object); -+ -+ drop_inhibitor (self); -+ if (self->sd_proxy) -+ g_object_unref (self->sd_proxy); -+ -+ if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) -+ G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object); -+} -+ -+static void -+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass) -+{ -+ GObjectClass *gobject_class; -+ -+ gobject_class = G_OBJECT_CLASS (klass); -+ -+ gobject_class->finalize = finalize; -+ -+ signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, -+ NM_TYPE_SLEEP_MONITOR, -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping), -+ NULL, /* accumulator */ -+ NULL, /* accumulator data */ -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); -+ signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING, -+ NM_TYPE_SLEEP_MONITOR, -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (NMSleepMonitorClass, resuming), -+ NULL, /* accumulator */ -+ NULL, /* accumulator data */ -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); -+} -+ -+NMSleepMonitor * -+nm_sleep_monitor_get (void) -+{ -+ static NMSleepMonitor *singleton = NULL; -+ -+ if (singleton) -+ return g_object_ref (singleton); -+ -+ singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL)); -+ return singleton; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c -new file mode 100644 -index 0000000..3c93f66 ---- /dev/null -+++ b/src/nm-sleep-monitor-upower.c -@@ -0,0 +1,151 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2012 Red Hat, Inc. -+ * Author: Matthias Clasen <mclasen@redhat.com> -+ */ -+ -+#include "config.h" -+#include <errno.h> -+#include <string.h> -+#include <sys/stat.h> -+#include <dbus/dbus-glib-lowlevel.h> -+#include <dbus/dbus-glib.h> -+#include <gio/gio.h> -+#include "nm-logging.h" -+#include "nm-dbus-manager.h" -+ -+#include "nm-sleep-monitor.h" -+ -+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" -+ -+struct _NMSleepMonitor { -+ GObject parent_instance; -+ -+ DBusGProxy *upower_proxy; -+}; -+ -+struct _NMSleepMonitorClass { -+ GObjectClass parent_class; -+ -+ void (*sleeping) (NMSleepMonitor *monitor); -+ void (*resuming) (NMSleepMonitor *monitor); -+}; -+ -+ -+enum { -+ SLEEPING, -+ RESUMING, -+ LAST_SIGNAL, -+}; -+static guint signals[LAST_SIGNAL] = {0}; -+ -+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); -+ -+/********************************************************************/ -+ -+static void -+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) -+{ -+ nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal"); -+ g_signal_emit (user_data, signals[SLEEPING], 0); -+} -+ -+static void -+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data) -+{ -+ nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal"); -+ g_signal_emit (user_data, signals[RESUMING], 0); -+} -+ -+static void -+nm_sleep_monitor_init (NMSleepMonitor *self) -+{ -+ NMDBusManager *dbus_mgr; -+ DBusGConnection *bus; -+ -+ dbus_mgr = nm_dbus_manager_get (); -+ bus = nm_dbus_manager_get_connection (dbus_mgr); -+ self->upower_proxy = dbus_g_proxy_new_for_name (bus, -+ UPOWER_DBUS_SERVICE, -+ "/org/freedesktop/UPower", -+ "org.freedesktop.UPower"); -+ if (self->upower_proxy) { -+ dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID); -+ dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping", -+ G_CALLBACK (upower_sleeping_cb), -+ self, NULL); -+ -+ dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID); -+ dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming", -+ G_CALLBACK (upower_resuming_cb), -+ self, NULL); -+ } else -+ nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); -+ g_object_unref (dbus_mgr); -+} -+ -+static void -+finalize (GObject *object) -+{ -+ NMSleepMonitor *self = NM_SLEEP_MONITOR (object); -+ -+ if (self->upower_proxy) -+ g_object_unref (self->upower_proxy); -+ -+ if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) -+ G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object); -+} -+ -+static void -+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass) -+{ -+ GObjectClass *gobject_class; -+ -+ gobject_class = G_OBJECT_CLASS (klass); -+ -+ gobject_class->finalize = finalize; -+ -+ signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, -+ NM_TYPE_SLEEP_MONITOR, -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping), -+ NULL, /* accumulator */ -+ NULL, /* accumulator data */ -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); -+ signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING, -+ NM_TYPE_SLEEP_MONITOR, -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (NMSleepMonitorClass, resuming), -+ NULL, /* accumulator */ -+ NULL, /* accumulator data */ -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); -+} -+ -+NMSleepMonitor * -+nm_sleep_monitor_get (void) -+{ -+ static NMSleepMonitor *singleton = NULL; -+ -+ if (singleton) -+ return g_object_ref (singleton); -+ -+ singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL)); -+ return singleton; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h -new file mode 100644 -index 0000000..173e6a1 ---- /dev/null -+++ b/src/nm-sleep-monitor.h -@@ -0,0 +1,46 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2012 Red Hat, Inc. -+ * Author: Matthias Clasen <mclasen@redhat.com> -+ */ -+ -+#ifndef NM_SLEEP_MONITOR_H -+#define NM_SLEEP_MONITOR_H -+ -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+#define NM_TYPE_SLEEP_MONITOR (nm_sleep_monitor_get_type ()) -+#define NM_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor)) -+#define NM_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) -+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) -+#define NM_IS_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR)) -+#define NM_IS_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR)) -+ -+#define NM_SLEEP_MONITOR_SLEEPING "sleeping" -+#define NM_SLEEP_MONITOR_RESUMING "resuming" -+ -+typedef struct _NMSleepMonitor NMSleepMonitor; -+typedef struct _NMSleepMonitorClass NMSleepMonitorClass; -+ -+GType nm_sleep_monitor_get_type (void) G_GNUC_CONST; -+NMSleepMonitor *nm_sleep_monitor_get (void); -+ -+G_END_DECLS -+ -+#endif /* NM_SLEEP_MONITOR_H */ -+ --- -1.7.12.2 - diff --git a/gnome-unstable/opus/PKGBUILD b/gnome-unstable/opus/PKGBUILD deleted file mode 100644 index c250b548d..000000000 --- a/gnome-unstable/opus/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> -# Contributor: pumbur - -pkgname=opus -pkgver=1.0.1 -pkgrel=2 -pkgdesc="codec designed for interactive speech and audio transmission over the Internet" -arch=('i686' 'x86_64') -url="http://www.opus-codec.org/" -license=('custom') -depends=('glibc') -source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -options=('!libtool') -md5sums=('bbac19996957b404a1139816e2f357f5') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -m755 -d "${pkgdir}/usr/share/licenses/opus" - install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/" -} diff --git a/gnome-unstable/pangox-compat/PKGBUILD b/gnome-unstable/pangox-compat/PKGBUILD deleted file mode 100644 index d6f3b6a1e..000000000 --- a/gnome-unstable/pangox-compat/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 169099 2012-10-17 23:24:52Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=pangox-compat -pkgver=0.0.2 -pkgrel=1 -pkgdesc="X Window System font support for Pango" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('pango') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -url="http://www.pango.org/" -sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make -} - -package() { - cd ${pkgname}-${pkgver} - make -j1 DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/pidgin/PKGBUILD b/gnome-unstable/pidgin/PKGBUILD deleted file mode 100644 index cc41d66a4..000000000 --- a/gnome-unstable/pidgin/PKGBUILD +++ /dev/null @@ -1,100 +0,0 @@ -# $Id: PKGBUILD 168421 2012-10-11 15:28:56Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.6 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi' - 'tk' 'ca-certificates' 'intltool' - 'networkmanager') -options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Use Python 2 - sed -i 's/env python$/&2/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --disable-vv \ - --with-python=/usr/bin/python2 \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction') - install=pidgin.install - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'python2-dbus: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - - cd "$srcdir/pidgin-$pkgver" - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2') - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/pidgin/pidgin.install b/gnome-unstable/pidgin/pidgin.install deleted file mode 100644 index 1a05f573e..000000000 --- a/gnome-unstable/pidgin/pidgin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD deleted file mode 100644 index c42b7ba78..000000000 --- a/gnome-unstable/pygobject/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 169075 2012-10-17 17:43:30Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=pygobject -pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.4.1.1 -pkgrel=1 -arch=('i686' 'x86_64') -url="https://live.gnome.org/PyGObject" -license=('LGPL') -makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) -options=('!libtool') -sha256sums=('dbcff64a641b4eb251a3ca72c782c8a2318c3bbf4a31bffc40446e15111e6017') - -build() { - cp -a "$pkgbase-$pkgver" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr - make - ) -} - -package_python-gobject() { - pkgdesc="Python 3 bindings for GObject" - depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{include,lib/pkgconfig} -} - -package_python2-gobject() { - pkgdesc="Python 2 bindings for GObject" - depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") - - cd "python2-build" - make DESTDIR="$pkgdir" install - mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" -} - -package_pygobject-devel() { - pkgdesc="Development files for the pygobject bindings" - cd "devel" - mkdir -p "$pkgdir"/usr/{include,lib} - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" -} diff --git a/gnome-unstable/rhythmbox/PKGBUILD b/gnome-unstable/rhythmbox/PKGBUILD deleted file mode 100644 index 820e743d3..000000000 --- a/gnome-unstable/rhythmbox/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 169093 2012-10-17 21:17:47Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=rhythmbox -pkgver=2.98 -pkgrel=2 -pkgdesc="An iTunes-like music playback and management application" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.rhythmbox.org" -depends=('dconf' 'desktop-file-utils' 'grilo' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' - 'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas' - 'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser' - 'tdb' 'libdiscid') -makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala') -optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' - 'brasero: cd burning') -options=('!libtool' '!emptydirs') -install=rhythmbox.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/rhythmbox \ - --localstatedir=/var --disable-static \ - --enable-daap --enable-python --enable-vala \ - --with-mdns=avahi --disable-scrollkeeper --without-webkit - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins" -} diff --git a/gnome-unstable/rhythmbox/rhythmbox.install b/gnome-unstable/rhythmbox/rhythmbox.install deleted file mode 100644 index e02ee2c16..000000000 --- a/gnome-unstable/rhythmbox/rhythmbox.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD deleted file mode 100644 index cb1623721..000000000 --- a/gnome-unstable/seahorse/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 168977 2012-10-17 07:36:23Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Michel Brabants <michel.linux@tiscali.be> - -pkgname=seahorse -pkgver=3.6.1 -pkgrel=1 -pkgdesc="GNOME application for managing PGP keys." -arch=(i686 x86_64) -license=(GPL) -url="http://projects.gnome.org/seahorse/" -depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf) -makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm) -optdepends=('openssh: SSH support') -provides=(x11-ssh-askpass) -options=('!libtool' '!emptydirs') -groups=(gnome-extra) -install=seahorse.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - seahorse-ssh-askpass.sh) -sha256sums=('dcdd9681a7896a13a597cf02aa2d6718b5f0ab3b50ed81f8d24b8db296a9214b' - '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-ldap --enable-hkp \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ - "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" -} diff --git a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh b/gnome-unstable/seahorse/seahorse-ssh-askpass.sh deleted file mode 100644 index 04f79d8f2..000000000 --- a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then - export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass -fi diff --git a/gnome-unstable/seahorse/seahorse.install b/gnome-unstable/seahorse/seahorse.install deleted file mode 100644 index 1571179ca..000000000 --- a/gnome-unstable/seahorse/seahorse.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/telepathy-farstream/PKGBUILD b/gnome-unstable/telepathy-farstream/PKGBUILD deleted file mode 100644 index 42665b4d5..000000000 --- a/gnome-unstable/telepathy-farstream/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 167406 2012-10-01 23:31:27Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=telepathy-farstream -pkgver=0.6.0 -pkgrel=1 -pkgdesc="A telepathy-backend to use stream engine." -arch=(i686 x86_64) -url="http://telepathy.freedesktop.org" -license=('LGPL2.1') -depends=('telepathy-glib' 'farstream') -makedepends=('dbus-glib' 'gobject-introspection') -conflicts=('telepathy-farsight') -replaces=('telepathy-farsight') -options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d154350f9f1e3bdba87617c0668481a5') - -build() { - cd "$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/telepathy \ - --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/telepathy-gabble/PKGBUILD b/gnome-unstable/telepathy-gabble/PKGBUILD deleted file mode 100644 index fa23be823..000000000 --- a/gnome-unstable/telepathy-gabble/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168140 2012-10-06 09:00:15Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Daniel Balieiro <daniel@balieiro.com> -# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> -pkgname=telepathy-gabble -pkgver=0.17.1 -pkgrel=1 -pkgdesc="A Jabber/XMPP connection manager for Telepathy" -arch=('i686' 'x86_64') -url="http://telepathy.freedesktop.org" -groups=('telepathy') -license=('LGPL2.1') -depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite') -makedepends=('libxslt' 'python2') -options=('!libtool' '!emptydirs') -source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -install=telepathy-gabble.install -md5sums=('42e01fdc4117255080883495411e7318') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy --with-tls=openssl - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" -} diff --git a/gnome-unstable/telepathy-gabble/telepathy-gabble.install b/gnome-unstable/telepathy-gabble/telepathy-gabble.install deleted file mode 100644 index 87d7838b8..000000000 --- a/gnome-unstable/telepathy-gabble/telepathy-gabble.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - killall -HUP dbus-daemon 2>&1 -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD deleted file mode 100644 index e6649d299..000000000 --- a/gnome-unstable/totem/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 167895 2012-10-03 15:58:28Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgbase=totem -pkgname=('totem' 'totem-plugin') -pkgver=3.6.0 -pkgrel=1 -pkgdesc="GNOME3 movie player based on GStreamer" -url="http://www.gnome.org" -arch=(i686 x86_64) -license=(GPL2 custom) -depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas - hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst - clutter-gtk mx python2-gobject gst-plugins-bad) -makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint) -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - browser-plugins.ini) -sha256sums=('e767da34f5212bd9b2d3ea9bc7e3a87b284581ee012214274225dd8decb8fe3e' - 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') - -build() { - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/totem \ - --localstatedir=/var \ - --disable-static \ - --enable-python \ - --enable-nautilus - make -} - -package_totem() { - groups=(gnome-extra) - install=totem.install - optdepends=('gst-plugins-ugly: Extra media codecs' - 'gst-ffmpeg: Extra media codecs' - 'lirc-utils: Infrared Remote Control plugin' - 'grilo-plugins: Browse sidebar (remote media)' - 'pyxdg: opensubtitles plugin') - - cd "$pkgbase-$pkgver" - make DESTDIR="${pkgdir}" install - - rm -r "$pkgdir/usr/lib/mozilla" - rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" - - sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ - $pkgdir/usr/lib/totem/totem/totem-bugreport.py - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" -} - -package_totem-plugin() { - pkgdesc="Totem plugin for web browsers" - depends=("totem=$pkgver") - backup=(etc/totem/browser-plugins.ini) - - cd "$pkgbase-$pkgver" - make -C browser-plugin \ - plugindir=/usr/lib/mozilla/plugins \ - xptdir=/usr/lib/mozilla/plugins \ - DESTDIR="$pkgdir" install - - install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" -} diff --git a/gnome-unstable/totem/browser-plugins.ini b/gnome-unstable/totem/browser-plugins.ini deleted file mode 100644 index cf3014997..000000000 --- a/gnome-unstable/totem/browser-plugins.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Plugins] -application/x-shockwave-flash.disabled=true diff --git a/gnome-unstable/totem/totem.install b/gnome-unstable/totem/totem.install deleted file mode 100644 index 7f0fc704b..000000000 --- a/gnome-unstable/totem/totem.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/tracker/PKGBUILD b/gnome-unstable/tracker/PKGBUILD deleted file mode 100644 index 5751a041e..000000000 --- a/gnome-unstable/tracker/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 167544 2012-10-02 13:24:36Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Alexander Fehr <pizzapunk gmail com> - -pkgbase=tracker -pkgname=(tracker libtracker-sparql) -pkgver=0.14.2 -_tver=${pkgver%.*} -pkgrel=2 -pkgdesc="All-in-one indexer, search tool and metadata database" -arch=('i686' 'x86_64') -license=('GPL') -makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' - 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' - 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' - 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' - 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') -url="http://www.gnome.org" -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz - bug675660.patch - tracker-extract-pdf-crash-fix.patch) -sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1' - '77c1377860f09aba42fc0bb662cb188613d5ed3744f3ffb3a710d1e60499cb8c' - 'afa14805b9a1adb2442dc4a6032b1575a07a87aa969599ca28669a2cf975e772') - -build() { - cd $pkgbase-$pkgver - - patch -Np1 -i "${srcdir}/bug675660.patch" - patch -Np1 -i "${srcdir}/tracker-extract-pdf-crash-fix.patch" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/tracker \ - --disable-unit-tests \ - --enable-libflac \ - --enable-libvorbis - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_tracker() { - depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' - 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' - 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') - optdepends=('giflib: extractor for GIF data' - 'gstreamer0.10-base: video extractor' - 'totem-plparser: playlist support' - 'nautilus: nautilus-extension' - 'libvorbis: Vorbis metadata extractor' - 'flac: FLAC metadata extractor' - 'taglib: writeback for audio files' - 'gnome-panel: tracker-search-bar') - groups=('gnome-extra') - install=tracker.install - - cd $pkgbase-$pkgver - make DESTDIR="$pkgdir" install - -### Split libtracker-sparql - - mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver - mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} - mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} - - mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" - - mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ - "$srcdir/sparql/usr/lib/tracker-$_tver" - - mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ - "$srcdir/sparql/usr/share/vala/vapi" - - mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql - mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib - mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc - mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir -} - -package_libtracker-sparql() { - pkgdesc="$pkgdesc (SPARQL library)" - depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') - - mv "$srcdir"/sparql/* "$pkgdir" -} diff --git a/gnome-unstable/tracker/bug675660.patch b/gnome-unstable/tracker/bug675660.patch deleted file mode 100644 index 5f217d983..000000000 --- a/gnome-unstable/tracker/bug675660.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 20 Jul 2012 14:46:33 +0000 -Subject: libtracker-fts: ICU cannot handle complex locale descriptions - -ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"), -not the full definition of your various locale variables and their -values as returned by glibc's setlocale(LC_ALL, NULL). - -Instead, limit ourselves to LC_CTYPE, since after all, that's all we -need to determine word boundaries. - -Fixes GB#675660. ---- -diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c -index 7388f69..69f75ed 100644 ---- a/src/libtracker-fts/tracker-parser-libicu.c -+++ b/src/libtracker-fts/tracker-parser-libicu.c -@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser, - - /* Open word-break iterator */ - parser->bi = ubrk_open(UBRK_WORD, -- setlocale (LC_ALL, NULL), -+ setlocale (LC_CTYPE, NULL), - parser->utxt, - parser->utxt_size, - &error); --- -cgit v0.9.0.2 diff --git a/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch b/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch deleted file mode 100644 index ac8522f6a..000000000 --- a/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 008677280d32b6db56483832b143760888c91ad4 Mon Sep 17 00:00:00 2001 -From: Sam Thursfield <sam.thursfield@codethink.co.uk> -Date: Tue, 31 Jul 2012 14:26:53 +0000 -Subject: tracker-extract-pdf: Fix crash if mmap() fails - -Patch from Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=751922 ---- -diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c -index caa24c7..85066b3 100644 ---- a/src/tracker-extract/tracker-extract-pdf.c -+++ b/src/tracker-extract/tracker-extract-pdf.c -@@ -451,7 +451,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) - len = 0; - } else { - contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); -- if (contents == NULL) { -+ if (contents == NULL || contents == MAP_FAILED) { - g_warning ("Could not mmap pdf file '%s': %s\n", - filename, - g_strerror (errno)); --- -cgit v0.9.0.2 diff --git a/gnome-unstable/tracker/tracker.install b/gnome-unstable/tracker/tracker.install deleted file mode 100644 index 95114273e..000000000 --- a/gnome-unstable/tracker/tracker.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD deleted file mode 100644 index 5dd566d72..000000000 --- a/gnome-unstable/vinagre/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168958 2012-10-16 22:54:38Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: lp76 <l.peduto@gmail.com> - -pkgname=vinagre -pkgver=3.6.1 -pkgrel=1 -pkgdesc="A VNC Client for the GNOME Desktop" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/vinagre/" -install=vinagre.install -depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') -optdepends=('openssh: SSH plugin' - 'rdesktop: RDP plugin') -makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('768727f9833ba9b9879d72671bc4b10577f4dfe74488cb0cf4c49edfe0165c62') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/vinagre/vinagre.install b/gnome-unstable/vinagre/vinagre.install deleted file mode 100644 index 4998e6e8b..000000000 --- a/gnome-unstable/vinagre/vinagre.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD deleted file mode 100644 index 45ac66e11..000000000 --- a/gnome-unstable/vino/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168957 2012-10-16 22:51:56Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=vino -pkgver=3.6.1 -pkgrel=1 -pkgdesc="a VNC server for the GNOME desktop" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils') -makedepends=('intltool' 'networkmanager' 'gnome-common') -groups=('gnome-extra') -url="http://www.gnome.org" -options=(!emptydirs) -install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('60fdc2271e27c4e10bef40dc2ee836d587930a178c3f189bd975c4d477f32783') - -build() { - cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - autoreconf --force - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vino \ - --localstatedir=/var \ - --disable-http-server --with-secret - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/vino/vino.install b/gnome-unstable/vino/vino.install deleted file mode 100644 index fabaa1ed7..000000000 --- a/gnome-unstable/vino/vino.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/vte3/PKGBUILD b/gnome-unstable/vte3/PKGBUILD deleted file mode 100644 index f4005fc7b..000000000 --- a/gnome-unstable/vte3/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 168890 2012-10-16 12:09:06Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=vte3 -pkgname=(vte3 vte-common) -pkgver=0.34.1 -pkgrel=1 -pkgdesc="Virtual Terminal Emulator widget for use with GTK3" -arch=('i686' 'x86_64') -license=('LGPL') -options=('!libtool' '!emptydirs') -makedepends=('intltool' 'gobject-introspection' 'gtk3') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz) -sha256sums=('06b78824875545ced8ebaff111b656d0b4ed370f46a4b609f43f88a0ee908f08') - -build() { - cd "vte-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vte \ - --localstatedir=/var --disable-static \ - --enable-introspection - make -} - -package_vte3(){ - depends=('gtk3' 'vte-common') - cd "vte-$pkgver" - make DESTDIR="$pkgdir" install - - rm "$pkgdir"/usr/lib/vte/gnome-pty-helper -} - -package_vte-common() { - pkgdesc="Common files used by vte and vte3" - depends=('glibc') - cd "vte-$pkgver" - - make -C gnome-pty-helper DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/webkitgtk/PKGBUILD b/gnome-unstable/webkitgtk/PKGBUILD deleted file mode 100644 index d77de3a00..000000000 --- a/gnome-unstable/webkitgtk/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=webkitgtk -pkgname=('webkitgtk2' 'webkitgtk3') -pkgver=1.10.1 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://webkitgtk.org/" -license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) -sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493') - -build() { - cd "$srcdir/webkitgtk-$pkgver" - mkdir build-gtk2 build-gtk3 - - cd build-gtk2 - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk2 \ - --with-gstreamer=1.0 \ - --with-gtk=2.0 \ - --disable-webkit2 - make all stamp-po - - cd ../build-gtk3 - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk3 \ - --with-gstreamer=1.0 - make all stamp-po -} - -package_webkitgtk3() { - pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs') - conflicts=('libwebkit3') - provides=("libwebkit3=${pkgver}") - replaces=('libwebkit3') - - cd "$srcdir/webkitgtk-$pkgver/build-gtk3" - make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} - -package_webkitgtk2() { - pkgdesc="GTK+ Web content engine library for GTK+ 2.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gst-plugins-base-libs') - conflicts=('libwebkit') - provides=("libwebkit=${pkgver}") - replaces=('libwebkit') - - cd "$srcdir/webkitgtk-$pkgver/build-gtk2" - make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} |