Accepting request 134826 from home:Zaitor:branches:GNOME:Factory

Add upstream fix taken from git, candidate for bnc#134707 for 12.2

OBS-URL: https://build.opensuse.org/request/show/134826
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2012-09-21 19:27:01 +00:00 committed by Git OBS Bridge
parent 11b87c5e56
commit 157f369204
5 changed files with 45 additions and 0 deletions

View File

@ -0,0 +1,29 @@
From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 20 Jul 2012 14:46:33 +0000
Subject: libtracker-fts: ICU cannot handle complex locale descriptions
ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
not the full definition of your various locale variables and their
values as returned by glibc's setlocale(LC_ALL, NULL).
Instead, limit ourselves to LC_CTYPE, since after all, that's all we
need to determine word boundaries.
Fixes GB#675660.
---
diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
index 7388f69..69f75ed 100644
--- a/src/libtracker-fts/tracker-parser-libicu.c
+++ b/src/libtracker-fts/tracker-parser-libicu.c
@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser,
/* Open word-break iterator */
parser->bi = ubrk_open(UBRK_WORD,
- setlocale (LC_ALL, NULL),
+ setlocale (LC_CTYPE, NULL),
parser->utxt,
parser->utxt_size,
&error);
--
cgit v0.9.0.2

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 18 11:07:46 UTC 2012 - zaitor@opensuse.org
- Add libtracker-fts-ICU-complx-locale.patch, fixes bnc#780614.
-------------------------------------------------------------------
Mon Aug 20 08:53:17 UTC 2012 - dimstar@opensuse.org

View File

@ -66,6 +66,8 @@ Patch2: tracker-fix-include-sched-idle.patch
Patch3: tracker-libgrss-0.5.patch
# PATCH-FIX-UPSTREAM tracker-evo-implicit.patch bgo#675413 dimstar@opensuse.org -- Include email-backend.h; fixes brp checks.
Patch4: tracker-evo-implicit.patch
# PATCH-FIX-UPSTREAM libtracker-fts-ICU-complx-locale.patch bnc#780614 bgo#675660 zaitor@opensuse.org -- libtracker-fts: ICU cannot handle complex locale descriptions, patch taken from upstream git.
Patch5: libtracker-fts-ICU-complx-locale.patch
BuildRequires: NetworkManager-devel >= 0.8
BuildRequires: enca-devel
BuildRequires: fdupes
@ -521,6 +523,7 @@ translation-update-upstream
%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1
cp %{S:1} src/miners/flickr/README.SUSE
cp %{S:2} src/miners/rss/README.SUSE

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 18 11:07:46 UTC 2012 - zaitor@opensuse.org
- Add libtracker-fts-ICU-complx-locale.patch, fixes bnc#780614.
-------------------------------------------------------------------
Mon Aug 20 08:53:17 UTC 2012 - dimstar@opensuse.org

View File

@ -65,6 +65,8 @@ Patch2: tracker-fix-include-sched-idle.patch
Patch3: tracker-libgrss-0.5.patch
# PATCH-FIX-UPSTREAM tracker-evo-implicit.patch bgo#675413 dimstar@opensuse.org -- Include email-backend.h; fixes brp checks.
Patch4: tracker-evo-implicit.patch
# PATCH-FIX-UPSTREAM libtracker-fts-ICU-complx-locale.patch bnc#780614 bgo#675660 zaitor@opensuse.org -- libtracker-fts: ICU cannot handle complex locale descriptions, patch taken from upstream git.
Patch5: libtracker-fts-ICU-complx-locale.patch
BuildRequires: NetworkManager-devel >= 0.8
BuildRequires: enca-devel
BuildRequires: fdupes
@ -520,6 +522,7 @@ translation-update-upstream
%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1
cp %{S:1} src/miners/flickr/README.SUSE
cp %{S:2} src/miners/rss/README.SUSE