Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[indicator-sync] Update to version 12.10.5daily13.01.25

  • Loading branch information...
commit f95358f94130252febc0a5205747d46910fa53a5 1 parent f5f9661
@chenxiaolong authored
View
18 indicator-sync/PKGBUILD
@@ -2,7 +2,9 @@
# Written by: roi.dm <https://bbs.archlinux.org/viewtopic.php?pid=1177835#p1177835>
pkgname=indicator-sync
-pkgver=12.10.4
+_actual_ver=12.10.5
+_extra_ver=daily13.01.25
+pkgver=${_actual_ver}${_extra_ver}
pkgrel=100
pkgdesc="Sync menu to aggregate services performing background synchronization"
arch=('i686' 'x86_64')
@@ -12,18 +14,24 @@ depends=('libdbusmenu-gtk3' 'ido' 'libindicator3')
makedepends=('intltool')
groups=('unity')
options=('!libtool')
-source=("http://launchpad.net/${pkgname}/12.10/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('30b5bddedf44a2bf57e012eebd389f4f80177ee6583df3d047d3391ef6a59d9a3aeb4a9540e57dda641f298dc5db899b91524ef57abb5b2905c2fba57141eb23')
+source=("https://launchpad.net/ubuntu/+archive/primary/+files/indicator-sync_${_actual_ver}${_extra_ver}.orig.tar.gz"
+ 'revert_r30.patch')
+sha512sums=('45aa33c95424fdbd87aaf77365a69b1b963d1b57051500e8f061f909b75a5ee1c25b08a12bb6ece181373c8acb9d158190027738660c687df3b146c3093d255b'
+ 'caa8751368f0d027c5326d89443d113538861ce41d4d5823bfc036ef2dcfaf9e705d13a18d46fec8b8f03e5f389ac6403ecb82005fb106c797ab426ccf79912c')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${_actual_ver}${_extra_ver}"
+
+ patch -p0 -i "${srcdir}/revert_r30.patch"
+
+ autoreconf -vfi
./configure --prefix=/usr --libexecdir=/usr/share/${pkgname} --disable-static
make ${MAKEFLAGS}
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${_actual_ver}${_extra_ver}"
make DESTDIR="${pkgdir}/" install
}
View
2  indicator-sync/compare_versions.sh
@@ -3,6 +3,6 @@
source "$(dirname ${0})/PKGBUILD"
source "$(dirname ${0})/../version_checker.sh"
-echo -e "PKGBUILD version: ${pkgver}"
+echo -e "PKGBUILD version: ${_actual_ver}${_extra_ver}"
echo -e "Upstream version: $(get_launchpad_version ${pkgname})"
echo -e "Ubuntu version: $(get_ubuntu_version ${pkgname} ${1:-raring})"
View
73 indicator-sync/revert_r30.patch
@@ -0,0 +1,73 @@
+Reverts:
+------------------------------------------------------------
+revno: 30 [merge]
+author: Charles Kerr <charles.kerr@canonical.com>
+committer: Tarmac
+branch nick: trunk.13.04
+timestamp: Wed 2013-01-23 14:50:54 +0000
+message:
+ Removes g_type_init() calls and bumps the glib prerequisite to 2.35.4. Fixes: https://bugs.launchpad.net/bugs/1103087.
+
+ Approved by Mathieu Trudel-Lapierre, PS Jenkins bot.
+------------------------------------------------------------
+=== modified file 'configure.ac'
+--- configure.ac 2013-01-22 20:14:33 +0000
++++ configure.ac 2012-11-08 17:29:38 +0000
+@@ -50,7 +50,7 @@
+ INDICATOR_REQUIRED_VERSION=0.3.19
+ DBUSMENUGLIB_REQUIRED_VERSION=.0.6.2
+ DBUSMENUGTK_REQUIRED_VERSION=0.5.90
+-GLIB_REQUIRED_VERSION=2.35.4
++GLIB_REQUIRED_VERSION=2.32.0
+
+ PKG_CHECK_MODULES(SYNC_LIB_DEPS, [dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+
+=== modified file 'examples/sync-app-example.c'
+--- examples/sync-app-example.c 2013-01-22 20:14:33 +0000
++++ examples/sync-app-example.c 2012-08-25 20:27:47 +0000
+@@ -211,6 +211,7 @@
+ int
+ main (void)
+ {
++ g_type_init ();
+ create_u1_sync_menu_app ();
+ g_main_loop_run (g_main_loop_new(NULL, FALSE));
+ return 0;
+
+=== modified file 'src/service/sync-service.c'
+--- src/service/sync-service.c 2013-01-22 20:14:33 +0000
++++ src/service/sync-service.c 2012-09-17 05:18:18 +0000
+@@ -643,6 +643,8 @@
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ textdomain (GETTEXT_PACKAGE);
+
++ g_type_init ();
++
+ sync_service.skeleton = dbus_sync_service_skeleton_new ();
+
+ g_bus_get (G_BUS_TYPE_SESSION, NULL, on_got_bus, &sync_service);
+
+=== modified file 'test/test-client.cpp'
+--- test/test-client.cpp 2013-01-22 20:14:33 +0000
++++ test/test-client.cpp 2012-09-21 23:17:22 +0000
+@@ -31,6 +31,7 @@
+ static bool ran_once_init = false;
+ if (!ran_once_init)
+ {
++ g_type_init();
+ g_setenv ("INDICATOR_SERVICE_SHUTDOWN_TIMEOUT", "5000", TRUE);
+ g_unsetenv ("INDICATOR_ALLOW_NO_WATCHERS");
+ g_unsetenv ("INDICATOR_SERVICE_REPLACE_MODE");
+
+=== modified file 'test/test-gtest.cpp'
+--- test/test-gtest.cpp 2013-01-22 20:14:33 +0000
++++ test/test-gtest.cpp 2012-08-19 07:00:07 +0000
+@@ -7,5 +7,6 @@
+ }
+
+ TEST(LauncherMenuItem, NameInitialized) {
++ g_type_init();
+ EXPECT_TRUE(true);
+ }
+
Please sign in to comment.
Something went wrong with that request. Please try again.