From f1e24935c38746a45e7e7f28e05628575c4566e4ef4591ba175b304623497791 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 29 Mar 2012 09:42:25 +0000 Subject: [PATCH] Accepting request 111654 from GNOME:Apps Pushing G:A OBS-URL: https://build.opensuse.org/request/show/111654 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin-sipe?expand=0&rev=29 --- pidgin-sipe-gcc47.patch | 21 +++++++++++++++++++++ pidgin-sipe.changes | 6 ++++++ pidgin-sipe.spec | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 pidgin-sipe-gcc47.patch diff --git a/pidgin-sipe-gcc47.patch b/pidgin-sipe-gcc47.patch new file mode 100644 index 0000000..af11478 --- /dev/null +++ b/pidgin-sipe-gcc47.patch @@ -0,0 +1,21 @@ +--- a/src/core/sipe-cal.c ++++ b/src/core/sipe-cal.c +@@ -3,7 +3,7 @@ + * + * pidgin-sipe + * +- * Copyright (C) 2010-11 SIPE Project ++ * Copyright (C) 2010-12 SIPE Project + * Copyright (C) 2009 pier11 + * + * +@@ -674,7 +674,7 @@ sipe_cal_get_status(struct sipe_buddy *buddy, + const char* free_busy; + int ret = SIPE_CAL_NO_DATA; + time_t state_since; +- int index; ++ int index = -1; + + if (!buddy || !buddy->cal_start_time || !buddy->cal_granularity) { + SIPE_DEBUG_INFO("sipe_cal_get_status: no calendar data1 for %s, exiting", + diff --git a/pidgin-sipe.changes b/pidgin-sipe.changes index 57f1ede..802d575 100644 --- a/pidgin-sipe.changes +++ b/pidgin-sipe.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 24 23:13:09 UTC 2012 - dimstar@opensuse.org + +- Add pidgin-sipe-gcc47.patch: Fix build with gcc 4.7; taken from + git. + ------------------------------------------------------------------- Thu Mar 15 13:23:31 UTC 2012 - vuntz@opensuse.org diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec index 5ad7f76..3b0938d 100644 --- a/pidgin-sipe.spec +++ b/pidgin-sipe.spec @@ -27,6 +27,8 @@ License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger Url: http://sipe.sourceforge.net/ Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.13.0/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM pidgin-sipe-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7; fixed in git +Patch0: pidgin-sipe-gcc47.patch BuildRequires: gettext-devel BuildRequires: glib2-devel >= 2.12.0 BuildRequires: gmime-devel @@ -96,6 +98,7 @@ various products: %prep %setup -q +%patch0 -p1 translation-update-upstream %build