Date: Tuesday, August 5, 2014 @ 14:33:28 Author: jgc Revision: 219327
upgpkg: upower 0.99.0-3 Update to git snapshot. Revert version and removal of isDocked API. Maintains compatibility with 0.99.0. Added: upower/trunk/revert-isdocked.patch upower/trunk/revert-version.patch Modified: upower/trunk/PKGBUILD Deleted: upower/trunk/create-dir-runtime.patch upower/trunk/fix-segfault.patch --------------------------+ PKGBUILD | 30 +++---- create-dir-runtime.patch | 34 -------- fix-segfault.patch | 24 ----- revert-isdocked.patch | 181 +++++++++++++++++++++++++++++++++++++++++++++ revert-version.patch | 49 ++++++++++++ 5 files changed, 245 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-05 12:15:46 UTC (rev 219326) +++ PKGBUILD 2014-08-05 12:33:28 UTC (rev 219327) @@ -3,31 +3,31 @@ pkgname=upower pkgver=0.99.0 -pkgrel=2 +pkgrel=3 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" license=('GPL') -depends=('systemd-tools' 'systemd' 'libusb' 'polkit' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') +depends=('systemd-tools' 'systemd' 'libusb' 'dbus-glib' 'libimobiledevice') +makedepends=('git' 'intltool' 'gtk-doc' 'docbook-xsl' 'gobject-introspection' 'systemd') backup=('etc/UPower/UPower.conf') -source=($url/releases/$pkgname-$pkgver.tar.xz - create-dir-runtime.patch - fix-segfault.patch) -md5sums=('14f43bc13353e23e7280863f33ac50d2' - '74901767f9c94451083b3d92396454ab' - 'fa2f37eec44703e4c10edb5d9abb0f6b') +source=("git://anongit.freedesktop.org/upower#commit=e4ad754351b67c00438c736c14bb948905708009" + revert-isdocked.patch + revert-version.patch) +sha256sums=('SKIP' + '81e250bc8402f91bf0841abc58ce8effde91a16ce2b889b7b7f15251d1ef8e92' + 'bf11b285dea24000c18fd75206b21c703d1fa5fbfa5e5a7f877383bf8efcbf2e') prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../create-dir-runtime.patch - patch -Np1 -i ../fix-segfault.patch + cd $pkgname + patch -Np1 -R -i ../revert-version.patch + patch -Np1 -R -i ../revert-isdocked.patch } build() { - cd "$pkgname-$pkgver" + cd $pkgname - ./configure --prefix=/usr --sysconfdir=/etc \ + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ --disable-static @@ -35,6 +35,6 @@ } package() { - cd "$pkgname-$pkgver" + cd $pkgname make DESTDIR="$pkgdir" install } Deleted: create-dir-runtime.patch =================================================================== --- create-dir-runtime.patch 2014-08-05 12:15:46 UTC (rev 219326) +++ create-dir-runtime.patch 2014-08-05 12:33:28 UTC (rev 219327) @@ -1,34 +0,0 @@ -From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cos...@endlessm.com> -Date: Tue, 25 Feb 2014 09:43:04 +0000 -Subject: Create the history directory at runtime - -In addition to build time - this increases compatibilty with OSTree, -which starts out with an empty /var. - -Signed-off-by: Richard Hughes <rich...@hughsie.com> ---- -diff --git a/src/up-history.c b/src/up-history.c -index f9d0fdf..795b093 100644 ---- a/src/up-history.c -+++ b/src/up-history.c -@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir) - { - g_free (history->priv->dir); - history->priv->dir = g_strdup (dir); -+ g_mkdir_with_parents (dir, 0755); - } - - /** -@@ -887,7 +888,8 @@ up_history_init (UpHistory *history) - history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE; -- history->priv->dir = g_build_filename (HISTORY_DIR, NULL); -+ -+ up_history_set_directory (history, HISTORY_DIR); - } - - /** --- -cgit v0.9.0.2-2-gbebe Deleted: fix-segfault.patch =================================================================== --- fix-segfault.patch 2014-08-05 12:15:46 UTC (rev 219326) +++ fix-segfault.patch 2014-08-05 12:33:28 UTC (rev 219327) @@ -1,24 +0,0 @@ -From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martinp...@gnome.org> -Date: Fri, 08 Nov 2013 13:59:50 +0000 -Subject: lib: Fix segfault on getting property when daemon is not running - -This fixes "upower --version" when the daemon is not running, and thus the -client proxy is NULL. ---- -diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c -index 35d7b5d..17fb02d 100644 ---- a/libupower-glib/up-client.c -+++ b/libupower-glib/up-client.c -@@ -322,6 +322,9 @@ up_client_get_property (GObject *object, - UpClient *client; - client = UP_CLIENT (object); - -+ if (client->priv->proxy == NULL) -+ return; -+ - switch (prop_id) { - case PROP_DAEMON_VERSION: - g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy)); --- -cgit v0.9.0.2-2-gbebe Added: revert-isdocked.patch =================================================================== --- revert-isdocked.patch (rev 0) +++ revert-isdocked.patch 2014-08-05 12:33:28 UTC (rev 219327) @@ -0,0 +1,181 @@ +From 5ed25a7e5f115a71433f137905394ae6b119e450 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <had...@hadess.net> +Date: Wed, 7 May 2014 10:49:37 +0200 +Subject: all: Remove IsDocked property + +Removes the deprecated (for not very long) property, before we do a 1.0 +release. + +https://bugs.freedesktop.org/show_bug.cgi?id=78380 + +diff --git a/configure.ac b/configure.ac +index db25851..9ead3d4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,7 @@ AC_SUBST(UP_MICRO_VERSION) + # CURRENT If the API or ABI interface has changed (reset REVISION to 0) + # REVISION If the API and ABI remains the same, but bugs are fixed. + # AGE Don't use. +-LT_CURRENT=2 ++LT_CURRENT=3 + LT_REVISION=0 + LT_AGE=0 + AC_SUBST(LT_CURRENT) +diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c +index 1beb220..48d99a0 100644 +--- a/libupower-glib/up-client.c ++++ b/libupower-glib/up-client.c +@@ -67,7 +67,6 @@ enum { + PROP_ON_BATTERY, + PROP_LID_IS_CLOSED, + PROP_LID_IS_PRESENT, +- PROP_IS_DOCKED, + PROP_LAST + }; + +@@ -227,24 +226,6 @@ up_client_get_lid_is_present (UpClient *client) + } + + /** +- * up_client_get_is_docked: +- * @client: a #UpClient instance. +- * +- * Get whether the machine is docked into a docking station. This property +- * is deprecated. Use XRandR, for example, to check for external displays +- * instead. +- * +- * Return value: Always %FALSE. +- * +- * Since: 0.9.2 +- */ +-gboolean +-up_client_get_is_docked (UpClient *client) +-{ +- return FALSE; +-} +- +-/** + * up_client_get_on_battery: + * @client: a #UpClient instance. + * +@@ -339,9 +320,6 @@ up_client_get_property (GObject *object, + case PROP_LID_IS_PRESENT: + g_value_set_boolean (value, up_client_glue_get_lid_is_present (client->priv->proxy)); + break; +- case PROP_IS_DOCKED: +- g_value_set_boolean (value, FALSE); +- break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -418,21 +396,6 @@ up_client_class_init (UpClientClass *klass) + G_PARAM_READABLE)); + + /** +- * UpClient:is-docked: +- * +- * If the laptop is docked +- * +- * Since: 0.9.8 +- */ +- g_object_class_install_property (object_class, +- PROP_IS_DOCKED, +- g_param_spec_boolean ("is-docked", +- "If a laptop is docked", +- NULL, +- FALSE, +- G_PARAM_READABLE)); +- +- /** + * UpClient::device-added: + * @client: the #UpClient instance that emitted the signal + * @device: the #UpDevice that was added. +diff --git a/libupower-glib/up-client.h b/libupower-glib/up-client.h +index 60bfb15..79c2d9e 100644 +--- a/libupower-glib/up-client.h ++++ b/libupower-glib/up-client.h +@@ -82,7 +82,6 @@ GPtrArray *up_client_get_devices (UpClient *client); + const gchar *up_client_get_daemon_version (UpClient *client); + gboolean up_client_get_lid_is_closed (UpClient *client); + gboolean up_client_get_lid_is_present (UpClient *client); +-gboolean up_client_get_is_docked (UpClient *client); + gboolean up_client_get_on_battery (UpClient *client); + + G_END_DECLS +diff --git a/src/org.freedesktop.UPower.xml b/src/org.freedesktop.UPower.xml +index 9b2319d..c376521 100644 +--- a/src/org.freedesktop.UPower.xml ++++ b/src/org.freedesktop.UPower.xml +@@ -199,20 +199,6 @@ method return sender=:1.386 -> dest=:1.451 reply_serial=2 + </doc:doc> + </property> + +- <property name="IsDocked" type="b" access="read"> +- <doc:doc> +- <doc:description> +- <doc:para> +- If the system is currently docked. +- Note: the "is-docked" value is now always False. +- Whether an external display is in use should be checked within +- the session service applying policy on the presence or absence +- of an external display, such as gnome-settings-daemon. +- </doc:para> +- </doc:description> +- </doc:doc> +- </property> +- + </interface> + + </node> +diff --git a/src/up-daemon.c b/src/up-daemon.c +index 4a81800..c7fea62 100644 +--- a/src/up-daemon.c ++++ b/src/up-daemon.c +@@ -49,7 +49,6 @@ enum + PROP_ON_BATTERY, + PROP_LID_IS_CLOSED, + PROP_LID_IS_PRESENT, +- PROP_IS_DOCKED, + PROP_LAST + }; + +@@ -1180,9 +1179,6 @@ up_daemon_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe + case PROP_LID_IS_PRESENT: + g_value_set_boolean (value, priv->lid_is_present); + break; +- case PROP_IS_DOCKED: +- g_value_set_boolean (value, FALSE); +- break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -1234,14 +1230,6 @@ up_daemon_class_init (UpDaemonClass *klass) + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, +- PROP_IS_DOCKED, +- g_param_spec_boolean ("is-docked", +- "Is docked", +- "If this computer is docked", +- FALSE, +- G_PARAM_READABLE)); +- +- g_object_class_install_property (object_class, + PROP_ON_BATTERY, + g_param_spec_boolean ("on-battery", + "On Battery", +diff --git a/tools/up-tool.c b/tools/up-tool.c +index 69430c9..a2a35b0 100644 +--- a/tools/up-tool.c ++++ b/tools/up-tool.c +@@ -136,7 +136,6 @@ up_client_print (UpClient *client) + g_print (" on-battery: %s\n", on_battery ? "yes" : "no"); + g_print (" lid-is-closed: %s\n", lid_is_closed ? "yes" : "no"); + g_print (" lid-is-present: %s\n", lid_is_present ? "yes" : "no"); +- g_print (" is-docked: no (deprecated, always false)\n"); + action = up_client_get_critical_action (client); + g_print (" critical-action: %s\n", action); + g_free (action); +-- +cgit v0.10.2 + Added: revert-version.patch =================================================================== --- revert-version.patch (rev 0) +++ revert-version.patch 2014-08-05 12:33:28 UTC (rev 219327) @@ -0,0 +1,49 @@ +From e96f5349f905d5005bd29c5a4786c10fb86d1453 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <rich...@hughsie.com> +Date: Tue, 29 Oct 2013 12:52:47 +0000 +Subject: trivial: post release version bump + + +diff --git a/RELEASE b/RELEASE +index 0f5abf2..f87444e 100644 +--- a/RELEASE ++++ b/RELEASE +@@ -2,9 +2,9 @@ UPower Release Notes + + 1. Write NEWS entries for UPower in the same format as usual. + +-git shortlog UPOWER_0_9_22.. | grep -i -v trivial | grep -v Merge > NEWS.new ++git shortlog UPOWER_0_99_0.. | grep -i -v trivial | grep -v Merge > NEWS.new + +-Version 0.99.0 ++Version 0.99.1 + ~~~~~~~~~~~~~~ + Released: 2013-xx-xx + +@@ -13,8 +13,8 @@ Bugfixes: + + 2. Commit changes to git: + +-git commit -a -m "Released UPower 0.99.0" +-git tag -s -f -m "Released UPower 0.99.0" UPOWER_0_99_0 ++git commit -a -m "Released UPower 0.99.1" ++git tag -s -f -m "Released UPower 0.99.1" UPOWER_0_99_1 + <wait> + git push --tags + git push +diff --git a/configure.ac b/configure.ac +index af41082..db25851 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. + + m4_define([up_major_version], [0]) + m4_define([up_minor_version], [99]) +-m4_define([up_micro_version], [0]) ++m4_define([up_micro_version], [1]) + m4_define([up_version], + [up_major_version.up_minor_version.up_micro_version]) + +-- +cgit v0.10.2 +