[Pkg-kde-commits] rev 2270 -
trunk/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Mon Nov 14 12:54:43 UTC 2005
Author: chrsmrtn
Date: 2005-11-14 12:54:42 +0000 (Mon, 14 Nov 2005)
New Revision: 2270
Removed:
trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r471176.diff
trunk/packages/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff
trunk/packages/kdenetwork/debian/patches/18_kopete_icq_fix.diff
Modified:
trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
trunk/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff
trunk/packages/kdenetwork/debian/patches/17_kppp_devices.diff
Log:
Some patches now superfluos, otherr synced.
Deleted: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r471176.diff
Modified: trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff 2005-11-14 12:54:02 UTC (rev 2269)
+++ trunk/packages/kdenetwork/debian/patches/11_dlopen-xmms.diff 2005-11-14 12:54:42 UTC (rev 2270)
@@ -1,5 +1,5 @@
---- kopete/plugins/nowlistening/nlxmms.h~
-+++ kopete/plugins/nowlistening/nlxmms.h
+--- kdenetwork.orig/kopete/plugins/nowlistening/nlxmms.h
++++ kdenetwork.patched/kopete/plugins/nowlistening/nlxmms.h
@@ -31,7 +31,11 @@
{
public:
@@ -12,16 +12,17 @@
};
#endif
---- kopete/plugins/nowlistening/nlxmms.cpp~
-+++ kopete/plugins/nowlistening/nlxmms.cpp
-@@ -26,19 +26,28 @@
+--- kdenetwork.orig/kopete/plugins/nowlistening/nlxmms.cpp
++++ kdenetwork.patched/kopete/plugins/nowlistening/nlxmms.cpp
+@@ -24,6 +24,7 @@
+ #ifdef HAVE_XMMS
+
+#include <dlfcn.h>
#include <kdebug.h>
#include <xmmsctrl.h> // need to fix Makefile.am for this?
#include "nlmediaplayer.h"
- #include "nlxmms.h"
-
+@@ -32,13 +33,21 @@
NLXmms::NLXmms() : NLMediaPlayer()
{
m_name = "Xmms";
@@ -44,16 +45,16 @@
{
QString newTrack;
// see if it's playing
---- kopete/plugins/nowlistening/Makefile.am~
-+++ kopete/plugins/nowlistening/Makefile.am
+--- kdenetwork.orig/kopete/plugins/nowlistening/Makefile.am
++++ kdenetwork.patched/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_SOURCES = nowlisteningconfig.kcfgc 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) $(all_libraries)
+-kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la $(XMMS_LIBS)
++kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la
- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.cpp
+ kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
Modified: trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff 2005-11-14 12:54:02 UTC (rev 2269)
+++ trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff 2005-11-14 12:54:42 UTC (rev 2270)
@@ -1,6 +1,6 @@
--- kdenetwork/kopete/protocols/configure.in.in
+++ kdenetwork/kopete/protocols/configure.in.in
-@@ -42,8 +42,20 @@
+@@ -47,8 +47,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
Deleted: trunk/packages/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff
Modified: trunk/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff 2005-11-14 12:54:02 UTC (rev 2269)
+++ trunk/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff 2005-11-14 12:54:42 UTC (rev 2270)
@@ -1,6 +1,6 @@
--- kdenetwork-orig/kopete/kopete/kopetewindow.cpp
+++ kdenetwork-patched/kopete/kopete/kopetewindow.cpp
-@@ -182,7 +182,7 @@
+@@ -245,7 +245,7 @@
actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "viewmag", CTRL + Key_U,
this, SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
@@ -8,7 +8,7 @@
+ actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
this, SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
- # if KDE_IS_VERSION(3,2,90)
+ actionShowOffliners->setCheckedState(i18n("Hide Offline &Users"));
--- kdenetwork-orig/kopete/kopete/contactlist/kopetegroupviewitem.h
+++ kdenetwork-patched/kopete/kopete/contactlist/kopetegroupviewitem.h
@@ -21,8 +21,8 @@
@@ -19,7 +19,6 @@
-#define KOPETE_GROUP_DEFAULT_CLOSED_ICON "folder_green"
+#define KOPETE_GROUP_DEFAULT_OPEN_ICON "folder_open"
+#define KOPETE_GROUP_DEFAULT_CLOSED_ICON "folder"
-
- /**
- * @author Olivier Goffart
-
+
+ namespace Kopete
+ {
Modified: trunk/packages/kdenetwork/debian/patches/17_kppp_devices.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/17_kppp_devices.diff 2005-11-14 12:54:02 UTC (rev 2269)
+++ trunk/packages/kdenetwork/debian/patches/17_kppp_devices.diff 2005-11-14 12:54:42 UTC (rev 2270)
@@ -1,6 +1,6 @@
--- kde.orig/kppp/devices.h
+++ kde.patched/kppp/devices.h
-@@ -37,37 +37,52 @@
+@@ -37,41 +37,52 @@
"/dev/dtyU3",
#elif defined (__linux__)
"/dev/modem",
@@ -40,7 +40,7 @@
"/dev/usb/ttyACM1",
"/dev/usb/ttyACM2",
"/dev/usb/ttyACM3",
-+ "/dev/ttyUSB0", /* USB stuff modems with udev */
++ "/dev/ttyUSB0",
+ "/dev/ttyUSB1",
+ "/dev/ttyUSB2",
+ "/dev/ttyUSB3",
@@ -48,7 +48,11 @@
"/dev/usb/ttyUSB1",
"/dev/usb/ttyUSB2",
"/dev/usb/ttyUSB3",
-- "/dev/ttyUSB0", /* USB stuff modems with udev */
+- "/dev/ttyACM0", /* USB stuff modems with udev */
+- "/dev/ttyACM1",
+- "/dev/ttyACM2",
+- "/dev/ttyACM3",
+- "/dev/ttyUSB0",
- "/dev/ttyUSB1",
- "/dev/ttyUSB2",
- "/dev/ttyUSB3",
@@ -67,7 +71,7 @@
"/dev/ircomm0", /* IrDA */
"/dev/ircomm1",
"/dev/ircomm2",
-@@ -80,6 +95,16 @@
+@@ -84,6 +95,16 @@
"/dev/ttySHSF1",
"/dev/ttySHSF2",
"/dev/ttySHSF3", /* necessary for conexant modem which use hsfserial commercial module */
Deleted: trunk/packages/kdenetwork/debian/patches/18_kopete_icq_fix.diff
More information about the pkg-kde-commits
mailing list