[arch-commits] Commit in (7 files)
Martin Wimpress
flexiondotorg at nymeria.archlinux.org
Thu Jan 16 18:12:29 UTC 2014
Date: Thursday, January 16, 2014 @ 19:12:29
Author: flexiondotorg
Revision: 104255
Added mate-utils
Added:
mate-utils/
mate-utils/repos/
mate-utils/trunk/
mate-utils/trunk/422504e251442ca9921c4218151cffb6548280e6.diff
mate-utils/trunk/PKGBUILD
mate-utils/trunk/mate-utils.install
mate-utils/trunk/patch.diff
-----------------------------------------------+
422504e251442ca9921c4218151cffb6548280e6.diff | 62 ++++++++++++++++++++++++
PKGBUILD | 36 +++++++++++++
mate-utils.install | 12 ++++
patch.diff | 34 +++++++++++++
4 files changed, 144 insertions(+)
Added: mate-utils/trunk/422504e251442ca9921c4218151cffb6548280e6.diff
===================================================================
--- mate-utils/trunk/422504e251442ca9921c4218151cffb6548280e6.diff (rev 0)
+++ mate-utils/trunk/422504e251442ca9921c4218151cffb6548280e6.diff 2014-01-16 18:12:29 UTC (rev 104255)
@@ -0,0 +1,62 @@
+diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c
+index 63ec5d9..6510f7f 100644
+--- a/mate-screenshot/mate-screenshot.c
++++ b/mate-screenshot/mate-screenshot.c
+@@ -809,13 +809,14 @@ enum
+ finish_prepare_screenshot (char *initial_uri, GdkWindow *window, GdkRectangle *rectangle)
+ {
+ ScreenshotDialog *dialog;
++ gboolean include_mask = (!take_window_shot && !take_area_shot);
+
+ /* always disable window border for full-desktop or selected-area screenshots */
+ if (!take_window_shot)
+- screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE);
++ screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE, include_mask);
+ else
+ {
+- screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border);
++ screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border, include_mask);
+
+ switch (border_effect[0])
+ {
+diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c
+index b41ae4b..faed676 100644
+--- a/mate-screenshot/screenshot-utils.c
++++ b/mate-screenshot/screenshot-utils.c
+@@ -670,7 +670,8 @@
+ screenshot_get_pixbuf (GdkWindow *window,
+ GdkRectangle *rectangle,
+ gboolean include_pointer,
+- gboolean include_border)
++ gboolean include_border,
++ gboolean include_mask)
+ {
+ GdkWindow *root;
+ GdkPixbuf *screenshot;
+@@ -738,7 +739,11 @@
+ x_orig, y_orig, 0, 0,
+ width, height);
+
+- mask_monitors (screenshot, root);
++ /*
++ * Masking currently only works properly with full-screen shots
++ */
++ if (include_mask)
++ mask_monitors (screenshot, root);
+
+ #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
+ if (include_border)
+diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/screenshot-utils.h
+index 0af2ba3..5404bde 100644
+--- a/mate-screenshot/screenshot-utils.h
++++ b/mate-screenshot/screenshot-utils.h
+@@ -36,7 +36,8 @@ gboolean screenshot_select_area (int *px,
+ GdkPixbuf *screenshot_get_pixbuf (GdkWindow *win,
+ GdkRectangle *rectangle,
+ gboolean include_pointer,
+- gboolean include_border);
++ gboolean include_border,
++ gboolean include_mask);
+
+ void screenshot_show_error_dialog (GtkWindow *parent,
+ const gchar *message,
Added: mate-utils/trunk/PKGBUILD
===================================================================
--- mate-utils/trunk/PKGBUILD (rev 0)
+++ mate-utils/trunk/PKGBUILD 2014-01-16 18:12:29 UTC (rev 104255)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper at gmail.com>
+
+pkgname=mate-utils
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Common MATE utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'libcanberra' 'libgtop' 'libsm' 'mate-desktop' 'zlib')
+makedepends=('mate-common' 'mate-doc-utils' 'mate-panel' 'perl-xml-parser'
+ 'rarian')
+optdepends=('mate-panel: Look up words in dictionaries from the panel')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('c765c53cd4b279155d30ed057a78a584e5b2addc')
+install=${pkgname}.install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgname} \
+ --sysconfdir=/etc \
+ --disable-static \
+ --disable-scrollkeeper
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Property changes on: mate-utils/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: mate-utils/trunk/mate-utils.install
===================================================================
--- mate-utils/trunk/mate-utils.install (rev 0)
+++ mate-utils/trunk/mate-utils.install 2014-01-16 18:12:29 UTC (rev 104255)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ gtk-update-icon-cache -q -t -f /usr/share/icons/mate
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Added: mate-utils/trunk/patch.diff
===================================================================
--- mate-utils/trunk/patch.diff (rev 0)
+++ mate-utils/trunk/patch.diff 2014-01-16 18:12:29 UTC (rev 104255)
@@ -0,0 +1,34 @@
+From a59fda7d006b856ac5982750f2ffdefd24191be0 Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Thu, 11 Jul 2013 11:14:38 +0000
+Subject: mate-screenshot: Fix save path selection
+
+Closes #32
+https://github.com/mate-desktop/mate-utils/issues/32
+
+Fix from https://bugzilla.gnome.org/show_bug.cgi?id=579232
+---
+diff --git a/mate-screenshot/screenshot-dialog.c b/mate-screenshot/screenshot-dialog.c
+index bcac343..b5b2be5 100644
+--- a/mate-screenshot/screenshot-dialog.c
++++ b/mate-screenshot/screenshot-dialog.c
+@@ -338,7 +338,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog)
+ gchar *uri, *file, *tmp;
+ GError *error;
+
+- folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget));
++ folder = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget));
+ file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry));
+
+ error = NULL;
+@@ -366,7 +366,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog)
+ char *
+ screenshot_dialog_get_folder (ScreenshotDialog *dialog)
+ {
+- return gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget));
++ return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget));
+ }
+
+ GdkPixbuf *
+--
+cgit
More information about the arch-commits
mailing list