- Fix startup crash

- Bump PORTREVISION
- Pass maintainership to submitter

Submitted by:	 Denis Shaposhnikov <dsh@vlink.ru> (via privat mail)

5 files changed, 95 insertions, 0 deletions

diff --git a/net-im/gajim/files/patch-data-Makefile.in b/net-im/gajim/files/patch-data-Makefile.in
new file mode 100644
index 000000000000..1c82b7033fb5
--- /dev/null
+++ b/net-im/gajim/files/patch-data-Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig	Thu Nov 23 03:01:40 2006
++++ data/Makefile.in	Fri Nov 24 23:09:19 2006
+@@ -258,7 +258,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = glade emoticons pixmaps iconsets 
++SUBDIRS = glade pixmaps 
+ desktopdir = $(datadir)/applications
+ desktop_in_files = gajim.desktop.in.in 
+ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
diff --git a/net-im/gajim/files/patch-po-Makefile.in.in b/net-im/gajim/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..d85f89737e19
--- /dev/null
+++ b/net-im/gajim/files/patch-po-Makefile.in.in
@@ -0,0 +1,23 @@
+--- po/Makefile.in.in.orig	Tue Oct 24 23:52:06 2006
++++ po/Makefile.in.in	Thu Nov 23 17:25:06 2006
+@@ -33,8 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -44,8 +43,8 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
++GMSGFMT = @INTLTOOL_MSGFMT@
++MSGFMT = @INTLTOOL_MSGFMT@
+ XGETTEXT = @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
diff --git a/net-im/gajim/files/patch-scripts-gajim.in b/net-im/gajim/files/patch-scripts-gajim.in
new file mode 100644
index 000000000000..35363ca7cbcf
--- /dev/null
+++ b/net-im/gajim/files/patch-scripts-gajim.in
@@ -0,0 +1,14 @@
+--- scripts/gajim.in.orig	Wed Oct 11 23:10:46 2006
++++ scripts/gajim.in	Fri Nov 24 14:15:58 2006
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##      gajim
+ ##
+ ## Contributors for this file:
+@@ -32,4 +32,4 @@
+ 
+ cd ${datadir}/gajim/src
+ export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
+-exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
++exec ${PYTHON_EXEC} -OO gajim.py $@
diff --git a/net-im/gajim/files/patch-src-Makefile.in b/net-im/gajim/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..9b94ff73f623
--- /dev/null
+++ b/net-im/gajim/files/patch-src-Makefile.in
@@ -0,0 +1,25 @@
+--- src/Makefile.in.orig	Wed Dec 27 03:01:21 2006
++++ src/Makefile.in	Wed Dec 27 12:47:12 2006
+@@ -324,18 +324,18 @@
+ 
+ @BUILD_TRAYICON_TRUE@trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
+ gajimsrcdir = $(pkgdatadir)/src
+-gajimsrc_DATA = $(srcdir)/*.py 
++gajimsrc_DATA = $(srcdir)/*.py $(srcdir)/*.pyc
+ gajimsrc1dir = $(pkgdatadir)/src/common
+ gajimsrc1_DATA = \
+-				$(srcdir)/common/*.py 
++				$(srcdir)/common/*.py $(srcdir)/common/*.pyc
+ 
+ gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
+ gajimsrc2_DATA = \
+-				$(srcdir)/common/xmpp/*.py 
++				$(srcdir)/common/xmpp/*.py $(srcdir)/common/xmpp/*.pyc
+ 
+ gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
+ gajimsrc3_DATA = \
+-				$(srcdir)/common/zeroconf/*.py 
++				$(srcdir)/common/zeroconf/*.py $(srcdir)/common/zeroconf/*.pyc
+ 
+ DISTCLEANFILES = 
+ EXTRA_DIST = $(gajimsrc_DATA) \
diff --git a/net-im/gajim/files/patch-src-roster_window.py b/net-im/gajim/files/patch-src-roster_window.py
new file mode 100644
index 000000000000..75f35d7284bd
--- /dev/null
+++ b/net-im/gajim/files/patch-src-roster_window.py
@@ -0,0 +1,22 @@
+--- src/roster_window.py.orig	Wed Nov 22 03:01:11 2006
++++ src/roster_window.py	Sun Nov 26 17:01:25 2006
+@@ -18,6 +18,7 @@
+ import gtk
+ import gobject
+ import os
++import sys
+ import time
+ import urllib
+ 
+@@ -744,9 +745,9 @@
+ 			if os.path.exists('history_manager.exe'): # user is running stable
+ 				helpers.exec_command('history_manager.exe')
+ 			else: # user is running svn
+-				helpers.exec_command('python history_manager.py')
++				helpers.exec_command('%s history_manager.py' % (sys.executable,))
+ 		else: # Unix user
+-			helpers.exec_command('python history_manager.py &')
++			helpers.exec_command('%s history_manager.py &' % (sys.executable,))
+ 
+ 	def get_and_connect_advanced_menuitem_menu(self, account):
+ 		'''adds FOR ACCOUNT options'''