Skip to content
Browse files

[indicator-session] Drop 0001_Revert_new_glib_stuff.patch: not needed…

… for GNOME 3.6
  • Loading branch information...
1 parent 8f5bc7f commit e6887a47309a0ce546657629d46ca223f235ceba @chenxiaolong committed Oct 23, 2012
View
46 indicator-session/0001_Revert_new_glib_stuff.patch
@@ -1,46 +0,0 @@
-diff -Nru indicator-session-12.10.2.orig/src/indicator-session.c indicator-session-12.10.2/src/indicator-session.c
---- indicator-session-12.10.2.orig/src/indicator-session.c 2012-09-09 13:35:42.659540407 -0400
-+++ indicator-session-12.10.2/src/indicator-session.c 2012-09-09 13:44:10.077463822 -0400
-@@ -447,7 +447,10 @@
- a11y = g_strdup (_("System"));
-
- g_debug (G_STRLOC" setting a11y to \"%s\"", a11y);
-- g_clear_pointer (&indicator->entry.accessible_desc, g_free);
-+ if (indicator->entry.accessible_desc != NULL) {
-+ g_free (indicator->entry.accessible_desc);
-+ indicator->entry.accessible_desc = NULL;
-+ }
- indicator->entry.accessible_desc = a11y;
- g_signal_emit (indicator,
- INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
-diff -Nru indicator-session-12.10.2.orig/src/session-dbus.c indicator-session-12.10.2/src/session-dbus.c
---- indicator-session-12.10.2.orig/src/session-dbus.c 2012-09-09 13:35:42.654540419 -0400
-+++ indicator-session-12.10.2/src/session-dbus.c 2012-09-09 13:43:09.356593727 -0400
-@@ -206,7 +206,10 @@
- {
- SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(object);
-
-- g_clear_pointer (&priv->name, g_free);
-+ if (priv->name != NULL) {
-+ g_free(priv->name);
-+ priv->name = NULL;
-+ }
-
- G_OBJECT_CLASS (session_dbus_parent_class)->finalize (object);
- return;
-diff -Nru indicator-session-12.10.2.orig/src/users-service-dbus.c indicator-session-12.10.2/src/users-service-dbus.c
---- indicator-session-12.10.2.orig/src/users-service-dbus.c 2012-09-09 13:35:42.656540415 -0400
-+++ indicator-session-12.10.2/src/users-service-dbus.c 2012-09-09 13:43:09.356593727 -0400
-@@ -735,7 +735,11 @@
- if (!g_strcmp0 (ssid, priv->guest_ssid))
- {
- g_debug ("%s removing guest session %s", G_STRLOC, ssid);
-- g_clear_pointer (&priv->guest_ssid, g_free);
-+ if (priv->guest_ssid != NULL) {
-+ g_free(priv->guest_ssid);
-+ priv->guest_ssid = NULL;
-+ }
-+
- emit_guest_login_changed (service);
- }
- else
View
6 indicator-session/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=indicator-session
pkgver=12.10.4
-pkgrel=100
+pkgrel=101
pkgdesc="Indicator showing session management, status and user switching"
arch=('i686' 'x86_64')
url="https://launchpad.net/indicator-session"
@@ -16,19 +16,15 @@ groups=('unity')
options=('!libtool')
install=${pkgname}.install
source=("http://launchpad.net/${pkgname}/12.10/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
- '0001_Revert_new_glib_stuff.patch'
'0002_There_is_no_help.patch')
sha512sums=('06269af75271cd69d4385e6d0f095cf52033c0449002c26b25d34e507f70d1b8ecdc248d0b9a16c8f5cdfea51abb024faa4d03cf65adc359b966be6670c9254b'
- '7889156ac9a16035d033d81a9eb12480d6b78f0fd566ffae58971dec7c95357cff4c81c507b2e027f4e665ad9588ad07aaa65815c8ccc888df7b1a072fa5bc7e'
'f00ea3d3c00da05211e869fbde613807671e2faf712f832aa47100486b5991ed00e0d301f0e05c56090f37fd556663de87f912b7af5e762f7925d21d2719f99d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/0001_Revert_new_glib_stuff.patch"
patch -Np1 -i "${srcdir}/0002_There_is_no_help.patch"
- sed -i 's/2\.33/2.22/g' configure.ac
autoreconf -vfi
./configure --prefix=/usr --libexecdir=/usr/lib/${pkgbase} --disable-static --disable-schemas-compile
View
2 indicator-session/compare_versions.sh
@@ -3,7 +3,7 @@
source "$(dirname ${0})/PKGBUILD"
echo "Getting latest Ubuntu version..."
-UBUNTU_VER=($(wget -q 'http://packages.ubuntu.com/quantal/source/indicator-session' -O - | sed -n 's/.*>indicator-session_\(.*\)-\(.*\)\.diff\.gz<.*/\1 \2/p'))
+UBUNTU_VER=($(wget -q -O - 'https://launchpad.net/ubuntu/quantal/+source/indicator-session' | sed -n 's/^.*current\ release\ (\(.*\)-\(.*\)).*$/\1 \2/p'))
echo "Getting latest upstream version..."
UPSTREAM_VER=$(wget -q 'https://launchpad.net/indicator-session/+download' -O - | sed -n 's/.*indicator-session-\(.*\)\.tar\.gz.*/\1/p' | head -n 1)

0 comments on commit e6887a4

Please sign in to comment.
Something went wrong with that request. Please try again.