[Pkg-kde-commits] rev 712 - in branches/kde-3.4.0/packages/kdenetwork/debian: . patches
Adeodato Simó
dato-guest@costa.debian.org
Sun, 06 Mar 2005 05:50:15 +0100
Author: dato-guest
Date: 2005-03-06 05:50:14 +0100 (Sun, 06 Mar 2005)
New Revision: 712
Added:
branches/kde-3.4.0/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
Removed:
branches/kde-3.4.0/packages/kdenetwork/debian/kopete.README.Debian
Modified:
branches/kde-3.4.0/packages/kdenetwork/debian/changelog
branches/kde-3.4.0/packages/kdenetwork/debian/control
branches/kde-3.4.0/packages/kdenetwork/debian/rules
Log:
whoohoo! Implement the dlopen libxmms thing, so that the now listening
plugin works even if xmms is not installed:
- new patch 11_dlopen-xmms.diff
- removed kopete.README.Debian
- remove xmms from kopete's suggests
- drop -Xusr/lib/kde3/kopete_nowlistening.so in rules
buildprep update needed.
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog 2005-03-06 03:46:04 UTC (rev 711)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog 2005-03-06 04:50:14 UTC (rev 712)
@@ -12,9 +12,12 @@
* Change kopete's section to kde. (Closes: #292398)
- * Change kopete's dependency on xmms to a Suggests, since only
- the Now Listening plug-in breaks without it. Added a
- README.Debian to explain.
+ +++ Changes by Adeodato Simó:
+
+ * kopete no longer depends on XMMS, which it did simply because the Now
+ Listening plugin was linked against libxmms. Added a patch to dlopen
+ libxmms at runtime and use it if present, so that the plugin remains
+ functional even if XMMS is not installed.
(Closes: #238368, #276586, #292963, #293191)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 4 Mar 2005 16:30:07 +0100
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control 2005-03-06 03:46:04 UTC (rev 711)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control 2005-03-06 04:50:14 UTC (rev 712)
@@ -116,7 +116,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: qca-tls
-Suggests: khelpcenter, imagemagick, gpg, gnomemeeting, xmms
+Suggests: khelpcenter, imagemagick, gpg, gnomemeeting
Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2)
Description: Instant messenger program
KDE is a powerful Open Source graphical desktop environment for Unix
Deleted: branches/kde-3.4.0/packages/kdenetwork/debian/kopete.README.Debian
Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff 2005-03-06 03:46:04 UTC (rev 711)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff 2005-03-06 04:50:14 UTC (rev 712)
@@ -0,0 +1,59 @@
+--- kopete/plugins/nowlistening/nlxmms.h~
++++ kopete/plugins/nowlistening/nlxmms.h
+@@ -31,7 +31,11 @@
+ {
+ public:
+ NLXmms();
++ ~NLXmms();
+ virtual void update();
++
++ private:
++ void *xmmslib;
+ };
+
+ #endif
+--- kopete/plugins/nowlistening/nlxmms.cpp~
++++ kopete/plugins/nowlistening/nlxmms.cpp
+@@ -26,19 +26,28 @@
+
++#include <dlfcn.h>
+ #include <kdebug.h>
+ #include <xmmsctrl.h> // need to fix Makefile.am for this?
+ #include "nlmediaplayer.h"
+ #include "nlxmms.h"
+
+ NLXmms::NLXmms() : NLMediaPlayer()
+ {
+ m_name = "Xmms";
++
++ xmmslib = dlopen("libxmms.so.1", RTLD_LAZY | RTLD_GLOBAL);
+ }
+
++NLXmms::~NLXmms()
++{
++ if (xmmslib)
++ dlclose(xmmslib);
++}
+
+ void NLXmms::update()
+ {
+ //look for running xmms
+- if ( xmms_remote_get_version( 0 ) )
++ if ( xmmslib &&
++ xmms_remote_get_version( 0 ) )
+ {
+ QString newTrack;
+ // see if it's playing
+--- kopete/plugins/nowlistening/Makefile.am~
++++ kopete/plugins/nowlistening/Makefile.am
+@@ -5,8 +5,8 @@
+ kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
+
+ kopete_nowlistening_la_SOURCES = nowlisteningconfig.cpp nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
+-kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(XMMS_LDFLAGS)
+-kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la $(XMMS_LIBS)
++kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN)
++kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la
+
+ kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.cpp
+ kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/rules 2005-03-06 03:46:04 UTC (rev 711)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/rules 2005-03-06 04:50:14 UTC (rev 712)
@@ -19,10 +19,6 @@
$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V))
-DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
-DEB_DH_SHLIBDEPS_ARGS_kopete := \
- -Xusr/lib/kde3/kopete_nowlistening.so
-
DEB_FIXPERMS_EXCLUDE := usr/bin/kppp usr/bin/kppplogview \
etc/ppp/peers/kppp-options