| 1 |
eva 09/05/31 21:12:11 |
| 2 |
|
| 3 |
Added: libgda-4.0.2-libsoup-magic.patch |
| 4 |
libgda-4.0.2-sandbox.patch |
| 5 |
Log: |
| 6 |
Bump to 4.1.0. Clean up old revision. |
| 7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libgda-4.0.2-libsoup-magic.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.in b/configure.in |
| 18 |
index 548667d..9b58cb2 100644 |
| 19 |
--- a/configure.in |
| 20 |
+++ b/configure.in |
| 21 |
@@ -1339,12 +1316,23 @@ export LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH" |
| 22 |
dnl ************************ |
| 23 |
dnl Check for libsoup |
| 24 |
dnl ************************ |
| 25 |
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, have_libsoup=yes, have_libsoup=no) |
| 26 |
-AM_CONDITIONAL(LIBSOUP, test x"$have_libsoup" = "xyes") |
| 27 |
-if test x"$have_libsoup" = "xyes" |
| 28 |
+ |
| 29 |
+AC_ARG_WITH(libsoup, |
| 30 |
+ AS_HELP_STRING([--with-libsoup], [Enable libsoup support]), |
| 31 |
+ ,with_soup=auto) |
| 32 |
+ |
| 33 |
+if test "$with_libsoup" = "auto" -a "$with_libsoup" = "yes" |
| 34 |
then |
| 35 |
- LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DHAVE_LIBSOUP" |
| 36 |
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, [ |
| 37 |
+ AC_DEFINE(HAVE_LIBSOUP, [], [libsoup support enable]) |
| 38 |
+ have_libsoup=yes], [ |
| 39 |
+ if test "$with_libsoup" = "yes" |
| 40 |
+ then |
| 41 |
+ AC_MSG_ERROR([libsoup support requested but not found.]) |
| 42 |
+ fi |
| 43 |
+ have_libsoup=no]) |
| 44 |
fi |
| 45 |
+AM_CONDITIONAL(LIBSOUP, test "$have_libsoup" = "yes") |
| 46 |
AC_SUBST(LIBSOUP_CFLAGS) |
| 47 |
AC_SUBST(LIBSOUP_LIBS) |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: libgda-4.0.2-sandbox.patch |
| 58 |
=================================================================== |
| 59 |
--- |
| 60 |
Allow building without sandbox violations. |
| 61 |
|
| 62 |
diff --git a/libgda-report/RML/trml2html/Makefile.am b/libgda-report/RML/trml2html/Makefile.am |
| 63 |
index 9b1e390..dd050cc 100644 |
| 64 |
--- a/libgda-report/RML/trml2html/Makefile.am |
| 65 |
+++ b/libgda-report/RML/trml2html/Makefile.am |
| 66 |
@@ -3,10 +3,10 @@ files = __init__.py \ |
| 67 |
utils.py |
| 68 |
|
| 69 |
install-exec-local: |
| 70 |
- -mkdir -p $(bindir)/gda_trml2html |
| 71 |
- -cd $(top_srcdir)/libgda-report/RML/trml2html && $(INSTALL_PROGRAM) $(files) $(bindir)/gda_trml2html |
| 72 |
+ -mkdir -p $(DESTDIR)$(bindir)/gda_trml2html |
| 73 |
+ -cd $(top_srcdir)/libgda-report/RML/trml2html && $(INSTALL_PROGRAM) $(files) $(DESTDIR)$(bindir)/gda_trml2html |
| 74 |
|
| 75 |
uninstall-local: |
| 76 |
- -rm -rf $(bindir)/gda_trml2html |
| 77 |
+ -rm -rf $(DESTDIR)$(bindir)/gda_trml2html |
| 78 |
|
| 79 |
EXTRA_DIST = $(files) |
| 80 |
diff --git a/libgda-report/RML/trml2pdf/Makefile.am b/libgda-report/RML/trml2pdf/Makefile.am |
| 81 |
index 7c241fe..aeab872 100644 |
| 82 |
--- a/libgda-report/RML/trml2pdf/Makefile.am |
| 83 |
+++ b/libgda-report/RML/trml2pdf/Makefile.am |
| 84 |
@@ -4,10 +4,10 @@ files = color.py \ |
| 85 |
utils.py |
| 86 |
|
| 87 |
install-exec-local: |
| 88 |
- -mkdir -p $(bindir)/gda_trml2pdf |
| 89 |
- -cd $(top_srcdir)/libgda-report/RML/trml2pdf && $(INSTALL_PROGRAM) $(files) $(bindir)/gda_trml2pdf |
| 90 |
+ -mkdir -p $(DESTDIR)$(bindir)/gda_trml2pdf |
| 91 |
+ -cd $(top_srcdir)/libgda-report/RML/trml2pdf && $(INSTALL_PROGRAM) $(files) $(DESTDIR)$(bindir)/gda_trml2pdf |
| 92 |
|
| 93 |
uninstall-local: |
| 94 |
- -rm -rf $(bindir)/gda_trml2pdf |
| 95 |
+ -rm -rf $(DESTDIR)$(bindir)/gda_trml2pdf |
| 96 |
|
| 97 |
EXTRA_DIST = $(files) |
Archives