mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-06 18:02:02 +01:00
cleanup: remove unused packages that break with latest gnome2 eclass
The following are unused and block updating our eclasses: - app-office/dia - gnome-base/libglade - media-libs/libart_lgpl - net-libs/libsoup
This commit is contained in:
Michael Marineau
parent
5a5c4ce0ae
commit
8569c92585
@ -1 +0,0 @@
|
|||||||
DIST dia-0.97.2.tar.xz 5507004 RMD160 f9270f1f2cb6ad505219463827d02e3759693796 SHA1 dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1
|
|
||||||
@ -1,104 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2.ebuild,v 1.7 2012/05/03 20:00:39 jdhore Exp $
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
|
|
||||||
GCONF_DEBUG=yes
|
|
||||||
GNOME2_LA_PUNT=yes
|
|
||||||
|
|
||||||
PYTHON_DEPEND="python? 2"
|
|
||||||
|
|
||||||
inherit autotools eutils gnome2 python multilib
|
|
||||||
|
|
||||||
DESCRIPTION="Diagram/flowchart creation program"
|
|
||||||
HOMEPAGE="http://live.gnome.org/Dia"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
|
|
||||||
# the doc USE flag doesn't seem to do anything without docbook2html
|
|
||||||
IUSE="cairo doc gnome python"
|
|
||||||
|
|
||||||
RDEPEND=">=dev-libs/glib-2
|
|
||||||
dev-libs/libxml2
|
|
||||||
dev-libs/libxslt
|
|
||||||
dev-libs/popt
|
|
||||||
>=media-libs/freetype-2
|
|
||||||
>=media-libs/libart_lgpl-2
|
|
||||||
media-libs/libpng
|
|
||||||
sys-libs/zlib
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
x11-libs/pango
|
|
||||||
cairo? ( x11-libs/cairo )
|
|
||||||
doc? (
|
|
||||||
app-text/docbook-xml-dtd:4.5
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
)
|
|
||||||
gnome? (
|
|
||||||
>=gnome-base/libgnome-2
|
|
||||||
>=gnome-base/libgnomeui-2
|
|
||||||
)
|
|
||||||
python? ( >=dev-python/pygtk-2 )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-util/intltool
|
|
||||||
virtual/pkgconfig
|
|
||||||
doc? ( dev-libs/libxslt )"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
|
|
||||||
|
|
||||||
# --exec-prefix makes Python look for modules in the Prefix
|
|
||||||
G2CONF="--exec-prefix=${EPREFIX}/usr
|
|
||||||
--docdir=${EPREFIX}/usr/share/doc/${PF}
|
|
||||||
$(use_enable gnome)
|
|
||||||
--disable-libemf
|
|
||||||
$(use_enable doc db2html)
|
|
||||||
$(use_with cairo)
|
|
||||||
$(use_with python)
|
|
||||||
--without-swig
|
|
||||||
--without-hardbooks"
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
python_set_active_version 2
|
|
||||||
python_pkg_setup
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.97.2-glib-2.31.patch #401331
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
python_convert_shebangs -r 2 .
|
|
||||||
sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! use doc; then
|
|
||||||
# Skip man generation
|
|
||||||
sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Fix naming conflict on Darwin/OSX
|
|
||||||
sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
|
|
||||||
|
|
||||||
intltoolize --force --copy --automake || die
|
|
||||||
eautoreconf
|
|
||||||
|
|
||||||
gnome2_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
gnome2_pkg_postinst
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
python_need_rebuild
|
|
||||||
python_mod_optimize /usr/share/dia
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_pkg_postrm
|
|
||||||
|
|
||||||
use python && python_mod_cleanup /usr/share/dia
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
acinclude.m4 | 9 +++++----
|
|
||||||
1 files changed, 5 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/acinclude.m4 b/acinclude.m4
|
|
||||||
index 57a2188..1bf3ad0 100644
|
|
||||||
--- a/acinclude.m4
|
|
||||||
+++ b/acinclude.m4
|
|
||||||
@@ -128,7 +128,7 @@ else:
|
|
||||||
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
|
|
||||||
[am_cv_python_pythondir],
|
|
||||||
[am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
|
|
||||||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
|
|
||||||
+ echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`])
|
|
||||||
AC_SUBST([pythondir], [$am_cv_python_pythondir])
|
|
||||||
|
|
||||||
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
|
|
||||||
@@ -145,7 +145,7 @@ else:
|
|
||||||
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
|
|
||||||
[am_cv_python_pyexecdir],
|
|
||||||
[am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
|
|
||||||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
|
|
||||||
+ echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`])
|
|
||||||
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
|
|
||||||
|
|
||||||
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
|
|
||||||
@@ -202,6 +202,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
|
|
||||||
AC_MSG_CHECKING(for headers required to compile python extensions)
|
|
||||||
dnl deduce PYTHON_INCLUDES
|
|
||||||
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
|
|
||||||
+py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3`
|
|
||||||
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
|
|
||||||
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
|
|
||||||
if test "$py_prefix" != "$py_exec_prefix"; then
|
|
||||||
@@ -225,7 +226,7 @@ AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
|
|
||||||
|
|
||||||
-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
|
|
||||||
+py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
|
|
||||||
|
|
||||||
py_makefile="${py_config_dir}/Makefile"
|
|
||||||
if test -f "$py_makefile"; then
|
|
||||||
@@ -235,7 +236,7 @@ dnl extra required libs
|
|
||||||
py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
|
|
||||||
|
|
||||||
dnl now the actual libpython
|
|
||||||
- if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
|
|
||||||
+ if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
|
|
||||||
PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
|
|
||||||
AC_MSG_RESULT(found)
|
|
||||||
else
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
From 9d40692b695b30f80b263814bdd351c0dbe67733 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
||||||
Date: Mon, 18 May 2009 22:19:35 +0200
|
|
||||||
Subject: [PATCH] Fix compilation in a gnome environment, gentoo bug #159831
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.in | 19 +++++++++++--------
|
|
||||||
1 files changed, 11 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.in b/configure.in
|
|
||||||
index d27ee6e..d9c0bf4 100644
|
|
||||||
--- a/configure.in
|
|
||||||
+++ b/configure.in
|
|
||||||
@@ -110,17 +110,19 @@ if test "$have_libart" = "yes" ; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether GNOME specific code should be used])
|
|
||||||
-AC_ARG_ENABLE(gnome,[ --enable-gnome enable gnome code],
|
|
||||||
- GNOME=$enableval, GNOME=no)
|
|
||||||
-if test "$GNOME" = "yes" ; then
|
|
||||||
+AC_ARG_ENABLE(gnome,
|
|
||||||
+ AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
|
|
||||||
+ enable_gnome=no)
|
|
||||||
+if test "x$enable_gnome" = "xyes" ; then
|
|
||||||
GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
|
|
||||||
AC_DEFINE(GNOME,1,[Define if building with GNOME support])
|
|
||||||
+ AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
|
|
||||||
AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
|
|
||||||
- have_gnome=true
|
|
||||||
+ have_gnome=yes
|
|
||||||
else
|
|
||||||
- have_gnome=false
|
|
||||||
+ have_gnome=no
|
|
||||||
fi
|
|
||||||
-AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
|
|
||||||
+AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
|
|
||||||
AC_MSG_RESULT($GNOME)
|
|
||||||
|
|
||||||
dnl GTK2: libgnomecanvas-2.0 ?
|
|
||||||
@@ -129,7 +131,8 @@ PKG_CHECK_MODULES(GTK,$GTK_MODULES)
|
|
||||||
AC_SUBST(GTK_CFLAGS)
|
|
||||||
AC_SUBST(GTK_LIBS)
|
|
||||||
|
|
||||||
-AM_CONDITIONAL(HAVE_BONOBO,false)
|
|
||||||
+#AM_CONDITIONAL(HAVE_BONOBO,false)
|
|
||||||
+AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
|
|
||||||
|
|
||||||
dnl Look for Cairo
|
|
||||||
AC_ARG_WITH(cairo,
|
|
||||||
@@ -627,7 +630,7 @@ Configuration:
|
|
||||||
Source code location: ${srcdir}
|
|
||||||
Compiler: ${CC}
|
|
||||||
|
|
||||||
- Gnome support: ${GNOME}
|
|
||||||
+ Gnome support: ${have_gnome}
|
|
||||||
Python support: ${with_python}
|
|
||||||
Libart support (PNG export): ${have_libart}
|
|
||||||
Cairo support (PNG, PDF, print): ${with_cairo}
|
|
||||||
--
|
|
||||||
1.6.3
|
|
||||||
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
From 59f67782b9e382b2d71aeabbd493799b179bdec0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hans Breuer <hans@breuer.org>
|
|
||||||
Date: Sun, 27 Feb 2011 20:32:47 +0000
|
|
||||||
Subject: Bug 642764 - use png_jmpbuf() rather than direct member access
|
|
||||||
|
|
||||||
Fix from Hanno Boeck to make Dia compile with libpng 1.5
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=642764
|
|
||||||
(cherry picked from commit 8e28086b95578d17386c3be9aea132064be829a0)
|
|
||||||
---
|
|
||||||
diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
|
|
||||||
index f8bbdc1..33ea6c3 100644
|
|
||||||
--- a/plug-ins/libart/export_png.c
|
|
||||||
+++ b/plug-ins/libart/export_png.c
|
|
||||||
@@ -178,7 +178,7 @@ export_png_ok(GtkButton *button, gpointer userdata)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set error handling ... */
|
|
||||||
- if (setjmp(png->jmpbuf)) {
|
|
||||||
+ if (setjmp(png_jmpbuf(png))) {
|
|
||||||
fclose(fp);
|
|
||||||
png_destroy_write_struct(&png, &info);
|
|
||||||
message_error(_("Error occurred while writing PNG"));
|
|
||||||
--
|
|
||||||
cgit v0.9
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
From e3d41e6dd3488a29d23f53c57526871a9b79e9bf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
|
||||||
Date: Sat, 7 Apr 2012 20:43:27 -0400
|
|
||||||
Subject: [PATCH] Do not include glib subheaders directly
|
|
||||||
|
|
||||||
Otherwise, dia cannot build against >=glib-2.31
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=673712
|
|
||||||
---
|
|
||||||
objects/custom/shape_typeinfo.c | 2 +-
|
|
||||||
tests/test-boundingbox.c | 3 ---
|
|
||||||
tests/test-objects.c | 4 ----
|
|
||||||
3 files changed, 1 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c
|
|
||||||
index c6133b1..3fb3d73 100644
|
|
||||||
--- a/objects/custom/shape_typeinfo.c
|
|
||||||
+++ b/objects/custom/shape_typeinfo.c
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
#include "custom_util.h"
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
-#include <glib/gstrfuncs.h>
|
|
||||||
+#include <glib.h>
|
|
||||||
#include <glib/gstdio.h>
|
|
||||||
#include <libxml/parser.h>
|
|
||||||
|
|
||||||
diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c
|
|
||||||
index 7adaab5..a13d018 100644
|
|
||||||
--- a/tests/test-boundingbox.c
|
|
||||||
+++ b/tests/test-boundingbox.c
|
|
||||||
@@ -28,9 +28,6 @@
|
|
||||||
#include <glib.h>
|
|
||||||
#include <glib-object.h>
|
|
||||||
|
|
||||||
-#if GLIB_CHECK_VERSION(2,16,0)
|
|
||||||
-#include <glib/gtestutils.h>
|
|
||||||
-#endif
|
|
||||||
#include "dialib.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/tests/test-objects.c b/tests/test-objects.c
|
|
||||||
index 57d5675..c5980a5 100644
|
|
||||||
--- a/tests/test-objects.c
|
|
||||||
+++ b/tests/test-objects.c
|
|
||||||
@@ -28,10 +28,6 @@
|
|
||||||
#include <glib.h>
|
|
||||||
#include <glib-object.h>
|
|
||||||
|
|
||||||
-#if GLIB_CHECK_VERSION(2,16,0)
|
|
||||||
-#include <glib/gtestutils.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#include "object.h"
|
|
||||||
#include "plug-ins.h"
|
|
||||||
#include "dialib.h"
|
|
||||||
--
|
|
||||||
1.7.8.5
|
|
||||||
|
|
||||||
@ -1 +0,0 @@
|
|||||||
DIST libglade-2.6.4.tar.bz2 356119 RMD160 516a43543e518a319ca9b35556ca1ac88e2ce8fb SHA1 8465851733b8a0efbe57c43efc0f140d8e2d2edb SHA256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
--- a/Makefile.am 2004-11-11 18:56:13.000000000 +0800
|
|
||||||
+++ b/Makefile.am 2004-12-06 11:00:24.501734048 +0800
|
|
||||||
@@ -24,7 +24,7 @@
|
|
||||||
|
|
||||||
if HAVE_XMLCATALOG
|
|
||||||
install-data-local:
|
|
||||||
- -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
|
|
||||||
+# -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
|
|
||||||
uninstall-local:
|
|
||||||
-$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
|
|
||||||
endif
|
|
||||||
--- a/Makefile.in 2004-11-11 19:21:38.000000000 +0800
|
|
||||||
+++ b/Makefile.in 2004-12-06 11:00:49.786890120 +0800
|
|
||||||
@@ -819,7 +819,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
@HAVE_XMLCATALOG_TRUE@install-data-local:
|
|
||||||
-@HAVE_XMLCATALOG_TRUE@ -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
|
|
||||||
+@HAVE_XMLCATALOG_TRUE@# -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
|
|
||||||
@HAVE_XMLCATALOG_TRUE@uninstall-local:
|
|
||||||
@HAVE_XMLCATALOG_TRUE@ -$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- a/tests/test-libglade-gtk.glade 2008-09-27 16:50:40.164242312 +0300
|
|
||||||
+++ b/tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300
|
|
||||||
@@ -470,7 +470,7 @@
|
|
||||||
<upper>100</upper>
|
|
||||||
<step>1</step>
|
|
||||||
<page>10</page>
|
|
||||||
- <page_size>10</page_size>
|
|
||||||
+ <page_size>0</page_size>
|
|
||||||
<child>
|
|
||||||
<left_attach>1</left_attach>
|
|
||||||
<right_attach>2</right_attach>
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
# Copyright 1999-2009 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.7 2009/10/09 18:25:07 armin76 Exp $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
|
|
||||||
inherit eutils gnome2
|
|
||||||
|
|
||||||
DESCRIPTION="Library to construct graphical interfaces at runtime"
|
|
||||||
HOMEPAGE="http://www.gnome.org/"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2"
|
|
||||||
SLOT="2.0"
|
|
||||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
|
|
||||||
IUSE="doc"
|
|
||||||
|
|
||||||
RDEPEND=">=dev-libs/glib-2.10
|
|
||||||
>=x11-libs/gtk+-2.8.10
|
|
||||||
>=dev-libs/atk-1.9
|
|
||||||
>=dev-libs/libxml2-2.4.10
|
|
||||||
>=dev-lang/python-2.0-r7"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
>=dev-util/pkgconfig-0.9
|
|
||||||
doc? ( >=dev-util/gtk-doc-1 )"
|
|
||||||
|
|
||||||
DOCS="AUTHORS ChangeLog NEWS README"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# patch to stop make install installing the xml catalog
|
|
||||||
# because we do it ourselves in postinst()
|
|
||||||
epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
|
|
||||||
|
|
||||||
# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
|
|
||||||
epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
dodir /etc/xml
|
|
||||||
gnome2_src_install
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
echo ">>> Updating XML catalog"
|
|
||||||
/usr/bin/xmlcatalog --noout --add "system" \
|
|
||||||
"http://glade.gnome.org/glade-2.0.dtd" \
|
|
||||||
/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
|
|
||||||
gnome2_pkg_postinst
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
gnome2_pkg_postrm
|
|
||||||
echo ">>> removing entries from the XML catalog"
|
|
||||||
/usr/bin/xmlcatalog --noout --del \
|
|
||||||
/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
DIST libart_lgpl-2.3.21.tar.bz2 329102 RMD160 ed40181ffc9d6646630c1db64532217acf7dd036 SHA1 dbac185c65696381ef188de1f98b348b530e22f9 SHA256 fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/art_misc.h libart_lgpl-2.3.19/art_misc.h
|
|
||||||
--- libart_lgpl-2.3.19.orig/art_misc.h 2007-01-01 18:59:22.000000000 -0500
|
|
||||||
+++ libart_lgpl-2.3.19/art_misc.h 2007-03-01 11:35:47.000000000 -0500
|
|
||||||
@@ -34,9 +34,15 @@
|
|
||||||
#include <libart_lgpl/art_config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+extern "C" {
|
|
||||||
+#endif
|
|
||||||
void *art_alloc(size_t size);
|
|
||||||
void art_free(void *ptr);
|
|
||||||
void *art_realloc(void *ptr, size_t size);
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+}
|
|
||||||
+#endif /* __cplusplus */
|
|
||||||
|
|
||||||
/* These aren't, strictly speaking, configuration macros, but they're
|
|
||||||
damn handy to have around, and may be worth playing with for
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/art_config.h libart_lgpl-2.3.19/art_config.h
|
|
||||||
--- libart_lgpl-2.3.19.orig/art_config.h 2007-02-28 08:00:44.000000000 -0500
|
|
||||||
+++ libart_lgpl-2.3.19/art_config.h 2007-08-24 16:25:28.000000000 -0400
|
|
||||||
@@ -1,10 +1,7 @@
|
|
||||||
/* Automatically generated by gen_art_config.c */
|
|
||||||
|
|
||||||
-#define ART_SIZEOF_CHAR 1
|
|
||||||
-#define ART_SIZEOF_SHORT 2
|
|
||||||
-#define ART_SIZEOF_INT 4
|
|
||||||
-#define ART_SIZEOF_LONG 4
|
|
||||||
+#include <stdint.h>
|
|
||||||
|
|
||||||
-typedef unsigned char art_u8;
|
|
||||||
-typedef unsigned short art_u16;
|
|
||||||
-typedef unsigned int art_u32;
|
|
||||||
+typedef uint8_t art_u8;
|
|
||||||
+typedef uint16_t art_u16;
|
|
||||||
+typedef uint32_t art_u32;
|
|
||||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/Makefile.am libart_lgpl-2.3.19/Makefile.am
|
|
||||||
--- libart_lgpl-2.3.19.orig/Makefile.am 2007-01-01 18:59:22.000000000 -0500
|
|
||||||
+++ libart_lgpl-2.3.19/Makefile.am 2007-08-24 15:42:44.000000000 -0400
|
|
||||||
@@ -3,11 +3,6 @@ noinst_PROGRAMS = testart testuta gen_ar
|
|
||||||
bin_SCRIPTS = \
|
|
||||||
libart2-config
|
|
||||||
|
|
||||||
-BUILT_SOURCES = art_config.h
|
|
||||||
-
|
|
||||||
-art_config.h: gen_art_config$(EXEEXT)
|
|
||||||
- ./gen_art_config > art_config.h
|
|
||||||
-
|
|
||||||
EXTRA_DIST = \
|
|
||||||
libart.def \
|
|
||||||
libart-config.in \
|
|
||||||
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/Makefile.in libart_lgpl-2.3.19/Makefile.in
|
|
||||||
--- libart_lgpl-2.3.19.orig/Makefile.in 2007-02-28 08:00:24.000000000 -0500
|
|
||||||
+++ libart_lgpl-2.3.19/Makefile.in 2007-08-24 15:42:44.000000000 -0400
|
|
||||||
@@ -254,7 +254,6 @@ top_srcdir = @top_srcdir@
|
|
||||||
bin_SCRIPTS = \
|
|
||||||
libart2-config
|
|
||||||
|
|
||||||
-BUILT_SOURCES = art_config.h
|
|
||||||
EXTRA_DIST = \
|
|
||||||
libart.def \
|
|
||||||
libart-config.in \
|
|
||||||
@@ -915,9 +914,6 @@ uninstall-am: uninstall-binSCRIPTS unins
|
|
||||||
uninstall-pkgconfigDATA
|
|
||||||
|
|
||||||
|
|
||||||
-art_config.h: gen_art_config$(EXEEXT)
|
|
||||||
- ./gen_art_config > art_config.h
|
|
||||||
-
|
|
||||||
@OS_WIN32_TRUE@install-libtool-import-lib:
|
|
||||||
@OS_WIN32_TRUE@ $(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir)
|
|
||||||
@OS_WIN32_TRUE@uninstall-libtool-import-lib:
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
||||||
Date: Tue, 6 Apr 2010 15:22:25 +0200
|
|
||||||
Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile.am | 11 ++---------
|
|
||||||
art_config.h | 5 +++++
|
|
||||||
configure.in | 10 ----------
|
|
||||||
3 files changed, 7 insertions(+), 19 deletions(-)
|
|
||||||
create mode 100644 art_config.h
|
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index 95952da..6aa2fe3 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta
|
|
||||||
|
|
||||||
bin_SCRIPTS = \
|
|
||||||
libart2-config
|
|
||||||
-
|
|
||||||
-noinst_SCRIPTS = gen_art_config.sh
|
|
||||||
-
|
|
||||||
-BUILT_SOURCES = art_config.h
|
|
||||||
-
|
|
||||||
-art_config.h:
|
|
||||||
- ./gen_art_config.sh > art_config.h
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
|
||||||
libart.def \
|
|
||||||
@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib
|
|
||||||
|
|
||||||
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
|
|
||||||
|
|
||||||
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
|
|
||||||
-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
|
|
||||||
+CLEANFILES = $(bin_SCRIPTS)
|
|
||||||
+DISTCLEANFILES = $(bin_SCRIPTS)
|
|
||||||
diff --git a/art_config.h b/art_config.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..5985f1f
|
|
||||||
--- a/art_config.h
|
|
||||||
+++ b/art_config.h
|
|
||||||
@@ -0,0 +1,5 @@
|
|
||||||
+#include <stdint.h>
|
|
||||||
+
|
|
||||||
+typedef uint8_t art_u8;
|
|
||||||
+typedef uint16_t art_u16;
|
|
||||||
+typedef uint32_t art_u32;
|
|
||||||
diff --git a/configure.in b/configure.in
|
|
||||||
index e4804f7..ddcac4f 100644
|
|
||||||
--- a/configure.in
|
|
||||||
+++ b/configure.in
|
|
||||||
@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA
|
|
||||||
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
|
|
||||||
-AC_CHECK_SIZEOF(char)
|
|
||||||
-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
|
|
||||||
-AC_CHECK_SIZEOF(short)
|
|
||||||
-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
|
|
||||||
-AC_CHECK_SIZEOF(int)
|
|
||||||
-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
|
|
||||||
-AC_CHECK_SIZEOF(long)
|
|
||||||
-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
|
|
||||||
-
|
|
||||||
AC_CONFIG_FILES([
|
|
||||||
libart-features.h
|
|
||||||
Makefile
|
|
||||||
@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc
|
|
||||||
libart-zip])
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
|
|
||||||
-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
|
|
||||||
|
|
||||||
AC_OUTPUT
|
|
||||||
--
|
|
||||||
1.7.0.4
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
From f3afed3b06c34c588a7c67cb83064e16255f54b4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
||||||
Date: Tue, 6 Apr 2010 15:11:46 +0200
|
|
||||||
Subject: [PATCH 1/2] gentoo: do not build tests if not required
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile.am | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index aec6c5d..95952da 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-noinst_PROGRAMS = testart testuta
|
|
||||||
+check_PROGRAMS = testart testuta
|
|
||||||
|
|
||||||
bin_SCRIPTS = \
|
|
||||||
libart2-config
|
|
||||||
--
|
|
||||||
1.7.0.4
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild,v 1.11 2012/05/05 08:02:38 jdhore Exp $
|
|
||||||
|
|
||||||
EAPI="3"
|
|
||||||
GCONF_DEBUG="no"
|
|
||||||
|
|
||||||
inherit autotools eutils gnome2
|
|
||||||
|
|
||||||
DESCRIPTION="a LGPL version of libart"
|
|
||||||
HOMEPAGE="http://www.levien.com/libart"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND=""
|
|
||||||
DEPEND="virtual/pkgconfig"
|
|
||||||
|
|
||||||
# The provided tests are interactive only
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
DOCS="AUTHORS ChangeLog NEWS README"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
G2CONF="${G2CONF} --disable-static"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
gnome2_src_prepare
|
|
||||||
|
|
||||||
# Fix crosscompiling, bug #185684
|
|
||||||
rm "${S}"/art_config.h
|
|
||||||
epatch "${FILESDIR}"/${PN}-2.3.21-crosscompile.patch
|
|
||||||
|
|
||||||
# Do not build tests if not required
|
|
||||||
epatch "${FILESDIR}"/${PN}-2.3.21-no-test-build.patch
|
|
||||||
|
|
||||||
AT_NOELIBTOOLIZE=yes eautoreconf
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
|
|
||||||
DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 ) python? ( >=dev-python/pygtk-2 ) dev-util/intltool virtual/pkgconfig doc? ( dev-libs/libxslt ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
|
|
||||||
DESCRIPTION=Diagram/flowchart creation program
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=http://live.gnome.org/Dia
|
|
||||||
IUSE=cairo doc gnome python debug
|
|
||||||
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 ) python? ( >=dev-python/pygtk-2 ) python? ( =dev-lang/python-2* )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.2.tar.xz
|
|
||||||
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 c77a2c791ae15742c3c796344e279142 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python 3a270b7b1d1e679847ff0faeac25c5a3 toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 versionator cd0bcdb170807e4a1984115e9d53a26f
|
|
||||||
_md5_=2db60ffb4930d47d82b037f4be70d861
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
|
|
||||||
DEPEND=>=dev-libs/glib-2.10 >=x11-libs/gtk+-2.8.10 >=dev-libs/atk-1.9 >=dev-libs/libxml2-2.4.10 >=dev-lang/python-2.0-r7 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4
|
|
||||||
DESCRIPTION=Library to construct graphical interfaces at runtime
|
|
||||||
EAPI=2
|
|
||||||
HOMEPAGE=http://www.gnome.org/
|
|
||||||
IUSE=doc debug
|
|
||||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
|
|
||||||
LICENSE=LGPL-2
|
|
||||||
RDEPEND=>=dev-libs/glib-2.10 >=x11-libs/gtk+-2.8.10 >=dev-libs/atk-1.9 >=dev-libs/libxml2-2.4.10 >=dev-lang/python-2.0-r7
|
|
||||||
SLOT=2.0
|
|
||||||
SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
|
|
||||||
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 c77a2c791ae15742c3c796344e279142 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 versionator cd0bcdb170807e4a1984115e9d53a26f
|
|
||||||
_md5_=5c462cbe23182dfff994aa63c5188e07
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
|
|
||||||
DEPEND=virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
|
|
||||||
DESCRIPTION=a LGPL version of libart
|
|
||||||
EAPI=3
|
|
||||||
HOMEPAGE=http://www.levien.com/libart
|
|
||||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
|
|
||||||
LICENSE=LGPL-2.1
|
|
||||||
RESTRICT=test
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2
|
|
||||||
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 c77a2c791ae15742c3c796344e279142 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 versionator cd0bcdb170807e4a1984115e9d53a26f
|
|
||||||
_md5_=a1a4c2b9c9fdcb63ab9189449619d0fd
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
|
|
||||||
DEPEND=>=dev-libs/glib-2.21.3 >=dev-libs/libxml2-2 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) ssl? ( >=net-libs/gnutls-2.1.7 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
|
|
||||||
DESCRIPTION=An HTTP library implementation in C
|
|
||||||
EAPI=3
|
|
||||||
HOMEPAGE=http://live.gnome.org/LibSoup
|
|
||||||
IUSE=debug doc +introspection ssl test debug
|
|
||||||
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
|
|
||||||
LICENSE=LGPL-2
|
|
||||||
RDEPEND=>=dev-libs/glib-2.21.3 >=dev-libs/libxml2-2 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) ssl? ( >=net-libs/gnutls-2.1.7 )
|
|
||||||
SLOT=2.4
|
|
||||||
SRC_URI=mirror://gnome/sources/libsoup/2.32/libsoup-2.32.2.tar.bz2
|
|
||||||
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 c77a2c791ae15742c3c796344e279142 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 versionator cd0bcdb170807e4a1984115e9d53a26f
|
|
||||||
_md5_=ea490e69344eda87153a50ee65ca7c47
|
|
||||||
@ -1 +0,0 @@
|
|||||||
DIST libsoup-2.32.2.tar.bz2 668131 RMD160 641d52bfbb9772cf9e69f3050f59b42783851926 SHA1 d93cfbd8a44c8b8759c98bfc83d2e3a003973708 SHA256 96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -1,65 +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.9 2011/04/15 16:18:32 darkside Exp $
|
|
||||||
|
|
||||||
EAPI="3"
|
|
||||||
GCONF_DEBUG="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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
|
||||||
IUSE="debug doc +introspection ssl test"
|
|
||||||
|
|
||||||
RDEPEND=">=dev-libs/glib-2.21.3
|
|
||||||
>=dev-libs/libxml2-2
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
|
|
||||||
ssl? ( >=net-libs/gnutls-2.1.7 )"
|
|
||||||
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]
|
|
||||||
# net-misc/curl )"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
# Set invalid apache module dir until apache tests are ready, bug #326957
|
|
||||||
DOCS="AUTHORS NEWS README"
|
|
||||||
G2CONF="${G2CONF}
|
|
||||||
--disable-static
|
|
||||||
--without-gnome
|
|
||||||
--with-apache-module-dir="${T}"
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable ssl)"
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user