Package: kdebluetooth
Version: 0.99+1.0beta1-6+b1
Severity: serious
Justification: no longer builds from source
Tags: patch
Hi,
A new version of libopenobex (1.1) finally was accepted in unstable.
This version does NOT use openobex-config anymore but the more
standardized pkg-config. The patch below make configure detect this version.
Like before, OPENOBEX_CFLAGS and OPENOBEX_LIBS are set.
However, other bugs are also involved: all includes like
#include <obex.h>
must be changed to
#include <openobex/obex.h>
If you have further problems, please tell me.
Sincerly
Hendrik Sattler
---------------------------snip---------------------------------
--- configure.in 2005-03-20 17:46:50.000000000 +0100
+++ ../modified/configure.in 2006-03-22 02:00:20.000000000 +0100
@@ -203,72 +203,20 @@
dnl Check for openobex library
-# Modified by Simone Gotti for kde-bluetooth on 2003-10-04
-
-AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
-
-if test "$OPENOBEX_CONFIG" = "no" ; then
- AC_MSG_WARN(openobex-config not found. Pehaps openobex is not
installed.)
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
- OPENOBEX_CONFIG="false"
-fi
-
-OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
-openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2`
-if test -f "$openobex_inc_dir/obex.h" ; then
- :
-else
- if test -f "$openobex_inc_dir/openobex/obex.h" ; then
- OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex"
- else
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
- fi
-fi
-OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
-
-min_obex_version=1.0.0
-AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
-obex_config_version=`$OPENOBEX_CONFIG --version`
-
-obex_config_major_version=`$OPENOBEX_CONFIG --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-obex_req_major_version=`echo $min_obex_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-obex_req_minor_version=`echo $min_obex_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-obex_req_micro_version=`echo $min_obex_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ;
then
- if test $obex_req_major_version -lt $obex_config_major_version ; then
- obex_config_version_ok="yes"
- fi
- if test $obex_req_major_version -eq $obex_config_major_version ; then
- if test $obex_req_minor_version -lt $obex_config_minor_version
; then
- obex_config_version_ok="yes"
- fi
- if test $obex_req_minor_version -eq $obex_config_minor_version
; then
- if test $obex_req_micro_version -le
$obex_config_micro_version ; then
- obex_config_version_ok="yes"
- fi
- fi
- fi
-fi
-
-if test "$obex_config_version_ok" != "yes" ; then
- AC_MSG_WARN(Installed openobex library too old ($obex_config_version))
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
-fi
-
-
+dnl Modified to be usable with openobex-1.1
+OPENOBEX_CFLAGS=
+OPENOBEX_LIBS=
+OPENOBEX_PRESENT="no"
+min_obex_version=1.1
+PKG_CHECK_MODULES(OPENOBEX,
+ openobex >= $min_obex_version,
+ [OPENOBEX_PRESENT="yes"],
+ [AC_MSG_WARN(pkg-config does not known about openobex.
Pehaps openobex is not installed.)
+ DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+ ]
+ )
AC_SUBST(OPENOBEX_CFLAGS)
AC_SUBST(OPENOBEX_LIBS)
-AC_MSG_RESULT(yes)
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -511,19 +459,12 @@
fi
-if test "$OPENOBEX_CONFIG" = "no" ; then
+if test "$OPENOBEX_PRESENT" = "no" ; then
echo ""
- echo "You're missing openobex."
+ echo "You're missing openobex or the installed openobex library"
+ echo "version is too old."
echo "Kdebluetooth won't be compiled without it, so you should"
- echo "consider installing it."
- echo ""
-fi
-
-if test "$obex_config_version_ok" != "yes" ; then
- echo ""
- echo "The installed openobex library version is too old:
($obex_config_version)"
- echo "Kdebluetooth won't be compiled without a newer version, so you
should"
- echo "consider updating it."
+ echo "consider installing/updating it."
echo ""
fi
---------------------------snip---------------------------------
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Versions of packages kdebluetooth depends on:
ii kdelibs4c2a 4:3.5.1-2 core libraries for all KDE applica
ii libart-2.0-2 2.3.17-1 Library of functions for 2D graphi
ii libaudio2 1.7-5 The Network Audio System (NAS). (s
ii libbluetooth1 2.25-1 Library to use the BlueZ Linux Blu
ii libc6 2.3.6-3 GNU C Library: Shared libraries an
ii libfam0 2.7.0-9 Client library to control the FAM
ii libfontconfig1 2.3.2-1.1 generic font configuration library
ii libfreetype6 2.1.10-1 FreeType 2 font engine, shared lib
ii libgcc1 1:4.0.3-1 GCC support library
ii libice6 6.9.0.dfsg.1-4 Inter-Client Exchange library
ii libidn11 0.5.18-2 GNU libidn library, implementation
ii libjpeg62 6b-12 The Independent JPEG Group's JPEG
ii libopenobex-1.0-0 1:1.0.0-rel-3 OBEX protocol library
ii libpng12-0 1.2.8rel-5 PNG library - runtime
ii libqt3-mt 3:3.3.5-4 Qt GUI Library (Threaded runtime v
ii libsm6 6.9.0.dfsg.1-4 X Window System Session Management
ii libstdc++6 4.0.3-1 The GNU Standard C++ Library v3
ii libx11-6 6.9.0.dfsg.1-4 X Window System protocol client li
ii libxcursor1 1.1.3-1 X cursor management library
ii libxext6 6.9.0.dfsg.1-4 X Window System miscellaneous exte
ii libxft2 2.1.8.2-3 FreeType-based font drawing librar
ii libxi6 6.9.0.dfsg.1-4 X Window System Input extension li
ii libxinerama1 6.9.0.dfsg.1-4 X Window System multi-head display
ii libxrandr2 6.9.0.dfsg.1-4 X Window System Resize, Rotate and
ii libxrender1 1:0.9.0.2-1 X Rendering Extension client libra
ii libxt6 6.9.0.dfsg.1-4 X Toolkit Intrinsics
ii qobex 0.99+1.0beta1-6+b1 Swiss army knife for the OBject EX
ii zlib1g 1:1.2.3-9 compression library - runtime
kdebluetooth recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
