diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-05-31 21:12:11 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-05-31 21:12:11 +0000 |
| commit | b2d9fe9c0d6c959875b1c831007c4cd4cb3ea78d (patch) | |
| tree | 581b59823a7d362026c07b4b2c64a31ea4245737 /gnome-extra/libgda/files | |
| parent | x86 stable, bug #271774 (diff) | |
| download | gentoo-2-b2d9fe9c0d6c959875b1c831007c4cd4cb3ea78d.tar.gz gentoo-2-b2d9fe9c0d6c959875b1c831007c4cd4cb3ea78d.tar.bz2 gentoo-2-b2d9fe9c0d6c959875b1c831007c4cd4cb3ea78d.zip | |
Bump to 4.1.0. Clean up old revision.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/libgda/files')
| -rw-r--r-- | gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch | 32 | ||||
| -rw-r--r-- | gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch | 39 |
2 files changed, 71 insertions, 0 deletions
diff --git a/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch b/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch new file mode 100644 index 000000000000..be523d725717 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch @@ -0,0 +1,32 @@ +diff --git a/configure.in b/configure.in +index 548667d..9b58cb2 100644 +--- a/configure.in ++++ b/configure.in +@@ -1339,12 +1316,23 @@ export LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH" + dnl ************************ + dnl Check for libsoup + dnl ************************ +-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, have_libsoup=yes, have_libsoup=no) +-AM_CONDITIONAL(LIBSOUP, test x"$have_libsoup" = "xyes") +-if test x"$have_libsoup" = "xyes" ++ ++AC_ARG_WITH(libsoup, ++ AS_HELP_STRING([--with-libsoup], [Enable libsoup support]), ++ ,with_soup=auto) ++ ++if test "$with_libsoup" = "auto" -a "$with_libsoup" = "yes" + then +- LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DHAVE_LIBSOUP" ++ PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, [ ++ AC_DEFINE(HAVE_LIBSOUP, [], [libsoup support enable]) ++ have_libsoup=yes], [ ++ if test "$with_libsoup" = "yes" ++ then ++ AC_MSG_ERROR([libsoup support requested but not found.]) ++ fi ++ have_libsoup=no]) + fi ++AM_CONDITIONAL(LIBSOUP, test "$have_libsoup" = "yes") + AC_SUBST(LIBSOUP_CFLAGS) + AC_SUBST(LIBSOUP_LIBS) + diff --git a/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch b/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch new file mode 100644 index 000000000000..f40de2dc532a --- /dev/null +++ b/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch @@ -0,0 +1,39 @@ +--- + Allow building without sandbox violations. + +diff --git a/libgda-report/RML/trml2html/Makefile.am b/libgda-report/RML/trml2html/Makefile.am +index 9b1e390..dd050cc 100644 +--- a/libgda-report/RML/trml2html/Makefile.am ++++ b/libgda-report/RML/trml2html/Makefile.am +@@ -3,10 +3,10 @@ files = __init__.py \ + utils.py + + install-exec-local: +- -mkdir -p $(bindir)/gda_trml2html +- -cd $(top_srcdir)/libgda-report/RML/trml2html && $(INSTALL_PROGRAM) $(files) $(bindir)/gda_trml2html ++ -mkdir -p $(DESTDIR)$(bindir)/gda_trml2html ++ -cd $(top_srcdir)/libgda-report/RML/trml2html && $(INSTALL_PROGRAM) $(files) $(DESTDIR)$(bindir)/gda_trml2html + + uninstall-local: +- -rm -rf $(bindir)/gda_trml2html ++ -rm -rf $(DESTDIR)$(bindir)/gda_trml2html + + EXTRA_DIST = $(files) +diff --git a/libgda-report/RML/trml2pdf/Makefile.am b/libgda-report/RML/trml2pdf/Makefile.am +index 7c241fe..aeab872 100644 +--- a/libgda-report/RML/trml2pdf/Makefile.am ++++ b/libgda-report/RML/trml2pdf/Makefile.am +@@ -4,10 +4,10 @@ files = color.py \ + utils.py + + install-exec-local: +- -mkdir -p $(bindir)/gda_trml2pdf +- -cd $(top_srcdir)/libgda-report/RML/trml2pdf && $(INSTALL_PROGRAM) $(files) $(bindir)/gda_trml2pdf ++ -mkdir -p $(DESTDIR)$(bindir)/gda_trml2pdf ++ -cd $(top_srcdir)/libgda-report/RML/trml2pdf && $(INSTALL_PROGRAM) $(files) $(DESTDIR)$(bindir)/gda_trml2pdf + + uninstall-local: +- -rm -rf $(bindir)/gda_trml2pdf ++ -rm -rf $(DESTDIR)$(bindir)/gda_trml2pdf + + EXTRA_DIST = $(files) |