* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2013-03-29 18:08 Priit Laes
0 siblings, 0 replies; 6+ messages in thread
From: Priit Laes @ 2013-03-29 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 55c8f65d0d35ae312492f54989629faf4f2dc00a
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar 29 18:07:35 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar 29 18:07:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=55c8f65d
net-libs/libsoup-gnome: Package has been removed (#463702)
---
.../files/libsoup-gnome-system-lib.patch | 224 --------------------
.../libsoup-gnome/libsoup-gnome-2.41.91.ebuild | 61 ------
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 61 ------
net-libs/libsoup-gnome/metadata.xml | 5 -
4 files changed, 0 insertions(+), 351 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
deleted file mode 100644
index 5ca3a94..0000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 1345959e285c8d2343d87121f5f3a17563f0cc1a 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
-
-https://bugzilla.gnome.org/show_bug.cgi?id=595065
-
-Original patch by Romain Perier.
----
- Makefile.am | 12 +++++++++--
- configure.ac | 9 ++++++++
- libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 63 insertions(+), 18 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 66992d9..787b3d6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
--SUBDIRS = libsoup po tests examples docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests examples docs
-+endif
-
- EXTRA_DIST = \
- data/effective_tld_names.dat \
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
-
- 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/configure.ac b/configure.ac
-index 34db367..c5a7075 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,11 @@ LT_INIT([win32-dll])
- dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
-+PKG_PROG_PKG_CONFIG
-+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])
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
-
- GLIB_REQUIRED=2.35.0
- AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-@@ -138,6 +143,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])
-+
-+ if test $with_libsoup_system != no; then
-+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+ fi
- fi
- AC_SUBST(HAVE_GNOME)
-
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index e99c8e6..6bebec8 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -1,18 +1,22 @@
- ## Process this file with automake to produce Makefile.in
-
- EXTRA_DIST =
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
-
--INCLUDES = \
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += \
- -DG_LOG_DOMAIN=\"libsoup\" \
- -DLOCALEDIR=\"$(localedir)\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(SOUP_DEBUG_FLAGS) \
- $(GLIB_CFLAGS) \
-- $(XML_CFLAGS) \
-- $(SQLITE_CFLAGS)
-+ $(XML_CFLAGS)
-
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
-
-@@ -72,7 +76,7 @@ libsoupinclude_HEADERS = \
- nodist_libsoupinclude_HEADERS = \
- soup-version.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) \
-@@ -181,18 +185,24 @@ libsoup_2_4_la_SOURCES = \
- soup-version.c \
- soup-xmlrpc.c
-
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES = tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
-
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
-+
- if BUILD_LIBSOUP_GNOME
-
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
-
-+INCLUDES += $(LIBSOUP_CFLAGS) \
-+ $(SQLITE_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS = \
- soup-cookie-jar-sqlite.h\
- soup-gnome.h \
-@@ -200,17 +210,26 @@ libsoupgnomeinclude_HEADERS = \
-
- 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 \
- -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
-
- EXTRA_DIST += libsoup-gnome-2.4.sym
-+endif
-
- libsoup_gnome_2_4_la_LIBADD = \
-- libsoup-2.4.la \
- $(GLIB_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 \
-@@ -223,9 +242,8 @@ endif
-
- GLIB_GENERATED = soup-marshal.c soup-marshal.h
- GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
-- $(GLIB_GENERATED) \
-- tld_data.inc
-+BUILT_SOURCES += \
-+ $(GLIB_GENERATED)
-
- soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -241,6 +259,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
-
- if HAVE_INTROSPECTION
-
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -262,20 +282,28 @@ Soup_2_4_gir_FILES = \
-
- 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
-
---
-1.8.1.5
-
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild
deleted file mode 100644
index 0f30687..0000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-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"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris"
-fi
-
-RDEPEND="~net-libs/libsoup-${PV}[introspection?]
- dev-db/sqlite:3=
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Use lib present on the system
- epatch "${FILESDIR}"/${PN}-system-lib.patch
- [[ ${PV} != 9999 ]] && eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # Disable apache tests until they are usable on Gentoo, bug #326957
- # FIXME: we need addpredict to workaround bug #324779 until
- # root cause (bug #249496) is solved
- addpredict /usr/share/snmp/mibs/.index
- gnome2_src_configure \
- --disable-static \
- --disable-tls-check \
- $(use_enable introspection) \
- --with-libsoup-system \
- --with-gnome \
- --without-apache-httpd
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
deleted file mode 100644
index 0f30687..0000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-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"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris"
-fi
-
-RDEPEND="~net-libs/libsoup-${PV}[introspection?]
- dev-db/sqlite:3=
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Use lib present on the system
- epatch "${FILESDIR}"/${PN}-system-lib.patch
- [[ ${PV} != 9999 ]] && eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # Disable apache tests until they are usable on Gentoo, bug #326957
- # FIXME: we need addpredict to workaround bug #324779 until
- # root cause (bug #249496) is solved
- addpredict /usr/share/snmp/mibs/.index
- gnome2_src_configure \
- --disable-static \
- --disable-tls-check \
- $(use_enable introspection) \
- --with-libsoup-system \
- --with-gnome \
- --without-apache-httpd
-}
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/net-libs/libsoup-gnome/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>gnome</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2014-12-26 21:48 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-26 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 41bff68f0aee593c575bb58c66f7216db6fe8fa9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 21:48:14 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 21:48:14 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=41bff68f
net-libs/libsoup-gnome: moved to gentoo-x86
---
.../files/libsoup-gnome-2.46.0-system-lib.patch | 283 ---------------------
net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild | 62 -----
2 files changed, 345 deletions(-)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
deleted file mode 100644
index d731fc0..0000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 63db817bac0382f3f43947b8233bf4585ede0e0b 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
-
-https://bugzilla.gnome.org/show_bug.cgi?id=595065
-
-Original patch by Romain Perier.
----
- Makefile.am | 12 +++++++++--
- configure.ac | 35 ++++++++++++++++++++-----------
- libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c8fa95c..fc09778 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
--SUBDIRS = libsoup po tests examples docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
-+endif
-
- EXTRA_DIST = \
- data/effective_tld_names.dat \
-@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
-
- 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/configure.ac b/configure.ac
-index 96bb378..0153f10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
- dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
-+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
-+ GLIB_REQUIRED=2.38.0
-+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+ fi
-+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-
--GLIB_REQUIRED=2.38.0
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
-- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
--fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+ AC_SUBST(GLIB_MAKEFILE)
-
--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)
-+fi
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
-
- GLIB_TESTS
-
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
--
- PKG_CHECK_MODULES(SQLITE, sqlite3)
- AC_SUBST(SQLITE_CFLAGS)
- AC_SUBST(SQLITE_LIBS)
-@@ -141,6 +148,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])
-+
-+ if test $with_libsoup_system != no; then
-+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+ fi
- fi
- AC_SUBST(HAVE_GNOME)
-
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 60920bd..26c5616 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -1,14 +1,19 @@
- ## Process this file with automake to produce Makefile.in
-
- EXTRA_DIST =
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
-
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
-
--AM_CPPFLAGS = \
-+AM_CPPFLAGS =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+AM_CPPFLAGS += \
- -DG_LOG_DOMAIN=\"libsoup\" \
- -DLOCALEDIR=\"$(localedir)\" \
- -I$(top_srcdir) \
-@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
- nodist_libsoupinclude_HEADERS = \
- soup-version.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) \
-@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
- soup-version.c \
- soup-xmlrpc.c
-
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES += tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
-
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
-- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
-
- if BUILD_LIBSOUP_GNOME
-
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
-
-+AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS = \
- soup-cookie-jar-sqlite.h\
- soup-gnome.h \
-@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
-
- 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 \
- -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
-+endif
-
- EXTRA_DIST += libsoup-gnome-2.4.sym
-
- libsoup_gnome_2_4_la_LIBADD = \
-- libsoup-2.4.la \
- $(GLIB_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 \
-@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
- endif
-
- GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
-- $(GLIB_GENERATED) \
-- tld_data.inc
-+BUILT_SOURCES += \
-+ $(GLIB_GENERATED)
-
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
- soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
-@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
-
- if HAVE_INTROSPECTION
-
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
-@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
-
- 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 = $(AM_CPPFLAGS)
--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
-
-@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
- typelibdir = $(libdir)/girepository-1.0
- typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
--CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-
- endif
-@@ -326,6 +326,7 @@
-
- # We only do this check on Linux, so we don't have to worry about
- # different "nm" output on other platforms
-+if BUILD_LIBSOUP
- if OS_LINUX
- check-local:
- @echo Checking libsoup-2.4.so symbols
-@@ -335,3 +336,16 @@
- env LANG=C sort -u | \
- diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
- endif
-+endif
-+
-+if BUILD_LIBSOUP_GNOME
-+if OS_LINUX
-+check-local:
-+ @echo Checking libsoup-gnome-2.4.so symbols
-+ @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
-+ grep "^[[:xdigit:]]\+ [BTR] " | \
-+ sed "s/^[[:xdigit:]]\+ [BTR] //" | \
-+ env LANG=C sort -u | \
-+ diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
-+endif
-+endif
---
-1.9.0
-
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
deleted file mode 100644
index 20f4e6c..0000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2 multilib-minimal
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
- ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
- dev-db/sqlite:3=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- >=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Use lib present on the system
- epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # FIXME: we need addpredict to workaround bug #324779 until
- # root cause (bug #249496) is solved
- addpredict /usr/share/snmp/mibs/.index
-
- # Disable apache tests until they are usable on Gentoo, bug #326957
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tls-check \
- $(multilib_native_use_enable introspection) \
- --with-libsoup-system \
- --with-gnome \
- --without-apache-httpd
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2014-12-07 21:27 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-07 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 669e94347e66497b15c2d1f9544df8d0ef994130
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 7 18:52:15 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 7 21:27:37 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=669e9434
net-libs/libsoup-gnome: 2.48.0 → 2.48.1
---
.../files/libsoup-gnome-2.46.0-system-lib.patch | 25 ++++++++++++++++++++++
...e-2.48.0.ebuild => libsoup-gnome-2.48.1.ebuild} | 0
2 files changed, 25 insertions(+)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
index 15f7724..d731fc0 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
@@ -253,6 +253,31 @@ index 60920bd..26c5616 100644
+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
endif
+@@ -326,6 +326,7 @@
+
+ # We only do this check on Linux, so we don't have to worry about
+ # different "nm" output on other platforms
++if BUILD_LIBSOUP
+ if OS_LINUX
+ check-local:
+ @echo Checking libsoup-2.4.so symbols
+@@ -335,3 +336,16 @@
+ env LANG=C sort -u | \
+ diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
+ endif
++endif
++
++if BUILD_LIBSOUP_GNOME
++if OS_LINUX
++check-local:
++ @echo Checking libsoup-gnome-2.4.so symbols
++ @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
++ grep "^[[:xdigit:]]\+ [BTR] " | \
++ sed "s/^[[:xdigit:]]\+ [BTR] //" | \
++ env LANG=C sort -u | \
++ diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
++endif
++endif
--
1.9.0
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.48.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.48.0.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2014-04-25 22:26 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-25 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 2ab2aad1ec80ed7bdfb59a4e0b7f18fcc8454331
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 21:43:40 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 22:26:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2ab2aad1
net-libs/libsoup-gnome: 2.44.2 → 2.46.0
---
...patch => libsoup-gnome-2.46.0-system-lib.patch} | 50 ++++++++++---------
net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild | 58 ++++++++++++++++++++++
2 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
similarity index 91%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
index 9c7a94a..15f7724 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
@@ -1,4 +1,4 @@
-From f8711d536d9605d3d9c773ccbba039a7828e026a Mon Sep 17 00:00:00 2001
+From 63db817bac0382f3f43947b8233bf4585ede0e0b 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
@@ -8,12 +8,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595065
Original patch by Romain Perier.
---
Makefile.am | 12 +++++++++--
- configure.ac | 34 +++++++++++++++++++-----------
+ configure.ac | 35 ++++++++++++++++++++-----------
libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 76 insertions(+), 30 deletions(-)
+ 3 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 66992d9..046f945 100644
+index c8fa95c..fc09778 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,11 @@
@@ -29,7 +29,7 @@ index 66992d9..046f945 100644
EXTRA_DIST = \
data/effective_tld_names.dat \
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
pkgconfigdir = $(libdir)/pkgconfig
@@ -43,10 +43,10 @@ index 66992d9..046f945 100644
if BUILD_LIBSOUP_GNOME
pkgconfig_DATA += libsoup-gnome-2.4.pc
diff --git a/configure.ac b/configure.ac
-index 4db8cd2..c1b17f4 100644
+index 96bb378..0153f10 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -77,20 +77,26 @@ LT_INIT([win32-dll])
+@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
dnl ***********************
dnl *** Checks for glib ***
dnl ***********************
@@ -56,36 +56,40 @@ index 4db8cd2..c1b17f4 100644
+ 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
-+ GLIB_REQUIRED=2.36.0
++ GLIB_REQUIRED=2.38.0
+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+ fi
-+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
-+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+ AC_SUBST(GLIB_MAKEFILE)
++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
--GLIB_REQUIRED=2.36.0
+-GLIB_REQUIRED=2.38.0
-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-if test "$GLIB_LIBS" = ""; then
- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+-fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++ AC_SUBST(GLIB_MAKEFILE)
+
+-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)
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
--
++fi
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+
+ GLIB_TESTS
+
-PKG_CHECK_MODULES(XML, libxml-2.0)
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
-
+-
PKG_CHECK_MODULES(SQLITE, sqlite3)
AC_SUBST(SQLITE_CFLAGS)
-@@ -139,6 +145,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+ AC_SUBST(SQLITE_LIBS)
+@@ -141,6 +148,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])
@@ -250,5 +254,5 @@ index 60920bd..26c5616 100644
endif
--
-1.8.3.2
+1.9.0
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
new file mode 100644
index 0000000..7610a25
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ ~net-libs/libsoup-${PV}[introspection?]
+ dev-db/sqlite:3=
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ >=net-libs/libsoup-2.42.2-r1
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Use lib present on the system
+ epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2013-11-19 8:18 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-19 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 5bdd5d4165688f4cadec5af813494a646db128fc
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 07:54:23 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 19 08:17:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5bdd5d41
net-libs/libsoup-gnome: 2.42.2 → 2.44.2
---
.../files/libsoup-gnome-2.44.2-system-lib.patch | 254 +++++++++++++++++++++
net-libs/libsoup-gnome/libsoup-gnome-2.44.2.ebuild | 58 +++++
net-libs/libsoup-gnome/metadata.xml | 5 +
3 files changed, 317 insertions(+)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
new file mode 100644
index 0000000..9c7a94a
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
@@ -0,0 +1,254 @@
+From f8711d536d9605d3d9c773ccbba039a7828e026a 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
+
+https://bugzilla.gnome.org/show_bug.cgi?id=595065
+
+Original patch by Romain Perier.
+---
+ Makefile.am | 12 +++++++++--
+ configure.ac | 34 +++++++++++++++++++-----------
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 76 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 66992d9..046f945 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+
+ EXTRA_DIST = \
+ data/effective_tld_names.dat \
+@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+
+ 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/configure.ac b/configure.ac
+index 4db8cd2..c1b17f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,20 +77,26 @@ LT_INIT([win32-dll])
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
++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
++ GLIB_REQUIRED=2.36.0
++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
++ if test "$GLIB_LIBS" = ""; then
++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ fi
++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++ AC_SUBST(GLIB_MAKEFILE)
+
+-GLIB_REQUIRED=2.36.0
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ PKG_CHECK_MODULES(XML, libxml-2.0)
++ AC_SUBST(XML_CFLAGS)
++ AC_SUBST(XML_LIBS)
+ fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
+-
+-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)
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+@@ -139,6 +145,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])
++
++ if test $with_libsoup_system != no; then
++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++ fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 60920bd..26c5616 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -1,14 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+
+ EXTRA_DIST =
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+
+-AM_CPPFLAGS = \
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS += \
+ -DG_LOG_DOMAIN=\"libsoup\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -I$(top_srcdir) \
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
+ nodist_libsoupinclude_HEADERS = \
+ soup-version.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) \
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
+ soup-version.c \
+ soup-xmlrpc.c
+
+-# TLD rules
+-EXTRA_DIST += tld-parser.py
+-
++BUILT_SOURCES += tld_data.inc
+ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+
+ tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
+- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+
+ if BUILD_LIBSOUP_GNOME
+
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS = \
+ soup-cookie-jar-sqlite.h\
+ soup-gnome.h \
+@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
+
+ 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 \
+ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+
+ libsoup_gnome_2_4_la_LIBADD = \
+- libsoup-2.4.la \
+ $(GLIB_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 \
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
+ endif
+
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+- $(GLIB_GENERATED) \
+- tld_data.inc
++BUILT_SOURCES += \
++ $(GLIB_GENERATED)
+
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+
+ if HAVE_INTROSPECTION
+
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+ $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
+
+ 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 = $(AM_CPPFLAGS)
+-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
+
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+
+ endif
+--
+1.8.3.2
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.44.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.44.2.ebuild
new file mode 100644
index 0000000..f1d1565
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.44.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="http://live.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ ~net-libs/libsoup-${PV}[introspection?]
+ dev-db/sqlite:3=
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ >=net-libs/libsoup-2.42.2-r1
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Use lib present on the system
+ epatch "${FILESDIR}"/${PN}-2.44.2-system-lib.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
+}
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/net-libs/libsoup-gnome/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2012-07-03 11:10 Priit Laes
0 siblings, 0 replies; 6+ messages in thread
From: Priit Laes @ 2012-07-03 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 9e047fc9f0eeeb502ad84b810a482f043d431cfc
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jul 3 11:08:44 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jul 3 11:08:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9e047fc9
net-libs/libsoup-gnome: Add 2.39.3 to overlay
---
.../files/libsoup-gnome-system-lib.patch | 111 ++++++++------------
...ome-9999.ebuild => libsoup-gnome-2.39.3.ebuild} | 1 +
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 1 +
3 files changed, 48 insertions(+), 65 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 0c6259a..c81aa42 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -1,33 +1,32 @@
-From b39aaca2ec6c551d7646bcb086afb8083492938b Mon Sep 17 00:00:00 2001
+From e09af88ff4b0eca56eda4b504e465430d3b6ec67 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
+Date: Tue, 3 Jul 2012 13:59:03 +0300
+Subject: [PATCH] Split libsoup-gnome
-Original patch by Romain Perier.
---
Makefile.am | 12 ++++++++++--
- configure.ac | 47 +++++++++++++++++++++++++++++------------------
+ configure.ac | 35 +++++++++++++++++++++++------------
libsoup/Makefile.am | 48 ++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 77 insertions(+), 30 deletions(-)
+ 3 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 8b86fb7..7f628f4 100644
+index 18bf80a..046f945 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,11 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = libsoup tests docs
+-SUBDIRS = libsoup po tests docs
+SUBDIRS = libsoup
+
+if BUILD_LIBSOUP
-+SUBDIRS += tests docs
++SUBDIRS += po tests docs
+endif
- EXTRA_DIST = \
- libsoup-2.4.pc.in \
-@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+ EXTRA_DIST = \
+ data/effective_tld_names.dat \
+@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
pkgconfigdir = $(libdir)/pkgconfig
@@ -41,69 +40,50 @@ index 8b86fb7..7f628f4 100644
if BUILD_LIBSOUP_GNOME
pkgconfig_DATA += libsoup-gnome-2.4.pc
diff --git a/configure.ac b/configure.ac
-index eee8636..f9d6e47 100644
+index 59ee43c..132ca89 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -72,19 +72,33 @@ dnl ***********************
+@@ -71,20 +71,27 @@ LT_INIT([win32-dll])
+ dnl ***********************
dnl *** Checks for glib ***
dnl ***********************
-
--GLIB_REQUIRED=2.31.7
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
-- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+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
-+ GLIB_REQUIRED=2.31.7
-+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
++ GLIB_REQUIRED=2.33.1
++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ 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)
-+ 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
--GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34"
++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++ AC_SUBST(GLIB_MAKEFILE)
+
+-GLIB_REQUIRED=2.33.1
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+-fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34"
-
-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)
-PKG_CHECK_MODULES(XML, libxml-2.0)
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
++fi
+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
dnl ***********************
dnl *** Check for Win32 ***
-@@ -103,13 +117,6 @@ esac
- 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 *********************
-@@ -134,6 +141,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+@@ -143,6 +150,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])
@@ -115,10 +95,10 @@ index eee8636..f9d6e47 100644
[Could not find sqlite3 devel files:
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index aa13eec..ef0c870 100644
+index c337b7f..4cf431d 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
-@@ -6,15 +6,18 @@ if OS_WIN32
+@@ -6,16 +6,19 @@ if OS_WIN32
LIBWS2_32 = -lws2_32
endif
@@ -130,6 +110,7 @@ index aa13eec..ef0c870 100644
+if BUILD_LIBSOUP
+INCLUDES += \
-DG_LOG_DOMAIN=\"libsoup\" \
+ -DLOCALEDIR=\"$(localedir)\" \
-I$(top_srcdir) \
$(SOUP_DEBUG_FLAGS) \
$(SOUP_MAINTAINER_FLAGS) \
@@ -141,7 +122,7 @@ index aa13eec..ef0c870 100644
libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
-@@ -67,7 +70,7 @@ libsoupinclude_HEADERS = \
+@@ -69,7 +72,7 @@ libsoupinclude_HEADERS = \
$(soup_headers) \
soup-enum-types.h
@@ -150,15 +131,15 @@ index aa13eec..ef0c870 100644
libsoup_2_4_la_LDFLAGS = \
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES = \
- soup-uri.c \
- soup-value-utils.c \
- soup-xmlrpc.c
+@@ -182,6 +185,7 @@ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+
+ tld_data.inc: $(TLD_DATA_FILE)
+ $(builddir)/tld-parser $(TLD_DATA_FILE) $(srcdir)/tld_data.inc
+endif
if BUILD_LIBSOUP_GNOME
-@@ -165,6 +169,10 @@ endif
+@@ -195,6 +199,10 @@ endif
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
@@ -169,7 +150,7 @@ index aa13eec..ef0c870 100644
libsoupgnomeinclude_HEADERS = \
soup-cookie-jar-sqlite.h\
soup-gnome.h \
-@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS = \
+@@ -202,14 +210,24 @@ libsoupgnomeinclude_HEADERS = \
lib_LTLIBRARIES += libsoup-gnome-2.4.la
@@ -195,7 +176,7 @@ index aa13eec..ef0c870 100644
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
-@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -239,6 +257,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
if HAVE_INTROSPECTION
@@ -204,7 +185,7 @@ index aa13eec..ef0c870 100644
# Core library
gi_soup_files = \
$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \
+@@ -260,20 +280,28 @@ Soup_2_4_gir_FILES = \
INTROSPECTION_GIRS += Soup-2.4.gir
@@ -238,5 +219,5 @@ index aa13eec..ef0c870 100644
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
--
-1.7.8.4
+1.7.8.6
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild
similarity index 98%
copy from net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
copy to net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild
index c5cde7c..0409b17 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild
@@ -34,6 +34,7 @@ RDEPEND="~net-libs/libsoup-${PV}
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ >=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
doc? ( >=dev-util/gtk-doc-1.10 )"
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index c5cde7c..0409b17 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="~net-libs/libsoup-${PV}
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ >=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
doc? ( >=dev-util/gtk-doc-1.10 )"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-26 21:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-29 18:08 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/ Priit Laes
-- strict thread matches above, loose matches on Subject: below --
2014-12-26 21:48 Gilles Dartiguelongue
2014-12-07 21:27 Gilles Dartiguelongue
2014-04-25 22:26 Gilles Dartiguelongue
2013-11-19 8:18 Gilles Dartiguelongue
2012-07-03 11:10 Priit Laes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox