public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, ...
@ 2012-08-24 21:27 Priit Laes
  0 siblings, 0 replies; 4+ messages in thread
From: Priit Laes @ 2012-08-24 21:27 UTC (permalink / raw
  To: gentoo-commits

commit:     7a8450be3ab30d820193277ca68768c4e863abc1
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 24 21:20:14 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 24 21:20:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a8450be

net-libs/libsoup{,-gnome}: 2.39.5 → 2.39.90

---
 .../files/libsoup-gnome-system-lib.patch           |   28 ++--
 ...-2.39.5.ebuild => libsoup-gnome-2.39.90.ebuild} |    0
 .../files/libsoup-2.39.5-fix-public-tlds.patch     |  168 --------------------
 .../files/libsoup-2.39.90-avoid-double-free.patch  |   30 ++++
 ...ibsoup-2.39.5.ebuild => libsoup-2.39.90.ebuild} |    2 +-
 5 files changed, 45 insertions(+), 183 deletions(-)

diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
index 5b24c58..d236e0c 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -1,4 +1,4 @@
-From 75d7a77705cd567ea1d2d95b6f99f1e0cabdb8bb Mon Sep 17 00:00:00 2001
+From 41200f48909dbf48fd2c96f305b71797634aca3e Mon Sep 17 00:00:00 2001
 From: Priit Laes <plaes@plaes.org>
 Date: Tue, 20 Dec 2011 15:42:44 +0200
 Subject: [PATCH] Split support for libsoup-gnome
@@ -7,9 +7,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595065
 
 Original patch by Romain Perier.
 ---
- Makefile.am         |   12 ++++++++-
- configure.ac        |   35 ++++++++++++++++++---------
- libsoup/Makefile.am |   63 +++++++++++++++++++++++++++++++++++++-------------
+ Makefile.am         | 12 ++++++++--
+ configure.ac        | 35 +++++++++++++++++++----------
+ libsoup/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++---------------
  3 files changed, 79 insertions(+), 31 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
