* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
@ 2012-04-12 18:23 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2012-04-12 18:23 UTC (permalink / raw
To: gentoo-commits
commit: bd8670b33edcd670c7b8d6068d41e5e3897e374f
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Thu Apr 12 18:22:34 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu Apr 12 18:22:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bd8670b3
[kde-base/pykde4] Remove unused patch that is applied upstream.
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
---
.../pykde4/files/pykde4-4.6.3-python-3.2.patch | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch
deleted file mode 100644
index 62abdf0..0000000
--- a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- python/pykde4/sip/kio/kfileitem.sip
-+++ python/pykde4/sip/kio/kfileitem.sip
-@@ -236,7 +236,13 @@
-
- len = sipCpp->count();
-
-- if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0)
-+ if (PySlice_GetIndicesEx(
-+#if PY_VERSION_HEX >= 0x03020000
-+ a0,
-+#else
-+ (PySliceObject *)a0,
-+#endif
-+ len, &start, &stop, &step, &slicelength) < 0)
- sipIsErr = 1;
- else
- {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
@ 2012-06-28 12:11 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2012-06-28 12:11 UTC (permalink / raw
To: gentoo-commits
commit: b73401b9a51aed28f7b655e7e32cc76d4d02dba8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 12:10:54 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 12:10:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b73401b9
[kde-base/pykde4] Remove unused patch.
(Portage version: 2.1.11.3/git/Linux x86_64, unsigned Manifest commit)
---
.../pykde4/files/pykde4-4.8.80-tcpclient.patch | 87 --------------------
1 files changed, 0 insertions(+), 87 deletions(-)
diff --git a/kde-base/pykde4/files/pykde4-4.8.80-tcpclient.patch b/kde-base/pykde4/files/pykde4-4.8.80-tcpclient.patch
deleted file mode 100644
index 680e3a9..0000000
--- a/kde-base/pykde4/files/pykde4-4.8.80-tcpclient.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -urNB pykde4/sip/soprano/model.sip new/sip/soprano/model.sip
---- pykde4/sip/soprano/model.sip 2012-04-07 13:56:35.580752066 +0200
-+++ new/sip/soprano/model.sip 2012-05-04 22:21:36.492281294 +0200
-@@ -41,7 +41,6 @@
- #include <soprano/signalcachemodel.h>
- #include <soprano/sparqlmodel.h>
- #include <soprano/storagemodel.h>
--#include <soprano/tcpclient.h>
- %End
-
- namespace Soprano
-@@ -104,8 +103,6 @@
- sipType = sipType_Soprano_Client_DBusClient;
- else if (dynamic_cast<Soprano::Client::LocalSocketClient*>(sipCpp))
- sipType = sipType_Soprano_Client_LocalSocketClient;
-- else if (dynamic_cast<Soprano::Client::TcpClient*>(sipCpp))
-- sipType = sipType_Soprano_Client_TcpClient;
- else if (dynamic_cast<Soprano::Model*>(sipCpp))
- {
- sipType = sipType_Soprano_Model;
-diff -urNB pykde4/sip/soprano/sopranomod.sip new/sip/soprano/sopranomod.sip
---- pykde4/sip/soprano/sopranomod.sip 2012-04-07 13:56:35.581752068 +0200
-+++ new/sip/soprano/sopranomod.sip 2012-05-04 21:17:01.769188069 +0200
-@@ -82,6 +82,5 @@
- %Include statementiterator.sip
- %Include statementpattern.sip
- %Include storagemodel.sip
--%Include tcpclient.sip
- %Include xesam.sip
- %Include xsd.sip
-diff -urNB pykde4/sip/soprano/tcpclient.sip new/sip/soprano/tcpclient.sip
---- pykde4/sip/soprano/tcpclient.sip 2012-04-07 13:56:35.582752070 +0200
-+++ new/sip/soprano/tcpclient.sip 1970-01-01 01:00:00.000000000 +0100
-@@ -1,53 +0,0 @@
--//
--// Copyright 2008 Simon Edwards <simon@simonzone.com>
--
--// Generated by twine
--
--// This file is part of PyKDE4.
--
--// PyKDE4 is free software; you can redistribute it and/or modify
--// it under the terms of the GNU Lesser General Public License as
--// published by the Free Software Foundation; either version 2.1 of
--// the License, or (at your option) any later version.
--
--// PyKDE4 is distributed in the hope that it will be useful,
--// but WITHOUT ANY WARRANTY; without even the implied warranty of
--// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--// GNU General Public License for more details.
--
--// You should have received a copy of the GNU General Public License
--// along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--namespace Soprano
--{
--namespace Client
--{
--
--class TcpClient : QObject, Soprano::Error::ErrorCache
--{
--%TypeHeaderCode
--#include <soprano/tcpclient.h>
--#include <soprano/servercore.h>
--%End
--
--public:
-- TcpClient (QObject* parent /TransferThis/ = 0);
-- const quint16 DEFAULT_PORT;
--
-- bool connect (const QHostAddress& address = QHostAddress::LocalHost, int port = Soprano::Server::ServerCore::DEFAULT_PORT);
--
-- bool isConnected ();
-- void disconnect ();
-- Soprano::Model* createModel (const QString& name, const QList<Soprano::BackendSetting>& settings = QList<Soprano::BackendSetting>());
-- void removeModel (const QString& name);
-- virtual ~TcpClient ();
--};
--// TcpClient
--
--};
--// Client
--
--};
--// Soprano
--
--
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
@ 2012-07-11 17:29 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2012-07-11 17:29 UTC (permalink / raw
To: gentoo-commits
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");
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
@ 2012-07-12 11:35 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2012-07-12 11:35 UTC (permalink / raw
To: gentoo-commits
commit: bbb94ce6ca6152bf72badf01c73f5eca9240cece
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 11:35:04 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 11:35:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bbb94ce6
[kde-base/pykde4] Whitespace.
(Portage version: 2.1.11.5/git/Linux x86_64, unsigned Manifest commit)
---
.../pykde4/files/kpythonpluginfactorywrapper.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
index 067c042..b5d152f 100644
--- a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
+++ b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
@@ -39,7 +39,7 @@ static void init() {
if(*s == '\n') {
*s = '\0';
break;
- }
+ }
++s;
}
int length = strlen(FORMAT) + strlen(buf) + 1;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
@ 2013-01-17 22:59 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2013-01-17 22:59 UTC (permalink / raw
To: gentoo-commits
commit: eb1f660f0d4f246c2ba2dea6e7c06691e73be142
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jan 17 22:59:03 2013 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 22:59:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eb1f660f
[kde-base/pykde4] revert all changes since rc2 for a test
---
kde-base/pykde4/files/pykde4-4.9.98-symlink.patch | 27 ++++++++++-----------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
index c9eab07..db1653c 100644
--- a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
+++ b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
@@ -1,14 +1,16 @@
-From fa1b3798477b91492330a6db9e81834d64ce8ec1 Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel" <mail@akhuettel.de>
-Date: Thu, 17 Jan 2013 17:33:46 +0100
-Subject: [PATCH] Revert "Use a slightly better strategy for symlinking:
- although the previous"
-
-This reverts commit 4e8ee28f3a314edef2a8489854c0ed58ac668070.
----
- tools/pykdeuic4/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
+diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
+index c24160e..9597cd1 100644
+--- a/kpythonpluginfactory/CMakeLists.txt
++++ b/kpythonpluginfactory/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(kpythonpluginfactory_SRCS
+ kpythonpluginfactory.cpp)
+
+ GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARIES} NAME)
+-ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}")
++ADD_DEFINITIONS(-DLIB_PYTHON="\\"${LIB_PYTHON}\\"")
+ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
+
+ kde4_add_plugin(kpythonpluginfactory ${kpythonpluginfactory_SRCS})
diff --git a/tools/pykdeuic4/CMakeLists.txt b/tools/pykdeuic4/CMakeLists.txt
index 092985d..2209fba 100644
--- a/tools/pykdeuic4/CMakeLists.txt
@@ -22,6 +24,3 @@ index 092985d..2209fba 100644
endif()
unset(_uic_name)
---
-1.8.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/
@ 2014-10-25 16:36 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-10-25 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 44494d44d59ada0b33be28b2ba3e5c93844684bc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 16:36:16 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 16:36:16 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=44494d44
[kde-base/pykde4] Remove unused patch.
Package-Manager: portage-2.2.14
---
kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch b/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch
deleted file mode 100644
index 8c322ef..0000000
--- a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=332223
-
-diff -up pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 pykde4-4.12.3/sip/phonon/backendcapabilities.sip
---- pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 2014-01-18 13:18:35.000000000 -0600
-+++ pykde4-4.12.3/sip/phonon/backendcapabilities.sip 2014-03-16 16:56:36.865132943 -0500
-@@ -26,7 +26,7 @@ namespace Phonon
- {
- namespace BackendCapabilities
- {
--class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
-+class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
- {
-
- signals:
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-25 16:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-12 18:23 [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2012-06-28 12:11 Michael Palimaka
2012-07-11 17:29 Michael Palimaka
2012-07-12 11:35 Michael Palimaka
2013-01-17 22:59 Andreas Hüttel
2014-10-25 16:36 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox