Merge into trunk : fix-634384 : Code : libubuntuone

Status:

Merged

Approved by:

dobey on 2010-09-21

Approved revision:

106

Merged at revision:

105

Proposed branch:

lp:~rodrigo-moya/libubuntuone/fix-634384

Merge into:

lp:libubuntuone

Diff against target:

35 lines (+4/-5)

1 file modified

libubuntuone/u1-music-store.c (+4/-5)

To merge this branch:

bzr merge lp:~rodrigo-moya/libubuntuone/fix-634384

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Manuel de la Peña (community)	2010-09-17	Approve on 2010-09-20
dobey (community)		Approve on 2010-09-20
Review via email: mp+35831@code.launchpad.net

Commit message

Clear tokens when the server tells us about invalid tokens

Description of the change

Clear tokens when the server tells us about invalid tokens

This branch needs lp:~rodrigo-moya/ubuntuone-client/fix-634384

Revision history for this message

dobey (dobey) wrote on 2010-09-20:

#

Code looks ok to me.

review: Approve

Revision history for this message

Manuel de la Peña (mandel) wrote on 2010-09-20:

#

+1

review: Approve

Revision history for this message

dobey (dobey) wrote on 2010-09-21:

#

Download full text (19.5 KiB)

The attempt to merge lp:~rodrigo-moya/libubuntuone/fix-634384 into lp:libubuntuone failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.6...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for glib-gettext >= 2.2.0...
  testing glib-gettextize... found 2.25.15
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.15
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
Copying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) ...

The attempt to merge lp:~rodrigo-moya/libubuntuone/fix-634384 into lp:libubuntuone failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.6...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for glib-gettext >= 2.2.0...
  testing glib-gettextize... found 2.25.15
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.15
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
Copying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
  progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking if gcc supports -c -o file.o... (cached) yes
checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
checking whether NLS is requested... yes
checking for intltool >= 0.35.5... 0.41.1 found
checking for intltool-update... /usr/bin/intltool-update
checking for intltool-merge... /usr/bin/intltool-merge
checking for intltool-extract... /usr/bin/intltool-extract
checking for xgettext... /usr/bin/xgettext
checking for msgmerge... /usr/bin/msgmerge
checking for msgfmt... /usr/bin/msgfmt
checking for gmsgfmt... /usr/bin/msgfmt
checking for perl... /usr/bin/perl
checking for perl >= 5.8.1... 5.10.1
checking for XML::Parser... ok
checking locale.h usability... yes
checking locale.h presence... yes
checking for locale.h... yes
checking for LC_MESSAGES... yes
checking libintl.h usability... yes
checking libintl.h presence... yes
checking for libintl.h... yes
checking for ngettext in libc... yes
checking for dgettext in libc... yes
checking for bind_textdomain_codeset... yes
checking for msgfmt... (cached) /usr/bin/msgfmt
checking for dcgettext... yes
checking if msgfmt accepts -c... yes
checking for gmsgfmt... (cached) /usr/bin/msgfmt
checking for xgettext... (cached) /usr/bin/xgettext
checking for glib-genmarshal... /usr/bin/glib-genmarshal
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for LIBUBUNTUONE... yes
checking for unistd.h... (cached) yes
checking time.h usability... yes
checking time.h presence... yes
checking for time.h... yes
checking for string.h... (cached) yes
checking alloca.h usability... yes
checking alloca.h presence... yes
checking for alloca.h... yes
checking stdio.h usability... yes
checking stdio.h presence... yes
checking for stdio.h... yes
checking stdarg.h usability... yes
checking stdarg.h presence... yes
checking for stdarg.h... yes
checking math.h usability... yes
checking math.h presence... yes
checking for math.h... yes
checking openssl/hmac.h usability... yes
checking openssl/hmac.h presence... yes
checking for openssl/hmac.h... yes
checking for CRYPTO_free in -lcrypto... yes
checking for gtkdoc-check... /usr/bin/gtkdoc-check
checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
checking whether to build gtk-doc documentation... no
checking for gapi2-parser... /usr/bin/gapi2-parser
checking for gapi2-codegen... /usr/bin/gapi2-codegen
checking for gapi2-fixup... /usr/bin/gapi2-fixup
checking for gmcs... /usr/bin/gmcs
checking for a Python interpreter with version >= 2.5... python
checking for python... /usr/bin/python
checking for python version... 2.6
checking for python platform... linux2
checking for python script directory... ${prefix}/lib/python2.6/dist-packages
checking for python extension module directory... ${exec_prefix}/lib/python2.6/dist-packages
checking for python-config... /usr/bin/python-config
checking for PYGTK... yes
checking for GTKSHARP... yes
checking for pygtk defs... /usr/share/pygtk/2.0/defs
checking for pygobject-codegen-2.0... /usr/bin/pygobject-codegen-2.0
checking for gobject-introspection... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating data/Makefile
config.status: creating libubuntuone.pc
config.status: creating ubuntuone-sharp.pc
config.status: creating libubuntuone/Makefile
config.status: creating tests/Makefile
config.status: creating bindings/Makefile
config.status: creating bindings/python/Makefile
config.status: creating bindings/mono/Makefile
config.status: creating bindings/mono/ubuntuone-sharp.dll.config
config.status: creating po/Makefile.in
config.status: creating config.h
config.status: config.h is unchanged
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing default-1 commands
config.status: executing po/stamp-it commands
configure:

