From 592ad511b74e7e0415328f62b7cc92011124c93d Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Mon, 13 Apr 2009 17:07:29 +0200 Subject: [PATCH] net-im/gajim-0.12.1: add QA patches --- net-im/gajim/Manifest | 4 +- ....1_autotools_install_pyfiles_in_pkglibdir.patch | 63 +++++++++++ .../files/fix_autotools_and_search_dirs.patch | 115 +++++++++++++++++++++ net-im/gajim/gajim-0.12.1.ebuild | 21 +++- 4 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch create mode 100644 net-im/gajim/files/fix_autotools_and_search_dirs.patch diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index 48c8895..cc95549 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,4 +1,6 @@ +AUX 0.12.1_autotools_install_pyfiles_in_pkglibdir.patch 1962 RMD160 72363a3658b45b983b9cfa8486f58a66fd6319d2 SHA1 fcaf7cfb2de8113f37e480b1c36e07cf6ff14003 SHA256 f798eb79d3b88bec645123ef7149d8b88e4677b1fc201703df0c083e7bc598a2 +AUX fix_autotools_and_search_dirs.patch 3465 RMD160 1df62f9f735af796e3d3d6520fda1ae2d84e430e SHA1 9e04a9b60068c6a8c2bebc93abdef785ec78afed SHA256 f800a13c0d948cbfecdf19cc69bb347f6cd30b084322b215130ca9d71c8a72a5 DIST gajim-0.12.1.tar.gz 4611614 RMD160 8d17d8083cbccff601b6583cedda93ec0d480316 SHA1 c5421a995842505d5143cacefa2b10a18ee2487e SHA256 7b5d590b548bf23ca395017bdf957d12fef59b17dbaf293152a1a6802280f4c5 -EBUILD gajim-0.12.1.ebuild 2121 RMD160 232880f3a2df883926cb46ab5554200d29ccff9f SHA1 07c4a6825660e51be76e52a7cbaff8c1e8c13962 SHA256 2f395b6295d7fda8f854fab35aeb6701ed4a1f2bebaac2737bfef2a1d4ad0844 +EBUILD gajim-0.12.1.ebuild 2599 RMD160 9a1f4fa3d87e356494e53607b9ae3a2b79562de8 SHA1 777f69455d96a2590ab8bb07bc5354fd04ec734a SHA256 a50d0c53de43ee25de71588fa02d5b7637b1e977649d13277607e2400b10855f MISC ChangeLog 10042 RMD160 3cfbed378246bd0db9b86cf353c95cdce3244a20 SHA1 4f1c66f50d61f3f654576180b15bceb9b495fb67 SHA256 d16a3f8e82ebbe4fd07e5d4d0c3d25ca53f095ea0558c2e7a10bb9a93dc5e8ce MISC metadata.xml 494 RMD160 88ad3a78822ec33575b9f197130806768b2162d9 SHA1 f7ffc3aa2608f508768f54e5f3a87397b953e83f SHA256 765a40dceb1e7eb40079e0d29f003e09882e90cac3369f7c12d977afa1119119 diff --git a/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch b/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch new file mode 100644 index 0000000..2166898 --- /dev/null +++ b/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch @@ -0,0 +1,63 @@ +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 + + diff --git a/net-im/gajim/files/fix_autotools_and_search_dirs.patch b/net-im/gajim/files/fix_autotools_and_search_dirs.patch new file mode 100644 index 0000000..45b5473 --- /dev/null +++ b/net-im/gajim/files/fix_autotools_and_search_dirs.patch @@ -0,0 +1,115 @@ +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 ++ ++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) + diff --git a/net-im/gajim/gajim-0.12.1.ebuild b/net-im/gajim/gajim-0.12.1.ebuild index 427558b..aa68b98 100644 --- a/net-im/gajim/gajim-0.12.1.ebuild +++ b/net-im/gajim/gajim-0.12.1.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI="2" -inherit multilib python eutils +inherit multilib python eutils autotools DESCRIPTION="Jabber client written in PyGTK" HOMEPAGE="http://www.gajim.org/" @@ -53,6 +53,21 @@ pkg_setup() { fi } +src_prepare() { + # bug #251466 move *.py out of /usr/share + # upstream: (http://trac.gajim.org/ticket/4770) + epatch "${FILESDIR}/fix_autotools_and_search_dirs.patch" + # not upstream: + epatch "${FILESDIR}/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch" + # fix datadir path (trunk use an env var for config this) + sed -i "s|'DATA',.*|'DATA', '/usr/share/gajim/data')|" \ + "src/common/configpaths.py" || die 'sed failed' + + eautoreconf +} + + + src_configure() { local myconf @@ -79,9 +94,9 @@ src_install() { } pkg_postinst() { - python_mod_optimize /usr/share/gajim/ + python_mod_optimize $(python_get_sitedir)/gajim/ } pkg_postrm() { - python_mod_cleanup /usr/share/gajim/ + python_mod_cleanup $(python_get_sitedir)/gajim/ } -- 2.11.4.GIT