Permalink
Browse files

Updates and fixes for Quantal packages unity and indicator-datetime

  • Loading branch information...
shiznix committed Oct 10, 2012
1 parent f47fb83 commit 70dfcc6ed8e765b60d00e28e8fd8c01815afc99c

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -1,4 +1,5 @@
AUX 0001_Revert_port_to_EDS_3.6_API.patch 10168 SHA256 f03abcf5bf8b86ced761c2d70cae24f6842f5f9f7d67b82c4f37c01f352cf038 SHA512 86552b1d50241e073558dccff1d0a26194de2b0bc33b31ee85ec955852d83c34ac30080fa27411eb9d1f9827f995c6bb34f3d55bebb0bfead8d305ba2f66eb2c WHIRLPOOL 955b1ecffdded9f479baf71f8f871dff09e32202870d074024ee495d74d4cbce87118b6aaffca2fd06f14451f8e6f147b0a455d139654bf355fcb8d4c4a62cd4
DIST indicator-datetime-12.10.0.tar.gz 429711 SHA256 c9784e5f9cbbe9d1491bae4b3c4066f6fdc0216288c9e6a6350deca47a74c581 SHA512 8427eba92c8ed526a529bd40946e0607cf41a52e8bdac1799038129ec02b8531ee9649dfa4eb95c5db5687cdf40a86e6fda0d92ebd399dc4203b4795c152491a WHIRLPOOL fe217261e9722e8124d26ee842bc5a35fab55c6071ffe5dedf86339b28d8674d8d56efc835e3ed4f9c8a70846cb9f092d466691c98867e193c9ff3586beee595 DIST indicator-datetime-12.10.0.tar.gz 429711 SHA256 c9784e5f9cbbe9d1491bae4b3c4066f6fdc0216288c9e6a6350deca47a74c581 SHA512 8427eba92c8ed526a529bd40946e0607cf41a52e8bdac1799038129ec02b8531ee9649dfa4eb95c5db5687cdf40a86e6fda0d92ebd399dc4203b4795c152491a WHIRLPOOL fe217261e9722e8124d26ee842bc5a35fab55c6071ffe5dedf86339b28d8674d8d56efc835e3ed4f9c8a70846cb9f092d466691c98867e193c9ff3586beee595
DIST indicator-datetime_0.3.94.orig.tar.gz 426720 SHA256 7ac8c9ba3005119403a12e3311f68fb6cd614ebc8b15761921409651b7fc16b5 SHA512 44214a834fba00d4c810b9029bc01ca1a25dde14abfa295f5b87ee8b4aa49e37e41aa08da1e751c925020c8e93d1bbb7e9683ead29f4e504def9afd6bce94692 WHIRLPOOL 1edbac0deaaca51f25ba1fa154fe5efc6a3b030eeb80c3abce6bc92074f8ad9832276d64006dce4ce198f67fb2a98a9ba9daf417dbc488e5c3b2c327cec635fa DIST indicator-datetime_0.3.94.orig.tar.gz 426720 SHA256 7ac8c9ba3005119403a12e3311f68fb6cd614ebc8b15761921409651b7fc16b5 SHA512 44214a834fba00d4c810b9029bc01ca1a25dde14abfa295f5b87ee8b4aa49e37e41aa08da1e751c925020c8e93d1bbb7e9683ead29f4e504def9afd6bce94692 WHIRLPOOL 1edbac0deaaca51f25ba1fa154fe5efc6a3b030eeb80c3abce6bc92074f8ad9832276d64006dce4ce198f67fb2a98a9ba9daf417dbc488e5c3b2c327cec635fa
EBUILD indicator-datetime-0.3.94.ebuild 1227 SHA256 3a0a91d7f44ac5efafb2f211869a1093696a26e2f3192d2cd0091f6e8d9ae4dc SHA512 7f786118af4f2b9bce5e18a4c2dd4346f3e7eb2eaa5c5a4b2e1ebc00218cee4fd2c4ba58d57203f92110e8fb108ef641194076ed19a6645d0b2327d777d75d68 WHIRLPOOL 9a6335a40eb676dbfd362cf61256775dde0ac5ba001872f46f350e965740be8d88b6dcc1637520755c55ca497d65943eb2f171187b54209dbb95fd2446179c69 EBUILD indicator-datetime-0.3.94.ebuild 1227 SHA256 3a0a91d7f44ac5efafb2f211869a1093696a26e2f3192d2cd0091f6e8d9ae4dc SHA512 7f786118af4f2b9bce5e18a4c2dd4346f3e7eb2eaa5c5a4b2e1ebc00218cee4fd2c4ba58d57203f92110e8fb108ef641194076ed19a6645d0b2327d777d75d68 WHIRLPOOL 9a6335a40eb676dbfd362cf61256775dde0ac5ba001872f46f350e965740be8d88b6dcc1637520755c55ca497d65943eb2f171187b54209dbb95fd2446179c69
EBUILD indicator-datetime-12.10.0.ebuild 1207 SHA256 40a14b5531c4338aba87b15bee3472d497b70da31aedab4e42bc7a1e851ef9a0 SHA512 0e6bf8a7fe7e364fd1d265bdd3a354803d453ff411f326ee74f2c231632de3c8f15e8dd6fbde05d15b35e5928ede6062166ba336285b67d408ee84f57e39e981 WHIRLPOOL 6fd10270d6d5b86cd39179a7edbbf7e6495021c42ea031f2857c48d7e50ce24ec3b34f6def48b0b180adb780928472ce6d9df9b90a24b0602a3520e38d692858 EBUILD indicator-datetime-12.10.0.ebuild 668 SHA256 5693b8ecf889ca2a05439595e14c31d1e52b2e62fce5589505161abb2d331d86 SHA512 7f54a3bb35bcf79f6d0d895f257b28ba12206c1007322a5389cf53154d5bfcca3145a4f0115ee2a8598b68a3a671ea62493f14cba629a34d7c0d9fb43e5a2357 WHIRLPOOL c0acd57ef2518b0c64f95961a1f0c4633e080a80e147adf75c104fc4fde038b2f5db76615a4e23f229e8b34bec33be5ce0ba201bc158e48ea67bac723a63858e
@@ -0,0 +1,251 @@
Revert BZR revision 180 (port to evolution-data-server 3.6 API)
------------------------------------------------------------
revno: 180
committer: Charles Kerr <charles.kerr@canonical.com>
branch nick: tmp
timestamp: Thu 2012-07-12 12:59:44 -0500
message:
cyphermox patch to support EDS 3.6's API
------------------------------------------------------------
diff -Nru indicator-datetime-12.10.0.orig/src/datetime-service.c indicator-datetime-12.10.0/src/datetime-service.c
--- indicator-datetime-12.10.0.orig/src/datetime-service.c 2012-07-12 17:24:07.000000000 -0400
+++ indicator-datetime-12.10.0/src/datetime-service.c 2012-08-13 18:46:58.348962944 -0400
@@ -40,9 +40,11 @@
#include <geoclue/geoclue-master-client.h>
#include <time.h>
-#include <libecal/libecal.h>
+#include <libecal/e-cal.h>
#include <libical/ical.h>
-#include <libedataserver/libedataserver.h>
+#include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-source.h>
+#include <libedataserverui/e-passwords.h>
// Other users of ecal seem to also include these, not sure why they should be included by the above
#include <libical/icaltime.h>
#include <cairo/cairo.h>
@@ -598,6 +600,27 @@
return FALSE;
}
+// Authentication function
+static gchar *
+auth_func (ECal *ecal,
+ const gchar *prompt,
+ const gchar *key,
+ gpointer user_data)
+{
+ ESource *source = e_cal_get_source (ecal);
+ gchar *auth_domain = e_source_get_duped_property (source, "auth-domain");
+
+ const gchar *component_name;
+ if (auth_domain) component_name = auth_domain;
+ else component_name = "Calendar";
+
+ gchar *password = e_passwords_get_password (component_name, key);
+
+ g_free (auth_domain);
+
+ return password;
+}
+
static gint
compare_comp_instances (gconstpointer ga, gconstpointer gb)
{
@@ -632,53 +655,23 @@
}
static gboolean
-populate_appointment_instances (ECalClient * client,
+populate_appointment_instances (ECalComponent * comp,
time_t start,
time_t end,
gpointer data)
{
- GSList *ecalcomps, *comp_item;
+ g_debug("Appending item %p", comp);
+
+ ECalComponentVType vtype = e_cal_component_get_vtype (comp);
+ if (vtype != E_CAL_COMPONENT_EVENT && vtype != E_CAL_COMPONENT_TODO) return FALSE;
+
+ icalproperty_status status;
+ e_cal_component_get_status (comp, &status);
+ if (status == ICAL_STATUS_COMPLETED || status == ICAL_STATUS_CANCELLED) return FALSE;
- if (e_cal_client_get_object_list_as_comps_sync (client,
- NULL,
- &ecalcomps,
- NULL, NULL)) {
-
- for (comp_item = ecalcomps; comp_item; comp_item = g_slist_next(comp_item)) {
- ECalComponent *comp = comp_item->data;
-
- g_debug("Appending item %p", e_cal_component_get_as_string(comp));
-
- ECalComponentVType vtype = e_cal_component_get_vtype (comp);
- if (vtype != E_CAL_COMPONENT_EVENT && vtype != E_CAL_COMPONENT_TODO) return FALSE;
-
- icalproperty_status status;
- e_cal_component_get_status (comp, &status);
- if (status == ICAL_STATUS_COMPLETED || status == ICAL_STATUS_CANCELLED) return FALSE;
-
- g_object_ref(comp);
-
- ECalComponentDateTime datetime;
- icaltimezone *appointment_zone = NULL;
- icaltimezone *current_zone = NULL;
-
- if (vtype == E_CAL_COMPONENT_EVENT)
- e_cal_component_get_dtstart (comp, &datetime);
- else
- e_cal_component_get_due (comp, &datetime);
-
- appointment_zone = icaltimezone_get_builtin_timezone_from_tzid(datetime.tzid);
- current_zone = icaltimezone_get_builtin_timezone_from_tzid(current_timezone);
- if (!appointment_zone || datetime.value->is_date) { // If it's today put in the current timezone?
- appointment_zone = current_zone;
- }
-
- struct comp_instance *ci = comp_instance_new (comp, start, end, E_SOURCE(data));
- comp_instances = g_list_append (comp_instances, ci);
- }
- return TRUE;
- }
- return FALSE;
+ struct comp_instance *ci = comp_instance_new (comp, start, end, E_SOURCE(data));
+ comp_instances = g_list_append (comp_instances, ci);
+ return TRUE;
}
/* Populate the menu with todays, next 5 appointments.
@@ -698,12 +691,12 @@
updating_appointments = TRUE;
time_t curtime = 0, t1 = 0, t2 = 0;
- GList *l, *s;
+ GList *l;
+ GSList *g;
GError *gerror = NULL;
gint i;
gint width = 0, height = 0;
- ESourceRegistry * src_registry = NULL;
- GList * sources = NULL;
+ ESourceList * sources = NULL;
// Get today & work out query times
time(&curtime);
@@ -743,52 +736,67 @@
highlightdays = highlightdays + 7; // Minimum of 7 days ahead
t2 = t1 + (time_t) (highlightdays * 24 * 60 * 60);
+ if (!e_cal_get_sources(&sources, E_CAL_SOURCE_TYPE_EVENT, &gerror)) {
+ g_debug("Failed to get ecal sources\n");
+ g_clear_error (&gerror);
+ return FALSE;
+ }
+
// clear any previous comp_instances
g_list_free_full (comp_instances, (GDestroyNotify)comp_instance_free);
comp_instances = NULL;
- src_registry = e_source_registry_new_sync (NULL, &gerror);
- if (!src_registry) {
- g_debug("Failed to get access to source registry: %s\n", gerror->message);
- return FALSE;
- }
-
- sources = e_source_registry_list_sources(src_registry, E_SOURCE_EXTENSION_CALENDAR);
-
+ GSList *cal_list = gconf_client_get_list(gconf, "/apps/evolution/calendar/display/selected_calendars", GCONF_VALUE_STRING, &gerror);
+ if (gerror) {
+ g_debug("Failed to get evolution preference for enabled calendars");
+ g_clear_error (&gerror);
+ cal_list = NULL;
+ }
+
// Generate instances for all sources
- for (s = g_list_first (sources); s; s = g_list_next (s)) {
-
- ESource *source = E_SOURCE (s->data);
- g_signal_connect (G_OBJECT(source), "changed", G_CALLBACK (update_appointment_menu_items), NULL);
- ECalClient *ecal = e_cal_client_new(source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, &gerror);
-
- icaltimezone* current_zone = icaltimezone_get_builtin_timezone(current_timezone);
- if (!current_zone) {
- // current_timezone may be a TZID?
- current_zone = icaltimezone_get_builtin_timezone_from_tzid(current_timezone);
- }
-
- e_cal_client_set_default_timezone (ecal, current_zone);
-
- g_debug("Checking if source %s is enabled", e_source_get_uid(source));
- if (e_source_get_enabled (source)) {
- g_debug("source is enabled, generating instances");
-
- if (!e_client_open_sync (E_CLIENT (ecal), TRUE, NULL, &gerror)) {
- g_debug("Failed to open source: %s", gerror->message);
+ for (g = e_source_list_peek_groups (sources); g; g = g->next) {
+ ESourceGroup *group = E_SOURCE_GROUP (g->data);
+ GSList *s;
+
+ for (s = e_source_group_peek_sources (group); s; s = s->next) {
+ ESource *source = E_SOURCE (s->data);
+ g_signal_connect (G_OBJECT(source), "changed", G_CALLBACK (update_appointment_menu_items), NULL);
+ ECal *ecal = e_cal_new(source, E_CAL_SOURCE_TYPE_EVENT);
+ e_cal_set_auth_func (ecal, (ECalAuthFunc) auth_func, NULL);
+
+ icaltimezone* current_zone = icaltimezone_get_builtin_timezone(current_timezone);
+ if (!current_zone) {
+ // current_timezone may be a TZID?
+ current_zone = icaltimezone_get_builtin_timezone_from_tzid(current_timezone);
+ }
+ if (current_zone && !e_cal_set_default_timezone(ecal, current_zone, &gerror)) {
+ g_debug("Failed to set ecal default timezone %s", gerror->message);
+ g_clear_error (&gerror);
+ g_object_unref(ecal);
+ continue;
+ }
+
+ if (!e_cal_open(ecal, FALSE, &gerror)) {
+ g_debug("Failed to get ecal sources %s", gerror->message);
g_clear_error (&gerror);
g_object_unref(ecal);
continue;
}
- e_cal_client_generate_instances (ecal, t1, t2, NULL,
- (ECalRecurInstanceFn) populate_appointment_instances,
- (gpointer) source,
- NULL);
- }
- g_object_unref(ecal);
- }
- g_list_free_full (sources, g_object_unref);
+ const gchar *ecal_uid = e_source_peek_uid(source);
+ g_debug("Checking ecal_uid is enabled: %s", ecal_uid);
+ const gboolean in_list = g_slist_find_custom (cal_list, ecal_uid, (GCompareFunc)g_strcmp0) != NULL;
+ if (!in_list) {
+ g_object_unref(ecal);
+ continue;
+ }
+
+ g_debug("ecal_uid is enabled, generating instances");
+ e_cal_generate_instances (ecal, t1, t2, (ECalRecurInstanceFn) populate_appointment_instances, source);
+ g_object_unref(ecal);
+ }
+ }
+ g_slist_free_full (cal_list, g_free);
g_debug("Number of ECalComponents returned: %d", g_list_length(comp_instances));
GList *sorted_comp_instances = g_list_sort(comp_instances, compare_comp_instances);
@@ -940,7 +948,7 @@
G_CALLBACK(activate_cb), cmd, (GClosureNotify)g_free, 0);
g_free (ad);
- const gchar *color_spec = e_source_selectable_get_color (e_source_get_extension (ci->source, E_SOURCE_EXTENSION_CALENDAR));
+ const gchar *color_spec = e_source_peek_color_spec(ci->source);
g_debug("Colour to use: %s", color_spec);
// Draw the correct icon for the appointment type and then tint it using mask fill.
@@ -24,42 +24,7 @@ DEPEND="dev-libs/libappindicator
>=gnome-extra/evolution-data-server-3.2 >=gnome-extra/evolution-data-server-3.2
<gnome-extra/evolution-data-server-3.5" <gnome-extra/evolution-data-server-3.5"
src_configure() { src_prepare() {
# Build GTK2 support # PATCHES+=( "${FILESDIR}/0001_Revert_port_to_EDS_3.6_API.patch" )
[[ -d build-gtk2 ]] || mkdir build-gtk2 base_src_prepare
pushd build-gtk2
../configure --prefix=/usr \
--with-gtk=2 || die
popd
# Build GTK3 support #
[[ -d build-gtk3 ]] || mkdir build-gtk3
pushd build-gtk3
../configure --prefix=/usr \
--with-gtk=3 || die
popd
}
src_compile() {
# Build GTK2 support #
pushd build-gtk2
emake || die
popd
# Build GTK3 support #
pushd build-gtk3
emake || die
popd
}
src_install() {
# Install GTK2 support #
pushd build-gtk2
emake DESTDIR="${D}" install || die
popd
# Install GTK3 support #
pushd build-gtk3
emake DESTDIR="${D}" install || die
popd
} }
@@ -6,4 +6,4 @@ DIST unity_5.16.0.orig.tar.gz 1288289 SHA256 2b99b7d8308817b9e1d431beb162a0cf03e
DIST unity_6.8.0-0ubuntu1.diff.gz 70153 SHA256 3a5048909ac7e0070f7dd3a1672991fec939ecdd43e1d0a9dabe44990566ee50 SHA512 f062853f84cf46e6252bc78422d6e25339c095f8f02702449737b6c5e57f929d217075c1af633afb77b6d19d44aa58f5e0e01c7965c4c1edcdb27433f2da926d WHIRLPOOL de843971848ce663fe62c8feab8bb54e660d5feb20e544d304411eb88a86c344357980e839adf8d60e28769a8680af26120ca34aa45764824f3446155210ec09 DIST unity_6.8.0-0ubuntu1.diff.gz 70153 SHA256 3a5048909ac7e0070f7dd3a1672991fec939ecdd43e1d0a9dabe44990566ee50 SHA512 f062853f84cf46e6252bc78422d6e25339c095f8f02702449737b6c5e57f929d217075c1af633afb77b6d19d44aa58f5e0e01c7965c4c1edcdb27433f2da926d WHIRLPOOL de843971848ce663fe62c8feab8bb54e660d5feb20e544d304411eb88a86c344357980e839adf8d60e28769a8680af26120ca34aa45764824f3446155210ec09
DIST unity_6.8.0.orig.tar.gz 1649760 SHA256 7fc1dbad3c676044f302664264b4843377e47be350139cc63388eb2888a18ab1 SHA512 883fc041bbbec5fccc02b4d8a1e44ff56124545c0dc8bdd2f39d95f0af05c9a4202e0a119577accb54ade0369524b9db87794b52b151ebd46a3099207a28f163 WHIRLPOOL 3422c681f08878ef114785d6cad25adb960d508f9ef602f2f49bb910eed702ad2d62f54f829c096186ae8388e7cb434e3912b14b5ca3d828b30ec0608b1a5e6a DIST unity_6.8.0.orig.tar.gz 1649760 SHA256 7fc1dbad3c676044f302664264b4843377e47be350139cc63388eb2888a18ab1 SHA512 883fc041bbbec5fccc02b4d8a1e44ff56124545c0dc8bdd2f39d95f0af05c9a4202e0a119577accb54ade0369524b9db87794b52b151ebd46a3099207a28f163 WHIRLPOOL 3422c681f08878ef114785d6cad25adb960d508f9ef602f2f49bb910eed702ad2d62f54f829c096186ae8388e7cb434e3912b14b5ca3d828b30ec0608b1a5e6a
EBUILD unity-5.16.0.ebuild 3081 SHA256 aee6567b4e478b9301dcda53bb0d94439c74723a0e29894f2f1aaf9a1d84def8 SHA512 4df8f141df219159ce5336ae5dbdacbd6ab0c4747789581727d797db8712f5d731cfd75899da670c134c51dc527890784910c32af6269b66df6c52f702301b5d WHIRLPOOL 1ead7508f850e0399affd75894d38e0ec5e446838b3842bec5a77717fde3351546cfdf6c36a0b012af8d9bebc8eab049264037f5a623f2cdd39ccc0b1e7cef76 EBUILD unity-5.16.0.ebuild 3081 SHA256 aee6567b4e478b9301dcda53bb0d94439c74723a0e29894f2f1aaf9a1d84def8 SHA512 4df8f141df219159ce5336ae5dbdacbd6ab0c4747789581727d797db8712f5d731cfd75899da670c134c51dc527890784910c32af6269b66df6c52f702301b5d WHIRLPOOL 1ead7508f850e0399affd75894d38e0ec5e446838b3842bec5a77717fde3351546cfdf6c36a0b012af8d9bebc8eab049264037f5a623f2cdd39ccc0b1e7cef76
EBUILD unity-6.8.0.ebuild 2869 SHA256 8de906db01d901fefcbafa4e963cd2b6a495eb2deaf11b28afbfb7fe8886ba54 SHA512 b942bf3ece427dfea6d36fd26df1c017fbf0a8f0c122f91b82738fcf1139664616eca4ed158d26a932c5de64f272998af142af71bb6ceeddadc9fcb1caf6f562 WHIRLPOOL c614fcec1624cd7f677b5bc42ed0b2aa2dcabb6c5d1f5f4d03132bd3ac2fed6204356107a9a908a8f05df5dda14ffccbc21bd107e70d6cd18b1d43b32394bdd4 EBUILD unity-6.8.0.ebuild 2872 SHA256 6b2dc3c656946fdb9a489762a3b7cb1afa50eab8295d1b06b10a7de6fd40e637 SHA512 a5cba3281160aceca5c7b686179c086e5a4e944efbe50de6727556663664f5a52ad1c58ea06c2a61609d05a320e023b4353b3c45429db3b962d06dc6faf1ea08 WHIRLPOOL c53bec65a6019589332c309ccca710e1660a8bcc93b6f2342e2482df661ac61e156ee67d4bde2a0eba8892f0d4cddfc0c3f9bd8d04d23122267b8a87e4a44934
Oops, something went wrong.

0 comments on commit 70dfcc6

Please sign in to comment.