libubuntuone configured:
 ------------------------

version:       0.3.7
 introspection: yes

Now type `make' to compile libubuntuone
{ test ! -d "libubuntuone-0.3.7" || { find "libubuntuone-0.3.7" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "libubuntuone-0.3.7"; }; }
test -d "libubuntuone-0.3.7" || mkdir "libubuntuone-0.3.7"
 (cd data && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/data \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/data'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/data'
 (cd libubuntuone && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/libubuntuone \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'
 (cd tests && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/tests \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/tests'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/tests'
 (cd bindings && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/bindings \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/bindings'
 (cd python && make  top_distdir=../../libubuntuone-0.3.7 distdir=../../libubuntuone-0.3.7/bindings/python \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[2]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/bindings/python'
make[2]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/bindings/python'
 (cd mono && make  top_distdir=../../libubuntuone-0.3.7 distdir=../../libubuntuone-0.3.7/bindings/mono \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[2]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/bindings/mono'
make[2]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/bindings/mono'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/bindings'
 (cd po && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/po \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/po'
dists="Makefile.in.in POTFILES.in es.po "; \
	extra_dists="ChangeLog POTFILES.skip Makevars LINGUAS"; \
	for file in $extra_dists; do \
	  test -f ./$file && dists="$dists ./$file"; \
	done; \
	for file in $dists; do \
	  test -f $file || file="./$file"; \
	  ln $file ../libubuntuone-0.3.7/po 2> /dev/null \
	    || cp -p $file ../libubuntuone-0.3.7/po; \
	done
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/po'
test -n "" \
	|| find "libubuntuone-0.3.7" -type d ! -perm -755 \
		-exec chmod u+rwx,go+rx {} \; -o \
	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
	  ! -type d ! -perm -444 -exec /bin/bash /var/cache/tarmac/libubuntuone/trunk/install-sh -c -m a+r {} {} \; \
	|| chmod -R a+r "libubuntuone-0.3.7"
tardir=libubuntuone-0.3.7 && /bin/bash /var/cache/tarmac/libubuntuone/trunk/missing --run tar chof - "$tardir" | GZIP=--best gzip -c >libubuntuone-0.3.7.tar.gz
{ test ! -d "libubuntuone-0.3.7" || { find "libubuntuone-0.3.7" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "libubuntuone-0.3.7"; }; }
Making check in data
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/data'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/data'
Making check in libubuntuone
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'
/bin/bash ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -pthread -DORBIT2=1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/webkit-1.0 -I/usr/include/gtk-2.0 -I/usr/include/libsoup-2.4 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/gnome-keyring-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libsoup-gnome-2.4 -I/usr/include/libsyncdaemon-1.0   -DU1_JAVASCRIPT_DIR=\"/usr/local/share/libubuntuone/1/javascript\"    -g -O2 -MT u1-music-store.lo -MD -MP -MF .deps/u1-music-store.Tpo -c -o u1-music-store.lo u1-music-store.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -pthread -DORBIT2=1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/webkit-1.0 -I/usr/include/gtk-2.0 -I/usr/include/libsoup-2.4 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/gnome-keyring-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libsoup-gnome-2.4 -I/usr/include/libsyncdaemon-1.0 -DU1_JAVASCRIPT_DIR=\"/usr/local/share/libubuntuone/1/javascript\" -g -O2 -MT u1-music-store.lo -MD -MP -MF .deps/u1-music-store.Tpo -c u1-music-store.c  -fPIC -DPIC -o .libs/u1-music-store.o
mv -f .deps/u1-music-store.Tpo .deps/u1-music-store.Plo
/bin/bash ../libtool --tag=CC   --mode=link gcc  -g -O2 -version-info 1:0:0  -o libubuntuone-1.0.la -rpath /usr/local/lib u1-marshal.lo oauth.lo u1-music-store.lo xmalloc.lo -pthread -L/lib -lwebkit-1.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 -lpango-1.0 -lfreetype -lfontconfig -lgnome-keyring -ldbus-glib-1 -ldbus-1 -lpthread -lgconf-2 -lxml2 -lsoup-gnome-2.4 -lsoup-2.4 -lgio-2.0 -lgmodule-2.0 -lsyncdaemon-1.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0   -lm -lcrypto 
libtool: link: rm -fr  .libs/libubuntuone-1.0.la .libs/libubuntuone-1.0.lai .libs/libubuntuone-1.0.so .libs/libubuntuone-1.0.so.1 .libs/libubuntuone-1.0.so.1.0.0
libtool: link: gcc -shared  .libs/u1-marshal.o .libs/oauth.o .libs/u1-music-store.o .libs/xmalloc.o   -L/lib -lwebkit-1.0 /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libpangoft2-1.0.so /usr/lib/libpangocairo-1.0.so -lgdk_pixbuf-2.0 /usr/lib/libcairo.so -lpng12 /usr/lib/libpango-1.0.so /usr/lib/libfreetype.so -lfontconfig -lgnome-keyring -ldbus-glib-1 -ldbus-1 -lpthread /usr/lib/libgconf-2.so /usr/lib/libxml2.so -lsoup-gnome-2.4 -lsoup-2.4 /usr/lib/libgio-2.0.so /usr/lib/libgmodule-2.0.so /usr/lib/libsyncdaemon-1.0.so /usr/lib/libgobject-2.0.so /usr/lib/libgthread-2.0.so -lrt /usr/lib/libglib-2.0.so -lm -lcrypto  -pthread   -pthread -Wl,-soname -Wl,libubuntuone-1.0.so.1 -o .libs/libubuntuone-1.0.so.1.0.0
libtool: link: (cd ".libs" && rm -f "libubuntuone-1.0.so.1" && ln -s "libubuntuone-1.0.so.1.0.0" "libubuntuone-1.0.so.1")
libtool: link: (cd ".libs" && rm -f "libubuntuone-1.0.so" && ln -s "libubuntuone-1.0.so.1.0.0" "libubuntuone-1.0.so")
libtool: link: ( cd ".libs" && rm -f "libubuntuone-1.0.la" && ln -s "../libubuntuone-1.0.la" "libubuntuone-1.0.la" )
/usr/bin/g-ir-scanner  --add-include-path=. --namespace=UbuntuOne --nsversion=1.0 --libtool="/bin/bash ../libtool"  --include=Gtk-2.0 --include=GLib-2.0  --library=libubuntuone-1.0.la  -I.. -I..  u1-music-store.h u1-music-store.c libubuntuone-1.0.la Makefile --output UbuntuOne-1.0.gir
g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gobject-introspection-1.0 -I.. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I.. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -c -o /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectzXqPIH/UbuntuOne-1.0.o /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectzXqPIH/UbuntuOne-1.0.c
g-ir-scanner: link: /bin/bash ../libtool --mode=link --tag=CC --silent gcc -o /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectzXqPIH/UbuntuOne-1.0 -L. -Wl,--export-dynamic -pthread -lgirepository-1.0 -lgobject-2.0 -lgmodule-2.0 -lffi -lgthread-2.0 -lrt -lglib-2.0 libubuntuone-1.0.la -pthread -Wl,--export-dynamic -lgio-2.0 -lgirepository-1.0 -lgobject-2.0 -lgmodule-2.0 -lffi -lgthread-2.0 -lrt -lglib-2.0 /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectzXqPIH/UbuntuOne-1.0.o
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'

**Warning**: I am going to run `configure' with no arguments.
If you wish to pass any to it, please specify them on the
`./autogen.sh' command line.

In file included from <stdin>:4:
/var/cache/tarmac/libubuntuone/trunk/libubuntuone/u1-music-store.h:25: fatal error: gtk/gtk.h: No such file or directory
compilation terminated.
/var/cache/tarmac/libubuntuone/trunk/libubuntuone/u1-music-store.h:20: syntax error, unexpected $end in '/*' at ''
./.libs/libubuntuone-1.0.so: undefined reference to `syncdaemon_authentication_clear_token'
collect2: ld returned 1 exit status
Traceback (most recent call last):
  File "/usr/bin/g-ir-scanner", line 38, in <module>
    sys.exit(scanner_main(sys.argv))
  File "/usr/lib/gobject-introspection/giscanner/scannermain.py", line 330, in scanner_main
    glibtransformer.get_get_type_functions())
  File "/usr/lib/gobject-introspection/giscanner/dumper.py", line 246, in compile_introspection_binary
    return dc.run()
  File "/usr/lib/gobject-introspection/giscanner/dumper.py", line 132, in run
    self._link(bin_path, o_path)
  File "/usr/lib/gobject-introspection/giscanner/dumper.py", line 241, in _link
    subprocess.check_call(args)
  File "/usr/lib/python2.6/subprocess.py", line 488, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['/bin/bash', '../libtool', '--mode=link', '--tag=CC', '--silent', 'gcc', '-o', '/var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectzXqPIH/UbuntuOne-1.0', '-L.', '-Wl,--export-dynamic', '-pthread', '-lgirepository-1.0', '-lgobject-2.0', '-lgmodule-2.0', '-lffi', '-lgthread-2.0', '-lrt', '-lglib-2.0', 'libubuntuone-1.0.la', '-pthread', '-Wl,--export-dynamic', '-lgio-2.0', '-lgirepository-1.0', '-lgobject-2.0', '-lgmodule-2.0', '-lffi', '-lgthread-2.0', '-lrt', '-lglib-2.0', '/var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectzXqPIH/UbuntuOne-1.0.o']' returned non-zero exit status 1
