From b531ff2410c8f63d8f9a6094e1638987ae3e0acb Mon Sep 17 00:00:00 2001 From: fake Date: Tue, 21 Dec 2004 04:56:05 +0000 Subject: [PATCH] fake: multisync: update to cvs version from 2004-12-18 adds evoltion2+kdepim plugin and fixes build [2004121811250710839] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5295 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../irmc_sync-newbluetoothlibs.patch | 157 +++++++++--------- package/jsaw/multisync/ldap-sasl-2-loc.patch | 103 ++++++------ package/jsaw/multisync/multisync.conf | 8 +- package/jsaw/multisync/multisync.desc | 4 +- 4 files changed, 139 insertions(+), 133 deletions(-) diff --git a/package/jsaw/multisync/irmc_sync-newbluetoothlibs.patch b/package/jsaw/multisync/irmc_sync-newbluetoothlibs.patch index 0379927ac..392d08722 100644 --- a/package/jsaw/multisync/irmc_sync-newbluetoothlibs.patch +++ b/package/jsaw/multisync/irmc_sync-newbluetoothlibs.patch @@ -1,55 +1,23 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/jsaw/multisync/irmc_sync-newbluetoothlibs.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./plugins/irmc_sync/configure.in.orig 2004-08-26 16:10:55.663700216 +0200 -+++ ./plugins/irmc_sync/configure.in 2004-08-26 16:22:42.186292456 +0200 -@@ -23,12 +23,12 @@ - CPPFLAGS="${PACKAGE_CFLAGS}" - AC_CHECK_LIB(bluetooth,baswap,BLUETOOTH=1,BLUETOOTH=0) - SDP=0 --AC_CHECK_LIB(sdp,sdp_list_free,SDP=1,BLUETOOTH=0) -+dnl AC_CHECK_LIB(sdp,sdp_record_alloc,SDP=1,BLUETOOTH=0) - AC_MSG_CHECKING(for correct SDP lib version) - AC_TRY_COMPILE([ - #include - #include --],[sdp_record_t t;],AC_MSG_RESULT(yes),BLUETOOTH=0;AC_MSG_RESULT(no)) -+],[sdp_record_t t;],AC_MSG_RESULT(yes),SDP=1,BLUETOOTH=0;AC_MSG_RESULT(no)) - AM_CONDITIONAL(BLUETOOTH,test "${BLUETOOTH}" = "1") - if test "x${BLUETOOTH}" = "x0"; then - echo "Bluetooth is DISABLED. You must have bluez-libs and bluez-kernel >= 2.3 and bluez-sdp >= 1.0-pre1." ---- ./plugins/irmc_sync/configure.orig 2004-08-26 16:10:46.630073536 +0200 -+++ ./plugins/irmc_sync/configure 2004-08-26 16:26:08.325954464 +0200 -@@ -4307,67 +4307,6 @@ +--- ./plugins/irmc_sync/configure.orig 2004-12-18 07:37:17.148587216 +0100 ++++ ./plugins/irmc_sync/configure 2004-12-18 08:12:51.570105824 +0100 +@@ -4802,77 +4802,12 @@ + _ACEOF + + LIBS="-lbluetooth $LIBS" ++ SDP=1 + + else BLUETOOTH=0 fi --SDP=0 --echo "$as_me:$LINENO: checking for sdp_list_free in -lsdp" >&5 --echo $ECHO_N "checking for sdp_list_free in -lsdp... $ECHO_C" >&6 --if test "${ac_cv_lib_sdp_sdp_list_free+set}" = set; then +-echo "$as_me:$LINENO: checking for sdp_connect in -lsdp" >&5 +-echo $ECHO_N "checking for sdp_connect in -lsdp... $ECHO_C" >&6 +-if test "${ac_cv_lib_sdp_sdp_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsdp $LIBS" -cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext @@ -62,76 +30,103 @@ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char sdp_list_free (); +-char sdp_connect (); -int -main () -{ --sdp_list_free (); +-sdp_connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&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); } && -- { ac_try='test -s conftest$ac_exeext' +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_sdp_sdp_list_free=yes +- ac_cv_lib_sdp_sdp_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_sdp_sdp_list_free=no +-ac_cv_lib_sdp_sdp_connect=no -fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi --echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_list_free" >&5 --echo "${ECHO_T}$ac_cv_lib_sdp_sdp_list_free" >&6 --if test $ac_cv_lib_sdp_sdp_list_free = yes; then +-echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_connect" >&5 +-echo "${ECHO_T}$ac_cv_lib_sdp_sdp_connect" >&6 +-if test $ac_cv_lib_sdp_sdp_connect = yes; then - SDP=1 --else -- BLUETOOTH=0 -fi -- + echo "$as_me:$LINENO: checking for correct SDP lib version" >&5 echo $ECHO_N "checking for correct SDP lib version... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -@@ -4401,7 +4340,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:$LINENO: result: yes" >&5 -+ SDP=1 ; echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 ---- ./plugins/irmc_sync/src/Makefile.am.orig 2004-09-06 22:35:03.136190448 +0200 -+++ ./plugins/irmc_sync/src/Makefile.am 2004-09-06 22:35:15.150364016 +0200 -@@ -21,7 +21,7 @@ - libirmc_bluetooth_la_SOURCES = \ +@@ -4904,7 +4839,7 @@ + #define HAVE_BLUETOOTH ${BLUETOOTH} + _ACEOF + +-LIBS="$LIBS -lglib-2.0" ++#LIBS="$LIBS -lglib-2.0" + + + echo "$as_me:$LINENO: checking for OBEX_Init in -lopenobex" >&5 +--- ./plugins/irmc_sync/configure.in.orig 2004-12-18 07:38:12.279206088 +0100 ++++ ./plugins/irmc_sync/configure.in 2004-12-18 08:11:04.547375752 +0100 +@@ -24,7 +24,8 @@ + SDP=0 + AC_CHECK_HEADER(bluetooth/bluetooth.h, BLUETOOTH=1, BLUETOOTH=0) + AC_CHECK_LIB(bluetooth, hci_open_dev,,BLUETOOTH=0) +-AC_CHECK_LIB(sdp, sdp_connect, SDP=1) ++AC_CHECK_HEADER(bluetooth/sdp.h, SDP=1, SDP=0) ++dnl AC_CHECK_LIB(sdp, sdp_connect, SDP=1) + AC_MSG_CHECKING(for correct SDP lib version) + AM_CONDITIONAL(SDP,test "${SDP}" = "1") + AM_CONDITIONAL(BLUETOOTH,test "${BLUETOOTH}" = "1") +@@ -32,5 +33,4 @@ + echo "Bluetooth is DISABLED. You must have the bluez-libs installed." + fi + AC_DEFINE_UNQUOTED(HAVE_BLUETOOTH, ${BLUETOOTH},Defined if Bluetooth is enabled.) +-LIBS="$LIBS -lglib-2.0" + +--- ./plugins/irmc_sync/src/Makefile.in.orig 2004-12-18 08:21:22.000000000 +0100 ++++ ./plugins/irmc_sync/src/Makefile.in 2004-12-18 08:21:30.000000000 +0100 +@@ -159,8 +159,6 @@ irmc_bluetooth.c irmc_bluetooth.h --libirmc_bluetooth_la_LIBADD = -lbluetooth -lsdp -lpthread -+libirmc_bluetooth_la_LIBADD = -lbluetooth -lpthread + +-@SDP_TRUE@sdp_lib = -lsdp +- + libirmc_bluetooth_la_LIBADD = -lbluetooth -lpthread $(sdp_lib) libirmc_sync_la_SOURCES = \ - interface.c interface.h \ ---- ./plugins/irmc_sync/src/Makefile.in.orig 2004-09-06 22:35:07.207571504 +0200 -+++ ./plugins/irmc_sync/src/Makefile.in 2004-09-06 22:35:23.023167168 +0200 -@@ -109,7 +109,7 @@ +--- ./plugins/irmc_sync/src/Makefile.am.orig 2004-12-18 08:20:49.000000000 +0100 ++++ ./plugins/irmc_sync/src/Makefile.am 2004-12-18 08:21:07.000000000 +0100 +@@ -21,10 +21,6 @@ + libirmc_bluetooth_la_SOURCES = \ irmc_bluetooth.c irmc_bluetooth.h - --libirmc_bluetooth_la_LIBADD = -lbluetooth -lsdp -lpthread -+libirmc_bluetooth_la_LIBADD = -lbluetooth -lpthread +-if SDP +-sdp_lib = -lsdp +-endif +- + libirmc_bluetooth_la_LIBADD = -lbluetooth -lpthread $(sdp_lib) libirmc_sync_la_SOURCES = \ - interface.c interface.h \ diff --git a/package/jsaw/multisync/ldap-sasl-2-loc.patch b/package/jsaw/multisync/ldap-sasl-2-loc.patch index c7243c03b..2bd84ad32 100644 --- a/package/jsaw/multisync/ldap-sasl-2-loc.patch +++ b/package/jsaw/multisync/ldap-sasl-2-loc.patch @@ -17,9 +17,29 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./plugins/ldap_plugin/configure.orig 2004-08-25 20:36:29.566175336 +0200 -+++ ./plugins/ldap_plugin/configure 2004-08-25 20:41:52.658057904 +0200 -@@ -8815,8 +8815,8 @@ +--- ./plugins/ldap_plugin/configure.in.orig 2004-08-25 20:36:19.699675272 +0200 ++++ ./plugins/ldap_plugin/configure.in 2004-08-25 20:37:11.541794072 +0200 +@@ -17,7 +17,7 @@ + AC_PROG_LIBTOOL + + AC_CHECK_LIB(ldap,ldap_init,,AC_MSG_ERROR(You must have openldap libraries installed.)) +-AC_CHECK_HEADER(sasl/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed)) ++AC_CHECK_HEADER(sasl2/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed)) + + dnl Info for the RPM + MULTISYNC_TOP="../.." +--- ./plugins/ldap_plugin/src/ldap.c.orig 2003-12-03 02:24:07.000000000 +0100 ++++ ./plugins/ldap_plugin/src/ldap.c 2004-08-25 21:05:03.364638368 +0200 +@@ -1,5 +1,5 @@ + #include "ldap_plugin.h" +-#include ++#include + + int lutil_sasl_interact( + LDAP *ld, +--- ./plugins/ldap_plugin/configure.orig 2004-12-18 09:27:21.466670192 +0100 ++++ ./plugins/ldap_plugin/configure 2004-12-18 09:28:05.211020040 +0100 +@@ -20172,8 +20172,8 @@ fi if test "${ac_cv_header_sasl_sasl_h+set}" = set; then @@ -30,7 +50,7 @@ if test "${ac_cv_header_sasl_sasl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -@@ -8824,8 +8824,8 @@ +@@ -20181,8 +20181,8 @@ echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 else # Is the header compilable? @@ -39,9 +59,9 @@ +echo "$as_me:$LINENO: checking sasl2/sasl.h usability" >&5 +echo $ECHO_N "checking sasl2/sasl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -8834,7 +8834,7 @@ + _ACEOF +@@ -20190,7 +20190,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -50,7 +70,7 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -8860,8 +8860,8 @@ +@@ -20225,15 +20225,15 @@ echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? @@ -59,9 +79,8 @@ +echo "$as_me:$LINENO: checking sasl2/sasl.h presence" >&5 +echo $ECHO_N "checking sasl2/sasl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -8869,7 +8869,7 @@ + _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -70,41 +89,49 @@ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -8902,10 +8902,10 @@ +@@ -20267,25 +20267,25 @@ # So? What about this header? - case $ac_header_compiler:$ac_header_preproc in - yes:no ) + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) - { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sasl2/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------ ## -@@ -8916,12 +8916,12 @@ - sed "s/^/$as_me: WARNING: /" >&2 ++ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sasl2/sasl.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sasl2/sasl.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sasl2/sasl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sasl2/sasl.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX - ## ------------------------------------ ## -@@ -8932,8 +8932,8 @@ + ## ------------------------------------------ ## +@@ -20296,8 +20296,8 @@ sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -115,23 +142,3 @@ if test "${ac_cv_header_sasl_sasl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ---- ./plugins/ldap_plugin/configure.in.orig 2004-08-25 20:36:19.699675272 +0200 -+++ ./plugins/ldap_plugin/configure.in 2004-08-25 20:37:11.541794072 +0200 -@@ -17,7 +17,7 @@ - AC_PROG_LIBTOOL - - AC_CHECK_LIB(ldap,ldap_init,,AC_MSG_ERROR(You must have openldap libraries installed.)) --AC_CHECK_HEADER(sasl/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed)) -+AC_CHECK_HEADER(sasl2/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed)) - - dnl Info for the RPM - MULTISYNC_TOP="../.." ---- ./plugins/ldap_plugin/src/ldap.c.orig 2003-12-03 02:24:07.000000000 +0100 -+++ ./plugins/ldap_plugin/src/ldap.c 2004-08-25 21:05:03.364638368 +0200 -@@ -1,5 +1,5 @@ - #include "ldap_plugin.h" --#include -+#include - - int lutil_sasl_interact( - LDAP *ld, diff --git a/package/jsaw/multisync/multisync.conf b/package/jsaw/multisync/multisync.conf index 1f294ada9..034c78cc0 100644 --- a/package/jsaw/multisync/multisync.conf +++ b/package/jsaw/multisync/multisync.conf @@ -40,9 +40,9 @@ multisync_pm() { build_multisync_plugin backup_plugin + echo "missing" > plugins/evolution2_sync/INSTALL pkginstalled evolution && \ - build_multisync_plugin evolution_sync \ - --with-evo-libs=$root/$pkg_evolution_libs + build_multisync_plugin evolution2_sync build_multisync_plugin palm_sync build_multisync_plugin opie_sync @@ -56,6 +56,10 @@ multisync_pm() { pkginstalled openobex && \ build_multisync_plugin irmc_sync \ LDFLAGS="-L$root/$ROCKCFG_PKG_GNOME28_CORE_PREFIX/lib" + + pkginstalled kdepim && \ + build_multisync_plugin kdepim_plugin + } hook_add postmake 3 multisync_pm diff --git a/package/jsaw/multisync/multisync.desc b/package/jsaw/multisync/multisync.desc index 6c371d0f9..27fad24f4 100644 --- a/package/jsaw/multisync/multisync.desc +++ b/package/jsaw/multisync/multisync.desc @@ -38,7 +38,7 @@ [L] GPL [S] Beta -[V] 0.82 +[V] 2004-12-18 [P] X -?---5---9 213.600 -[D] 1420076458 multisync-0.82.tar.bz2 http://dl.sourceforge.net/multisync/ +[D] 3025181880 multisync-2004-12-18.tar.bz2 http://www.rocklinux.net/people/fake/multisync/