diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-03-18 09:35:51 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-03-18 09:35:51 +0000 |
commit | 30ea12b686afbb74e836f782b47657468b3de290 (patch) | |
tree | df0691b05a8d6339c2da0417fd02b57a569d58d0 /net-im/gajim/files | |
parent | Use mask kde for net-im/gajim (diff) | |
download | gentoo-2-30ea12b686afbb74e836f782b47657468b3de290.tar.gz gentoo-2-30ea12b686afbb74e836f782b47657468b3de290.tar.bz2 gentoo-2-30ea12b686afbb74e836f782b47657468b3de290.zip |
Drop old files, bump to latest beta release
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'net-im/gajim/files')
-rw-r--r-- | net-im/gajim/files/0.13.4-python-version.patch | 13 | ||||
-rw-r--r-- | net-im/gajim/files/0.14.1-link.patch | 16 | ||||
-rw-r--r-- | net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch | 116 |
3 files changed, 0 insertions, 145 deletions
diff --git a/net-im/gajim/files/0.13.4-python-version.patch b/net-im/gajim/files/0.13.4-python-version.patch deleted file mode 100644 index 1fbc503e244a..000000000000 --- a/net-im/gajim/files/0.13.4-python-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/gajim.in b/scripts/gajim.in -index 711ddac..0098b9e 100644 ---- a/scripts/gajim.in -+++ b/scripts/gajim.in -@@ -30,7 +30,7 @@ fi - [ "$APP" = "gajim-history-manager" ] && APP="history_manager" - - export datadir=@DATADIR@/gajim --PYTHON_EXEC=@PYTHON@ -+PYTHON_EXEC=@PYTHON@@PYTHON_VERSION@ - - cd ${datadir}/src - export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" diff --git a/net-im/gajim/files/0.14.1-link.patch b/net-im/gajim/files/0.14.1-link.patch deleted file mode 100644 index 9f4bb6ee5936..000000000000 --- a/net-im/gajim/files/0.14.1-link.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/chat_control.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/chat_control.py b/src/chat_control.py -index e59a871..c34f86a 100644 ---- a/src/chat_control.py -+++ b/src/chat_control.py -@@ -1912,7 +1912,7 @@ class ChatControl(ChatControlBase): - - if status_escaped: - status_text = self.urlfinder.sub(self.make_href, status_escaped) -- status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped) -+ status_text = '<span %s>%s</span>' % (font_attrs_small, status_text) - self.banner_status_label.set_tooltip_text(status) - self.banner_status_label.set_no_show_all(False) - self.banner_status_label.show() diff --git a/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch b/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch deleted file mode 100644 index ad683913e923..000000000000 --- a/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch +++ /dev/null @@ -1,116 +0,0 @@ -autotools: add --enable-site-packages option - -This option allows the installation of pyfiles in PYTHON/site-packages/gajim -instead of DATADIR/gajim/src. - -partial backport of upstream version (http://trac.gajim.org/ticket/5460). - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,20 @@ - AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) - AC_SUBST([PYTHON_INCLUDES]) - -+dnl **** -+dnl enable installation in python-2.x/site-packages/gajim -+dnl **** -+AC_ARG_ENABLE(site-packages, -+ [AS_HELP_STRING([--enable-site-packages], -+ [install gajim sources in PYTHONDIR/site-packages/gajim -+instead of DATADIR/gajim/src.])] -+, -+AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) -+, -+AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) -+) -+ -+AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") - AS_AC_EXPAND(DATADIR, "${datadir}") - AS_AC_EXPAND(LIBDIR, "${libdir}") - AS_AC_EXPAND(DOCDIR, "${docdir}") -@@ -95,4 +109,11 @@ - ***************************** - Build features: - trayicon ......... ${have_trayicon} -+ -+ Installation: -+ Prefix ........... ${prefix} -+ Python modules ... ${GAJIM_SRCDIR} -+ C modules ........ ${LIBDIR}/gajim -+ Documentation .... ${DOCDIR} -+ Others............ ${DATADIR}/gajim - *****************************" -diff --git a/data/Makefile.am b/data/Makefile.am ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -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 = $(gajim_srcdir)/common - installdefs_DATA = defs.py - - soundsdir = $(pkgdatadir)/data/sounds -diff --git a/scripts/gajim.in b/scripts/gajim.in ---- a/scripts/gajim.in -+++ b/scripts/gajim.in -@@ -32,6 +32,6 @@ - export datadir=@DATADIR@/gajim - PYTHON_EXEC=@PYTHON@ - --cd ${datadir}/src -+cd "@GAJIM_SRCDIR@" - export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" - exec ${PYTHON_EXEC} -OO $APP.py "$@" -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -26,37 +26,16 @@ - --override $(srcdir)/trayicon.override \ - $(srcdir)/trayicon.defs > $@ - endif --gajimsrcdir = $(pkgdatadir)/src --gajimsrc_PYTHON = $(srcdir)/*.py -+gajimsrcdir = $(gajim_srcdir) -+nobase_dist_gajimsrc_PYTHON = \ -+ $(srcdir)/*.py \ -+ $(srcdir)/common/*.py \ -+ $(srcdir)/common/xmpp/*.py \ -+ $(srcdir)/common/zeroconf/*.py \ -+ $(srcdir)/command_system/*.py \ -+ $(srcdir)/command_system/implementation/*.py - --gajimsrc1dir = $(pkgdatadir)/src/common --gajimsrc1_PYTHON = \ -- $(srcdir)/common/*.py -- --gajimsrc2dir = $(pkgdatadir)/src/common/xmpp --gajimsrc2_PYTHON = \ -- $(srcdir)/common/xmpp/*.py -- --gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf --gajimsrc3_PYTHON = \ -- $(srcdir)/common/zeroconf/*.py -- --gajimsrc4dir = $(pkgdatadir)/src/command_system --gajimsrc4_PYTHON = \ -- $(srcdir)/command_system/*.py -- --gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation --gajimsrc5_PYTHON = \ -- $(srcdir)/command_system/implementation/*.py -- --DISTCLEANFILES = -- --EXTRA_DIST = $(gajimsrc_PYTHON) \ -- $(gajimsrc1_PYTHON) \ -- $(gajimsrc2_PYTHON) \ -- $(gajimsrc3_PYTHON) \ -- $(gajimsrc4_PYTHON) \ -- $(gajimsrc5_PYTHON) \ -+EXTRA_DIST = \ - eggtrayicon.c \ - trayiconmodule.c \ - eggtrayicon.h \ |