@@ -43,7 +43,7 @@ index 18bf80a..046f945 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 1057f63..648afc7 100644
+index 95410de..1f00bdd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -71,20 +71,27 @@ LT_INIT([win32-dll])
@@ -98,7 +98,7 @@ index 1057f63..648afc7 100644
  [Could not find sqlite3 devel files:
  
 diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index fdba1ef..b8a9186 100644
+index cc99e75..f9b25fc 100644
 --- a/libsoup/Makefile.am
 +++ b/libsoup/Makefile.am
 @@ -1,23 +1,26 @@
@@ -133,7 +133,7 @@ index fdba1ef..b8a9186 100644
  
  libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
  
-@@ -71,7 +74,7 @@ libsoupinclude_HEADERS =	\
+@@ -72,7 +75,7 @@ libsoupinclude_HEADERS =	\
  	$(soup_headers)		\
  	soup-enum-types.h
  
@@ -142,7 +142,7 @@ index fdba1ef..b8a9186 100644
  
  libsoup_2_4_la_LDFLAGS =	\
  	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -171,14 +174,17 @@ libsoup_2_4_la_SOURCES =		\
+@@ -173,14 +176,17 @@ libsoup_2_4_la_SOURCES =		\
  	soup-value-utils.c		\
  	soup-xmlrpc.c
  
@@ -163,7 +163,7 @@ index fdba1ef..b8a9186 100644
  if BUILD_LIBSOUP_GNOME
  
  if OS_WIN32
-@@ -191,6 +197,10 @@ endif
+@@ -193,6 +199,10 @@ endif
  
  libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
  
@@ -174,7 +174,7 @@ index fdba1ef..b8a9186 100644
  libsoupgnomeinclude_HEADERS =	\
  	soup-cookie-jar-sqlite.h\
  	soup-gnome.h		\
-@@ -198,14 +208,24 @@ libsoupgnomeinclude_HEADERS =	\
+@@ -200,14 +210,24 @@ libsoupgnomeinclude_HEADERS =	\
  
  lib_LTLIBRARIES += libsoup-gnome-2.4.la
  
@@ -200,7 +200,7 @@ index fdba1ef..b8a9186 100644
  libsoup_gnome_2_4_la_SOURCES =		\
  	soup-cookie-jar-sqlite.c	\
  	soup-gnome-features.c		\
-@@ -217,9 +237,8 @@ endif
+@@ -219,9 +239,8 @@ endif
  
  GLIB_GENERATED = soup-marshal.c soup-marshal.h
  GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
@@ -212,7 +212,7 @@ index fdba1ef..b8a9186 100644
  
  soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
  soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -235,6 +254,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -237,6 +256,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
  
  if HAVE_INTROSPECTION
  
@@ -221,7 +221,7 @@ index fdba1ef..b8a9186 100644
  # Core library
  gi_soup_files = \
  	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -256,20 +277,28 @@ Soup_2_4_gir_FILES = \
+@@ -258,20 +279,28 @@ Soup_2_4_gir_FILES = \
  
  INTROSPECTION_GIRS += Soup-2.4.gir
  
@@ -255,5 +255,5 @@ index fdba1ef..b8a9186 100644
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
 -- 
-1.7.8.6
+1.7.12
 

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.5.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.90.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.5.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.39.90.ebuild

diff --git a/net-libs/libsoup/files/libsoup-2.39.5-fix-public-tlds.patch b/net-libs/libsoup/files/libsoup-2.39.5-fix-public-tlds.patch
deleted file mode 100644
index 81fe7cf..0000000
--- a/net-libs/libsoup/files/libsoup-2.39.5-fix-public-tlds.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-commit 82084a0c02c958a8d5bff4f847fc1507b10db9ed
-Author: Sergio Villar Senin <svillar@igalia.com>
-Date:   Thu Aug 2 16:50:54 2012 +0200
-
-    SoupTLD: fix a regression in soup_tld_is_public_suffix()
-    
-    soup_tld_is_public_suffix() was not returning TRUE for well known TLDs as
-    ".com" after cbae89f4. Also added some extra documentation to
-    soup_tld_get_base_domain() in order to make explicit that it returns NULL
-    for private URLs.
-    
-    Reworked unit tests in order to allow them detect these regressions.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=681085
-
-diff --git a/libsoup/soup-tld.c b/libsoup/soup-tld.c
-index 0c40b67..fc7c992 100644
---- a/libsoup/soup-tld.c
-+++ b/libsoup/soup-tld.c
-@@ -59,6 +59,10 @@ soup_tld_ensure_rules_hash_table (void)
-  * plus the second level domain, for example for myhost.mydomain.com
-  * it will return mydomain.com.
-  *
-+ * Note that %NULL will be returned for private URLs (those not ending
-+ * with any well known TLD) because choosing a base domain for them
-+ * would be totally arbitrary.
-+ *
-  * This method only works for valid UTF-8 hostnames in their canonical
-  * representation form, so you should use g_hostname_to_unicode() to
-  * get the canonical representation if that is not the case.
-@@ -106,7 +110,7 @@ soup_tld_domain_is_public_suffix (const char *domain)
- 		g_return_val_if_reached (FALSE);
- 
- 	base_domain = soup_tld_get_base_domain_internal (domain, 0, &error);
--	if (base_domain)
-+	if (g_strcmp0 (domain, base_domain))
- 		return FALSE;
- 
- 	if (g_error_matches (error, SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN)) {
-@@ -178,15 +182,9 @@ soup_tld_get_base_domain_internal (const char *hostname, guint additional_domain
- 				/* If we match a *. rule and there were no previous exceptions
- 				 * nor previous domains then treat it as an exact match.
- 				 */
--				if (!prev_domain) {
--					g_set_error_literal (error, SOUP_TLD_ERROR,
--							     SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS,
--							     _("Not enough domains"));
--					return NULL;
--				}
--				tld = prev_domain;
-+				tld = prev_domain ? prev_domain : cur_domain;
- 				break;
--			} else if (*flags == SOUP_TLD_RULE_NORMAL || !next_dot) {
-+			} else if (*flags == SOUP_TLD_RULE_NORMAL) {
- 				tld = cur_domain;
- 				break;
- 			} else if (*flags & SOUP_TLD_RULE_EXCEPTION) {
-diff --git a/tests/tld-test.c b/tests/tld-test.c
-index 25d2da2..d0c73a8 100644
---- a/tests/tld-test.c
-+++ b/tests/tld-test.c
-@@ -21,16 +21,6 @@ static struct {
-   { ".example", NULL },
-   { ".example.com", NULL },
-   { ".example.example", NULL },
--  /* Unlisted TLD.*/
--  { "example", NULL },
--  { "example.example", NULL },
--  { "b.example.example", NULL },
--  { "a.b.example.example", NULL },
--  /* Listed, but non-Internet, TLD. */
--  { "local", NULL },
--  { "example.local", NULL },
--  { "b.example.local", NULL },
--  { "a.b.example.local", NULL },
-   /* TLD with only 1 rule. */
-   { "biz", NULL },
-   { "domain.biz", "domain.biz" },
-@@ -88,6 +78,20 @@ static struct {
-   /* The original list does not include non-ASCII tests. Let's add a couple. */
-   { "公司.cn", NULL },
-   { "a.b.åfjord.no", "b.åfjord.no" }
-+},
-+/* Non Internet TLDs have NULL as expected result
-+ */
-+non_inet_tld_tests[] = {
-+  /* Unlisted TLD.*/
-+  { "example", NULL },
-+  { "example.example", NULL },
-+  { "b.example.example", NULL },
-+  { "a.b.example.example", NULL },
-+  /* Listed, but non-Internet, TLD. */
-+  { "local", NULL },
-+  { "example.local", NULL },
-+  { "b.example.local", NULL },
-+  { "a.b.example.local", NULL }
- };
- 
- int
-@@ -99,29 +103,46 @@ main (int argc, char **argv)
- 
- 	errors = 0;
- 	for (i = 0; i < G_N_ELEMENTS (tld_tests); ++i) {
--               gboolean is_public = soup_tld_domain_is_public_suffix (tld_tests[i].hostname);
--               const char *base_domain = soup_tld_get_base_domain (tld_tests[i].hostname, NULL);
-+		GError *error = NULL;
-+		gboolean is_public = soup_tld_domain_is_public_suffix (tld_tests[i].hostname);
-+		const char *base_domain = soup_tld_get_base_domain (tld_tests[i].hostname, &error);
-+
-+		debug_printf (1, "Testing %s: ", tld_tests[i].hostname);
-+
-+		if (is_public && tld_tests[i].result) {
-+			debug_printf (1, "ERROR: domain is public but base_domain is not NULL (%s)\n",
-+				      base_domain);
-+			++errors;
-+		} else if (g_strcmp0 (tld_tests[i].result, base_domain)) {
-+			debug_printf (1, "ERROR: %s expected as base domain but got %s\n",
-+				      tld_tests[i].result, base_domain);
-+			++errors;
-+
-+		} else if (!tld_tests[i].result && !is_public &&
-+			   !g_error_matches (error, SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME)) {
-+			debug_printf (1, "ERROR: not public domain with NULL expected result\n");
-+			++errors;
-+		} else
-+			debug_printf (1, "OK\n");
-+
-+		g_clear_error(&error);
-+	}
-+
-+	for (i = 0; i < G_N_ELEMENTS (non_inet_tld_tests); ++i) {
-+		gboolean is_public = soup_tld_domain_is_public_suffix (non_inet_tld_tests[i].hostname);
-+		const char *base_domain = soup_tld_get_base_domain (non_inet_tld_tests[i].hostname, NULL);
-+
-+		debug_printf (1, "Testing %s: ", non_inet_tld_tests[i].hostname);
- 
--	       debug_printf (1, "Testing %s: ", tld_tests[i].hostname);
--               if (tld_tests[i].result) {
--                       /* Public domains have NULL expected results. */
--                       if (is_public || g_strcmp0 (tld_tests[i].result, base_domain)) {
--                               debug_printf (1, "ERROR: %s got %s (%s expected)\n",
--                                             tld_tests[i].hostname, base_domain, tld_tests[i].result);
--                               ++errors;
--                       } else
--			       debug_printf (1, "OK\n");
--               } else {
--                       /* If there is no expected result then either the domain is public or
--                        * the hostname invalid (for example starts with a leading dot).
--                        */
--                       if (!is_public && base_domain) {
--                               debug_printf (1, "ERROR: public domain %s got %s (none expected)\n",
--                                             tld_tests[i].hostname, base_domain);
--                               ++errors;
--                       } else
--			       debug_printf (1, "OK\n");
--	       }
-+		if (is_public) {
-+			debug_printf (1, "ERROR: domain incorrectly clasified as public\n");
-+			++errors;
-+		} else if (base_domain) {
-+			debug_printf (1, "ERROR: non NULL base domain (%s) for local url\n",
-+				      base_domain);
-+			++errors;
-+		} else
-+			debug_printf (1, "OK\n");
- 	}
- 
- 	test_cleanup ();

diff --git a/net-libs/libsoup/files/libsoup-2.39.90-avoid-double-free.patch b/net-libs/libsoup/files/libsoup-2.39.90-avoid-double-free.patch
new file mode 100644
index 0000000..8ab5021
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.39.90-avoid-double-free.patch
@@ -0,0 +1,30 @@
+From 2e70097a13289f6e665e7bbe327d12d5b0d3cddb Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Fri, 24 Aug 2012 13:20:15 +0200
+Subject: [PATCH 1/2] Avoid double free of hash key
+
+When soup_message_headers_get_content_disposition re-inserts the
+new filename we need to g_strdup the key or otherwise it will
+be freed by the hashtable key destroy func.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=682569
+---
+ libsoup/soup-message-headers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index b9bab23..1dd53dd 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1303,7 +1303,7 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders  *hdrs,
+ 		char *filename = strrchr (orig_value, '/');
+ 
+ 		if (filename)
+-			g_hash_table_insert (*params, orig_key, filename + 1);
++			g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
+ 	}
+ 	return TRUE;
+ }
+-- 
+1.7.12
+

diff --git a/net-libs/libsoup/libsoup-2.39.5.ebuild b/net-libs/libsoup/libsoup-2.39.90.ebuild
similarity index 98%
rename from net-libs/libsoup/libsoup-2.39.5.ebuild
rename to net-libs/libsoup/libsoup-2.39.90.ebuild
index 17826ee..7f50d15 100644
--- a/net-libs/libsoup/libsoup-2.39.5.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.90.ebuild
@@ -80,7 +80,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
 		[[ ${PV} != 9999 ]] && eautoreconf
 	fi
-	epatch "${FILESDIR}/${P}-fix-public-tlds.patch"
+	epatch "${FILESDIR}/${P}-avoid-double-free.patch"
 
 	gnome2_src_prepare
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, ...
@ 2012-03-06 15:40 Priit Laes
  0 siblings, 0 replies; 4+ messages in thread
From: Priit Laes @ 2012-03-06 15:40 UTC (permalink / raw
  To: gentoo-commits

commit:     819f2da652930c1161609e39fc8bab6e533becf9
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Mar  6 15:36:35 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Mar  6 15:36:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=819f2da6

net-libs/libsoup{,gnome}: 2.37.90 → 2.37.91

---
 .../libsoup-gnome/files/libsoup-et_EE-locale.patch |   35 --------------------
 ...2.37.90.ebuild => libsoup-gnome-2.37.91.ebuild} |    3 --
 net-libs/libsoup/files/libsoup-et_EE-locale.patch  |   35 --------------------
 ...bsoup-2.37.90.ebuild => libsoup-2.37.91.ebuild} |    3 --
 4 files changed, 0 insertions(+), 76 deletions(-)

diff --git a/net-libs/libsoup-gnome/files/libsoup-et_EE-locale.patch b/net-libs/libsoup-gnome/files/libsoup-et_EE-locale.patch
deleted file mode 100644
index 39b7739..0000000
--- a/net-libs/libsoup-gnome/files/libsoup-et_EE-locale.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fba62b120862a789e9c8afd0c7142290c56695d4 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Fri, 24 Feb 2012 12:00:20 +0200
-Subject: [PATCH] Fix locale-specific issues
-
-When using Estonian (et_EE) locale, 'a-z' range skips 'tuv...'
----
- Makefile.glib |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.glib b/Makefile.glib
-index 37f2b92..78eb07d 100644
---- a/Makefile.glib
-+++ b/Makefile.glib
-@@ -155,7 +155,7 @@ define _glib_make_genmarshal_rules
- $(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch]))
- 
- $(1).list.stamp: $(_glib_marshal_sources)
--	$$(_GLIB_V_GEN) sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
-+	$$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
- 	(cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \
- 	rm -f $(1).list.tmp && \
- 	echo timestamp > $$@
-@@ -192,7 +192,7 @@ $(foreach f,$(_GLIB_MARSHAL_GENERATED),$(eval $(call _glib_make_genmarshal_rules
- _GLIB_ENUM_TYPES_GENERATED = $(subst .h,,$(filter %enum-types.h %enumtypes.h,$(GLIB_GENERATED)))
- 
- _glib_enum_types_prefix = $(subst -,_,$(notdir $(1)))
--_glib_enum_types_guard = __$(shell echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
-+_glib_enum_types_guard = __$(shell LC_ALL=C echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
- _glib_enum_types_sources_var = $(_glib_enum_types_prefix)_sources
- _glib_enum_types_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enum_types_sources_var)))
- _glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources))
--- 
-1.7.8.4
-

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.90.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.91.ebuild
similarity index 93%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.90.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.37.91.ebuild
index c5abfb0..fefdad3 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.37.90.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.37.91.ebuild
@@ -59,9 +59,6 @@ src_configure() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654395
-	epatch "${FILESDIR}"/libsoup-et_EE-locale.patch
-
 	# Use lib present on the system
 	epatch "${FILESDIR}"/${PN}-system-lib.patch
 	eautoreconf

diff --git a/net-libs/libsoup/files/libsoup-et_EE-locale.patch b/net-libs/libsoup/files/libsoup-et_EE-locale.patch
deleted file mode 100644
index 39b7739..0000000
--- a/net-libs/libsoup/files/libsoup-et_EE-locale.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fba62b120862a789e9c8afd0c7142290c56695d4 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Fri, 24 Feb 2012 12:00:20 +0200
-Subject: [PATCH] Fix locale-specific issues
-
-When using Estonian (et_EE) locale, 'a-z' range skips 'tuv...'
----
- Makefile.glib |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.glib b/Makefile.glib
-index 37f2b92..78eb07d 100644
---- a/Makefile.glib
-+++ b/Makefile.glib
-@@ -155,7 +155,7 @@ define _glib_make_genmarshal_rules
- $(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch]))
- 
- $(1).list.stamp: $(_glib_marshal_sources)
--	$$(_GLIB_V_GEN) sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
-+	$$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
- 	(cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \
- 	rm -f $(1).list.tmp && \
- 	echo timestamp > $$@
-@@ -192,7 +192,7 @@ $(foreach f,$(_GLIB_MARSHAL_GENERATED),$(eval $(call _glib_make_genmarshal_rules
- _GLIB_ENUM_TYPES_GENERATED = $(subst .h,,$(filter %enum-types.h %enumtypes.h,$(GLIB_GENERATED)))
- 
- _glib_enum_types_prefix = $(subst -,_,$(notdir $(1)))
--_glib_enum_types_guard = __$(shell echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
-+_glib_enum_types_guard = __$(shell LC_ALL=C echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
- _glib_enum_types_sources_var = $(_glib_enum_types_prefix)_sources
- _glib_enum_types_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enum_types_sources_var)))
- _glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources))
--- 
-1.7.8.4
-

diff --git a/net-libs/libsoup/libsoup-2.37.90.ebuild b/net-libs/libsoup/libsoup-2.37.91.ebuild
similarity index 96%
rename from net-libs/libsoup/libsoup-2.37.90.ebuild
rename to net-libs/libsoup/libsoup-2.37.91.ebuild
index e38a77e..b8e8f76 100644
--- a/net-libs/libsoup/libsoup-2.37.90.ebuild
+++ b/net-libs/libsoup/libsoup-2.37.91.ebuild
@@ -72,9 +72,6 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654395
-	epatch "${FILESDIR}/${PN}-et_EE-locale.patch"
-
 	# Patch *must* be applied conditionally (see patch for details)
 	if use doc; then
 		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, ...
@ 2012-02-24 10:24 Priit Laes
  0 siblings, 0 replies; 4+ messages in thread
From: Priit Laes @ 2012-02-24 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     9504b9857535a8a7a9e6f6c9200f440ec26e238c
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Feb 24 10:17:23 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Feb 24 10:17:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9504b985

net-libs/libsoup{,-gnome}: 2.37.5 → 2.37.90

---
 .../libsoup-gnome/files/libsoup-et_EE-locale.patch |   35 +++++++++++++
 ...em-lib.patch => libsoup-gnome-system-lib.patch} |   52 +++++++++-----------
 ...-2.37.5.ebuild => libsoup-gnome-2.37.90.ebuild} |   17 +++++-
 net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild   |    2 +-
 net-libs/libsoup/files/libsoup-et_EE-locale.patch  |   35 +++++++++++++
 ...ibsoup-2.37.5.ebuild => libsoup-2.37.90.ebuild} |   19 ++++++-
 net-libs/libsoup/libsoup-9999.ebuild               |    3 +-
 7 files changed, 127 insertions(+), 36 deletions(-)

