Re: UPDATE: net/gajim (0.11.1 = 0.11.2)
On Sun, Sep 23, 2007 at 03:47:40PM +0400, Vlad Glagolev wrote: Tested @ i386. Does anybody need gtkspell there?.. Yes, I think so. And it's not a real big dependecy, is it? What's that roster_window.py patch you added? -- simon
Re: UPDATE: net/gajim (0.11.1 = 0.11.2)
On Sun, 23 Sep 2007 14:13:21 +0200 Simon Kuhnle [EMAIL PROTECTED] wrote: On Sun, Sep 23, 2007 at 03:47:40PM +0400, Vlad Glagolev wrote: What's that roster_window.py patch you added? We don't have 'python' executable, if you know.. but we have python2.4 :) -- Cheerz, Vlad / Stelz
Re: UPDATE: net/gajim (0.11.1 = 0.11.2)
On Sun, Sep 23, 2007 at 04:24:00PM +0400, Vlad Glagolev wrote:
On Sun, 23 Sep 2007 14:13:21 +0200
Simon Kuhnle [EMAIL PROTECTED] wrote:
On Sun, Sep 23, 2007 at 03:47:40PM +0400, Vlad Glagolev wrote:
What's that roster_window.py patch you added?
We don't have 'python' executable, if you know.. but we have python2.4 :)
That makes sense, yes.
Perhaps you want to open a ticket for it, so it get's into 0.12?
Works fine on i386 (as did 0.11.2-pre1).
But it would still be nice to have gtkspell enabled.
I attached a diff based on yours, having gtkspell in, and an upstream
patch to fix a small error http://trac.gajim.org/changeset/8861.
BTW, the first line of the Makefile patch looks strange.
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 15 Sep 2007 22:36:53 - 1.17
+++ Makefile 23 Sep 2007 13:54:19 -
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.17 2007/09/15 22:36:53 merdely Exp $
+# $OpenBSD: Makefile,v 1.16 2007/05/06 19:09:24 alek Exp $
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
-DISTNAME= gajim-0.11.1
-PKGNAME= ${DISTNAME}p2
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= gajim-0.11.2
CATEGORIES= net x11
+
MASTER_SITES= ${HOMEPAGE}downloads/
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.gajim.org/
@@ -38,11 +38,10 @@
::databases/py-sqlite2 \
::x11/py-gtk2 \
:dbus-python-*:x11/dbus-python
-WANTLIB= X11 Xext Xss Xrender fontconfig freetype m z \
- aspell atk-1.0.=1011.0 cairo gdk-x11-2.0.=600.0 \
+WANTLIB= Xcursor Xfixes Xi Xinerama Xrandr X11 Xext Xss Xrender \
+ fontconfig freetype m z atk-1.0.=1011.0 cairo gdk-x11-2.0.=600.0 \
gdk_pixbuf-2.0.=600.0 glib-2.0.=600.0 gmodule-2.0.=600.0 \
gobject-2.0.=600.0 gtk-x11-2.0.=600.0 pango-1.0.=800.0 \
pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat
-WANTLIB += Xcursor Xfixes Xi Xinerama Xrandr
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 5 Apr 2007 16:20:09 - 1.6
+++ distinfo 23 Sep 2007 13:54:19 -
@@ -1,5 +1,5 @@
-MD5 (gajim-0.11.1.tar.bz2) = zFh+dhf1OujV4LMNcyTonA==
-RMD160 (gajim-0.11.1.tar.bz2) = mY54t/axVFANGiJPN4qicCtPptM=
-SHA1 (gajim-0.11.1.tar.bz2) = qFV1YPWok5Pvrq6Jmfl3m2L5RWA=
-SHA256 (gajim-0.11.1.tar.bz2) = 9C5s+3q5giSEan6e6Xygq6LqSnlDqDFaZ8zxEnwqoTI=
-SIZE (gajim-0.11.1.tar.bz2) = 2785799
+MD5 (gajim-0.11.2.tar.bz2) = jLDNWHEZGg6N1D/O9HBW3A==
+RMD160 (gajim-0.11.2.tar.bz2) = 8/qDx28dsl9SMc3VA8cJrC8nrt8=
+SHA1 (gajim-0.11.2.tar.bz2) = qf2OqI2bWFU7iV0udR0FCDHvU8Q=
+SHA256 (gajim-0.11.2.tar.bz2) = poEbfxw1sViXcf4Sj/N4T+xMCKjkxDUjcPFhqweBSqM=
+SIZE (gajim-0.11.2.tar.bz2) = 2908570
Index: patches/patch-src_config_py
===
RCS file: patches/patch-src_config_py
diff -N patches/patch-src_config_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_config_py 23 Sep 2007 13:54:19 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/config.py.orig Sun Sep 23 15:44:41 2007
src/config.py Sun Sep 23 15:45:10 2007
+@@ -579,8 +579,7 @@ class PreferencesWindow:
+ for account in gajim.connections:
+ if gajim.connections[account].connected:
+ for gc_control in gajim.interface.msg_win_mgr.get_controls(
+- message_control.TYPE_GC) + \
+- gajim.interface.minimized_controls[account].values():
++ message_control.TYPE_GC):
+ gc_control.draw_roster()
+
+ def on_emoticons_combobox_changed(self, widget):
Index: patches/patch-src_roster_window_py
===
RCS file: patches/patch-src_roster_window_py
diff -N patches/patch-src_roster_window_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_roster_window_py 23 Sep 2007 13:54:19 -
@@ -0,0 +1,22 @@
+--- src/roster_window.py.orig Thu Sep 20 18:31:54 2007
src/roster_window.py Sun Sep 23 15:43:32 2007
+@@ -19,6 +19,7 @@ import gtk
+ import pango
+ import gobject
+ import os
++import sys
+ import time
+ import urllib
+
+@@ -753,9 +754,9 @@ class RosterWindow:
+ 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'''
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gajim/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 1 Apr 2007
Re: UPDATE: net/gajim (0.11.1 = 0.11.2)
I forgot about adding aspell to WANTLIB again, sorry.
New patch attached.
Thanks viq!
--
simon
Index: Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 15 Sep 2007 22:36:53 - 1.17
+++ Makefile 23 Sep 2007 16:52:57 -
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.17 2007/09/15 22:36:53 merdely Exp $
+# $OpenBSD: Makefile,v 1.16 2007/05/06 19:09:24 alek Exp $
SHARED_ONLY= Yes
COMMENT= jabber client written in pygtk
-DISTNAME= gajim-0.11.1
-PKGNAME= ${DISTNAME}p2
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= gajim-0.11.2
CATEGORIES= net x11
+
MASTER_SITES= ${HOMEPAGE}downloads/
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.gajim.org/
@@ -38,11 +38,10 @@
::databases/py-sqlite2 \
::x11/py-gtk2 \
:dbus-python-*:x11/dbus-python
-WANTLIB= X11 Xext Xss Xrender fontconfig freetype m z \
+WANTLIB= X11 Xext Xss Xrender fontconfig freetype m z \
aspell atk-1.0.=1011.0 cairo gdk-x11-2.0.=600.0 \
gdk_pixbuf-2.0.=600.0 glib-2.0.=600.0 gmodule-2.0.=600.0 \
gobject-2.0.=600.0 gtk-x11-2.0.=600.0 pango-1.0.=800.0 \
- pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat
-WANTLIB += Xcursor Xfixes Xi Xinerama Xrandr
-
+ pangocairo-1.0 pangoft2-1.0 png glitz Xau Xdmcp expat \
+ Xcursor Xfixes Xi Xinerama Xrandr
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 5 Apr 2007 16:20:09 - 1.6
+++ distinfo 23 Sep 2007 16:52:57 -
@@ -1,5 +1,5 @@
-MD5 (gajim-0.11.1.tar.bz2) = zFh+dhf1OujV4LMNcyTonA==
-RMD160 (gajim-0.11.1.tar.bz2) = mY54t/axVFANGiJPN4qicCtPptM=
-SHA1 (gajim-0.11.1.tar.bz2) = qFV1YPWok5Pvrq6Jmfl3m2L5RWA=
-SHA256 (gajim-0.11.1.tar.bz2) = 9C5s+3q5giSEan6e6Xygq6LqSnlDqDFaZ8zxEnwqoTI=
-SIZE (gajim-0.11.1.tar.bz2) = 2785799
+MD5 (gajim-0.11.2.tar.bz2) = jLDNWHEZGg6N1D/O9HBW3A==
+RMD160 (gajim-0.11.2.tar.bz2) = 8/qDx28dsl9SMc3VA8cJrC8nrt8=
+SHA1 (gajim-0.11.2.tar.bz2) = qf2OqI2bWFU7iV0udR0FCDHvU8Q=
+SHA256 (gajim-0.11.2.tar.bz2) = poEbfxw1sViXcf4Sj/N4T+xMCKjkxDUjcPFhqweBSqM=
+SIZE (gajim-0.11.2.tar.bz2) = 2908570
Index: patches/patch-src_config_py
===
RCS file: patches/patch-src_config_py
diff -N patches/patch-src_config_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_config_py 23 Sep 2007 16:52:57 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/config.py.orig Sun Sep 23 15:44:41 2007
src/config.py Sun Sep 23 15:45:10 2007
+@@ -579,8 +579,7 @@ class PreferencesWindow:
+ for account in gajim.connections:
+ if gajim.connections[account].connected:
+ for gc_control in gajim.interface.msg_win_mgr.get_controls(
+- message_control.TYPE_GC) + \
+- gajim.interface.minimized_controls[account].values():
++ message_control.TYPE_GC):
+ gc_control.draw_roster()
+
+ def on_emoticons_combobox_changed(self, widget):
Index: patches/patch-src_roster_window_py
===
RCS file: patches/patch-src_roster_window_py
diff -N patches/patch-src_roster_window_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_roster_window_py 23 Sep 2007 16:52:57 -
@@ -0,0 +1,22 @@
+--- src/roster_window.py.orig Thu Sep 20 18:31:54 2007
src/roster_window.py Sun Sep 23 15:43:32 2007
+@@ -19,6 +19,7 @@ import gtk
+ import pango
+ import gobject
+ import os
++import sys
+ import time
+ import urllib
+
+@@ -753,9 +754,9 @@ class RosterWindow:
+ 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'''
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gajim/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 1 Apr 2007 20:55:29 - 1.5
+++ pkg/PLIST 23 Sep 2007 16:52:57 -
@@ -840,6 +840,7 @@
share/gajim/src/tooltips.py
share/gajim/src/vcard.py
share/locale/be/LC_MESSAGES/gajim.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/gajim.mo
share/locale/bg/LC_MESSAGES/gajim.mo
share/locale/br/LC_MESSAGES/gajim.mo
share/locale/cs/LC_MESSAGES/gajim.mo
@@ -850,8 +851,10 @@
share/locale/es/LC_MESSAGES/gajim.mo
share/locale/eu/LC_MESSAGES/gajim.mo
share/locale/fr/LC_MESSAGES/gajim.mo
+share/locale/gl/LC_MESSAGES/gajim.mo
share/locale/hr/LC_MESSAGES/gajim.mo
share/locale/it/LC_MESSAGES/gajim.mo
