[gentoo-commits] gentoo-x86 commit in net-im/pidgin/files: pidgin-2.10.9-fix-gtkmedia.patch pidgin-2.10.9-python3_fix1.patch pidgin-2.10.9-python3_fix2.patch

[gentoo-commits] gentoo-x86 commit in net-im/pidgin/files: pidgin-2.10.9-fix-gtkmedia.patch pidgin-2.10.9-python3_fix1.patch pidgin-2.10.9-python3_fix2.patch

[Lars Wendler (polynomial-c)]

polynomial-c    14/02/18 08:11:44

  Added:                pidgin-2.10.9-fix-gtkmedia.patch
                        pidgin-2.10.9-python3_fix1.patch
                        pidgin-2.10.9-python3_fix2.patch
  Log:
  Fixed compilation with python3 (bug #499760) and some undefined reference to gtkmedia (bug #500762)
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.1                  net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.10.9-fix-gtkmedia.patch
===================================================================
--- a/pidgin/Makefile.am	2014-02-02 22:29:20.000000000 +0100
+++ b/pidgin/Makefile.am	2014-02-14 19:35:24.347547795 +0100
@@ -154,6 +154,7 @@
 	$(GSTREAMER_LIBS) \
 	$(XSS_LIBS) \
 	$(SM_LIBS) \
+	$(X11_LIBS) \
 	$(INTLLIBS) \
 	$(GTKSPELL_LIBS) \
 	$(LIBXML_LIBS) \



1.1                  net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.10.9-python3_fix1.patch
===================================================================

# HG changeset patch
# User Ed Catmur <ed@catmur.co.uk>
# Date 1392340585 18000
# Node ID c8bb4edd63253b5b23006e8674c015c854075981
# Parent  eeb82d3d33b1720024ee7aef9bdfba87bb1b163d
Fix build of Finch against Python3.

Fixes #15969.

diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -1281,7 +1281,12 @@
 {
 	char *dir = g_path_get_dirname(path);
 	FILE *file = fopen(path, "r");
-	PyObject *pp = PySys_GetObject("path"), *dirobj = PyString_FromString(dir);
+	PyObject *pp = PySys_GetObject("path");
+#if PY_MAJOR_VERSION >= 3
+	PyObject *dirobj = PyUnicode_FromString(dir);
+#else
+	PyObject *dirobj = PyString_FromString(dir);
+#endif
 
 	PyList_Insert(pp, 0, dirobj);
 	Py_DECREF(dirobj);




1.1                  net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.10.9-python3_fix2.patch
===================================================================

# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1392341598 18000
# Node ID 922e7abddb4dbc1a397aad9c1d3b6fd091c4e392
# Parent  a591c0486b041e029075e12b446430cf32b27d24
Fix call to Py_SetProgramName in Python3.

Refs #15969.

diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -1577,7 +1577,17 @@
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "run-python", run_python,
 				GNT_KEY_F3, NULL);
 	if (!Py_IsInitialized()) {
+#if PY_MAJOR_VERSION >= 3
+		wchar_t *name;
+		size_t len;
+		len = mbstowcs(NULL, "gnt", 0);
+		name = g_new(wchar_t, len + 1);
+		mbstowcs(name, "gnt", len + 1);
+		Py_SetProgramName(name);
+		g_free(name);
+#else
 		Py_SetProgramName("gnt");
+#endif
 		Py_Initialize();
 		started_python = TRUE;
 	}