make[1]: *** [UbuntuOne-1.0.gir] Error 1
make: *** [check-recursive] Error 1

Revision history for this message

Rodrigo Moya (rodrigo-moya) wrote on 2010-09-21:

#

This needs the new libsyncdaemon package, which is already accepted

Revision history for this message

dobey (dobey) wrote on 2010-09-21:

#

Download full text (19.5 KiB)

The attempt to merge lp:~rodrigo-moya/libubuntuone/fix-634384 into lp:libubuntuone failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.6...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for glib-gettext >= 2.2.0...
  testing glib-gettextize... found 2.25.15
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.15
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
Copying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) ...

The attempt to merge lp:~rodrigo-moya/libubuntuone/fix-634384 into lp:libubuntuone failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.6...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for glib-gettext >= 2.2.0...
  testing glib-gettextize... found 2.25.15
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.15
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
Copying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
  progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking if gcc supports -c -o file.o... (cached) yes
checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
checking whether NLS is requested... yes
checking for intltool >= 0.35.5... 0.41.1 found
checking for intltool-update... /usr/bin/intltool-update
checking for intltool-merge... /usr/bin/intltool-merge
checking for intltool-extract... /usr/bin/intltool-extract
checking for xgettext... /usr/bin/xgettext
checking for msgmerge... /usr/bin/msgmerge
checking for msgfmt... /usr/bin/msgfmt
checking for gmsgfmt... /usr/bin/msgfmt
checking for perl... /usr/bin/perl
checking for perl >= 5.8.1... 5.10.1
checking for XML::Parser... ok
checking locale.h usability... yes
checking locale.h presence... yes
checking for locale.h... yes
checking for LC_MESSAGES... yes
checking libintl.h usability... yes
checking libintl.h presence... yes
checking for libintl.h... yes
checking for ngettext in libc... yes
checking for dgettext in libc... yes
checking for bind_textdomain_codeset... yes
checking for msgfmt... (cached) /usr/bin/msgfmt
checking for dcgettext... yes
checking if msgfmt accepts -c... yes
checking for gmsgfmt... (cached) /usr/bin/msgfmt
checking for xgettext... (cached) /usr/bin/xgettext
checking for glib-genmarshal... /usr/bin/glib-genmarshal
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for LIBUBUNTUONE... yes
checking for unistd.h... (cached) yes
checking time.h usability... yes
checking time.h presence... yes
checking for time.h... yes
checking for string.h... (cached) yes
checking alloca.h usability... yes
checking alloca.h presence... yes
checking for alloca.h... yes
checking stdio.h usability... yes
checking stdio.h presence... yes
checking for stdio.h... yes
checking stdarg.h usability... yes
checking stdarg.h presence... yes
checking for stdarg.h... yes
checking math.h usability... yes
checking math.h presence... yes
checking for math.h... yes
checking openssl/hmac.h usability... yes
checking openssl/hmac.h presence... yes
checking for openssl/hmac.h... yes
checking for CRYPTO_free in -lcrypto... yes
checking for gtkdoc-check... /usr/bin/gtkdoc-check
checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
checking whether to build gtk-doc documentation... no
checking for gapi2-parser... /usr/bin/gapi2-parser
checking for gapi2-codegen... /usr/bin/gapi2-codegen
checking for gapi2-fixup... /usr/bin/gapi2-fixup
checking for gmcs... /usr/bin/gmcs
checking for a Python interpreter with version >= 2.5... python
checking for python... /usr/bin/python
checking for python version... 2.6
checking for python platform... linux2
checking for python script directory... ${prefix}/lib/python2.6/dist-packages
checking for python extension module directory... ${exec_prefix}/lib/python2.6/dist-packages
checking for python-config... /usr/bin/python-config
checking for PYGTK... yes
checking for GTKSHARP... yes
checking for pygtk defs... /usr/share/pygtk/2.0/defs
checking for pygobject-codegen-2.0... /usr/bin/pygobject-codegen-2.0
checking for gobject-introspection... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating data/Makefile
config.status: creating libubuntuone.pc
config.status: creating ubuntuone-sharp.pc
config.status: creating libubuntuone/Makefile
config.status: creating tests/Makefile
config.status: creating bindings/Makefile
config.status: creating bindings/python/Makefile
config.status: creating bindings/mono/Makefile
config.status: creating bindings/mono/ubuntuone-sharp.dll.config
config.status: creating po/Makefile.in
config.status: creating config.h
config.status: config.h is unchanged
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing default-1 commands
config.status: executing po/stamp-it commands
configure:

