diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-13 16:42:04 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-13 16:42:04 +0000 |
commit | 1d268fed2eb64e84a574be2011de10bab5711628 (patch) | |
tree | 396c41049340735783c7a271db5d883d0c4b8b3b /net-im/kadu/files | |
parent | Version bump. (diff) | |
download | gentoo-2-1d268fed2eb64e84a574be2011de10bab5711628.tar.gz gentoo-2-1d268fed2eb64e84a574be2011de10bab5711628.tar.bz2 gentoo-2-1d268fed2eb64e84a574be2011de10bab5711628.zip |
old
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'net-im/kadu/files')
-rw-r--r-- | net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch | 14 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch | 39 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch | 33 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-0.6.5.2-gcc44.patch | 34 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff | 162 | ||||
-rw-r--r-- | net-im/kadu/files/voice-gentoo.patch | 12 | ||||
-rw-r--r-- | net-im/kadu/files/xosd-0.6.0-gentoo.patch | 27 | ||||
-rw-r--r-- | net-im/kadu/files/xosd-gentoo.patch | 38 |
8 files changed, 0 insertions, 359 deletions
diff --git a/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch b/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch deleted file mode 100644 index 086fd663e0bc..000000000000 --- a/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naurp kadu-orig/modules/tcl_scripting/tcl_scripting.h kadu/modules/tcl_scripting/tcl_scripting.h ---- kadu-orig/modules/tcl_scripting/tcl_scripting.h 2006-12-27 23:36:24.000000000 -0600 -+++ kadu/modules/tcl_scripting/tcl_scripting.h 2006-12-27 23:37:34.000000000 -0600 -@@ -65,8 +65,8 @@ class TclSession : public QObject - bool allowErrors; - - public: -- TclSession::TclSession(bool main = FALSE); -- TclSession::~TclSession(); -+ TclSession(bool main = FALSE); -+ ~TclSession(); - void addMenu(); - void delMenu(); - void menuItemSetEnabled(int idx, bool enabled); diff --git a/net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch b/net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch deleted file mode 100644 index b9ede5098623..000000000000 --- a/net-im/kadu/files/kadu-0.6.0.2-kill-strip.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ccbae5f87973acf551c943488c93c89ebef6f96 Mon Sep 17 00:00:00 2001 -From: Robert Buchholz <rbu@goodpoint.de> -Date: Wed, 4 Feb 2009 17:26:46 +0100 -Subject: [PATCH] Kill -s CFLAG for regular build - -Binaries are stripped using "make install-strip" and not during compile. ---- - configure.ac | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0f32cfe..30df316 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -802,10 +802,6 @@ if test "$enable_debug" = "yes"; then - CXXFLAGS="$CXXFLAGS -ggdb" - CFLAGS="$CFLAGS -ggdb" - libgadu_CFLAGS="$CFLAGS -ggdb" --else -- CXXFLAGS="$CXXFLAGS -s" -- CFLAGS="$CFLAGS -s" -- libgadu_CFLAGS="$CFLAGS -s" - fi - - -@@ -820,10 +816,6 @@ if test -z "$enable_macosx"; then - SHARED_FLAGS= - fi - if test "$enable_macosx" = "yes"; then -- # -s kills dynamic modules -- CXXFLAGS="`echo $CXXFLAGS | sed 's/ -s//'`" -- CFLAGS="`echo $CFLAGS | sed 's/ -s//'`" -- - LDFLAGS="$LDFLAGS -framework Carbon -framework QuickTime -lz -framework OpenGL -framework AGL" - DYNAMIC_OPT="-dynamic" - SO_EXT="dylib" --- -1.6.0.6 - diff --git a/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch b/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch deleted file mode 100644 index d3113a0779a0..000000000000 --- a/net-im/kadu/files/kadu-0.6.5.1-fix-qt4.5-encoding.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- branches/0.6.5/kadu-core/main.cpp 2009/01/04 13:18:33 6032 -+++ branches/0.6.5/kadu-core/main.cpp 2009/02/22 10:45:49 6261 -@@ -153,6 +153,11 @@ - } - - #endif -+ -+ kdebugm(KDEBUG_INFO, "before creation of new KaduApplication\n"); -+ new KaduApplication(argc, argv); -+ kdebugm(KDEBUG_INFO, "after creation of new KaduApplication\n"); -+ - debug_mask = -1; - qInstallMsgHandler(kaduQtMessageHandler); - xml_config_file = new XmlConfigFile(); -@@ -199,7 +204,6 @@ - if (freopen(path, "w+", stderr) == 0) - fprintf(stdout, "freopen: %s\n", strerror(errno)); - #endif -- - } - - #ifdef DEBUG_ENABLED -@@ -227,10 +231,6 @@ - exit(10); - } - -- kdebugm(KDEBUG_INFO, "before creation of new KaduApplication\n"); -- new KaduApplication(argc, argv); -- kdebugm(KDEBUG_INFO, "after creation of new KaduApplication\n"); -- - defaultFont = new QFont(qApp->font()); - defaultFontInfo = new QFontInfo(*defaultFont); - // loading translation diff --git a/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch b/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch deleted file mode 100644 index 868dd3a5165f..000000000000 --- a/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- branches/0.6.5/kadu-core/protocol.h 2009/05/14 16:31:06 6636 -+++ branches/0.6.5/kadu-core/protocol.h 2009/05/14 16:32:15 6637 -@@ -4,9 +4,9 @@ - #include <QtCore/QDateTime> - #include <QtCore/QObject> - --#ifdef __sun__ -+#if defined(__sun__ ) || defined(__linux__) - #include <sys/types.h> --#endif /* __sun__ */ -+#endif /* __sun__ || __linux__ */ - - #ifdef _MSC_VER - #include "kinttypes.h" ---- branches/0.6.5/kadu-core/protocol.h 2008/09/25 20:10:18 5602 -+++ branches/0.6.5/kadu-core/protocol.h 2009/04/24 21:11:43 6584 -@@ -14,6 +14,7 @@ - - #include "status.h" - #include "usergroup.h" -+#include <stdint.h> - - typedef uint32_t UinType; - ---- branches/0.6.5//modules/encryption/pkcs1_certificate.h 2009-07-25 15:26:05.000000000 -0400 -+++ branches/0.6.5/modules/encryption/pkcs1_certificate.h 2009-07-25 15:26:27.000000000 -0400 -@@ -26,6 +26,7 @@ - #define PKCS1_CERTIFICATE_H - - #include <QtCrypto> -+#include <stdint.h> - - /** - * PKCS#1 certificate reader/writer (implemented according to the PKCS#1 v2.1 Specification). diff --git a/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff b/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff deleted file mode 100644 index 24b931618fac..000000000000 --- a/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff +++ /dev/null @@ -1,162 +0,0 @@ -diff -aurp kadu.orig/kadu/kadu.cpp kadu/kadu/kadu.cpp ---- kadu.orig/kadu/kadu.cpp 2005-03-20 15:48:41.000000000 +0100 -+++ kadu/kadu/kadu.cpp 2005-03-20 19:07:06.000000000 +0100 -@@ -100,8 +100,21 @@ void ToolBar::createControls() - if ((*j).caption== "--separator--") - addSeparator(); - else -- (*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption, -- QString::null, (*j).receiver, (*j).slot, this, (*j).name); -+ { -+ if ((*j).type == ToolButton::Push) -+ { -+ (*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption, -+ QString::null, (*j).receiver, (*j).slot, this, (*j).name); -+ } -+ else -+ { -+ (*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption, -+ QString::null, 0, 0, this, (*j).name); -+ (*j).button->setToggleButton(true); -+ (*j).button->setOn((*j).type == ToolButton::ToggleOn); -+ connect((*j).button, SIGNAL(toggled(bool)), (*j).receiver, (*j).slot); -+ } -+ } - - setStretchableWidget(new QWidget(this)); - kdebugf2(); -@@ -141,6 +154,34 @@ void ToolBar::registerButton(const QStri - RToolButton.slot= slot; - RToolButton.position= position; - RToolButton.name= name; -+ RToolButton.type= ToolButton::Push; -+ -+ if ((RegisteredToolButtons.count()<(uint)(position+1)) || (position == -1)) -+ RegisteredToolButtons.append(RToolButton); -+ else -+ RegisteredToolButtons.insert(RegisteredToolButtons.at(position), RToolButton); -+ -+ if(instance!=NULL) -+ instance->createControls(); -+ kdebugf2(); -+} -+ -+void ToolBar::registerToggleButton(const QString &iconname, const QString& caption, bool on, -+ QObject* receiver, const char* slot, int position, const char* name) -+{ -+ kdebugf(); -+ if(instance!=NULL) -+ instance->clear(); -+ -+ ToolButton RToolButton; -+ -+ RToolButton.iconname= iconname; -+ RToolButton.caption= caption; -+ RToolButton.receiver= receiver; -+ RToolButton.slot= slot; -+ RToolButton.position= position; -+ RToolButton.name= name; -+ RToolButton.type= on ? ToolButton::ToggleOn : ToolButton::ToggleOff; - - if ((RegisteredToolButtons.count()<(uint)(position+1)) || (position == -1)) - RegisteredToolButtons.append(RToolButton); -@@ -400,8 +441,10 @@ Kadu::Kadu(QWidget *parent, const char * - setActiveGroup(""); - - // dodanie przyciskow do paska narzedzi -- ToolBar::registerButton("ShowHideInactiveUsers", tr("Show / hide inactive users"), Userbox, SLOT(showHideInactive()), -1, "inactiveUsersButton"); -- ToolBar::registerButton("ShowOnlyDescriptionUsers", tr("Show / hide users without description"), Userbox, SLOT(showHideDescriptions()), -1, "withDescriptionUsersButton"); -+ ToolBar::registerToggleButton("ShowHideInactiveUsers", tr("Show / hide inactive users"), -+ config_file.readBoolEntry("General","ShowHideInactive"), Userbox, SLOT(showHideInactive(bool)), -1, "inactiveUsersButton"); -+ ToolBar::registerToggleButton("ShowOnlyDescriptionUsers", tr("Show / hide users without description"), -+ config_file.readBoolEntry("General","ShowOnlyDescriptionUsers"), Userbox, SLOT(showHideDescriptions(bool)), -1, "withDescriptionUsersButton"); - ToolBar::registerButton("Configuration", tr("Configuration"), this, SLOT(configure()), -1, "configurationButton"); - ToolBar::registerSeparator(); - ToolBar::registerButton("History", tr("View history"), this, SLOT(viewHistory()), -1, "historyButton"); -diff -aurp kadu.orig/kadu/kadu.h kadu/kadu/kadu.h ---- kadu.orig/kadu/kadu.h 2005-03-20 15:48:41.000000000 +0100 -+++ kadu/kadu/kadu.h 2005-03-20 19:02:48.000000000 +0100 -@@ -35,6 +35,12 @@ class ToolBar : public QToolBar - QString slot; - QToolButton* button; - int position; -+ enum -+ { -+ Push, -+ ToggleOff, -+ ToggleOn -+ } type; - }; - static QValueList<ToolButton> RegisteredToolButtons; - void createControls(); -@@ -44,6 +50,8 @@ class ToolBar : public QToolBar - ~ToolBar(); - static void registerButton(const QString &iconname, const QString& caption, - QObject* receiver, const char* slot, const int position=-1, const char* name=""); -+ static void registerToggleButton(const QString &iconname, const QString& caption, bool on, -+ QObject* receiver, const char* slot, const int position=-1, const char* name=""); - static void unregisterButton(const char* name); - static void registerSeparator(int position=-1); - static QToolButton* getButton(const char* name); -diff -aurp kadu.orig/kadu/userbox.cpp kadu/kadu/userbox.cpp ---- kadu.orig/kadu/userbox.cpp 2005-03-20 15:48:42.000000000 +0100 -+++ kadu/kadu/userbox.cpp 2005-03-20 18:08:42.000000000 +0100 -@@ -678,6 +678,14 @@ void UserBox::showHideInactive() - kdebugf2(); - } - -+void UserBox::showHideInactive(bool state) -+{ -+ kdebugf(); -+ config_file.writeEntry("General","ShowHideInactive",state); -+ all_refresh(); -+ kdebugf2(); -+} -+ - void UserBox::showHideDescriptions() - { - kdebugf(); -@@ -685,6 +693,13 @@ void UserBox::showHideDescriptions() - all_refresh(); - } - -+void UserBox::showHideDescriptions(bool state) -+{ -+ kdebugf(); -+ config_file.writeEntry("General","ShowOnlyDescriptionUsers",state); -+ all_refresh(); -+} -+ - UinsList UserBox::getSelectedUins() const - { - kdebugf(); -diff -aurp kadu.orig/kadu/userbox.h kadu/kadu/userbox.h ---- kadu.orig/kadu/userbox.h 2005-03-20 15:48:42.000000000 +0100 -+++ kadu/kadu/userbox.h 2005-03-20 17:58:14.000000000 +0100 -@@ -418,12 +418,26 @@ class UserBox : public QListBox , QToolT - void showHideInactive(); - - /** -+ \fn void showHideInactive() -+ Przełącza tryb pokazywania kontaktów niedostępnych. -+ \param state Jeśli true - kontakty nieaktywne sa widoczne -+ **/ -+ void showHideInactive(bool state); -+ -+ /** - \fn void showHideDescriptions() - Przełącza tryb pokazywania opisów kontaktów. - **/ - void showHideDescriptions(); - - /** -+ \fn void showHideDescriptions() -+ Przełącza tryb pokazywania opisów kontaktów. -+ \param state Jeśli true - kontakty bez opisow sa ukryte -+ **/ -+ void showHideDescriptions(bool state); -+ -+ /** - \fn virtual void clear() - Czyśli listę. - **/ diff --git a/net-im/kadu/files/voice-gentoo.patch b/net-im/kadu/files/voice-gentoo.patch deleted file mode 100644 index 536364f4f0cc..000000000000 --- a/net-im/kadu/files/voice-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kadu.orig/modules/voice/libgsm/src/code.c kadu/modules/voice/libgsm/src/code.c ---- kadu.orig/modules/voice/libgsm/src/code.c 2008-02-12 11:19:33.000000000 +0000 -+++ kadu/modules/voice/libgsm/src/code.c 2008-02-12 11:20:47.000000000 +0000 -@@ -7,7 +7,7 @@ - /* $Header: /var/cvsroot/gentoo-x86/net-im/kadu/files/voice-gentoo.patch,v 1.1 2008/02/13 01:43:35 cla Exp $ */ - - #include "config.h" -- -+#include <string.h> - - #ifdef HAS_STDLIB_H - #include <stdlib.h> diff --git a/net-im/kadu/files/xosd-0.6.0-gentoo.patch b/net-im/kadu/files/xosd-0.6.0-gentoo.patch deleted file mode 100644 index 274bccdfd6ec..000000000000 --- a/net-im/kadu/files/xosd-0.6.0-gentoo.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur kadu.orig/modules/xosd_notify/gtkfontdialog/Makefile.in kadu/modules/xosd_notify/gtkfontdialog/Makefile.in ---- kadu.orig/modules/xosd_notify/gtkfontdialog/Makefile.in 2008-02-12 10:58:41.000000000 +0000 -+++ kadu/modules/xosd_notify/gtkfontdialog/Makefile.in 2008-02-12 11:01:58.000000000 +0000 -@@ -1,5 +1,5 @@ --CFLAGS:=$(CFLAGS) `gtk-config --cflags` --LDFLAGS:=$(LDFLAGS) `gtk-config --libs` -+CFLAGS:=$(CFLAGS) `pkg-config gtk+-2.0 --cflags` -+LDFLAGS:=$(LDFLAGS) `pkg-config gtk+-2.0 --libs` - - all: gtkfontdialog - ln -f gtkfontdialog ../bin/ -diff -Naur kadu.orig/modules/xosd_notify/spec kadu/modules/xosd_notify/spec ---- kadu.orig/modules/xosd_notify/spec 2008-02-12 10:58:41.000000000 +0000 -+++ kadu/modules/xosd_notify/spec 2008-02-12 11:00:35.000000000 +0000 -@@ -8,10 +8,10 @@ - MODULE_LDFLAGS="$PTHREAD_LDFLAGS $PTHREAD_LIBS" - - MODULE_3RDPARTY="gtkfontdialog" --MODULE_TOOLS="gtk-config" -+MODULE_TOOLS="pkg-config" - MODULE_CONFIGURE_CMD=' - TOOL_DIRS2=`echo $TOOL_DIRS | sed -e "s/\//\\\\\\\\\//g"` --sed -e "s/gtk-config/$TOOL_DIRS2\/gtk-config/g" <./modules/xosd_notify/gtkfontdialog/Makefile.in >./modules/xosd_notify/gtkfontdialog/Makefile -+sed -e "s/pkg-config/$TOOL_DIRS2\/pkg-config/g" <./modules/xosd_notify/gtkfontdialog/Makefile.in >./modules/xosd_notify/gtkfontdialog/Makefile - - echo -e "#include <xosd.h>\nint main(){xosd_create(1);return 0;}\n" > xosdtest.c - ret=`$CC $CXXFLAGS $MODULE_CXXFLAGS xosdtest.c $LDFLAGS $MODULE_LDFLAGS -o xosdtest 2>/dev/null >/dev/null && echo 1` diff --git a/net-im/kadu/files/xosd-gentoo.patch b/net-im/kadu/files/xosd-gentoo.patch deleted file mode 100644 index 066d90c9dbd4..000000000000 --- a/net-im/kadu/files/xosd-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- modules/xosd_notify/xosd_notify.cpp.orig 2005-02-27 16:21:08.000000000 +0100 -+++ modules/xosd_notify/xosd_notify.cpp 2005-03-18 11:56:17.521249672 +0100 -@@ -51,7 +51,7 @@ - "NewChat"<<"NewMessage"<<"Error"<<"OtherMessage"; - - int val; -- CONST_FOREACH(it, optionPrefixes) -+ FOREACH(it, optionPrefixes) - { - config_file.addVariable("XOSD", (*it)+"Position", 4); - val = config_file.readNumEntry("XOSD", (*it)+"Position"); -@@ -392,7 +392,7 @@ - } - - int y_offset = config_file.readNumEntry("XOSD", QString("OffsetY%1").arg(position)); -- CONST_FOREACH(line, lines[position]) -+ FOREACH(line, lines[position]) - { - xosd_set_vertical_offset((*line).handle, y_offset); - xosd_hide((*line).handle); -@@ -456,7 +456,7 @@ - toggled_SetAll(config_file.readBoolEntry("XOSD", "SetAll")); - - configs.clear(); -- CONST_FOREACH(prefix, optionPrefixes) -+ FOREACH(prefix, optionPrefixes) - { - TestConfig c; - c.type = *prefix; -@@ -498,7 +498,7 @@ - { - kdebugf(); - -- CONST_FOREACH(prefix, optionPrefixes) -+ FOREACH(prefix, optionPrefixes) - { - TestConfig c = configs[*prefix]; - config_file.writeEntry("XOSD", (*prefix)+"Position", c.position); |