From 6db99f26bc4735f7aebce32f82c3d5495592c2ba Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 12 Aug 2014 12:03:30 +0800 Subject: [PATCH 1/3] - Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 --- zeitgeist.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 7149d93..65e9df8 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.14 -Release: 2%{?dist} +Release: 3%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -97,7 +97,7 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/zeitgeist-daemon %{_mandir}/man1/zeitgeist-*.* -%{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop %files libs %doc COPYING @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Tue Aug 12 2014 Christopher Meng - 0.9.14-3 +- Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 + * Sun Aug 04 2013 Fedora Release Engineering - 0.9.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 91bf8e987f4eb6752e1d136af379abcf57326aef Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 18 Aug 2014 17:20:48 +0800 Subject: [PATCH 2/3] Add a patch from upstream to fix crashes with vala 0.24 --- ...array-length-to-work-with-string.joi.patch | 29 +++++++++++++++++++ zeitgeist.spec | 9 ++++-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch diff --git a/0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch b/0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch new file mode 100644 index 0000000..830df89 --- /dev/null +++ b/0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch @@ -0,0 +1,29 @@ +From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Mon, 17 Mar 2014 20:57:49 +0100 +Subject: [PATCH] WhereClause: Fix array-length to work with string.joinv of + vala-0.24 + +--- + libzeitgeist/where-clause.vala | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala +index a830599..d981914 100644 +--- a/libzeitgeist/where-clause.vala ++++ b/libzeitgeist/where-clause.vala +@@ -211,7 +211,11 @@ namespace Zeitgeist + */ + private T[] generic_array_to_unowned_array (GenericArray gptrarr) + { ++#if VALA_0_24 ++ long[] pointers = new long[gptrarr.length]; ++#else + long[] pointers = new long[gptrarr.length + 1]; ++#endif + Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata, + (gptrarr.length) * sizeof (void *)); + return (T[]) pointers; +-- +2.0.0 + diff --git a/zeitgeist.spec b/zeitgeist.spec index 65e9df8..6ca6951 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,7 +1,7 @@ Summary: Framework providing Desktop activity awareness Name: zeitgeist Version: 0.9.14 -Release: 3%{?dist} +Release: 4%{?dist} # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -13,7 +13,7 @@ Release: 3%{?dist} License: LGPLv2+ and LGPLv3+ and GPLv2+ URL: https://launchpad.net/zeitgeist Source0: http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz - +Patch0: 0001-WhereClause-Fix-array-length-to-work-with-string.joi.patch BuildRequires: dbus-devel BuildRequires: gettext BuildRequires: glib2-devel @@ -63,7 +63,7 @@ developing applications that use %{name}. %prep %setup -q - +%patch0 -p1 ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure @@ -116,6 +116,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi %changelog +* Mon Aug 18 2014 Christopher Meng - 0.9.14-4 +- Cherry-pick commit to fix SQL errors when built with vala-0.24, Fix BZ#1130769 + * Tue Aug 12 2014 Christopher Meng - 0.9.14-3 - Mark xdg autostart file as noreplace for better UX, Fix BZ#863222 From 0c53d67cf50167a8810032bd82b853c4fb98acb9 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 21 Aug 2014 16:43:55 +0800 Subject: [PATCH 3/3] Revert --- zeitgeist.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeitgeist.spec b/zeitgeist.spec index 0c80572..b1bb63e 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -98,7 +98,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build %configure --enable-fts --enable-datahub --disable-silent-rules -%make_build +make %{?_smp_mflags} %install %make_install