libubuntuone configured:
 ------------------------

version:       0.3.7
 introspection: yes

Now type `make' to compile libubuntuone
{ test ! -d "libubuntuone-0.3.7" || { find "libubuntuone-0.3.7" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "libubuntuone-0.3.7"; }; }
test -d "libubuntuone-0.3.7" || mkdir "libubuntuone-0.3.7"
 (cd data && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/data \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/data'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/data'
 (cd libubuntuone && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/libubuntuone \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'
 (cd tests && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/tests \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/tests'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/tests'
 (cd bindings && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/bindings \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/bindings'
 (cd python && make  top_distdir=../../libubuntuone-0.3.7 distdir=../../libubuntuone-0.3.7/bindings/python \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[2]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/bindings/python'
make[2]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/bindings/python'
 (cd mono && make  top_distdir=../../libubuntuone-0.3.7 distdir=../../libubuntuone-0.3.7/bindings/mono \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[2]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/bindings/mono'
make[2]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/bindings/mono'
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/bindings'
 (cd po && make  top_distdir=../libubuntuone-0.3.7 distdir=../libubuntuone-0.3.7/po \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/po'
dists="Makefile.in.in POTFILES.in es.po "; \
	extra_dists="ChangeLog POTFILES.skip Makevars LINGUAS"; \
	for file in $extra_dists; do \
	  test -f ./$file && dists="$dists ./$file"; \
	done; \
	for file in $dists; do \
	  test -f $file || file="./$file"; \
	  ln $file ../libubuntuone-0.3.7/po 2> /dev/null \
	    || cp -p $file ../libubuntuone-0.3.7/po; \
	done
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/po'
test -n "" \
	|| find "libubuntuone-0.3.7" -type d ! -perm -755 \
		-exec chmod u+rwx,go+rx {} \; -o \
	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
	  ! -type d ! -perm -444 -exec /bin/bash /var/cache/tarmac/libubuntuone/trunk/install-sh -c -m a+r {} {} \; \
	|| chmod -R a+r "libubuntuone-0.3.7"
tardir=libubuntuone-0.3.7 && /bin/bash /var/cache/tarmac/libubuntuone/trunk/missing --run tar chof - "$tardir" | GZIP=--best gzip -c >libubuntuone-0.3.7.tar.gz
{ test ! -d "libubuntuone-0.3.7" || { find "libubuntuone-0.3.7" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "libubuntuone-0.3.7"; }; }
Making check in data
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/data'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/data'
Making check in libubuntuone
make[1]: Entering directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'
/bin/bash ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -pthread -DORBIT2=1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/webkit-1.0 -I/usr/include/gtk-2.0 -I/usr/include/libsoup-2.4 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/gnome-keyring-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libsoup-gnome-2.4 -I/usr/include/libsyncdaemon-1.0   -DU1_JAVASCRIPT_DIR=\"/usr/local/share/libubuntuone/1/javascript\"    -g -O2 -MT u1-music-store.lo -MD -MP -MF .deps/u1-music-store.Tpo -c -o u1-music-store.lo u1-music-store.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -pthread -DORBIT2=1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/webkit-1.0 -I/usr/include/gtk-2.0 -I/usr/include/libsoup-2.4 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/gnome-keyring-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/libsoup-gnome-2.4 -I/usr/include/libsyncdaemon-1.0 -DU1_JAVASCRIPT_DIR=\"/usr/local/share/libubuntuone/1/javascript\" -g -O2 -MT u1-music-store.lo -MD -MP -MF .deps/u1-music-store.Tpo -c u1-music-store.c  -fPIC -DPIC -o .libs/u1-music-store.o
mv -f .deps/u1-music-store.Tpo .deps/u1-music-store.Plo
/bin/bash ../libtool --tag=CC   --mode=link gcc  -g -O2 -version-info 1:0:0  -o libubuntuone-1.0.la -rpath /usr/local/lib u1-marshal.lo oauth.lo u1-music-store.lo xmalloc.lo -pthread -L/lib -lwebkit-1.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 -lpango-1.0 -lfreetype -lfontconfig -lgnome-keyring -ldbus-glib-1 -ldbus-1 -lpthread -lgconf-2 -lxml2 -lsoup-gnome-2.4 -lsoup-2.4 -lgio-2.0 -lgmodule-2.0 -lsyncdaemon-1.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0   -lm -lcrypto 
libtool: link: rm -fr  .libs/libubuntuone-1.0.la .libs/libubuntuone-1.0.lai .libs/libubuntuone-1.0.so .libs/libubuntuone-1.0.so.1 .libs/libubuntuone-1.0.so.1.0.0
libtool: link: gcc -shared  .libs/u1-marshal.o .libs/oauth.o .libs/u1-music-store.o .libs/xmalloc.o   -L/lib -lwebkit-1.0 /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libpangoft2-1.0.so /usr/lib/libpangocairo-1.0.so -lgdk_pixbuf-2.0 /usr/lib/libcairo.so -lpng12 /usr/lib/libpango-1.0.so /usr/lib/libfreetype.so -lfontconfig -lgnome-keyring -ldbus-glib-1 -ldbus-1 -lpthread /usr/lib/libgconf-2.so /usr/lib/libxml2.so -lsoup-gnome-2.4 -lsoup-2.4 /usr/lib/libgio-2.0.so /usr/lib/libgmodule-2.0.so /usr/lib/libsyncdaemon-1.0.so /usr/lib/libgobject-2.0.so /usr/lib/libgthread-2.0.so -lrt /usr/lib/libglib-2.0.so -lm -lcrypto  -pthread   -pthread -Wl,-soname -Wl,libubuntuone-1.0.so.1 -o .libs/libubuntuone-1.0.so.1.0.0
libtool: link: (cd ".libs" && rm -f "libubuntuone-1.0.so.1" && ln -s "libubuntuone-1.0.so.1.0.0" "libubuntuone-1.0.so.1")
libtool: link: (cd ".libs" && rm -f "libubuntuone-1.0.so" && ln -s "libubuntuone-1.0.so.1.0.0" "libubuntuone-1.0.so")
libtool: link: ( cd ".libs" && rm -f "libubuntuone-1.0.la" && ln -s "../libubuntuone-1.0.la" "libubuntuone-1.0.la" )
/usr/bin/g-ir-scanner  --add-include-path=. --namespace=UbuntuOne --nsversion=1.0 --libtool="/bin/bash ../libtool"  --include=Gtk-2.0 --include=GLib-2.0  --library=libubuntuone-1.0.la  -I.. -I..  u1-music-store.h u1-music-store.c libubuntuone-1.0.la Makefile --output UbuntuOne-1.0.gir
g-ir-scanner: compile: gcc -Wall -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gobject-introspection-1.0 -I.. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I.. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -c -o /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectQUE7jd/UbuntuOne-1.0.o /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectQUE7jd/UbuntuOne-1.0.c
g-ir-scanner: link: /bin/bash ../libtool --mode=link --tag=CC --silent gcc -o /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectQUE7jd/UbuntuOne-1.0 -L. -Wl,--export-dynamic -pthread -lgirepository-1.0 -lgobject-2.0 -lgmodule-2.0 -lffi -lgthread-2.0 -lrt -lglib-2.0 libubuntuone-1.0.la -pthread -Wl,--export-dynamic -lgio-2.0 -lgirepository-1.0 -lgobject-2.0 -lgmodule-2.0 -lffi -lgthread-2.0 -lrt -lglib-2.0 /var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectQUE7jd/UbuntuOne-1.0.o
make[1]: Leaving directory `/var/cache/tarmac/libubuntuone/trunk/libubuntuone'

