* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/files/, sci-geosciences/geocode-glib/
@ 2016-04-09 15:37 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2016-04-09 15:37 UTC (permalink / raw
To: gentoo-commits
commit: c778cd26d8a593a538e76d6693beed3ec5fd5eb2
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:44:31 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 15:44:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c778cd26
sci-geosciences/geocode-glib: fix build on uclibc, bug #577290
Package-Manager: portage-2.2.26
.../geocode-glib-3.18.1-fix-GLIBC-features.patch | 54 ++++++++++++++++++++++
.../geocode-glib/geocode-glib-3.18.1.ebuild | 6 ++-
.../geocode-glib/geocode-glib-3.18.2.ebuild | 6 ++-
3 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch b/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch
new file mode 100644
index 0000000..23b1443
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch
@@ -0,0 +1,54 @@
+From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+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/geocode-glib/geocode-glib.c b/geocode-glib/geocode-glib.c
+index 4e3b3fd..6215fd1 100644
+--- a/geocode-glib/geocode-glib.c
++++ b/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;
+diff --git a/geocode-glib/test-gcglib.c b/geocode-glib/test-gcglib.c
+index a23a3c3..9d7194d 100644
+--- a/geocode-glib/test-gcglib.c
++++ b/geocode-glib/test-gcglib.c
+@@ -395,7 +395,7 @@ test_distance (void)
+ static void
+ test_locale_format (void)
+ {
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ GeocodeForward *object;
+ GError *error = NULL;
+ GList *res;
+--
+2.7.3
+
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
index abb0b02..504779d 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.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$
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
# need various locales to be present
RESTRICT="test"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-GLIBC-features.patch
+}
+
src_test() {
export GVFS_DISABLE_FUSE=1
export GIO_USE_VFS=gvfs
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
index a2a5922..09dcadc 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.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$
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
# need various locales to be present
RESTRICT="test"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.18.1-fix-GLIBC-features.patch
+}
+
src_configure() {
gnome2_src_configure $(use_enable introspection)
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/files/, sci-geosciences/geocode-glib/
@ 2017-08-15 22:44 Gilles Dartiguelongue
0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2017-08-15 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 538398b274487b281978d04311ee0ccc1e08d73c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 20:51:34 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 22:43:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538398b2
sci-geosciences/geocode-glib: drop old revision
Package-Manager: Portage-2.3.7, Repoman-2.3.3
sci-geosciences/geocode-glib/Manifest | 1 -
.../geocode-glib-3.18.1-fix-GLIBC-features.patch | 54 ----------------------
.../geocode-glib/geocode-glib-3.18.2.ebuild | 53 ---------------------
3 files changed, 108 deletions(-)
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index a55d672c512..6ffa139e906 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,3 +1,2 @@
-DIST geocode-glib-3.18.2.tar.xz 369516 SHA256 95b11ef2697ac5dbb2f397e7117e08e157b2168624c71507656928095012494e SHA512 3ad874d9ae2c5d172dc5a2be06ae2c78293c33f5845b1d4b4eacec789beb87cc6278cde1ab6bd098a36ce6e2596a312333f0e6cfab00b5977416ad14578ff7eb WHIRLPOOL eb65633fcd7ad2d36365fe8e869e2f0057905cf58dc297e195635d334e0afcf63406553aa736381efd6ea16389a9c3ee51335cbefdf21f50f2b901c9c4c4f881
DIST geocode-glib-3.20.1.tar.xz 371200 SHA256 669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2 SHA512 0016b04928d3d7e9e3339bf1457d5ba7951af7af53b72a185f9cb3e92e9d1b1deb7ca11f95de1bcb0a3521a5b200ce3c25bb35eaf8bf15b81672846ec01b718f WHIRLPOOL 5aab167244191ac29489fee4f7b68cd7c41a820d4ad127fd6412f8adbf00b7dfba03a1d372ac064054429d9442d5178314597b93ada19c0c1e66bd6f4781736b
DIST geocode-glib-3.24.0.tar.xz 413536 SHA256 19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6 WHIRLPOOL 23e19aa31ccbc0196d890e71c76d45c6b2d585a7a635d146a9e50a655a7c108562a641b242637ba5279c7d6bb5b362e8ad3c1f3e3e760b88cdde3604339b7097
diff --git a/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch b/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch
deleted file mode 100644
index 23b14430c9b..00000000000
--- a/sci-geosciences/geocode-glib/files/geocode-glib-3.18.1-fix-GLIBC-features.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-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/geocode-glib/geocode-glib.c b/geocode-glib/geocode-glib.c
-index 4e3b3fd..6215fd1 100644
---- a/geocode-glib/geocode-glib.c
-+++ b/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;
-diff --git a/geocode-glib/test-gcglib.c b/geocode-glib/test-gcglib.c
-index a23a3c3..9d7194d 100644
---- a/geocode-glib/test-gcglib.c
-+++ b/geocode-glib/test-gcglib.c
-@@ -395,7 +395,7 @@ test_distance (void)
- static void
- test_locale_format (void)
- {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- GeocodeForward *object;
- GError *error = NULL;
- GList *res;
---
-2.7.3
-
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
deleted file mode 100644
index 4ab5a682fe1..00000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no" # --enable-debug does not do anything useful
-
-inherit gnome2
-
-DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
-HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection test"
-
-RDEPEND="
- >=dev-libs/glib-2.34:2
- >=dev-libs/json-glib-0.99.2[introspection?]
- gnome-base/gvfs[http]
- >=net-libs/libsoup-2.42:2.4[introspection?]
- introspection? (
- >=dev-libs/gobject-introspection-0.6.3:=
- net-libs/libsoup:2.4[introspection] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.13
- >=sys-devel/gettext-0.18
- virtual/pkgconfig
- test? ( sys-apps/dbus )
-"
-# eautoreconf requires:
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-
-# FIXME: need network #424719, recheck
-# need various locales to be present
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.18.1-fix-GLIBC-features.patch
-}
-
-src_configure() {
- gnome2_src_configure $(use_enable introspection)
-}
-
-src_test() {
- export GVFS_DISABLE_FUSE=1
- export GIO_USE_VFS=gvfs
- ewarn "Tests require network access to http://where.yahooapis.com"
- dbus-launch emake check || die "tests failed"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/files/, sci-geosciences/geocode-glib/
@ 2022-07-04 0:09 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-07-04 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 81d5316516c330c46ed86cc3e23409d7a36e535a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 23:53:40 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 00:07:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d53165
sci-geosciences/geocode-glib: Version bump to 3.26.3
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sci-geosciences/geocode-glib/Manifest | 1 +
.../files/3.26.3-tests-Fix-locale-in-pi-test.patch | 43 +++++++++++++++++++++
.../geocode-glib/geocode-glib-3.26.3.ebuild | 45 ++++++++++++++++++++++
3 files changed, 89 insertions(+)
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 373e7b16b678..882ba5a4e1a7 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1 +1,2 @@
DIST geocode-glib-3.26.2.tar.xz 72956 BLAKE2B 40a32fb0ba61cd91b28e57c518dc5450ce89a16889a335d19fe722c1088a4cdb085237d1fe24d08eeac62581ac68895a7a2b432d66f46fc4e03466485cfe5060 SHA512 b3ef81fac6959f6c4725ca721125cdafbbec69233f321872e17f9035266ed7616018ef54a9082fbd0a83395d18c664144cfe3b431d63744be433f058071cd435
+DIST geocode-glib-3.26.3.tar.xz 75148 BLAKE2B 8eba0cb40511a724cddcab659fe0720b0c0534d811c83f8a90d21b9153af242de2a69b2c882b3eb3008ac128d1631a2ac7692c5e000284579aade987334f6cce SHA512 42313b1da24f5256ad73bd4be366d6bacf35256acc098e4865bbff58e92c5b78f4a2537e4787c6387190f10a2be2a72bc1507f7cb436e096e772195cf30fca7c
diff --git a/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch
new file mode 100644
index 000000000000..5df7814383c0
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch
@@ -0,0 +1,43 @@
+From c9bbf13d76600492565fa042638b48cb737e492d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 2 Jul 2022 10:11:10 +0200
+Subject: [PATCH] tests: Fix locale in "pi" test
+
+The test expects the locale to be en_GB.UTF-8, so set it as such.
+
+Closes: #27
+---
+ geocode-glib/tests/geocode-glib.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/geocode-glib/tests/geocode-glib.c b/geocode-glib/tests/geocode-glib.c
+index f74d031..ef20716 100644
+--- a/geocode-glib/tests/geocode-glib.c
++++ b/geocode-glib/tests/geocode-glib.c
+@@ -410,10 +410,14 @@ test_pi (void)
+ {
+ g_autoptr (GHashTable) params = NULL;
+ GeocodeForward *object;
++ g_autofree char *old_locale = NULL;
+ GError *error = NULL;
+ GList *res;
+ GeocodePlace *place;
+
++ old_locale = g_strdup (setlocale(LC_ALL, NULL));
++ setlocale (LC_ALL, "en_GB.UTF-8");
++
+ /* The query parameters the mock server expects to receive. */
+ params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+ add_attr_string (params, "q", "Jack Cole Building, St Andrews");
+@@ -439,6 +443,8 @@ test_pi (void)
+ g_assert_cmpstr (geocode_place_get_street_address (place), ==, "North Haugh π");
+ g_object_unref (place);
+ g_list_free (res);
++
++ setlocale (LC_ALL, old_locale);
+ }
+
+ static void
+--
+2.35.1
+
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild
new file mode 100644
index 000000000000..f8360512af4b
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/json-glib-0.99.2[introspection?]
+ >=net-libs/libsoup-2.42:2.4[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.13
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-tests-Fix-locale-in-pi-test.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -Denable-installed-tests=false
+ $(meson_use introspection enable-introspection)
+ $(meson_use gtk-doc enable-gtk-doc)
+ -Dsoup2=true
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/files/, sci-geosciences/geocode-glib/
@ 2022-10-14 14:29 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-10-14 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 51d3c42c4d5e9666762392b1ec61bdb50de3d41e
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 04:44:08 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 14:29:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d3c42c
sci-geosciences/geocode-glib: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sci-geosciences/geocode-glib/Manifest | 1 -
.../files/3.26.3-tests-Fix-locale-in-pi-test.patch | 43 ---------------------
.../geocode-glib/geocode-glib-3.26.3.ebuild | 45 ----------------------
3 files changed, 89 deletions(-)
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index ee02f262716b..1fb2ce520239 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,2 +1 @@
-DIST geocode-glib-3.26.3.tar.xz 75148 BLAKE2B 8eba0cb40511a724cddcab659fe0720b0c0534d811c83f8a90d21b9153af242de2a69b2c882b3eb3008ac128d1631a2ac7692c5e000284579aade987334f6cce SHA512 42313b1da24f5256ad73bd4be366d6bacf35256acc098e4865bbff58e92c5b78f4a2537e4787c6387190f10a2be2a72bc1507f7cb436e096e772195cf30fca7c
DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609
diff --git a/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch b/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch
deleted file mode 100644
index 5df7814383c0..000000000000
--- a/sci-geosciences/geocode-glib/files/3.26.3-tests-Fix-locale-in-pi-test.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c9bbf13d76600492565fa042638b48cb737e492d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 2 Jul 2022 10:11:10 +0200
-Subject: [PATCH] tests: Fix locale in "pi" test
-
-The test expects the locale to be en_GB.UTF-8, so set it as such.
-
-Closes: #27
----
- geocode-glib/tests/geocode-glib.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/geocode-glib/tests/geocode-glib.c b/geocode-glib/tests/geocode-glib.c
-index f74d031..ef20716 100644
---- a/geocode-glib/tests/geocode-glib.c
-+++ b/geocode-glib/tests/geocode-glib.c
-@@ -410,10 +410,14 @@ test_pi (void)
- {
- g_autoptr (GHashTable) params = NULL;
- GeocodeForward *object;
-+ g_autofree char *old_locale = NULL;
- GError *error = NULL;
- GList *res;
- GeocodePlace *place;
-
-+ old_locale = g_strdup (setlocale(LC_ALL, NULL));
-+ setlocale (LC_ALL, "en_GB.UTF-8");
-+
- /* The query parameters the mock server expects to receive. */
- params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
- add_attr_string (params, "q", "Jack Cole Building, St Andrews");
-@@ -439,6 +443,8 @@ test_pi (void)
- g_assert_cmpstr (geocode_place_get_street_address (place), ==, "North Haugh π");
- g_object_unref (place);
- g_list_free (res);
-+
-+ setlocale (LC_ALL, old_locale);
- }
-
- static void
---
-2.35.1
-
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild
deleted file mode 100644
index c227364da6da..000000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="GLib helper library for geocoding services"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/json-glib-0.99.2[introspection?]
- >=net-libs/libsoup-2.42:2.4[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- gtk-doc? (
- >=dev-util/gtk-doc-1.13
- app-text/docbook-xml-dtd:4.3
- )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-tests-Fix-locale-in-pi-test.patch
-)
-
-src_configure() {
- local emesonargs=(
- -Denable-installed-tests=false
- $(meson_use introspection enable-introspection)
- $(meson_use gtk-doc enable-gtk-doc)
- -Dsoup2=true
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/files/, sci-geosciences/geocode-glib/
@ 2023-03-30 13:43 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2023-03-30 13:43 UTC (permalink / raw
To: gentoo-commits
commit: 807a0217ec1ee13df781c89839fc7c7d7596b74c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 13:37:32 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 13:43:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807a0217
sci-geosciences/geocode-glib: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/3.26.4-r200-do-not-install-icons.patch | 27 ------------
.../geocode-glib/geocode-glib-3.26.4-r1.ebuild | 49 ----------------------
2 files changed, 76 deletions(-)
diff --git a/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch b/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch
deleted file mode 100644
index c85e250e5c2f..000000000000
--- a/sci-geosciences/geocode-glib/files/3.26.4-r200-do-not-install-icons.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-geocode-glib-3.26.4 in SLOT="2" has file collissions with geocode-glib-3.26.4 with SLOT="0".
-These file collissions are only 11 svg-files. We do not install them with SLOT="2" and instead only install them with SLOT="0" and
-SLOT="2" depends on SLOT="0" to make sure users that try to only install SLOT="2" get the files regardless.
-
-2022-09-24 - Pascal Jaeger (Schievel) <pascal.jaeger@leimstift.de>
-
----
-
-diff --git a/icons/meson.build b/icons/meson.build
-index 8d58886..edecbed 100644
---- a/icons/meson.build
-+++ b/icons/meson.build
-@@ -10,14 +10,3 @@ public_icons = [ 'poi-airport.svg',
- 'poi-restaurant.svg',
- 'poi-bar.svg',
- 'poi-light-rail-station.svg' ]
--
--foreach icon : public_icons
-- file = join_paths('maki' , icon)
-- install_dir = join_paths(get_option('datadir'),
-- 'icons',
-- 'hicolor',
-- 'scalable',
-- 'places')
--
-- install_data(file, install_dir: install_dir)
--endforeach
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r1.ebuild
deleted file mode 100644
index 20ccad005d11..000000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="GLib helper library for geocoding services"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-# Needs to depend on geocode-glib-3.26.4:2 because only slot 2 has some svg
-# files that we patch out here to avoid file collisions.
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/json-glib-0.99.2[introspection?]
- >=net-libs/libsoup-2.42:2.4[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
- >=sci-geosciences/geocode-glib-3.26.4-r201:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- gtk-doc? (
- >=dev-util/gtk-doc-1.13
- app-text/docbook-xml-dtd:4.3
- )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-r200-do-not-install-icons.patch
-)
-
-src_configure() {
- local emesonargs=(
- -Denable-installed-tests=false
- $(meson_use introspection enable-introspection)
- $(meson_use gtk-doc enable-gtk-doc)
- -Dsoup2=true
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-30 13:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-30 13:43 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/files/, sci-geosciences/geocode-glib/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-10-14 14:29 Matt Turner
2022-07-04 0:09 Matt Turner
2017-08-15 22:44 Gilles Dartiguelongue
2016-04-09 15:37 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox