vcs.maemo.org Git - oespirit1/blob - glib-2.0/maemo-glib/mer-changes.patch

   1 --- glib2.0-2.18.1-1maemo4+0m5.orig/autogen.sh
   2 +++ glib2.0-2.18.1-1maemo4+0m5/autogen.sh
   3 @@ -16,7 +16,7 @@
   4  if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
   5         libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
   6         case $libtool_version in
   7 -           1.4*|1.5*)
   8 +           1.4*|1.5*|2.2*)
   9                 have_libtool=true
  10                 ;;
  11         esac
  12 --- glib2.0-2.18.1-1maemo4+0m5.orig/configure.in
  13 +++ glib2.0-2.18.1-1maemo4+0m5/configure.in
  14 @@ -1302,7 +1302,7 @@
  15    G_MODULE_LDFLAGS=
  16  else
  17    export SED
  18 -  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
  19 +  G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
  20  fi
  21  dnl G_MODULE_IMPL= don't reset, so cmd-line can override
  22  G_MODULE_NEED_USCORE=0
  23 @@ -1367,7 +1367,7 @@
  24         LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  25  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  26         echo "void glib_plugin_test(void) { }" > plugin.c
  27 -       ${SHELL} ./libtool --mode=compile ${CC} -shared \
  28 +       ${SHELL} libtool --mode=compile ${CC} -shared \
  29                 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  30         AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  31                 glib_cv_rtldglobal_broken,[
  32 @@ -1441,7 +1441,7 @@
  33
  34  AC_MSG_CHECKING(for the suffix of module shared libraries)
  35  export SED
  36 -shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
  37 +shrext_cmds=`libtool --config | grep '^shrext_cmds='`
  38  eval $shrext_cmds
  39  module=yes eval std_shrext=$shrext_cmds
  40  # chop the initial dot
  41 @@ -1846,6 +1846,11 @@
  42          G_THREAD_CFLAGS="-D_REENTRANT -D_PTHREADS"
  43          G_THREAD_LIBS="-lpthread -lthread"
  44          ;;
  45 +      arm-*-linux*)
  46 +        G_THREAD_CFLAGS="-pthread"
  47 +        G_THREAD_LIBS="-lpthread -lrt"
  48 +       G_THREAD_LIBS_FOR_GTHREAD='-lpthread -lrt'
  49 +       ;;
  50        *)
  51          for flag in pthread pthreads mt; do
  52            glib_save_CFLAGS="$CFLAGS"
  53 --- glib2.0-2.18.1-1maemo4+0m5.orig/debian/rules
  54 +++ glib2.0-2.18.1-1maemo4+0m5/debian/rules
  55 @@ -86,7 +86,7 @@
  56                         --mandir=\$${prefix}/share/man \
  57                         --infodir=\$${prefix}/share/info \
  58                         --with-html-dir=\$${prefix}/share/doc/libglib$(apiver)-doc \
  59 -                       --enable-static \
  60 +                       --enable-static --with-threads=posix \
  61                         $(ENABLE_GTK_DOC)
  62
  63         cd $(BUILD_DEB_DIR) && \
  64 --- glib2.0-2.18.1-1maemo4+0m5.orig/debian/control
  65 +++ glib2.0-2.18.1-1maemo4+0m5/debian/control
  66 @@ -2,7 +2,7 @@
  67  Section: libs
  68  Priority: optional
  69  Maintainer: Claudio Saavedra <csaavedra@igalia.com>
  70 -Build-Depends: debhelper (>> 4.0.0), pkg-config (>= 0.14.0), gettext, autotools-dev, gtk-doc-tools
  71 +Build-Depends: debhelper (>> 4.0.0), pkg-config (>= 0.14.0), gettext, autotools-dev, gtk-doc-tools, libglib2.0-0
  72  Standards-Version: 3.6.1.0
  73
  74  Package: libglib2.0-0
  75 --- glib2.0-2.18.1-1maemo4+0m5.orig/debian/changelog
  76 +++ glib2.0-2.18.1-1maemo4+0m5/debian/changelog
  77 @@ -1,3 +1,10 @@
  78 +glib2.0 (2.18.1-1maemo4+0m5-mer1) jaunty; urgency=low
  79 +
  80 +  * Added OBS-building-patch by lbt, fixing QEMU-ARM problem and OBS oddity.
  81 +  * Fix libtool2 issue.
  82 +
  83 + -- Carsten V. Munk <cvm@cs.au.dk>  Wed, 20 May 2009 13:24:18 +0000
  84 +
  85  glib2.0 (2.18.1-1maemo4+0m5) unstable; urgency=low
  86
  87    * This entry has been added by BIFH queue processor
  88 --- glib2.0-2.18.1-1maemo4+0m5.orig/debian/control.in
  89 +++ glib2.0-2.18.1-1maemo4+0m5/debian/control.in
  90 @@ -2,7 +2,7 @@
  91  Section: libs
  92  Priority: optional
  93  Maintainer: Claudio Saavedra <csaavedra@igalia.com>
  94 -Build-Depends: debhelper (>> 4.0.0), pkg-config (>= 0.14.0), gettext, autotools-dev, gtk-doc-tools
  95 +Build-Depends: debhelper (>> 4.0.0), pkg-config (>= 0.14.0), gettext, autotools-dev, gtk-doc-tools, libglib2.0-0
  96  Standards-Version: 3.6.1.0
  97
  98  Package: libglib2.0-@SONAME@