Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/dosbox/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fbgrab/PKGBUILD
	community/fbv/PKGBUILD
	community/flam3/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gdk-pixbuf/PKGBUILD
	community/ghemical/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/gnustep-base/PKGBUILD
	community/guvcview/PKGBUILD
	community/keepassx/PKGBUILD
	community/kvpnc/PKGBUILD
	community/libghemical/PKGBUILD
	community/liboglappth/PKGBUILD
	community/png2ico/PKGBUILD
	community/shapelib/PKGBUILD
	community/sloccount/PKGBUILD
	community/tmw/PKGBUILD
	community/xmoto/PKGBUILD
	core/links/PKGBUILD
	extra/amule/PKGBUILD
	extra/cairomm/PKGBUILD
	extra/calligra/PKGBUILD
	extra/evas/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gd/PKGBUILD
	extra/gif2png/PKGBUILD
	extra/glhack/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/imlib/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/lbreakout2/PKGBUILD
	extra/libgdiplus/PKGBUILD
	extra/libkate/PKGBUILD
	extra/libpano13/PKGBUILD
	extra/libwebp/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxslt/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/ntp/PKGBUILD
	extra/nx/PKGBUILD
	extra/openjpeg/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/vice/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wv/PKGBUILD
	extra/wxgtk/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zvbi/PKGBUILD

1 files changed, 10 insertions, 21 deletions

diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch
index b763078ba..b263613c4 100644
--- a/community/cinnamon-control-center/gnomerrlabeler.patch
+++ b/community/cinnamon-control-center/gnomerrlabeler.patch
@@ -1,6 +1,5 @@
-diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c
---- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c	2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c	2013-04-22 03:46:53.499944701 +0200
+--- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c  2013-05-05 13:12:28.000000000 +0200
++++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200
 @@ -31,12 +31,13 @@
  #define GNOME_DESKTOP_USE_UNSTABLE_API
  #include <libgnome-desktop/gnome-rr.h>
@@ -8,7 +7,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c
 -#include <libgnome-desktop/gnome-rr-labeler.h>
  #include <gdk/gdkx.h>
  #include <X11/Xlib.h>
- #include <glib/gi18n.h>
+ #include <glib/gi18n-lib.h>
  #include <gdesktop-enums.h>
  
 +#include "cc-rr-labeler.h"
@@ -34,7 +33,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c
    g_object_unref (self->priv->labeler);
  
    G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object);
-@@ -293,16 +294,16 @@
+@@ -293,14 +294,14 @@
    self->priv->current_output = NULL;
  
    if (self->priv->labeler) {
@@ -43,36 +42,26 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c
      g_object_unref (self->priv->labeler);
    }
  
--  self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
-+  self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration);
+   self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration);
  
    if (cc_panel_get_shell (CC_PANEL (self)) == NULL)
 -    gnome_rr_labeler_hide (self->priv->labeler);
 +    cc_rr_labeler_hide (self->priv->labeler);
    else
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
+     gnome_rr_labeler_show (self->priv->labeler);
  
-   select_current_output_from_dialog_position (self);
- 
-@@ -2594,9 +2595,9 @@
-   if (self->priv->labeler == NULL)
-     return;
+@@ -2596,7 +2597,7 @@
    if (gtk_window_has_toplevel_focus (window))
--    gnome_rr_labeler_show (self->priv->labeler);
-+    cc_rr_labeler_show (self->priv->labeler);
+     gnome_rr_labeler_show (self->priv->labeler);
    else
 -    gnome_rr_labeler_hide (self->priv->labeler);
 +    cc_rr_labeler_hide (self->priv->labeler);
  }
  
  static void
-@@ -2606,9 +2607,9 @@
-     if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL)
-         return;
+@@ -2608,7 +2609,7 @@
      if (gtk_widget_get_visible (widget)) {
--        gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
-+        cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
+         gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler);
      } else {
 -        gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);
 +        cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler);