Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: kpythonpluginfactorywrapper.c
Date: Wed, 01 Aug 2012 22:34:04
Message-Id: 20120801221709.1491E2004E@flycatcher.gentoo.org
1 johu 12/08/01 22:17:09
2
3 Modified: kpythonpluginfactorywrapper.c
4 Log:
5 Version bump KDE SC 4.9.0
6
7 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 kde-base/pykde4/files/kpythonpluginfactorywrapper.c
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/kpythonpluginfactorywrapper.c?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/kpythonpluginfactorywrapper.c?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/kpythonpluginfactorywrapper.c?r1=1.1&r2=1.2
15
16 Index: kpythonpluginfactorywrapper.c
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/files/kpythonpluginfactorywrapper.c,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- kpythonpluginfactorywrapper.c 9 Jul 2011 15:14:09 -0000 1.1
23 +++ kpythonpluginfactorywrapper.c 1 Aug 2012 22:17:08 -0000 1.2
24 @@ -34,10 +34,18 @@
25 char buf[VERSION_LEN + 1];
26 memset(buf, 0, VERSION_LEN + 1);
27 get_python_version(buf);
28 + char *s = buf;
29 + while(*s != '\0') {
30 + if(*s == '\n') {
31 + *s = '\0';
32 + break;
33 + }
34 + ++s;
35 + }
36 int length = strlen(FORMAT) + strlen(buf) + 1;
37 char *name = malloc(length + 1);
38 snprintf(name, length, FORMAT, buf);
39 - void *handle = dlopen(name, RTLD_NOW);
40 + handle = dlopen(name, RTLD_NOW);
41 free(name);
42 wrapped_qt_plugin_instance = dlsym(handle, "qt_plugin_instance");
43 }