win32/patches/libgdata.patch

   1 diff -upr -x .deps -x .libs -x '*.la' libgdata-0.15.1.old/Makefile.am libgdata-0.15.1/Makefile.am
   2 --- libgdata-0.15.1.old/Makefile.am     2014-06-20 21:01:11 +0000
   3 +++ libgdata-0.15.1/Makefile.am 2014-06-20 20:58:04 +0000
   4 @@ -1,4 +1,4 @@
   5 -SUBDIRS = . gdata/tests po docs
   6 +SUBDIRS = . po docs
   7
   8  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
   9
  10 diff -upr -x .deps -x .libs -x '*.la' libgdata-0.15.1.old/Makefile.in libgdata-0.15.1/Makefile.in
  11 --- libgdata-0.15.1.old/Makefile.in     2014-06-20 21:01:11 +0000
  12 +++ libgdata-0.15.1/Makefile.in 2014-06-20 20:58:04 +0000
  13 @@ -775,7 +775,7 @@ target_alias = @target_alias@
  14  top_build_prefix = @top_build_prefix@
  15  top_builddir = @top_builddir@
  16  top_srcdir = @top_srcdir@
  17 -SUBDIRS = . gdata/tests po docs
  18 +SUBDIRS = . po docs
  19  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  20  DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
  21  MAINTAINERCLEANFILES = $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
  22 diff -upr -x .deps -x .libs -x '*.la' libgdata-0.15.1.old/configure libgdata-0.15.1/configure
  23 --- libgdata-0.15.1.old/configure       2014-06-20 21:01:11 +0000
  24 +++ libgdata-0.15.1/configure   2014-06-20 20:58:04 +0000
  25 @@ -16239,96 +16239,6 @@ fi
  26
  27
  28
  29 -pkg_failed=no
  30 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UHTTPMOCK" >&5
  31 -$as_echo_n "checking for UHTTPMOCK... " >&6; }
  32 -
  33 -if test -n "$UHTTPMOCK_CFLAGS"; then
  34 -    pkg_cv_UHTTPMOCK_CFLAGS="$UHTTPMOCK_CFLAGS"
  35 - elif test -n "$PKG_CONFIG"; then
  36 -    if test -n "$PKG_CONFIG" && \
  37 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libuhttpmock-0.0\""; } >&5
  38 -  ($PKG_CONFIG --exists --print-errors "libuhttpmock-0.0") 2>&5
  39 -  ac_status=$?
  40 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  41 -  test $ac_status = 0; }; then
  42 -  pkg_cv_UHTTPMOCK_CFLAGS=`$PKG_CONFIG --cflags "libuhttpmock-0.0" 2>/dev/null`
  43 -                     test "x$?" != "x0" && pkg_failed=yes
  44 -else
  45 -  pkg_failed=yes
  46 -fi
  47 - else
  48 -    pkg_failed=untried
  49 -fi
  50 -if test -n "$UHTTPMOCK_LIBS"; then
  51 -    pkg_cv_UHTTPMOCK_LIBS="$UHTTPMOCK_LIBS"
  52 - elif test -n "$PKG_CONFIG"; then
  53 -    if test -n "$PKG_CONFIG" && \
  54 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libuhttpmock-0.0\""; } >&5
  55 -  ($PKG_CONFIG --exists --print-errors "libuhttpmock-0.0") 2>&5
  56 -  ac_status=$?
  57 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  58 -  test $ac_status = 0; }; then
  59 -  pkg_cv_UHTTPMOCK_LIBS=`$PKG_CONFIG --libs "libuhttpmock-0.0" 2>/dev/null`
  60 -                     test "x$?" != "x0" && pkg_failed=yes
  61 -else
  62 -  pkg_failed=yes
  63 -fi
  64 - else
  65 -    pkg_failed=untried
  66 -fi
  67 -
  68 -
  69 -
  70 -if test $pkg_failed = yes; then
  71 -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  72 -$as_echo "no" >&6; }
  73 -
  74 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  75 -        _pkg_short_errors_supported=yes
  76 -else
  77 -        _pkg_short_errors_supported=no
  78 -fi
  79 -        if test $_pkg_short_errors_supported = yes; then
  80 -               UHTTPMOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libuhttpmock-0.0" 2>&1`
  81 -        else
  82 -               UHTTPMOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libuhttpmock-0.0" 2>&1`
  83 -        fi
  84 -       # Put the nasty error message in config.log where it belongs
  85 -       echo "$UHTTPMOCK_PKG_ERRORS" >&5
  86 -
  87 -       as_fn_error $? "Package requirements (libuhttpmock-0.0) were not met:
  88 -
  89 -$UHTTPMOCK_PKG_ERRORS
  90 -
  91 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
  92 -installed software in a non-standard prefix.
  93 -
  94 -Alternatively, you may set the environment variables UHTTPMOCK_CFLAGS
  95 -and UHTTPMOCK_LIBS to avoid the need to call pkg-config.
  96 -See the pkg-config man page for more details." "$LINENO" 5
  97 -elif test $pkg_failed = untried; then
  98 -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  99 -$as_echo "no" >&6; }
 100 -       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 101 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 102 -as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 103 -is in your PATH or set the PKG_CONFIG environment variable to the full
 104 -path to pkg-config.
 105 -
 106 -Alternatively, you may set the environment variables UHTTPMOCK_CFLAGS
 107 -and UHTTPMOCK_LIBS to avoid the need to call pkg-config.
 108 -See the pkg-config man page for more details.
 109 -
 110 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 111 -See \`config.log' for more details" "$LINENO" 5; }
 112 -else
 113 -       UHTTPMOCK_CFLAGS=$pkg_cv_UHTTPMOCK_CFLAGS
 114 -       UHTTPMOCK_LIBS=$pkg_cv_UHTTPMOCK_LIBS
 115 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 116 -$as_echo "yes" >&6; }
 117 -
 118 -fi
 119
 120  # Various necessary functions and headers
 121  for ac_func in strchr
 122 diff -upr -x .deps -x .libs -x '*.la' libgdata-0.15.1.old/configure.ac libgdata-0.15.1/configure.ac
 123 --- libgdata-0.15.1.old/configure.ac    2014-06-20 21:01:11 +0000
 124 +++ libgdata-0.15.1/configure.ac        2014-06-20 20:58:04 +0000
 125 @@ -123,11 +123,6 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
 126  AC_SUBST([GNOME_PACKAGES])
 127  AC_SUBST([GOA_ENABLED])
 128
 129 -dnl ****************************
 130 -dnl Check for uhttpmock
 131 -dnl ****************************
 132 -PKG_CHECK_MODULES(UHTTPMOCK, libuhttpmock-0.0)
 133 -
 134  # Various necessary functions and headers
 135  AC_CHECK_FUNCS([strchr])
 136  AC_CHECK_FUNCS([strstr])
 137 diff -upr -x .deps -x .libs -x '*.la' libgdata-0.15.1.old/gdata/gdata.symbols libgdata-0.15.1/gdata/gdata.symbols
 138 --- libgdata-0.15.1.old/gdata/gdata.symbols     2014-06-20 21:01:11 +0000
 139 +++ libgdata-0.15.1/gdata/gdata.symbols 2014-06-20 21:02:28 +0000
 140 @@ -965,9 +965,6 @@ gdata_documents_entry_get_quota_used
 141  gdata_documents_service_copy_document
 142  gdata_documents_service_copy_document_async
 143  gdata_documents_service_copy_document_finish
 144 -gdata_goa_authorizer_get_type
 145 -gdata_goa_authorizer_new
 146 -gdata_goa_authorizer_get_goa_object
 147  gdata_documents_document_get_thumbnail_uri
 148  gdata_tasks_task_get_type
 149  gdata_tasks_task_new
 150 @@ -1087,8 +1084,6 @@ gdata_freebase_topic_value_is_image
 151  gdata_freebase_topic_result_get_type
 152  gdata_freebase_topic_result_new
 153  gdata_freebase_topic_result_dup_object
 154 -gdata_freebase_result_error_get_type
 155 -gdata_freebase_result_error_quark
 156  gdata_freebase_result_get_type
 157  gdata_freebase_result_new
 158  gdata_freebase_result_dup_variant