[arch-commits] Commit in mate-utils/trunk (3 files)
Martin Wimpress
flexiondotorg at nymeria.archlinux.org
Wed Mar 5 20:46:49 UTC 2014
Date: Wednesday, March 5, 2014 @ 21:46:49
Author: flexiondotorg
Revision: 106536
Updated to 1.8
Modified:
mate-utils/trunk/PKGBUILD
Deleted:
mate-utils/trunk/422504e251442ca9921c4218151cffb6548280e6.diff
mate-utils/trunk/patch.diff
-----------------------------------------------+
422504e251442ca9921c4218151cffb6548280e6.diff | 62 ------------------------
PKGBUILD | 20 +++----
patch.diff | 34 -------------
3 files changed, 9 insertions(+), 107 deletions(-)
Deleted: 422504e251442ca9921c4218151cffb6548280e6.diff
===================================================================
--- 422504e251442ca9921c4218151cffb6548280e6.diff 2014-03-05 20:16:35 UTC (rev 106535)
+++ 422504e251442ca9921c4218151cffb6548280e6.diff 2014-03-05 20:46:49 UTC (rev 106536)
@@ -1,62 +0,0 @@
-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,
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-03-05 20:16:35 UTC (rev 106535)
+++ PKGBUILD 2014-03-05 20:46:49 UTC (rev 106536)
@@ -1,22 +1,20 @@
-# $Id$
# Maintainer : Martin Wimpress <code at flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper at gmail.com>
pkgname=mate-utils
-pkgver=1.6.1
+pkgver=1.8.0
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')
+depends=('desktop-file-utils' 'gtk2' 'libcanberra' 'libgtop' 'libsm' 'zlib')
+makedepends=('mate-common' 'mate-panel' 'perl-xml-parser' 'rarian' 'yelp-tools')
+optdepends=('mate-panel: Look up words in dictionaries from the panel'
+ 'yelp: for reading MATE help documents')
options=('!emptydirs')
groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c765c53cd4b279155d30ed057a78a584e5b2addc')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('5f4b6d8f7a39ab078c9ed8302ed97926e57b0596')
install=${pkgname}.install
build() {
@@ -24,9 +22,9 @@
./configure \
--prefix=/usr \
--libexecdir=/usr/lib/${pkgname} \
+ --with-gtk=2.0 \
--sysconfdir=/etc \
- --disable-static \
- --disable-scrollkeeper
+ --disable-static
make
}
Deleted: patch.diff
===================================================================
--- patch.diff 2014-03-05 20:16:35 UTC (rev 106535)
+++ patch.diff 2014-03-05 20:46:49 UTC (rev 106536)
@@ -1,34 +0,0 @@
-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