Date: Saturday, December 28, 2013 @ 17:34:23 Author: lfleischer Revision: 103168
upgpkg: redshift 1.8-1 Upstream update. Modified: redshift/trunk/PKGBUILD Deleted: redshift/trunk/165_164.diff --------------+ 165_164.diff | 55 ------------------------------------------------------- PKGBUILD | 16 +++++----------- 2 files changed, 5 insertions(+), 66 deletions(-) Deleted: 165_164.diff =================================================================== --- 165_164.diff 2013-12-28 11:16:04 UTC (rev 103167) +++ 165_164.diff 2013-12-28 16:34:23 UTC (rev 103168) @@ -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)) { - Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-28 11:16:04 UTC (rev 103167) +++ PKGBUILD 2013-12-28 16:34:23 UTC (rev 103168) @@ -5,8 +5,8 @@ # 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 @@ '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() {