[arch-commits] Commit in mate-color-manager/trunk (PKGBUILD adapt-materr.diff)

[Martin Wimpress]

    Date: Tuesday, July 14, 2015 @ 15:34:11
  Author: flexiondotorg
Revision: 136876

upgpkg: mate-color-manager 1.8.0-2 - Exiv2 rebuild

Added:
  mate-color-manager/trunk/adapt-materr.diff
Modified:
  mate-color-manager/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   14 +++++++++-----
 adapt-materr.diff |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-14 13:29:47 UTC (rev 136875)
+++ PKGBUILD	2015-07-14 13:34:11 UTC (rev 136876)
@@ -3,21 +3,25 @@
 
 pkgname=mate-color-manager
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Color management application for MATE."
 url="https://github.com/NiceandGently/${pkgname}"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus' 'desktop-file-utils' 'exiv2' 'gtk2' 'lcms2' 'libcanberra' 'libcups' 'libexif' 'libnotify' 'libtiff'
-         'libunique' 'mate-desktop' 'sane' 'vte')
+depends=('dbus' 'desktop-file-utils' 'exiv2' 'gtk2' 'lcms2' 'libcanberra' 'libcups' 'libexif'
+         'libgudev' 'libnotify' 'libtiff' 'libunique' 'mate-desktop>=1.10' 'sane' 'vte')
 makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz")
-sha1sums=('9727991077ca740eb050eb7a64cc7a6f5dd0e3ae')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz"
+        "adapt-materr.diff")
+sha1sums=('9727991077ca740eb050eb7a64cc7a6f5dd0e3ae'
+          'f4b910418866c90530ff990564d992c802d9ba05')
 install=${pkgname}.install
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
+    # https://github.com/NiceandGently/mate-color-manager/commit/2512d5c1cf10b3a3903045c5ca5a8d411ea0ef32
+    patch -p1 < "${srcdir}/adapt-materr.diff"
     NOCONFIGURE=1 ./autogen.sh
 }
 

Added: adapt-materr.diff
===================================================================
--- adapt-materr.diff	                        (rev 0)
+++ adapt-materr.diff	2015-07-14 13:34:11 UTC (rev 136876)
@@ -0,0 +1,28 @@
+diff --git a/src/mcm-screen.c b/src/mcm-screen.c
+index d555a37..aeec5b9 100644
+--- a/src/mcm-screen.c
++++ b/src/mcm-screen.c
+@@ -91,11 +91,13 @@ mcm_screen_ensure_instance (McmScreen *screen, GError **error)
+ 		goto out;
+ 
+ 	/* get screen (this is slow) */
+-	priv->rr_screen = mate_rr_screen_new (gdk_screen_get_default (), (MateRRScreenChanged) mcm_screen_randr_event_cb, screen, error);
++	priv->rr_screen = mate_rr_screen_new (gdk_screen_get_default (), error);
+ 	if (priv->rr_screen == NULL) {
+ 		ret = FALSE;
+ 		goto out;
+ 	}
++
++	g_signal_connect (priv->rr_screen, "changed", G_CALLBACK (mcm_screen_randr_event_cb), screen);
+ out:
+ 	return ret;
+ }
+@@ -196,7 +198,7 @@ mcm_screen_finalize (GObject *object)
+ 	McmScreenPrivate *priv = screen->priv;
+ 
+ 	if (priv->rr_screen != NULL)
+-		mate_rr_screen_destroy (priv->rr_screen);
++		g_object_unref (priv->rr_screen);
+ 
+ 	G_OBJECT_CLASS (mcm_screen_parent_class)->finalize (object);
+ }