summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-06-13 10:08:58 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-06-13 10:08:58 +0000
commit23252cd0cc98cd9723bf9c7a0758395c5b11cc2d (patch)
tree891b99a1b017793460572ffc235fa46966f98e9a /media-sound/clementine
parentVersion bump. (diff)
downloadgentoo-2-23252cd0cc98cd9723bf9c7a0758395c5b11cc2d.tar.gz
gentoo-2-23252cd0cc98cd9723bf9c7a0758395c5b11cc2d.tar.bz2
gentoo-2-23252cd0cc98cd9723bf9c7a0758395c5b11cc2d.zip
fix compile with sr@latin LINGUAS wrt bug #420871
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/clementine')
-rw-r--r--media-sound/clementine/ChangeLog6
-rw-r--r--media-sound/clementine/clementine-1.0.1-r1.ebuild5
-rw-r--r--media-sound/clementine/files/clementine-1.0.1-linguas.patch14
3 files changed, 22 insertions, 3 deletions
diff --git a/media-sound/clementine/ChangeLog b/media-sound/clementine/ChangeLog
index 25f3fc4ac68e..7f3b5a96227c 100644
--- a/media-sound/clementine/ChangeLog
+++ b/media-sound/clementine/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/clementine
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.60 2012/05/21 09:33:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/ChangeLog,v 1.61 2012/06/13 10:08:58 hasufell Exp $
+
+ 13 Jun 2012; Julian Ospald <hasufell@gentoo.org> clementine-1.0.1-r1.ebuild,
+ +files/clementine-1.0.1-linguas.patch:
+ fix compile with sr@latin LINGUAS wrt bug #420871
21 May 2012; Samuli Suominen <ssuominen@gentoo.org>
clementine-0.7.1-r2.ebuild:
diff --git a/media-sound/clementine/clementine-1.0.1-r1.ebuild b/media-sound/clementine/clementine-1.0.1-r1.ebuild
index 532cf5db62f0..4f81783f7be2 100644
--- a/media-sound/clementine/clementine-1.0.1-r1.ebuild
+++ b/media-sound/clementine/clementine-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.0.1-r1.ebuild,v 1.5 2012/05/05 08:16:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.0.1-r1.ebuild,v 1.6 2012/06/13 10:08:58 hasufell Exp $
EAPI=4
@@ -86,7 +86,8 @@ src_prepare() {
has_version '>=app-pda/libimobiledevice-1.1.2' && \
sed -i -e 's:event->uuid:event->udid:' src/devices/ilister.cpp
- epatch "${FILESDIR}"/${P}-fresh-start.patch
+ epatch "${FILESDIR}"/${P}-fresh-start.patch \
+ "${FILESDIR}"/${P}-linguas.patch
}
src_configure() {
diff --git a/media-sound/clementine/files/clementine-1.0.1-linguas.patch b/media-sound/clementine/files/clementine-1.0.1-linguas.patch
new file mode 100644
index 000000000000..317353861f60
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.0.1-linguas.patch
@@ -0,0 +1,14 @@
+https://code.google.com/p/clementine-player/source/detail?r=5e685b2b1425
+https://bugs.gentoo.org/show_bug.cgi?id=420871
+
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -634,7 +634,7 @@
+ if (NOT LINGUAS OR LINGUAS STREQUAL "None")
+ set (LANGUAGES "")
+ else (NOT LINGUAS OR LINGUAS STREQUAL "None")
+- string(REGEX MATCHALL [a-zA-Z_]+
++ string(REGEX MATCHALL [a-zA-Z_@]+
+ LANGUAGES ${LINGUAS})
+ endif (NOT LINGUAS OR LINGUAS STREQUAL "None")
+ endif (LINGUAS STREQUAL "All")