[Pkg-kde-commits] rev 931 - in trunk/packages/kdenetwork/debian: . patches
Adeodato Simó
dato-guest@costa.debian.org
Tue, 29 Mar 2005 04:48:42 +0000
Author: dato-guest
Date: 2005-03-29 04:48:41 +0000 (Tue, 29 Mar 2005)
New Revision: 931
Added:
trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
Removed:
trunk/packages/kdenetwork/debian/kopete.README.Debian
Modified:
trunk/packages/kdenetwork/debian/changelog
trunk/packages/kdenetwork/debian/control
trunk/packages/kdenetwork/debian/rules
Log:
Backport the kopete dlopen patch from 3.4 to 3.3.
Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2005-03-28 23:59:47 UTC (rev 930)
+++ trunk/packages/kdenetwork/debian/changelog 2005-03-29 04:48:41 UTC (rev 931)
@@ -8,14 +8,16 @@
* 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)
-TODO: backport xmms/kopete dlopen patch from 3.4 ??
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 29 Mar 2005 06:40:45 +0200
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Date
-
kdenetwork (4:3.3.2-1) unstable; urgency=low
+++ Changes by Christopher Martin:
Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control 2005-03-28 23:59:47 UTC (rev 930)
+++ trunk/packages/kdenetwork/debian/control 2005-03-29 04:48:41 UTC (rev 931)
@@ -102,7 +102,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: qca-tls
-Suggests: khelpcenter, xmms
+Suggests: khelpcenter
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: trunk/packages/kdenetwork/debian/kopete.README.Debian
Added: trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff 2005-03-28 23:59:47 UTC (rev 930)
+++ trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff 2005-03-29 04:48:41 UTC (rev 931)
@@ -0,0 +1,60 @@
+--- a/kopete/plugins/nowlistening/Makefile.am
++++ b/kopete/plugins/nowlistening/Makefile.am
+@@ -5,8 +5,9 @@
+ 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)
+-kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la $(XMMS_LIBS)
++coma = ,
++kopete_nowlistening_la_LDFLAGS = -module $(subst $(KDE_NO_UNDEFINED),,$(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)
+--- a/kopete/plugins/nowlistening/nlxmms.h~
++++ b/kopete/plugins/nowlistening/nlxmms.h
+@@ -31,7 +31,11 @@
+ {
+ public:
+ NLXmms();
++ ~NLXmms();
+ virtual void update();
++
++ private:
++ void *xmmslib;
+ };
+
+ #endif
+--- a/kopete/plugins/nowlistening/nlxmms.cpp~
++++ b/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
Modified: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules 2005-03-28 23:59:47 UTC (rev 930)
+++ trunk/packages/kdenetwork/debian/rules 2005-03-29 04:48:41 UTC (rev 931)
@@ -217,7 +217,7 @@
# dh_python
env DH_COMPAT=3 dh_makeshlibs -V
dh_installdeb
- dh_shlibdeps -ldebian/kopete/usr/lib:debian/librss1/usr/lib -Xusr/lib/kde3/kopete_nowlistening.so
+ dh_shlibdeps -ldebian/kopete/usr/lib:debian/librss1/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb