[gentoo-commits] gentoo-x86 commit in net-im/gajim/files: 0.12.1_autotools_install_pyfiles_in_pkglibdir.patch 0.12.1-roster_window.py_r10934.patch 0.12.1-sound-path-fix.patch fix_autotools_and_search_dirs.patch

[Patrick Lauer (patrick)]

patrick     09/04/27 22:36:23

  Added:                0.12.1_autotools_install_pyfiles_in_pkglibdir.patch
                        0.12.1-roster_window.py_r10934.patch
                        0.12.1-sound-path-fix.patch
                        fix_autotools_and_search_dirs.patch
  Log:
  Bump to 0.12.1, fixes #251298. Patches by Bruno Tarquini, ebuild mods by Bruno Tarquini and Marcin Rybarski.
  (Portage version: 2.2_rc31/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch?rev=1.1&content-type=text/plain

Index: 0.12.1_autotools_install_pyfiles_in_pkglibdir.patch
===================================================================
autotools: install *.py in $(pkglibdir), ie $prefix/lib/gajim

diff -r 2c6ac74dd0e2 data/Makefile.am
--- a/data/Makefile.am	Tue Feb 03 15:52:16 2009 +0100
+++ b/data/Makefile.am	Tue Feb 03 16:52:41 2009 +0100
@@ -5,7 +5,7 @@
 desktop_in_files = gajim.desktop.in.in 
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-installdefsdir = $(pkgdatadir)/src/common
+installdefsdir = $(pkglibdir)/common
 installdefs_DATA = defs.py
 
 soundsdir = $(pkgdatadir)/data/sounds
diff -r 2c6ac74dd0e2 scripts/gajim-remote.in
--- a/scripts/gajim-remote.in	Tue Feb 03 15:52:16 2009 +0100
+++ b/scripts/gajim-remote.in	Tue Feb 03 16:52:41 2009 +0100
@@ -27,6 +27,6 @@
 datadir=@DATADIR@
 PYTHON_EXEC=@PYTHON@
 
-cd ${datadir}/gajim/src
+cd @LIBDIR@/gajim
 export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
 exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"
diff -r 2c6ac74dd0e2 scripts/gajim.in
--- a/scripts/gajim.in	Tue Feb 03 15:52:16 2009 +0100
+++ b/scripts/gajim.in	Tue Feb 03 16:52:41 2009 +0100
@@ -29,6 +29,6 @@
 datadir=@DATADIR@
 PYTHON_EXEC=@PYTHON@
 
-cd ${datadir}/gajim/src
+cd @LIBDIR@/gajim
 export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
 exec ${PYTHON_EXEC} -OO gajim.py $@
diff -r 2c6ac74dd0e2 src/Makefile.am
--- a/src/Makefile.am	Tue Feb 03 15:52:16 2009 +0100
+++ b/src/Makefile.am	Tue Feb 03 16:52:41 2009 +0100
@@ -43,18 +43,18 @@
 		    --override $(srcdir)/trayicon.override \
 		    $(srcdir)/trayicon.defs > $@
 endif
-gajimsrcdir = $(pkgdatadir)/src
+gajimsrcdir = $(pkglibdir)
 gajimsrc_PYTHON = $(srcdir)/*.py 
 
-gajimsrc1dir = $(pkgdatadir)/src/common
+gajimsrc1dir = $(pkglibdir)/common
 gajimsrc1_PYTHON = \
 				$(srcdir)/common/*.py 
 
-gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
+gajimsrc2dir = $(pkglibdir)/common/xmpp
 gajimsrc2_PYTHON = \
 				$(srcdir)/common/xmpp/*.py 
 
-gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
+gajimsrc3dir = $(pkglibdir)/common/zeroconf
 gajimsrc3_PYTHON = \
 				$(srcdir)/common/zeroconf/*.py 
 



1.1                  net-im/gajim/files/0.12.1-roster_window.py_r10934.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch?rev=1.1&content-type=text/plain

Index: 0.12.1-roster_window.py_r10934.patch
===================================================================
Index: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py (revision 10772)
+++ trunk/src/roster_window.py (revision 10934)
@@ -1000,7 +1000,7 @@
 		and ('artist' in gajim.connections[account].tune \
 		or 'title' in gajim.connections[account].tune):
+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
 			self.model[child_iter][C_TUNE_PIXBUF] = \
-				gtk.gdk.pixbuf_new_from_file(
-				'../data/emoticons/static/music.png')
+				gtk.gdk.pixbuf_new_from_file(path)
 		else:
 			self.model[child_iter][C_TUNE_PIXBUF] = None
@@ -1263,6 +1263,6 @@
 		contact = gajim.contacts.get_contact(account, jid)
 		if 'artist' in contact.tune or 'title' in contact.tune:
-			pixbuf = gtk.gdk.pixbuf_new_from_file(
-				'../data/emoticons/static/music.png')
+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
+			pixbuf = gtk.gdk.pixbuf_new_from_file(path)
 		else:
 			pixbuf = None



1.1                  net-im/gajim/files/0.12.1-sound-path-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.12.1-sound-path-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/0.12.1-sound-path-fix.patch?rev=1.1&content-type=text/plain

Index: 0.12.1-sound-path-fix.patch
===================================================================
diff -r 955cd2eb2893 data/defs.py.in
--- a/data/defs.py.in	Tue Feb 03 21:39:50 2009 +0100
+++ b/data/defs.py.in	Mon Feb 16 02:05:18 2009 +0100
@@ -2,7 +2,7 @@
 # do not edit it!
 docdir = "@DOCDIR@"
 
-datadir = "@DATADIR@"
+datadir = "@DATADIR@/gajim"
 
 localedir = "@LOCALEDIR@"
 
diff -r 955cd2eb2893 src/common/config.py
--- a/src/common/config.py	Tue Feb 03 21:39:50 2009 +0100
+++ b/src/common/config.py	Mon Feb 16 02:05:18 2009 +0100
@@ -447,15 +447,15 @@
 	}
 
 	soundevents_default = {
-		'first_message_received': [ True, '../data/sounds/message1.wav' ],
-		'next_message_received_focused': [ True, '../data/sounds/message2.wav' ],
-		'next_message_received_unfocused': [ True, '../data/sounds/message2.wav' ],
-		'contact_connected': [ True, '../data/sounds/connected.wav' ],
-		'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ],
-		'message_sent': [ True, '../data/sounds/sent.wav' ],
-		'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')],
-		'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ],
-		'gmail_received': [ False, '../data/sounds/message1.wav' ],
+		'first_message_received': [ True, 'message1.wav' ],
+		'next_message_received_focused': [ True, 'message2.wav' ],
+		'next_message_received_unfocused': [ True, 'message2.wav' ],
+		'contact_connected': [ True, 'connected.wav' ],
+		'contact_disconnected': [ True, 'disconnected.wav' ],
+		'message_sent': [ True, 'sent.wav' ],
+		'muc_message_highlight': [ True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')],
+		'muc_message_received': [ False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.') ],
+		'gmail_received': [ False, 'message1.wav' ],
 	}
 
 	themes_default = {
@@ -696,7 +696,8 @@
 			default = self.soundevents_default[event]
 			self.add_per('soundevents', event)
 			self.set_per('soundevents', event, 'enabled', default[0])
-			self.set_per('soundevents', event, 'path', default[1])
+			self.set_per('soundevents', event, 'path', '%s/data/sounds/%s' %
+															(defs.datadir, default[1]))
 
 		for status in self.defaultstatusmsg_default:
 			default = self.defaultstatusmsg_default[status]



1.1                  net-im/gajim/files/fix_autotools_and_search_dirs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/fix_autotools_and_search_dirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/gajim/files/fix_autotools_and_search_dirs.patch?rev=1.1&content-type=text/plain

Index: fix_autotools_and_search_dirs.patch
===================================================================
upstream: http://trac.gajim.org/ticket/4770

diff -r 15ddf05b958b -r 6c0f28cde899 configure.ac
--- a/configure.ac	Tue Feb 03 21:18:37 2009 +0100
+++ b/configure.ac	Tue Feb 03 21:39:50 2009 +0100
@@ -174,18 +174,12 @@
 AC_SUBST([PYTHON_INCLUDES])
 
 AS_AC_EXPAND(DATADIR, "${datadir}")
-
-AS_AC_EXPAND(LIBDIR, ${libdir})
-
+AS_AC_EXPAND(LIBDIR, "${libdir}")
 AS_AC_EXPAND(DOCDIR, "${docdir}")
+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
 
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
-AC_SUBST(DATADIR)
-AC_SUBST(LIBDIR)
-AS_AC_EXPAND(DATADIR, "${DATADIR}")
-AC_SUBST(DOCDIR)
-AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
 
 AC_CONFIG_FILES([ 
 	Makefile
diff -r 15ddf05b958b -r 6c0f28cde899 data/defs.py.in
--- a/data/defs.py.in	Tue Feb 03 21:18:37 2009 +0100
+++ b/data/defs.py.in	Tue Feb 03 21:39:50 2009 +0100
@@ -4,4 +4,6 @@
 
 datadir = "@DATADIR@"
 
+localedir = "@LOCALEDIR@"
+
 version = "@VERSION@"
diff -r 15ddf05b958b -r 6c0f28cde899 m4/acinclude.m4
--- a/m4/acinclude.m4	Tue Feb 03 21:18:37 2009 +0100
+++ b/m4/acinclude.m4	Tue Feb 03 21:39:50 2009 +0100
@@ -1,6 +1,15 @@
+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
 dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
+
+dnl example:
 dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
 
@@ -15,7 +24,7 @@
 
   dnl if no prefix given, then use /usr/local, the default prefix
   if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
+    prefix="$ac_default_prefix"
   fi
   dnl if no exec_prefix given, then use prefix
   if test "x$exec_prefix" = "xNONE"; then
@@ -26,7 +35,7 @@
   dnl loop until it doesn't change anymore
   while true; do
     new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
+    if test "x$new_full_var" = "x$full_var"; then break; fi
     full_var=$new_full_var
   done
 
diff -r 15ddf05b958b -r 6c0f28cde899 src/common/defs.py
--- a/src/common/defs.py	Tue Feb 03 21:18:37 2009 +0100
+++ b/src/common/defs.py	Tue Feb 03 21:39:50 2009 +0100
@@ -25,6 +25,7 @@
 
 docdir = '../'
 datadir = '../'
+localedir = '../po'
 
 version = '0.12.1.2-svn'
 
diff -r 15ddf05b958b -r 6c0f28cde899 src/common/i18n.py
--- a/src/common/i18n.py	Tue Feb 03 21:18:37 2009 +0100
+++ b/src/common/i18n.py	Tue Feb 03 21:39:50 2009 +0100
@@ -26,10 +26,8 @@
 import os
 
 APP = 'gajim'
-if os.path.isdir('../po'):
-	DIR = '../po'
-else:
-	DIR = '../../locale'
+import defs
+DIR = defs.localedir
 
 # set '' so each part of the locale that should be modified is set
 # according to the environment variables
diff -r 15ddf05b958b -r 6c0f28cde899 src/gtkgui_helpers.py
--- a/src/gtkgui_helpers.py	Tue Feb 03 21:18:37 2009 +0100
+++ b/src/gtkgui_helpers.py	Tue Feb 03 21:39:50 2009 +0100
@@ -61,7 +61,7 @@
 screen_w = gtk.gdk.screen_width()
 screen_h = gtk.gdk.screen_height()
 
-GLADE_DIR = os.path.join('..', 'data', 'glade')
+GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade')
 def get_glade(file_name, root = None):
 	file_path = os.path.join(GLADE_DIR, file_name)
 	return gtk.glade.XML(file_path, root=root, domain=i18n.APP)