**Warning**: I am going to run `configure' with no arguments.
If you wish to pass any to it, please specify them on the
`./autogen.sh' command line.

In file included from <stdin>:4:
/var/cache/tarmac/libubuntuone/trunk/libubuntuone/u1-music-store.h:25: fatal error: gtk/gtk.h: No such file or directory
compilation terminated.
/var/cache/tarmac/libubuntuone/trunk/libubuntuone/u1-music-store.h:20: syntax error, unexpected $end in '/*' at ''
./.libs/libubuntuone-1.0.so: undefined reference to `syncdaemon_authentication_clear_token'
collect2: ld returned 1 exit status
Traceback (most recent call last):
  File "/usr/bin/g-ir-scanner", line 38, in <module>
    sys.exit(scanner_main(sys.argv))
  File "/usr/lib/gobject-introspection/giscanner/scannermain.py", line 330, in scanner_main
    glibtransformer.get_get_type_functions())
  File "/usr/lib/gobject-introspection/giscanner/dumper.py", line 246, in compile_introspection_binary
    return dc.run()
  File "/usr/lib/gobject-introspection/giscanner/dumper.py", line 132, in run
    self._link(bin_path, o_path)
  File "/usr/lib/gobject-introspection/giscanner/dumper.py", line 241, in _link
    subprocess.check_call(args)
  File "/usr/lib/python2.6/subprocess.py", line 488, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['/bin/bash', '../libtool', '--mode=link', '--tag=CC', '--silent', 'gcc', '-o', '/var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectQUE7jd/UbuntuOne-1.0', '-L.', '-Wl,--export-dynamic', '-pthread', '-lgirepository-1.0', '-lgobject-2.0', '-lgmodule-2.0', '-lffi', '-lgthread-2.0', '-lrt', '-lglib-2.0', 'libubuntuone-1.0.la', '-pthread', '-Wl,--export-dynamic', '-lgio-2.0', '-lgirepository-1.0', '-lgobject-2.0', '-lgmodule-2.0', '-lffi', '-lgthread-2.0', '-lrt', '-lglib-2.0', '/var/cache/tarmac/libubuntuone/trunk/libubuntuone/tmp-introspectQUE7jd/UbuntuOne-1.0.o']' returned non-zero exit status 1
make[1]: *** [UbuntuOne-1.0.gir] Error 1
make: *** [check-recursive] Error 1

1	=== modified file 'libubuntuone/u1-music-store.c'
2	--- libubuntuone/u1-music-store.c 2010-09-15 08:20:48 +0000
3	+++ libubuntuone/u1-music-store.c 2010-09-18 08:14:46 +0000
4	@@ -354,10 +354,10 @@
5	g_str_has_prefix (uri_args[i], "next")) {
6	this_arg = g_strsplit (uri_args[i], "=", 2);
7
8	- url_to_use = g_strdup_printf ("%s%s?returnUrl=%s&forward_on_to_url=%s",
9	+ url_to_use = g_strdup_printf ("%s%s?forward_on_to_url=%s",
10	nrrd->music_store->priv->base_url,
11	U1_STORE_URL,
12	- this_arg[1], this_arg[1]);
13	+ this_arg[1]);
14	g_strfreev (this_arg);
15	break;
16	}
17	@@ -370,8 +370,6 @@
18	} else
19	url_to_use = g_strdup_printf ("%s%s", nrrd->music_store->priv->base_url, U1_STORE_URL);
20
21	- nrrd->music_store->priv->auth_retries = 0;
22	-
23	/* Now sign the URL and load the new page in the view */
24	real_url = oauth_sign_url2 (url_to_use, NULL, OA_HMAC, "GET",
25	oauth_consumer_token, oauth_consumer_secret,
26	@@ -544,7 +542,8 @@
27	g_strrstr (parsed_uri->query, "next=") != NULL) {
28	fire_authentication (music_store, request, policy_decision);
29	} else if (g_str_has_prefix (parsed_uri->path, U1_TOKEN_INVALID_URL)) {
30	- // FIXME: do we need this from ubuntu-sso? authentication_clear_tokens ();
31	+ syncdaemon_authentication_clear_token (syncdaemon_daemon_get_authentication (music_store->priv->syncdaemon));
32	+ music_store->priv->auth_retries = 0;
33	fire_authentication (music_store, request, policy_decision);
34	} else if (g_strrstr (parsed_uri->path, "library.aspx") != NULL \|\|
35	g_str_has_prefix (parsed_uri->path, "/music/store/library")) {

libubuntuone

Merge lp:~rodrigo-moya/libubuntuone/fix-634384 into lp:libubuntuone

Commit message

Description of the change

Preview Diff

Subscribers