From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BCE6159CAF for ; Sat, 9 Apr 2016 15:29:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 781C821C007; Sat, 9 Apr 2016 15:29:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01EC121C007 for ; Sat, 9 Apr 2016 15:29:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6760D340C3E for ; Sat, 9 Apr 2016 15:29:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D23F17E for ; Sat, 9 Apr 2016 15:29:04 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1460216174.ce62bb9af7af545ac2c02ddf8ab40313d0560774.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/geoclue/files/, app-misc/geoclue/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch app-misc/geoclue/geoclue-2.4.1.ebuild app-misc/geoclue/geoclue-2.4.3.ebuild X-VCS-Directories: app-misc/geoclue/ app-misc/geoclue/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: ce62bb9af7af545ac2c02ddf8ab40313d0560774 X-VCS-Branch: master Date: Sat, 9 Apr 2016 15:29:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 02797322-4a98-45a9-9623-8228ad2dae56 X-Archives-Hash: aafecec9e1cd131b620aee572b2a5367 commit: ce62bb9af7af545ac2c02ddf8ab40313d0560774 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Apr 9 15:36:14 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Apr 9 15:36:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce62bb9a app-misc/geoclue: fix build on uclibc, bug #577290 Package-Manager: portage-2.2.26 .../files/geoclue-2.4.1-fix-GLIBC-features.patch | 44 ++++++++++++++++++++++ app-misc/geoclue/geoclue-2.4.1.ebuild | 6 ++- app-misc/geoclue/geoclue-2.4.3.ebuild | 6 ++- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch new file mode 100644 index 0000000..b27bf5d --- /dev/null +++ b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch @@ -0,0 +1,44 @@ +This has been edited to fit geoclue that import the code from geocode-glib. +--Anthony G. Basile + +From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Tue, 22 Mar 2016 09:48:00 +0000 +Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features + +Commit f0f85d8d introduces __GLIBC__ to check for glibc only features. +However this is not sufficient for uClibc because it shares code with +glibc. To select for features in glibc but not uClibc, we need +defined(__GLIBC__) && !defined(__UCLIBC__). + +https://bugzilla.gnome.org/show_bug.cgi?id=764021 +--- + geocode-glib/geocode-glib.c | 4 ++-- + geocode-glib/test-gcglib.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/geocode-glib/geocode-glib.c b/src/geocode-glib/geocode-glib.c +index 4e3b3fd..6215fd1 100644 +--- a/src/geocode-glib/geocode-glib.c ++++ b/src/geocode-glib/geocode-glib.c +@@ -213,7 +213,7 @@ _geocode_object_get_lang (void) + return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL)); + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + static gpointer + is_number_after_street (gpointer data) + { +@@ -246,7 +246,7 @@ is_number_after_street (gpointer data) + gboolean + _geocode_object_is_number_after_street (void) + { +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) || defined(__UCLIBC__) + return FALSE; + #else + static GOnce once = G_ONCE_INIT; +-- +2.7.3 + diff --git a/app-misc/geoclue/geoclue-2.4.1.ebuild b/app-misc/geoclue/geoclue-2.4.1.ebuild index 3138114..6bb7977 100644 --- a/app-misc/geoclue/geoclue-2.4.1.ebuild +++ b/app-misc/geoclue/geoclue-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,6 +35,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-GLIBC-features.patch +} + src_configure() { # debug only affects CFLAGS gnome2_src_configure \ diff --git a/app-misc/geoclue/geoclue-2.4.3.ebuild b/app-misc/geoclue/geoclue-2.4.3.ebuild index 64d892e..ff6d540 100644 --- a/app-misc/geoclue/geoclue-2.4.3.ebuild +++ b/app-misc/geoclue/geoclue-2.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,6 +35,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch +} + src_configure() { # debug only affects CFLAGS gnome2_src_configure \