diff --git a/net-libs/libsoup-gnome/files/libsoup-et_EE-locale.patch b/net-libs/libsoup-gnome/files/libsoup-et_EE-locale.patch
new file mode 100644
index 0000000..39b7739
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-et_EE-locale.patch
@@ -0,0 +1,35 @@
+From fba62b120862a789e9c8afd0c7142290c56695d4 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Fri, 24 Feb 2012 12:00:20 +0200
+Subject: [PATCH] Fix locale-specific issues
+
+When using Estonian (et_EE) locale, 'a-z' range skips 'tuv...'
+---
+ Makefile.glib |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.glib b/Makefile.glib
+index 37f2b92..78eb07d 100644
+--- a/Makefile.glib
++++ b/Makefile.glib
+@@ -155,7 +155,7 @@ define _glib_make_genmarshal_rules
+ $(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch]))
+ 
+ $(1).list.stamp: $(_glib_marshal_sources)
+-	$$(_GLIB_V_GEN) sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
++	$$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
+ 	(cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \
+ 	rm -f $(1).list.tmp && \
+ 	echo timestamp > $$@
+@@ -192,7 +192,7 @@ $(foreach f,$(_GLIB_MARSHAL_GENERATED),$(eval $(call _glib_make_genmarshal_rules
+ _GLIB_ENUM_TYPES_GENERATED = $(subst .h,,$(filter %enum-types.h %enumtypes.h,$(GLIB_GENERATED)))
+ 
+ _glib_enum_types_prefix = $(subst -,_,$(notdir $(1)))
+-_glib_enum_types_guard = __$(shell echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
++_glib_enum_types_guard = __$(shell LC_ALL=C echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
+ _glib_enum_types_sources_var = $(_glib_enum_types_prefix)_sources
+ _glib_enum_types_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enum_types_sources_var)))
+ _glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources))
+-- 
+1.7.8.4
+

diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
similarity index 82%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
index 101c906..0c6259a 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -1,4 +1,4 @@
-From 57588fea518799c2cb69d44772a4ee7799c24eca Mon Sep 17 00:00:00 2001
+From b39aaca2ec6c551d7646bcb086afb8083492938b Mon Sep 17 00:00:00 2001
 From: Priit Laes <plaes@plaes.org>
 Date: Tue, 20 Dec 2011 15:42:44 +0200
 Subject: [PATCH] Split support for libsoup-gnome
@@ -6,12 +6,12 @@ Subject: [PATCH] Split support for libsoup-gnome
 Original patch by Romain Perier.
 ---
  Makefile.am         |   12 ++++++++++--
- configure.ac        |   43 +++++++++++++++++++++++++++----------------
- libsoup/Makefile.am |   50 +++++++++++++++++++++++++++++++++++++++-----------
- 3 files changed, 76 insertions(+), 29 deletions(-)
+ configure.ac        |   47 +++++++++++++++++++++++++++++------------------
+ libsoup/Makefile.am |   48 ++++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 77 insertions(+), 30 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index bb94238..0562574 100644
+index 8b86fb7..7f628f4 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,11 @@
@@ -27,7 +27,7 @@ index bb94238..0562574 100644
  
  EXTRA_DIST =			\
  	libsoup-2.4.pc.in	\
-@@ -14,7 +18,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
  
  pkgconfigdir = $(libdir)/pkgconfig
  
@@ -41,10 +41,10 @@ index bb94238..0562574 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 6394974..5229544 100644
+index eee8636..f9d6e47 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -72,16 +72,30 @@ dnl ***********************
+@@ -72,19 +72,33 @@ dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
  
@@ -63,6 +63,8 @@ index 6394974..5229544 100644
 +	   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
 +	fi
 +	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
++	GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++	AC_SUBST(GLIB_MAKEFILE)
 +
 +	PKG_CHECK_MODULES(XML, libxml-2.0)
 +	AC_SUBST(XML_CFLAGS)
@@ -77,6 +79,9 @@ index 6394974..5229544 100644
  fi
 -GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 -
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
+ 
 -PKG_CHECK_MODULES(XML, libxml-2.0)
 -AC_SUBST(XML_CFLAGS)
 -AC_SUBST(XML_LIBS)
@@ -84,7 +89,7 @@ index 6394974..5229544 100644
  
  dnl ***********************
  dnl *** Check for Win32 ***
-@@ -100,13 +114,6 @@ esac
+@@ -103,13 +117,6 @@ esac
  AC_MSG_RESULT([$os_win32])
  AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
  
@@ -98,7 +103,7 @@ index 6394974..5229544 100644
  dnl *********************
  dnl *** GNOME support ***
  dnl *********************
-@@ -131,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+@@ -134,6 +141,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
  if test $with_gnome != no; then
  	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
  
@@ -110,10 +115,10 @@ index 6394974..5229544 100644
  [Could not find sqlite3 devel files:
  
 diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 096f0fb..416e523 100644
+index aa13eec..ef0c870 100644
 --- a/libsoup/Makefile.am
 +++ b/libsoup/Makefile.am
-@@ -4,15 +4,18 @@ if OS_WIN32
+@@ -6,15 +6,18 @@ if OS_WIN32
  LIBWS2_32 = -lws2_32
  endif
  
@@ -134,18 +139,9 @@ index 096f0fb..416e523 100644
 -	$(GNOME_KEYRING_CFLAGS)
 +	$(XML_CFLAGS)
  
- MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
- MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
- 
- BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
--CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
  libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
  
-@@ -94,7 +97,7 @@ libsoupinclude_HEADERS =	\
+@@ -67,7 +70,7 @@ libsoupinclude_HEADERS =	\
  	$(soup_headers)		\
  	soup-enum-types.h
  
@@ -154,7 +150,7 @@ index 096f0fb..416e523 100644
  
  libsoup_2_4_la_LDFLAGS =	\
  	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -176,6 +179,7 @@ libsoup_2_4_la_SOURCES =		\
+@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES =		\
  	soup-uri.c			\
  	soup-value-utils.c		\
  	soup-xmlrpc.c
@@ -162,7 +158,7 @@ index 096f0fb..416e523 100644
  
  if BUILD_LIBSOUP_GNOME
  
-@@ -189,6 +193,10 @@ endif
+@@ -165,6 +169,10 @@ endif
  
  libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
  
@@ -173,7 +169,7 @@ index 096f0fb..416e523 100644
  libsoupgnomeinclude_HEADERS =	\
  	soup-cookie-jar-sqlite.h\
  	soup-gnome.h		\
-@@ -196,14 +204,24 @@ libsoupgnomeinclude_HEADERS =	\
+@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS =	\
  
  lib_LTLIBRARIES += libsoup-gnome-2.4.la
  
@@ -199,7 +195,7 @@ index 096f0fb..416e523 100644
  libsoup_gnome_2_4_la_SOURCES =		\
  	soup-cookie-jar-sqlite.c	\
  	soup-gnome-features.c		\
-@@ -223,6 +241,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
  
  if HAVE_INTROSPECTION
  
@@ -208,7 +204,7 @@ index 096f0fb..416e523 100644
  # Core library
  gi_soup_files = \
  	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -244,20 +264,28 @@ Soup_2_4_gir_FILES = \
+@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \
  
  INTROSPECTION_GIRS += Soup-2.4.gir
  
@@ -242,5 +238,5 @@ index 096f0fb..416e523 100644
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
 -- 
-1.7.8.3
+1.7.8.4
 

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.90.ebuild
similarity index 73%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.37.90.ebuild
index 3ce4451..c5abfb0 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.37.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild,v 1.1 2011/10/30 02:38:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -10,6 +10,10 @@ MY_PN=${PN/-gnome}
 MY_P=${MY_PN}-${PV}
 
 inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	GNOME_LIVE_MODULE=${MY_PN}
+	inherit gnome2-live
+fi
 
 DESCRIPTION="GNOME plugin for libsoup"
 HOMEPAGE="http://live.gnome.org/LibSoup"
@@ -17,7 +21,11 @@ SRC_URI="${SRC_URI//-gnome}"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
+fi
 IUSE="debug doc +introspection"
 
 RDEPEND="~net-libs/libsoup-${PV}
@@ -51,7 +59,10 @@ src_configure() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=654395
+	epatch "${FILESDIR}"/libsoup-et_EE-locale.patch
+
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.37-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-system-lib.patch
 	eautoreconf
 }

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index a5a4a47..fefdad3 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -60,6 +60,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.37-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-system-lib.patch
 	eautoreconf
 }

