libsoup r1084 - branches/gnome-2-20
- From: danw svn gnome org
- To: svn-commits-list gnome org
- Subject: libsoup r1084 - branches/gnome-2-20
- Date: Mon, 11 Feb 2008 19:50:59 +0000 (GMT)
Author: danw
Date: Mon Feb 11 19:50:59 2008
New Revision: 1084
URL: http://svn.gnome.org/viewvc/libsoup?rev=1084&view=rev
Log:
* configure.in: 2.2.105
* NEWS: Update
Modified:
branches/gnome-2-20/ChangeLog
branches/gnome-2-20/NEWS
branches/gnome-2-20/configure.in
branches/gnome-2-20/gtk-doc.make
Modified: branches/gnome-2-20/NEWS
==============================================================================
--- branches/gnome-2-20/NEWS (original)
+++ branches/gnome-2-20/NEWS Mon Feb 11 19:50:59 2008
@@ -1,3 +1,22 @@
+Changes in libsoup from 2.2.104 to 2.2.105:
+
+ * Fixed a crash-when-idle that affected evolution-exchange
+ [#437835] and rhythmbox [#506552].
+
+ * Added the API version to the gtk-doc installation dir, to
+ prevent parallel-installation problems with libsoup 2.2 and
+ 2.4. [#512810, Daniel Gryniewicz].
+
+ With the upcoming release of libsoup 2.4.0 as part of GNOME
+ 2.22, libsoup 2.2 is becoming deprecated, and there will
+ probably not be any further releases in the 2.2 series.
+ Applications that use libsoup should start looking into
+ porting to the exciting and fun libsoup-2.4 API. A porting
+ guide is available at
+ http://library.gnome.org/devel/libsoup/unstable/libsoup-porting-2.2-2.4.html.
+ If you have questions not answered by that document, please
+ send mail to libsoup-list gnome org
+
Changes in libsoup from 2.2.103 to 2.2.104:
* soup_message_io_pause() and soup_message_io_pause() are now
Modified: branches/gnome-2-20/configure.in
==============================================================================
--- branches/gnome-2-20/configure.in (original)
+++ branches/gnome-2-20/configure.in Mon Feb 11 19:50:59 2008
@@ -3,7 +3,7 @@
dnl *******************************************
AC_PREREQ(2.53)
-AC_INIT(libsoup, 2.2.104)
+AC_INIT(libsoup, 2.2.105)
AC_CONFIG_SRCDIR(libsoup.pc.in)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
Modified: branches/gnome-2-20/gtk-doc.make
==============================================================================
--- branches/gnome-2-20/gtk-doc.make (original)
+++ branches/gnome-2-20/gtk-doc.make Mon Feb 11 19:50:59 2008
@@ -5,11 +5,11 @@
####################################
if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
endif
# We set GPATH here; this gives us semantics for GNU make
@@ -38,12 +38,7 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
-REPORT_FILES = \
- $(DOC_MODULE)-undocumented.txt \
- $(DOC_MODULE)-undeclared.txt \
- $(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
if ENABLE_GTK_DOC
all-local: html-build.stamp
@@ -84,10 +79,6 @@
tmpl.stamp: tmpl-build.stamp
@true
-tmpl/*.sgml:
- @true
-
-
#### xml ####
sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@@ -105,11 +96,11 @@
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
+ rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
+ @echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
@@ -119,16 +110,11 @@
rm -f *~ *.bak
rm -rf .libs
-distclean-local:
- cd $(srcdir) && \
- rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
- -installfiles=`echo $(srcdir)/html/*`; \
+ installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
@@ -139,10 +125,7 @@
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
- which gtkdoc-rebase >/dev/null && \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
fi
-
uninstall-local:
rm -f $(DESTDIR)$(TARGET_DIR)/*
@@ -165,9 +148,8 @@
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ if test -f $(srcdir)/$(DOC_MODULE).types; then \
+ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
+ fi
.PHONY : dist-hook-local docs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]