From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
Date: Wed, 11 Jul 2012 17:29:12 +0000 (UTC) [thread overview]
Message-ID: <1342027617.4fdfe5d4647b2f536ea2c55404a089e3af7b1946.kensington@gentoo> (raw)
commit: 4fdfe5d4647b2f536ea2c55404a089e3af7b1946
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 17:26:57 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 17:26:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4fdfe5d4
[kde-base/pykde4] Fix problem with plugin not loading due to trailing newlines. Patch by Franz Fellner <alpine.art.de <AT> googlemail.com>.
(Portage version: 2.1.11.5/git/Linux x86_64, unsigned Manifest commit)
---
.../pykde4/files/kpythonpluginfactorywrapper.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
index 3915a0d..067c042 100644
--- a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
+++ b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
@@ -34,10 +34,18 @@ static void init() {
char buf[VERSION_LEN + 1];
memset(buf, 0, VERSION_LEN + 1);
get_python_version(buf);
+ char *s = buf;
+ while(*s != '\0') {
+ if(*s == '\n') {
+ *s = '\0';
+ break;
+ }
+ ++s;
+ }
int length = strlen(FORMAT) + strlen(buf) + 1;
char *name = malloc(length + 1);
snprintf(name, length, FORMAT, buf);
- void *handle = dlopen(name, RTLD_NOW);
+ handle = dlopen(name, RTLD_NOW);
free(name);
wrapped_qt_plugin_instance = dlsym(handle, "qt_plugin_instance");
}
next reply other threads:[~2012-07-11 17:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 17:29 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-25 16:36 [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/ Michael Palimaka
2013-01-17 22:59 Andreas Hüttel
2012-07-12 11:35 Michael Palimaka
2012-06-28 12:11 Michael Palimaka
2012-04-12 18:23 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342027617.4fdfe5d4647b2f536ea2c55404a089e3af7b1946.kensington@gentoo \
--to=kensington@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox