Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24d84f2a9a64ee7990bdfb80a8317593237be6c4

commit 24d84f2a9a64ee7990bdfb80a8317593237be6c4
Author: bouleetbil <[EMAIL PROTECTED]>
Date:   Wed Dec 3 21:02:23 2008 +0100

pygobject-2.15.4-1-i686
*version bump some gnome stable depends
*to devel version of pygobject
*new subpkg for don't force gvfs depends
*closed #3500

diff --git a/source/lib/pygobject/FrugalBuild b/source/lib/pygobject/FrugalBuild
index adef3c1..14ef7b5 100644
--- a/source/lib/pygobject/FrugalBuild
+++ b/source/lib/pygobject/FrugalBuild
@@ -2,13 +2,27 @@
# Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]>

pkgname=pygobject
-pkgver=2.14.2
+pkgver=2.15.4
pkgrel=1
pkgdesc="Python bindings for GObject"
-depends=('python' 'glib2>=2.16.3' 'libffi')
+depends=('python' 'glib2>=2.18.3' 'libffi')
+makedepends=('gvfs')
groups=('lib')
archs=('i686' 'x86_64' 'ppc')
-Finclude gnome
-sha1sums=('e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc')
+Finclude gnome python
+source=($source detect_libffi.patch)
+sha1sums=('dfc3f04a27243ac4c386bfd19e4c383dd419d040' \
+          'c825944223544dc8821c7b99b084ac2da064aea8')
+
+subpkgs=("pygobject-gvfs")
+subdescs=('Python bindings for gvfs')
+subdepends=("pygobject=$pkgver gvfs")
+subgroups=('gnome')
+subarchs=('i686 x86_64')
+
+build() {
+       Fbuild
+       Fsplit pygobject-gvfs $_F_python_libdir/gtk-2.0/gio
+}

# optimization OK
diff --git a/source/lib/pygobject/detect_libffi.patch 
b/source/lib/pygobject/detect_libffi.patch
new file mode 100644
index 0000000..1030bd6
--- /dev/null
+++ b/source/lib/pygobject/detect_libffi.patch
@@ -0,0 +1,256 @@
+--- pygobject-2.15.4old/configure      2008-09-03 09:51:11.000000000 +0200
++++ pygobject-2.15.4/configure 2008-12-03 09:56:56.000000000 +0100
+@@ -11475,104 +11475,173 @@
+   exec_prefix=$exec_prefix_save
+
+
+-{ echo "$as_me:$LINENO: checking for ffi" >&5
+-echo $ECHO_N "checking for ffi... $ECHO_C" >&6; }
+
+-# Check whether --with-ffi was given.
+-if test "${with_ffi+set}" = set; then
+-  withval=$with_ffi; with_libffi=$withval
++{ echo "$as_me:$LINENO: checking for ffi.h" >&5
++echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; }
++
++# Check whether --with-libffi was given.
++if test "${with_libffi+set}" = set; then
++  withval=$with_libffi; with_ffi=$withval
+ else
+-  with_libffi=auto
++  with_ffi=auto
+ fi
+
+-if test x"$with_libffi" = xno ; then
+-  have_libffi=false
++if test x"$with_ffi" = xno ; then
++  pygobject_ffi_h=disabled
+ else
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FFI" >&5
+-echo $ECHO_N "checking for FFI... $ECHO_C" >&6; }
+-
+-if test -n "$FFI_CFLAGS"; then
+-    pkg_cv_FFI_CFLAGS="$FFI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi >= 
3.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libffi >= 3.0") 2>&5
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ffi.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0" 2>/dev/null`
++  (exit $ac_status); } >/dev/null && {
++       test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++       test ! -s conftest.err
++       }; then
++  pygobject_ffi_h=yes
+ else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  pygobject_ffi_h=no
+ fi
+-if test -n "$FFI_LIBS"; then
+-    pkg_cv_FFI_LIBS="$FFI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi >= 
3.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libffi >= 3.0") 2>&5
++
++rm -f conftest.err conftest.$ac_ext
++  if test $pygobject_ffi_h = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_FFI_H 1
++_ACEOF
++
++    save_LIBS=$LIBS
++    if test x"$with_ffi" = xyes || test x"$with_ffi" = xauto; then
++      other_LIBS=
++    else
++      other_LIBS=$with_ffi
++    fi
++    { echo "$as_me:$LINENO: checking for library containing ffi_call" >&5
++echo $ECHO_N "checking for library containing ffi_call... $ECHO_C" >&6; }
++if test "${ac_cv_search_ffi_call+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char ffi_call ();
++int
++main ()
++{
++return ffi_call ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ffi; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib $other_LIBS $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0" 2>/dev/null`
++  (exit $ac_status); } && {
++       test -z "$ac_c_werror_flag" ||
++       test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ac_cv_search_ffi_call=$ac_res
+ else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+
+-if test $pkg_failed = yes; then
++fi
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext
++  if test "${ac_cv_search_ffi_call+set}" = set; then
++  break
++fi
++done
++if test "${ac_cv_search_ffi_call+set}" = set; then
++  :
+ else
+-        _pkg_short_errors_supported=no
++  ac_cv_search_ffi_call=no
+ fi
+-        if test $_pkg_short_errors_supported = yes; then
+-              FFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
"libffi >= 3.0" 2>&1`
+-        else
+-              FFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi >= 3.0" 2>&1`
+-        fi
+-      # Put the nasty error message in config.log where it belongs
+-      echo "$FFI_PKG_ERRORS" >&5
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_search_ffi_call" >&5
++echo "${ECHO_T}$ac_cv_search_ffi_call" >&6; }
++ac_res=$ac_cv_search_ffi_call
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+-      { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-                have_libffi=no
+-elif test $pkg_failed = untried; then
+-      have_libffi=no
+ else
+-      FFI_CFLAGS=$pkg_cv_FFI_CFLAGS
+-      FFI_LIBS=$pkg_cv_FFI_LIBS
+-        { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-      have_libffi=yes
++  { { echo "$as_me:$LINENO: error: libffi not found" >&5
++echo "$as_me: error: libffi not found" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
++
++    if test x$"ac_cv_search_ffi_call" = x"none required" ; then
++      FFI_LIBS=$other_LIBS
++    else
++      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
++    fi
++    LIBS=$save_LIBS
++  fi
+ fi
+-if test x"$with_libffi" = xyes && test x"$have_libffi" = xno ; then
+-  { { echo "$as_me:$LINENO: error: ffi requested, but not found" >&5
+-echo "$as_me: error: ffi requested, but not found" >&2;}
++if test x"$with_ffi" != xauto && test x"$pygobject_ffi_h" != xyes ; then
++  { { echo "$as_me:$LINENO: error: libffi requested, but ffi.h not found" >&5
++echo "$as_me: error: libffi requested, but ffi.h not found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test x"$have_libffi" = xyes; then
++{ echo "$as_me:$LINENO: result: $pygobject_ffi_h" >&5
++echo "${ECHO_T}$pygobject_ffi_h" >&6; }
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FFI_H 1
+-_ACEOF
+
+-fi
+-{ echo "$as_me:$LINENO: result: $have_libffi" >&5
+-echo "${ECHO_T}$have_libffi" >&6; }
+- if test "$have_libffi" = "yes"; then
++if test "$pygobject_ffi_h" = "yes"; then
+   HAVE_LIBFFI_TRUE=
+   HAVE_LIBFFI_FALSE='#'
++  have_libffi=true
+ else
+   HAVE_LIBFFI_TRUE='#'
+   HAVE_LIBFFI_FALSE=
+@@ -11580,8 +11649,6 @@
+
+
+
+-
+-
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GIO" >&5
+ echo $ECHO_N "checking for GIO... $ECHO_C" >&6; }
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to