[Pkg-voip-commits] r2680 - in wengophone/trunk/debian: . patches
patches/generic patches/head
Marco Nenciarini
mnencia at alioth.debian.org
Sat Nov 4 18:44:15 CET 2006
Author: mnencia
Date: 2006-11-04 18:44:15 +0100 (Sat, 04 Nov 2006)
New Revision: 2680
Added:
wengophone/trunk/debian/patches/generic/cmake-fix-gaim4.patch
wengophone/trunk/debian/patches/head/cmake-findxml2.patch
Removed:
wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/control
wengophone/trunk/debian/patches/series
Log:
New upstream snapshot (wengophone-ng/branches/wengophone-2.0 rev 8281)
Added patch to make snapshot building
Added build-dep on libxml2-dev
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-11-04 14:05:07 UTC (rev 2679)
+++ wengophone/trunk/debian/changelog 2006-11-04 17:44:15 UTC (rev 2680)
@@ -1,12 +1,20 @@
-wengophone (2.0.0~rc5-svn8137-1) UNRELEASED; urgency=low
+wengophone (2.0.0~rc5-svn8281-1) UNRELEASED; urgency=low
* New upstream snapshot. Switched to branches/wengophone-2.0
* debian/get-orig-source.sh: Stripped wifo/phapi/speex from the
source tarball.
- * Removed cmake-external-speex patch (fixed upstream)
+ * debian/control
+ + added XS-Vcs-Svn field to source package
+ + Build-depends on libxml2-dev
+ * Added patches
+ + cmake-fix-gaim4
+ + cmake-findxml2 (from upstream trunk)
+ * Removed patches
+ + cmake-external-speex (fixed upstream)
+ + fix-varargs-alpha (fixed upstream)
+
+ -- Marco Nenciarini <mnencia at debian.org> Sat, 4 Nov 2006 17:57:26 +0100
- -- Marco Nenciarini <mnencia at debian.org> Fri, 20 Oct 2006 20:02:23 +0200
-
wengophone (2.0.0~rc5-svn8108-2) unstable; urgency=low
* Added cmake-external-speex.patch to fix compilation on alpha,
Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control 2006-11-04 14:05:07 UTC (rev 2679)
+++ wengophone/trunk/debian/control 2006-11-04 17:44:15 UTC (rev 2680)
@@ -8,8 +8,9 @@
libboost-serialization-dev (>= 1.33.1-5), libboost-thread-dev (>= 1.33.1-5),
libboost-regex-dev (>= 1.33.1-5), libboost-signals-dev (>= 1.33.1-5),
libboost-program-options-dev (>= 1.33.1-5), uuid-dev, libasound2-dev,
- libspeex-dev, libssl-dev
+ libspeex-dev, libssl-dev, libxml2-dev
Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/wengophone/trunk
Package: wengophone
Architecture: any
Added: wengophone/trunk/debian/patches/generic/cmake-fix-gaim4.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-gaim4.patch 2006-11-04 14:05:07 UTC (rev 2679)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-gaim4.patch 2006-11-04 17:44:15 UTC (rev 2680)
@@ -0,0 +1,335 @@
+Index: wengophone-2.0.0~rc5-svn8281/libs/gaim/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc5-svn8281.orig/libs/gaim/CMakeLists.txt 2006-09-28 13:30:10.000000000 +0200
++++ wengophone-2.0.0~rc5-svn8281/libs/gaim/CMakeLists.txt 2006-11-04 17:11:51.000000000 +0100
+@@ -1,13 +1,16 @@
+ project(gaim)
+
++find_package(XML2 REQUIRED)
++
+ # needed include directories to build gaim
+ # saves the variable in internal cache for later use
+ set(GAIM_INCLUDE_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/src
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/src
+- ${CMAKE_CURRENT_SOURCE_DIR}/src/src/protocols/oscar
++ ${CMAKE_CURRENT_SOURCE_DIR}/src/libgaim
++ ${CMAKE_CURRENT_SOURCE_DIR}/src/libgaim/protocols/oscar
+ ${GLIB2_INCLUDE_DIRS}
++ ${XML2_INCLUDE_DIRS}
+ CACHE INTERNAL "gaim include directories"
+ )
+
+@@ -22,6 +25,7 @@
+ ${GLIB2_LIBRARY}
+ ${GMODULE2_LIBRARY}
+ ${GTHREAD2_LIBRARY}
++ ${XML2_LIBRARIES}
+ resolv
+ gnutls
+ )
+@@ -35,164 +39,145 @@
+ )
+
+ set(gaim_SRCS
+- src/src/account.c
+- src/src/accountopt.c
+- src/src/blist.c
+- src/src/buddyicon.c
+- src/src/cipher.c
+- src/src/cmds.c
+- src/src/connection.c
+- src/src/conversation.c
+- src/src/core.c
+- src/src/debug.c
+- src/src/desktopitem.c
+- src/src/dnssrv.c
+- src/src/eventloop.c
+- src/src/ft.c
+- #src/src/gaim_buffer.c
+- src/src/getopt.c
+- src/src/getopt1.c
+- src/src/idle.c
+- src/src/imgstore.c
+- src/src/log.c
+- src/src/media.c
+- src/src/mime.c
+- src/src/network.c
+- src/src/notify.c
+- src/src/ntlm.c
+- src/src/plugin.c
+- src/src/pluginpref.c
+- src/src/pounce.c
+- src/src/prefs.c
+- src/src/privacy.c
+- src/src/proxy.c
+- src/src/prpl.c
+- src/src/request.c
+- src/src/roomlist.c
+- src/src/savedstatuses.c
+- src/src/server.c
+- src/src/signals.c
+- src/src/sound.c
+- src/src/sslconn.c
+- src/src/status.c
+- src/src/stringref.c
+- src/src/stun.c
+- src/src/upnp.c
+- src/src/util.c
+- src/src/value.c
+- src/src/whiteboard.c
+- src/src/xmlnode.c
+- src/plugins/ssl/ssl.c
+- #src/plugins/tcl/tcl.c
+- #src/plugins/tcl/tcl_cmds.c
+- #src/plugins/tcl/tcl_signals.c
+- #src/plugins/tcl/tcl_glib.c
+- src/src/protocols/irc/cmds.c
+- src/src/protocols/irc/dcc_send.c
+- src/src/protocols/irc/irc.c
+- src/src/protocols/irc/msgs.c
+- src/src/protocols/irc/parse.c
+- src/src/protocols/jabber/auth.c
+- src/src/protocols/jabber/buddy.c
+- src/src/protocols/jabber/chat.c
+- src/src/protocols/jabber/disco.c
+- src/src/protocols/jabber/iq.c
+- src/src/protocols/jabber/jabber.c
+- src/src/protocols/jabber/jutil.c
+- src/src/protocols/jabber/message.c
+- src/src/protocols/jabber/oob.c
+- src/src/protocols/jabber/parser.c
+- src/src/protocols/jabber/presence.c
+- src/src/protocols/jabber/roster.c
+- src/src/protocols/jabber/si.c
+- src/src/protocols/jabber/xdata.c
+- src/src/protocols/msn/cmdproc.c
+- src/src/protocols/msn/command.c
+- src/src/protocols/msn/dialog.c
+- src/src/protocols/msn/directconn.c
+- src/src/protocols/msn/error.c
+- src/src/protocols/msn/group.c
+- src/src/protocols/msn/history.c
+- src/src/protocols/msn/httpconn.c
+- src/src/protocols/msn/msg.c
+- src/src/protocols/msn/msn.c
+- src/src/protocols/msn/nexus.c
+- src/src/protocols/msn/notification.c
+- src/src/protocols/msn/object.c
+- src/src/protocols/msn/page.c
+- src/src/protocols/msn/servconn.c
+- src/src/protocols/msn/session.c
+- src/src/protocols/msn/slp.c
+- src/src/protocols/msn/slpcall.c
+- src/src/protocols/msn/slplink.c
+- src/src/protocols/msn/slpmsg.c
+- src/src/protocols/msn/slpsession.c
+- src/src/protocols/msn/state.c
+- src/src/protocols/msn/switchboard.c
+- src/src/protocols/msn/sync.c
+- src/src/protocols/msn/table.c
+- src/src/protocols/msn/transaction.c
+- src/src/protocols/msn/user.c
+- src/src/protocols/msn/userlist.c
+- src/src/protocols/msn/utils.c
+- src/src/protocols/napster/napster.c
+- src/src/protocols/novell/nmconference.c
+- src/src/protocols/novell/nmconn.c
+- src/src/protocols/novell/nmcontact.c
+- src/src/protocols/novell/nmevent.c
+- src/src/protocols/novell/nmfield.c
+- src/src/protocols/novell/nmmessage.c
+- src/src/protocols/novell/nmrequest.c
+- src/src/protocols/novell/nmrtf.c
+- src/src/protocols/novell/nmuser.c
+- src/src/protocols/novell/nmuserrecord.c
+- src/src/protocols/novell/novell.c
+- src/src/protocols/oscar/admin.c
+- src/src/protocols/oscar/adverts.c
+- src/src/protocols/oscar/auth.c
+- src/src/protocols/oscar/bart.c
+- src/src/protocols/oscar/bos.c
+- src/src/protocols/oscar/bstream.c
+- src/src/protocols/oscar/buddylist.c
+- src/src/protocols/oscar/chat.c
+- src/src/protocols/oscar/chatnav.c
+- src/src/protocols/oscar/conn.c
+- src/src/protocols/oscar/email.c
+- src/src/protocols/oscar/ft.c
+- src/src/protocols/oscar/icq.c
+- src/src/protocols/oscar/im.c
+- src/src/protocols/oscar/invite.c
+- src/src/protocols/oscar/locate.c
+- src/src/protocols/oscar/misc.c
+- src/src/protocols/oscar/msgcookie.c
+- src/src/protocols/oscar/odir.c
+- src/src/protocols/oscar/oscar.c
+- src/src/protocols/oscar/popups.c
+- src/src/protocols/oscar/rxhandlers.c
+- src/src/protocols/oscar/rxqueue.c
+- src/src/protocols/oscar/search.c
+- src/src/protocols/oscar/service.c
+- src/src/protocols/oscar/snac.c
+- src/src/protocols/oscar/ssi.c
+- src/src/protocols/oscar/stats.c
+- src/src/protocols/oscar/tlv.c
+- src/src/protocols/oscar/translate.c
+- src/src/protocols/oscar/txqueue.c
+- src/src/protocols/oscar/util.c
+- src/src/protocols/yahoo/util.c
+- src/src/protocols/yahoo/yahoo.c
+- src/src/protocols/yahoo/yahoo_auth.c
+- src/src/protocols/yahoo/yahoo_crypt.c
+- src/src/protocols/yahoo/yahoo_doodle.c
+- src/src/protocols/yahoo/yahoo_filexfer.c
+- src/src/protocols/yahoo/yahoo_friend.c
+- src/src/protocols/yahoo/yahoo_packet.c
+- src/src/protocols/yahoo/yahoo_picture.c
+- src/src/protocols/yahoo/yahoo_profile.c
+- src/src/protocols/yahoo/yahoochat.c
+- src/src/protocols/yahoo/ycht.c
+- src/src/prefix.c
+- src/plugins/ssl/ssl-gnutls.c
++ src/libgaim/account.c
++ src/libgaim/accountopt.c
++ src/libgaim/blist.c
++ src/libgaim/buddyicon.c
++ src/libgaim/cipher.c
++ src/libgaim/circbuffer.c
++ src/libgaim/cmds.c
++ src/libgaim/connection.c
++ src/libgaim/conversation.c
++ src/libgaim/core.c
++ src/libgaim/debug.c
++ src/libgaim/desktopitem.c
++ src/libgaim/dnsquery.c
++ src/libgaim/dnssrv.c
++ src/libgaim/eventloop.c
++ src/libgaim/ft.c
++ src/libgaim/getopt.c
++ src/libgaim/getopt1.c
++ src/libgaim/idle.c
++ src/libgaim/imgstore.c
++ src/libgaim/log.c
++ src/libgaim/mime.c
++ src/libgaim/network.c
++ src/libgaim/notify.c
++ src/libgaim/ntlm.c
++ src/libgaim/plugin.c
++ src/libgaim/pluginpref.c
++ src/libgaim/pounce.c
++ src/libgaim/prefix.c
++ src/libgaim/prefs.c
++ src/libgaim/privacy.c
++ src/libgaim/proxy.c
++ src/libgaim/prpl.c
++ src/libgaim/request.c
++ src/libgaim/roomlist.c
++ src/libgaim/savedstatuses.c
++ src/libgaim/server.c
++ src/libgaim/signals.c
++ src/libgaim/sound.c
++ src/libgaim/sslconn.c
++ src/libgaim/status.c
++ src/libgaim/stringref.c
++ src/libgaim/stun.c
++ src/libgaim/upnp.c
++ src/libgaim/util.c
++ src/libgaim/value.c
++ src/libgaim/whiteboard.c
++ src/libgaim/xmlnode.c
++ src/libgaim/plugins/ssl/ssl.c
++ src/libgaim/protocols/jabber/auth.c
++ src/libgaim/protocols/jabber/buddy.c
++ src/libgaim/protocols/jabber/chat.c
++ src/libgaim/protocols/jabber/disco.c
++ src/libgaim/protocols/jabber/iq.c
++ src/libgaim/protocols/jabber/jabber.c
++ src/libgaim/protocols/jabber/jutil.c
++ src/libgaim/protocols/jabber/message.c
++ src/libgaim/protocols/jabber/oob.c
++ src/libgaim/protocols/jabber/parser.c
++ src/libgaim/protocols/jabber/presence.c
++ src/libgaim/protocols/jabber/roster.c
++ src/libgaim/protocols/jabber/si.c
++ src/libgaim/protocols/jabber/xdata.c
++ src/libgaim/protocols/msn/cmdproc.c
++ src/libgaim/protocols/msn/command.c
++ src/libgaim/protocols/msn/dialog.c
++ src/libgaim/protocols/msn/directconn.c
++ src/libgaim/protocols/msn/error.c
++ src/libgaim/protocols/msn/group.c
++ src/libgaim/protocols/msn/history.c
++ src/libgaim/protocols/msn/httpconn.c
++ src/libgaim/protocols/msn/msg.c
++ src/libgaim/protocols/msn/msn.c
++ src/libgaim/protocols/msn/nexus.c
++ src/libgaim/protocols/msn/notification.c
++ src/libgaim/protocols/msn/object.c
++ src/libgaim/protocols/msn/page.c
++ src/libgaim/protocols/msn/servconn.c
++ src/libgaim/protocols/msn/session.c
++ src/libgaim/protocols/msn/slp.c
++ src/libgaim/protocols/msn/slpcall.c
++ src/libgaim/protocols/msn/slplink.c
++ src/libgaim/protocols/msn/slpmsg.c
++ src/libgaim/protocols/msn/slpsession.c
++ src/libgaim/protocols/msn/state.c
++ src/libgaim/protocols/msn/switchboard.c
++ src/libgaim/protocols/msn/sync.c
++ src/libgaim/protocols/msn/table.c
++ src/libgaim/protocols/msn/transaction.c
++ src/libgaim/protocols/msn/user.c
++ src/libgaim/protocols/msn/userlist.c
++ src/libgaim/protocols/msn/msn-utils.c
++ src/libgaim/protocols/oscar/bstream.c
++ src/libgaim/protocols/oscar/family_admin.c
++ src/libgaim/protocols/oscar/family_advert.c
++ src/libgaim/protocols/oscar/family_alert.c
++ src/libgaim/protocols/oscar/family_auth.c
++ src/libgaim/protocols/oscar/family_bart.c
++ src/libgaim/protocols/oscar/family_bos.c
++ src/libgaim/protocols/oscar/family_buddy.c
++ src/libgaim/protocols/oscar/family_chat.c
++ src/libgaim/protocols/oscar/family_chatnav.c
++ src/libgaim/protocols/oscar/family_feedbag.c
++ src/libgaim/protocols/oscar/family_icbm.c
++ src/libgaim/protocols/oscar/family_icq.c
++ src/libgaim/protocols/oscar/family_invite.c
++ src/libgaim/protocols/oscar/family_locate.c
++ src/libgaim/protocols/oscar/family_odir.c
++ src/libgaim/protocols/oscar/family_oservice.c
++ src/libgaim/protocols/oscar/family_popup.c
++ src/libgaim/protocols/oscar/family_stats.c
++ src/libgaim/protocols/oscar/family_translate.c
++ src/libgaim/protocols/oscar/family_userlookup.c
++ src/libgaim/protocols/oscar/flap_connection.c
++ src/libgaim/protocols/oscar/misc.c
++ src/libgaim/protocols/oscar/msgcookie.c
++ src/libgaim/protocols/oscar/odc.c
++ src/libgaim/protocols/oscar/oft.c
++ src/libgaim/protocols/oscar/oscar.c
++ src/libgaim/protocols/oscar/oscar_data.c
++ src/libgaim/protocols/oscar/peer.c
++ src/libgaim/protocols/oscar/peer_proxy.c
++ src/libgaim/protocols/oscar/rxhandlers.c
++ src/libgaim/protocols/oscar/snac.c
++ src/libgaim/protocols/oscar/tlv.c
++ src/libgaim/protocols/oscar/util.c
++ src/libgaim/protocols/yahoo/util.c
++ src/libgaim/protocols/yahoo/yahoo.c
++ src/libgaim/protocols/yahoo/yahoo_auth.c
++ src/libgaim/protocols/yahoo/yahoo_crypt.c
++ src/libgaim/protocols/yahoo/yahoo_doodle.c
++ src/libgaim/protocols/yahoo/yahoo_filexfer.c
++ src/libgaim/protocols/yahoo/yahoo_friend.c
++ src/libgaim/protocols/yahoo/yahoo_packet.c
++ src/libgaim/protocols/yahoo/yahoo_picture.c
++ src/libgaim/protocols/yahoo/yahoo_profile.c
++ src/libgaim/protocols/yahoo/yahoochat.c
++ src/libgaim/protocols/yahoo/ycht.c
++ src/libgaim/plugins/ssl/ssl-gnutls.c
+ )
+
+ include_directories(
Deleted: wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch 2006-11-04 14:05:07 UTC (rev 2679)
+++ wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch 2006-11-04 17:44:15 UTC (rev 2680)
@@ -1,129 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.c
-===================================================================
---- wengophone-2.0.0~rc4-svn8088.orig/libs/gaim/src/src/account.c 2006-09-28 10:40:25.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.c 2006-10-18 15:52:37.000000000 +0200
-@@ -1400,32 +1400,22 @@
- gaim_account_set_status(GaimAccount *account, const char *status_id,
- gboolean active, ...)
- {
-- va_list args;
--
-- va_start(args, active);
-- gaim_account_set_status_vargs(account, status_id, active, args);
-- va_end(args);
--}
--
--void
--gaim_account_set_status_vargs(GaimAccount *account, const char *status_id,
-- gboolean active, va_list args)
--{
- GList *attrs = NULL;
- const gchar *id;
- gpointer data;
-+ va_list args;
-+
-+ va_start(args, active);
-
-- if (args != NULL)
-+ while ((id = va_arg(args, const char *)) != NULL)
- {
-- while ((id = va_arg(args, const char *)) != NULL)
-- {
-- attrs = g_list_append(attrs, (char *)id);
-- data = va_arg(args, void *);
-- attrs = g_list_append(attrs, data);
-- }
-+ attrs = g_list_append(attrs, (char *)id);
-+ data = va_arg(args, void *);
-+ attrs = g_list_append(attrs, data);
- }
- gaim_account_set_status_list(account, status_id, active, attrs);
- g_list_free(attrs);
-+ va_end(args);
- }
-
- void
-Index: wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.h
-===================================================================
---- wengophone-2.0.0~rc4-svn8088.orig/libs/gaim/src/src/account.h 2006-09-28 10:40:25.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.h 2006-10-18 15:52:37.000000000 +0200
-@@ -314,8 +314,7 @@
-
- /**
- * Activates or deactivates a status. All changes to the statuses of
-- * an account go through this function or gaim_account_set_status_vargs
-- * or gaim_account_set_status_list.
-+ * an account go through this function or gaim_account_set_status_list.
- *
- * Only independent statuses can be deactivated with this. To deactivate
- * an exclusive status, activate a different (and exclusive?) status.
-@@ -323,34 +322,15 @@
- * @param account The account.
- * @param status_id The ID of the status.
- * @param active The active state.
-- * @param ... Optional NULL-terminated attributes passed for the
-- * new status, in an id, value pair.
-+ * @param ... Pairs of attributes for the new status passed in
-+ * as a NULL-terminated list of id/value pairs.
- */
- void gaim_account_set_status(GaimAccount *account, const char *status_id,
- gboolean active, ...);
-
--
--/**
-- * Activates or deactivates a status. All changes to the statuses of
-- * an account go through this function or gaim_account_set_status or
-- * gaim_account_set_status_list.
-- *
-- * Only independent statuses can be deactivated with this. To deactivate
-- * an exclusive status, activate a different (and exclusive?) status.
-- *
-- * @param account The account.
-- * @param status_id The ID of the status.
-- * @param active The active state.
-- * @param args The va_list of attributes.
-- */
--void gaim_account_set_status_vargs(GaimAccount *account,
-- const char *status_id,
-- gboolean active, va_list args);
--
- /**
- * Activates or deactivates a status. All changes to the statuses of
-- * an account go through this function or gaim_account_set_status or
-- * gaim_account_set_status_vargs.
-+ * an account go through this function or gaim_account_set_status.
- *
- * Only independent statuses can be deactivated with this. To deactivate
- * an exclusive status, activate a different (and exclusive?) status.
-Index: wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/status.c
-===================================================================
---- wengophone-2.0.0~rc4-svn8088.orig/libs/gaim/src/src/status.c 2006-09-28 10:40:25.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/status.c 2006-10-18 15:53:51.000000000 +0200
-@@ -713,7 +713,7 @@
- void
- gaim_status_set_active(GaimStatus *status, gboolean active)
- {
-- gaim_status_set_active_with_attrs(status, active, NULL);
-+ gaim_status_set_active_with_attrs_list(status, active, NULL);
- }
-
- /*
-@@ -729,14 +729,11 @@
- const gchar *id;
- gpointer data;
-
-- if (args != NULL)
-+ while ((id = va_arg(args, const char *)) != NULL)
- {
-- while ((id = va_arg(args, const char *)) != NULL)
-- {
-- attrs = g_list_append(attrs, (char *)id);
-- data = va_arg(args, void *);
-- attrs = g_list_append(attrs, data);
-- }
-+ attrs = g_list_append(attrs, (char *)id);
-+ data = va_arg(args, void *);
-+ attrs = g_list_append(attrs, data);
- }
- gaim_status_set_active_with_attrs_list(status, active, attrs);
- g_list_free(attrs);
Added: wengophone/trunk/debian/patches/head/cmake-findxml2.patch
===================================================================
--- wengophone/trunk/debian/patches/head/cmake-findxml2.patch 2006-11-04 14:05:07 UTC (rev 2679)
+++ wengophone/trunk/debian/patches/head/cmake-findxml2.patch 2006-11-04 17:44:15 UTC (rev 2680)
@@ -0,0 +1,103 @@
+Index: wengophone-2.0.0~rc5-svn8281/cmake/Modules/FindXML2.cmake
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ wengophone-2.0.0~rc5-svn8281/cmake/Modules/FindXML2.cmake 2006-11-04 16:59:46.000000000 +0100
+@@ -0,0 +1,86 @@
++# - Try to find XML2
++# Once done this will define
++#
++# XML2_FOUND - system has XML2
++# XML2_INCLUDE_DIRS - the XML2 include directory
++# XML2_LIBRARIES - Link these to use XML2
++# XML2_DEFINITIONS - Compiler switches required for using XML2
++#
++# Copyright (c) 2006 Andreas Schneider <mail at cynapses.org>
++#
++# Redistribution and use is allowed according to the terms of the New
++# BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++#
++
++
++if (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
++ # in cache already
++ set(XML2_FOUND TRUE)
++else (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
++ # use pkg-config to get the directories and then use these values
++ # in the FIND_PATH() and FIND_LIBRARY() calls
++ include(UsePkgConfig)
++
++ pkgconfig(libxml-2.0 _XML2IncDir _XML2LinkDir _XML2LinkFlags _XML2Cflags)
++
++ set(XML2_DEFINITIONS ${_XML2Cflags})
++
++ find_path(XML2_INCLUDE_DIR
++ NAMES
++ libxml/xpath.h
++ PATHS
++ ${_XML2IncDir}
++ /usr/include
++ /usr/local/include
++ /opt/local/include
++ /sw/include
++ PATH_SUFFIXES
++ libxml2
++ )
++
++ find_library(XML2_LIBRARY
++ NAMES
++ xml2
++ PATHS
++ ${_XML2LinkDir}
++ /usr/lib
++ /usr/local/lib
++ /opt/local/lib
++ /sw/lib
++ )
++
++ if (XML2_LIBRARY)
++ set(XML2_FOUND TRUE)
++ endif (XML2_LIBRARY)
++
++ set(XML2_INCLUDE_DIRS
++ ${XML2_INCLUDE_DIR}
++ )
++
++ if (XML2_FOUND)
++ set(XML2_LIBRARIES
++ ${XML2_LIBRARIES}
++ ${XML2_LIBRARY}
++ )
++ endif (XML2_FOUND)
++
++ if (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
++ set(XML2_FOUND TRUE)
++ endif (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
++
++ if (XML2_FOUND)
++ if (NOT XML2_FIND_QUIETLY)
++ message(STATUS "Found XML2: ${XML2_LIBRARIES}")
++ endif (NOT XML2_FIND_QUIETLY)
++ else (XML2_FOUND)
++ if (XML2_FIND_REQUIRED)
++ message(FATAL_ERROR "Could not find XML2")
++ endif (XML2_FIND_REQUIRED)
++ endif (XML2_FOUND)
++
++ # show the XML2_INCLUDE_DIRS and XML2_LIBRARIES variables only in the advanced view
++ mark_as_advanced(XML2_INCLUDE_DIRS XML2_LIBRARIES)
++
++endif (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
++
+Index: wengophone-2.0.0~rc5-svn8281/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc5-svn8281.orig/CMakeLists.txt 2006-11-04 17:15:01.000000000 +0100
++++ wengophone-2.0.0~rc5-svn8281/CMakeLists.txt 2006-11-04 17:15:19.000000000 +0100
+@@ -35,6 +35,7 @@
+ set(QT_MIN_VERSION 4.1.2)
+ find_package(Qt4 REQUIRED)
+ find_package(Boost REQUIRED)
++find_package(XML2 REQUIRED)
+
+ if (WIN32)
+ find_package(OpenSSLInternal REQUIRED)
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2006-11-04 14:05:07 UTC (rev 2679)
+++ wengophone/trunk/debian/patches/series 2006-11-04 17:44:15 UTC (rev 2680)
@@ -1,5 +1,6 @@
+head/cmake-findxml2.patch
generic/cmake-fix-static-sfp-plugin.patch
-generic/fix-varargs-alpha.patch
+generic/cmake-fix-gaim4.patch
debian/disable-crashreport.patch
debian/cmake-svnrelease-from-debian-changelog.patch
debian/disable-ilbc.patch
More information about the Pkg-voip-commits
mailing list