diff --git a/net-libs/libsoup/files/libsoup-et_EE-locale.patch b/net-libs/libsoup/files/libsoup-et_EE-locale.patch
new file mode 100644
index 0000000..39b7739
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-et_EE-locale.patch
@@ -0,0 +1,35 @@
+From fba62b120862a789e9c8afd0c7142290c56695d4 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Fri, 24 Feb 2012 12:00:20 +0200
+Subject: [PATCH] Fix locale-specific issues
+
+When using Estonian (et_EE) locale, 'a-z' range skips 'tuv...'
+---
+ Makefile.glib |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.glib b/Makefile.glib
+index 37f2b92..78eb07d 100644
+--- a/Makefile.glib
++++ b/Makefile.glib
+@@ -155,7 +155,7 @@ define _glib_make_genmarshal_rules
+ $(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch]))
+ 
+ $(1).list.stamp: $(_glib_marshal_sources)
+-	$$(_GLIB_V_GEN) sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
++	$$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \
+ 	(cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \
+ 	rm -f $(1).list.tmp && \
+ 	echo timestamp > $$@
+@@ -192,7 +192,7 @@ $(foreach f,$(_GLIB_MARSHAL_GENERATED),$(eval $(call _glib_make_genmarshal_rules
+ _GLIB_ENUM_TYPES_GENERATED = $(subst .h,,$(filter %enum-types.h %enumtypes.h,$(GLIB_GENERATED)))
+ 
+ _glib_enum_types_prefix = $(subst -,_,$(notdir $(1)))
+-_glib_enum_types_guard = __$(shell echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
++_glib_enum_types_guard = __$(shell LC_ALL=C echo $(_glib_enum_types_prefix) | tr 'a-z' 'A-Z')_H__
+ _glib_enum_types_sources_var = $(_glib_enum_types_prefix)_sources
+ _glib_enum_types_sources = $(filter-out $(GLIB_GENERATED),$($(_glib_enum_types_sources_var)))
+ _glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources))
+-- 
+1.7.8.4
+

diff --git a/net-libs/libsoup/libsoup-2.37.5.ebuild b/net-libs/libsoup/libsoup-2.37.90.ebuild
similarity index 76%
rename from net-libs/libsoup/libsoup-2.37.5.ebuild
rename to net-libs/libsoup/libsoup-2.37.90.ebuild
index 198fc6f..e38a77e 100644
--- a/net-libs/libsoup/libsoup-2.37.5.ebuild
+++ b/net-libs/libsoup/libsoup-2.37.90.ebuild
@@ -1,19 +1,26 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.1 2011/10/30 02:33:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
 IUSE="debug doc +introspection samba ssl test"
 
 RDEPEND=">=dev-libs/glib-2.31.7:2
@@ -54,12 +61,20 @@ src_configure() {
 src_prepare() {
 	gnome2_src_prepare
 
+	if [[ ${PV} = 9999 ]]; then
+		# prevent SOUP_MAINTAINER_FLAGS from getting set
+		mv .git .git-bck || die
+	fi
+
 	if ! use test; then
 		# don't waste time building tests (bug #226271)
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 			|| die "sed failed"
 	fi
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=654395
+	epatch "${FILESDIR}/${PN}-et_EE-locale.patch"
+
 	# Patch *must* be applied conditionally (see patch for details)
 	if use doc; then
 		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index c5b21b7..b8e8f76 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -23,8 +23,7 @@ else
 fi
 IUSE="debug doc +introspection samba ssl test"
 
-# glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
-RDEPEND=">=dev-libs/glib-2.31.0:2
+RDEPEND=">=dev-libs/glib-2.31.7:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, ...
@ 2011-06-02 15:48 Nirbheek Chauhan
  0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2011-06-02 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     2d5f975f340067a3111b82f30921521b47f29956
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 15:30:52 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 15:30:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2d5f975f

net-libs/libsoup: was moved to tree a while back

---
 .../files/libsoup-gnome-2.34.0-system-lib.patch    |  227 --------------------
 net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild |   57 -----
 ...p-2.30.1-fix-build-without-gnome-with-doc.patch |   58 -----
 net-libs/libsoup/libsoup-2.34.0.ebuild             |   67 ------
 4 files changed, 0 insertions(+), 409 deletions(-)

diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
deleted file mode 100644
index ff5da04..0000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-Split support for libsoup-gnome
-
-Original patch by Romain Perier.
----
---- configure.ac
-+++ configure.ac
-@@ -72,15 +72,30 @@
- dnl *** Checks for glib ***
- dnl ***********************
- 
--AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup)
--fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
--
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
-+PKG_PROG_PKG_CONFIG
-+enable_ssl=no
-+AC_ARG_WITH(libsoup-system,
-+   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+   [with_libsoup_system=$withval], [with_libsoup_system=no])
-+if test "$with_libsoup_system" = "no"; then
-+	AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
-+	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup)
-+	fi
-+	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-+
-+	PKG_CHECK_MODULES(XML, libxml-2.0)
-+	AC_SUBST(XML_CFLAGS)
-+	AC_SUBST(XML_LIBS)
-+
-+	dnl *******************
-+	dnl *** Misc checks ***
-+	dnl *******************
-+	AC_CHECK_FUNCS(gmtime_r)
-+	AC_CHECK_FUNCS(mmap)
-+	AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
-+fi
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
- dnl ***********************
- dnl *** Check for Win32 ***
-@@ -99,13 +114,6 @@
- AC_MSG_RESULT([$os_win32])
- AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
- 
--dnl *******************
--dnl *** Misc checks ***
--dnl *******************
--AC_CHECK_FUNCS(gmtime_r)
--AC_CHECK_FUNCS(mmap)
--AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
--
- dnl *********************
- dnl *** GNOME support ***
- dnl *********************
-@@ -130,6 +138,10 @@
- if test $with_gnome != no; then
- 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
- 
-+	if test $with_libsoup_system != no; then
-+		PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+	fi
-+
- 	PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
- [Could not find sqlite3 devel files:
- 
---- libsoup/Makefile.am
-+++ libsoup/Makefile.am
-@@ -4,15 +4,18 @@
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += 				\
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-I$(top_srcdir)			\
- 	$(SOUP_DEBUG_FLAGS)		\
- 	$(SOUP_MAINTAINER_FLAGS)	\
- 	$(GLIB_CFLAGS)			\
--	$(XML_CFLAGS)			\
--	$(SQLITE_CFLAGS)		\
--	$(GNOME_KEYRING_CFLAGS)
-+	$(XML_CFLAGS)
- 
- MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
- MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-@@ -41,7 +44,7 @@
- 
- BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
--CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
- 
-@@ -94,7 +97,7 @@
- 	$(soup_headers)		\
- 	soup-enum-types.h
- 
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
- 
- libsoup_2_4_la_LDFLAGS =	\
- 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -178,10 +181,16 @@
- 	soup-value-utils.c		\
- 	soup-xmlrpc.c
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)		\
-+    $(SQLITE_CFLAGS)			\
-+    $(GNOME_KEYRING_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -189,14 +198,24 @@
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
-+if BUILD_LIBSOUP
- libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
-+libsoup_gnome_2_4_la_LDFLAGS =		\
-+	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-+endif
- 
- libsoup_gnome_2_4_la_LIBADD =		\
--	libsoup-2.4.la			\
- 	$(GLIB_LIBS)			\
- 	$(SQLITE_LIBS)			\
- 	$(GNOME_KEYRING_LIBS)
- 
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES =		\
- 	soup-cookie-jar-sqlite.c	\
- 	soup-gnome-features.c		\
-@@ -217,6 +236,8 @@
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.%,\
-@@ -238,20 +259,28 @@
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS =			\
- 	--identifier-prefix=Soup			\
- 	--symbol-prefix=soup				\
--	--c-include "libsoup/soup-gnome.h"		\
--	--include-uninstalled=$(builddir)/Soup-2.4.gir
-+	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- 
---- Makefile.am
-+++ Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = libsoup tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += tests docs
-+endif
- 
- EXTRA_DIST =			\
- 	libsoup-2.4.pc.in	\
-@@ -14,7 +18,11 @@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
--pkgconfig_DATA = libsoup-2.4.pc
-+pkgconfig_DATA =
-+
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
deleted file mode 100644
index e249b66..0000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild,v 1.1 2010/12/04 16:00:25 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-IUSE="debug doc +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.34.0-system-lib.patch
-	eautoreconf
-}

diff --git a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index 2b5a39d..0000000
--- a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c8ff78e489ccf5becd1ae309222b7977510558e6 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 25 Feb 2010 20:59:51 +0200
-Subject: [PATCH] Split docs into libsoup and libsoup-gnome.
-
-Fixes Gentoo Bug 268592, patch adapted from upstream patch.
-
-Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
-Hence, to be applied ONLY when !gnome && doc
----
- docs/reference/Makefile.am           |    5 ++++-
- docs/reference/libsoup-2.4-docs.sgml |    2 ++
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
-index 64d3cf8..8b91b7f 100644
---- a/docs/reference/Makefile.am
-+++ b/docs/reference/Makefile.am
-@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
- 	soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
- 	soup-proxy-resolver-static.h
- 
-+IGNORE_HFILES += soup-cookie-jar-sqlite.h \
-+   soup-gnome.h soup-gnome-features.h
-+
- # Images to copy into HTML directory.
- HTML_IMAGES = 
- 
-@@ -62,7 +65,7 @@ GTKDOC_CFLAGS =				\
- 	$(GNUTLS_CFLAGS)		\
- 	$(LIBPROXY_LIBS)
- 
--GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
-+GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
- 
- # include common portion ...
- include $(top_srcdir)/gtk-doc.make
-diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
-index 3cb3d11..707e525 100644
---- a/docs/reference/libsoup-2.4-docs.sgml
-+++ b/docs/reference/libsoup-2.4-docs.sgml
-@@ -52,11 +52,13 @@
-     <xi:include href="xml/soup-value-utils.xml"/>
-   </chapter>
- 
-+<!--
-   <chapter>
-     <title>GNOME integration</title>
-     <xi:include href="xml/soup-gnome-features.xml"/>
-     <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
-   </chapter>
-+-->
- 
-   <chapter>
-     <title>Low-level Networking API</title>
--- 
-1.7.0
-

diff --git a/net-libs/libsoup/libsoup-2.34.0.ebuild b/net-libs/libsoup/libsoup-2.34.0.ebuild
deleted file mode 100644
index fda3480..0000000
--- a/net-libs/libsoup/libsoup-2.34.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.32.2.ebuild,v 1.1 2010/12/04 15:56:50 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc +introspection ssl test"
-
-RDEPEND=">=dev-libs/glib-2.27.5:2
-	>=dev-libs/libxml2-2:2
-	net-libs/glib-networking[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	# Set invalid apache module dir until apache tests are ready, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--with-apache-module-dir="${T}"
-		$(use_enable introspection)"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-24 21:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-24 21:27 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/, Priit Laes
  -- strict thread matches above, loose matches on Subject: below --
2012-03-06 15:40 Priit Laes
2012-02-24 10:24 Priit Laes
2011-06-02 15:48 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox