Sun Dec 29 03:35:02 UTC 2013

2 files changed, 6 insertions, 67 deletions

diff --git a/community/redshift/165_164.diff b/community/redshift/165_164.diff
deleted file mode 100644
index 663b5663b..000000000
--- a/community/redshift/165_164.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-=== modified file 'src/location-geoclue.c'
---- src/location-geoclue.c	2011-03-27 22:14:58 +0000
-+++ src/location-geoclue.c	2011-07-12 20:30:30 +0000
-@@ -50,14 +50,20 @@
- int
- location_geoclue_start(location_geoclue_state_t *state)
- {
--	GeoclueMaster *master = NULL;
--	GeoclueMasterClient *client = NULL;
--	GError *error = NULL;
--	gchar *name = NULL;
-+        if (state->provider && state->provider_path) {
-+		state->position = geoclue_position_new(state->provider,
-+						       state->provider_path);
-+        } else {
-+                GeoclueMaster *master = geoclue_master_get_default();
-+                GeoclueMasterClient *client = geoclue_master_create_client(master,
-+                                                                           NULL, NULL);
-+                GError *error = NULL;
- 
--        if (!(state->provider && state->provider_path)) {
--		master = geoclue_master_get_default();
--		client = geoclue_master_create_client(master, NULL, NULL);
-+                if (client == NULL) {
-+                        g_printerr(_("Unable to obtain master client.\n"));
-+                        g_object_unref(master);
-+                        return -1;
-+                }
- 
- 		if (!geoclue_master_client_set_requirements(client,
- 							    GEOCLUE_ACCURACY_LEVEL_REGION,
-@@ -68,15 +74,18 @@
- 				   error->message);
- 			g_error_free(error);
- 			g_object_unref(client);
-+                        g_object_unref(master);
- 
- 			return -1;
- 		}
- 
- 		state->position = geoclue_master_client_create_position(client, NULL);
--	} else {
--		state->position = geoclue_position_new(state->provider,
--						       state->provider_path);
--        }
-+
-+                g_object_unref(client);
-+                g_object_unref(master);
-+	}
-+
-+	gchar *name = NULL;
- 
- 	if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position),
- 					       &name, NULL, NULL)) {
-
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index 1826118d3..d75a6c2c2 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 95564 2013-08-14 09:35:51Z lfleischer $
+# $Id: PKGBUILD 103169 2013-12-28 17:00:30Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Geoffrey Teale <tealeg@stop-squark>
 # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com>
 # Contributor: Biginoz <biginoz a free dot fr>
 
 pkgname=redshift
-pkgver=1.7
-pkgrel=7
+pkgver=1.8
+pkgrel=1
 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.'
 arch=('i686' 'x86_64')
 url='http://jonls.dk/redshift/'
@@ -17,18 +17,12 @@ optdepends=('pygtk: for gtk-redshift'
             'librsvg: for gtk-redshift')
 makedepends=('python2')
 install='redshift.install'
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"
-        '165_164.diff') 
-md5sums=('c56512afa292b5a94b715ed4a1841d4c'
-         'eaafcdc62a47d725c256cd5473f4efa1')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a05c34bc7b8fbb4f5d546a0b5cca5d6f')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's/python/python2/' src/gtk-redshift/gtk-redshift
-
-  # fix GTK UI segmentation fault (fixes FS#33412)
-  patch -p0 -i ../165_164.diff
+  sed -i 's/python/python2/' src/redshift-gtk/redshift-gtk
 }
 
 build() {