Date: Monday, June 3, 2013 @ 23:26:54
Author: lfleischer
Revision: 92311
archrelease: copy trunk to community-i686, community-x86_64
Added:
redshift/repos/community-i686/165_164.diff
(from rev 92310, redshift/trunk/165_164.diff)
redshift/repos/community-i686/PKGBUILD
(from rev 92310, redshift/trunk/PKGBUILD)
redshift/repos/community-i686/redshift.install
(from rev 92310, redshift/trunk/redshift.install)
redshift/repos/community-x86_64/165_164.diff
(from rev 92310, redshift/trunk/165_164.diff)
redshift/repos/community-x86_64/PKGBUILD
(from rev 92310, redshift/trunk/PKGBUILD)
redshift/repos/community-x86_64/redshift.install
(from rev 92310, redshift/trunk/redshift.install)
Deleted:
redshift/repos/community-i686/PKGBUILD
redshift/repos/community-i686/redshift.install
redshift/repos/community-x86_64/PKGBUILD
redshift/repos/community-x86_64/redshift.install
-----------------------------------+
/PKGBUILD | 88 ++++++++++++++++++++++++++++++++++++
/redshift.install | 22 +++++++++
community-i686/165_164.diff | 55 ++++++++++++++++++++++
community-i686/PKGBUILD | 35 --------------
community-i686/redshift.install | 11 ----
community-x86_64/165_164.diff | 55 ++++++++++++++++++++++
community-x86_64/PKGBUILD | 35 --------------
community-x86_64/redshift.install | 11 ----
8 files changed, 220 insertions(+), 92 deletions(-)
Copied: redshift/repos/community-i686/165_164.diff (from rev 92310,
redshift/trunk/165_164.diff)
===================================================================
--- community-i686/165_164.diff (rev 0)
+++ community-i686/165_164.diff 2013-06-03 21:26:54 UTC (rev 92311)
@@ -0,0 +1,55 @@
+=== 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)) {
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-06-03 21:26:39 UTC (rev 92310)
+++ community-i686/PKGBUILD 2013-06-03 21:26:54 UTC (rev 92311)
@@ -1,35 +0,0 @@
-# $Id$
-# 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=5
-pkgdesc='Adjusts the color temperature of your screen according to your
surroundings.'
-arch=('i686' 'x86_64')
-url='http://jonls.dk/redshift/'
-license=('GPL3')
-depends=('gconf' 'geoclue' 'libxxf86vm')
-optdepends=('pygtk: for gtk-redshift'
- 'pyxdg: for gtk-redshift'
- 'librsvg: for gtk-redshift')
-makedepends=('python2')
-install='redshift.install'
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('c56512afa292b5a94b715ed4a1841d4c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/python/python2/' src/gtk-redshift/gtk-redshift
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: redshift/repos/community-i686/PKGBUILD (from rev 92310,
redshift/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-06-03 21:26:54 UTC (rev 92311)
@@ -0,0 +1,44 @@
+# $Id$
+# 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=6
+pkgdesc='Adjusts the color temperature of your screen according to your
surroundings.'
+arch=('i686' 'x86_64')
+url='http://jonls.dk/redshift/'
+license=('GPL3')
+depends=('gconf' 'geoclue' 'libxxf86vm')
+optdepends=('pygtk: for gtk-redshift'
+ 'pyxdg: 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')
+
+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
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/redshift.install
===================================================================
--- community-i686/redshift.install 2013-06-03 21:26:39 UTC (rev 92310)
+++ community-i686/redshift.install 2013-06-03 21:26:54 UTC (rev 92311)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: redshift/repos/community-i686/redshift.install (from rev 92310,
redshift/trunk/redshift.install)
===================================================================
--- community-i686/redshift.install (rev 0)
+++ community-i686/redshift.install 2013-06-03 21:26:54 UTC (rev 92311)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: redshift/repos/community-x86_64/165_164.diff (from rev 92310,
redshift/trunk/165_164.diff)
===================================================================
--- community-x86_64/165_164.diff (rev 0)
+++ community-x86_64/165_164.diff 2013-06-03 21:26:54 UTC (rev 92311)
@@ -0,0 +1,55 @@
+=== 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)) {
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-06-03 21:26:39 UTC (rev 92310)
+++ community-x86_64/PKGBUILD 2013-06-03 21:26:54 UTC (rev 92311)
@@ -1,35 +0,0 @@
-# $Id$
-# 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=5
-pkgdesc='Adjusts the color temperature of your screen according to your
surroundings.'
-arch=('i686' 'x86_64')
-url='http://jonls.dk/redshift/'
-license=('GPL3')
-depends=('gconf' 'geoclue' 'libxxf86vm')
-optdepends=('pygtk: for gtk-redshift'
- 'pyxdg: for gtk-redshift'
- 'librsvg: for gtk-redshift')
-makedepends=('python2')
-install='redshift.install'
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('c56512afa292b5a94b715ed4a1841d4c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/python/python2/' src/gtk-redshift/gtk-redshift
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: redshift/repos/community-x86_64/PKGBUILD (from rev 92310,
redshift/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-06-03 21:26:54 UTC (rev 92311)
@@ -0,0 +1,44 @@
+# $Id$
+# 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=6
+pkgdesc='Adjusts the color temperature of your screen according to your
surroundings.'
+arch=('i686' 'x86_64')
+url='http://jonls.dk/redshift/'
+license=('GPL3')
+depends=('gconf' 'geoclue' 'libxxf86vm')
+optdepends=('pygtk: for gtk-redshift'
+ 'pyxdg: 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')
+
+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
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/redshift.install
===================================================================
--- community-x86_64/redshift.install 2013-06-03 21:26:39 UTC (rev 92310)
+++ community-x86_64/redshift.install 2013-06-03 21:26:54 UTC (rev 92311)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: redshift/repos/community-x86_64/redshift.install (from rev 92310,
redshift/trunk/redshift.install)
===================================================================
--- community-x86_64/redshift.install (rev 0)
+++ community-x86_64/redshift.install 2013-06-03 21:26:54 UTC (rev 92311)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
