diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2009-11-09 10:36:22 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2009-11-09 10:36:22 +0000 |
commit | 730ce12f2df0dc7256f767501d5a3ede8ccdb1ac (patch) | |
tree | e03199bdc16a82bdf700723414bc3251ba489beb /kde-base | |
parent | Drop unneeded patch (diff) | |
download | historical-730ce12f2df0dc7256f767501d5a3ede8ccdb1ac.tar.gz historical-730ce12f2df0dc7256f767501d5a3ede8ccdb1ac.tar.bz2 historical-730ce12f2df0dc7256f767501d5a3ede8ccdb1ac.zip |
Drop unneeded patches
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdelibs/Manifest | 4 | ||||
-rw-r--r-- | kde-base/pykde4/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/pykde4/files/pykde4-installation-fix.patch | 10 | ||||
-rw-r--r-- | kde-base/pykde4/files/pykde4_sip-4.8.patch | 109 | ||||
-rw-r--r-- | kde-base/systemsettings/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch | 11 | ||||
-rw-r--r-- | kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch | 44 |
7 files changed, 12 insertions, 179 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 3bd4829ccdea..de789af86858 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -9,8 +9,6 @@ AUX kdelibs-3.5.10-kjs-gcc44.patch 8730 RMD160 d1d139782c7c9a34b8b7c2c46f360ad7d AUX kdelibs-4.3.1-crash-on-konqueror-tabs.patch 372 RMD160 0d0bc7eed8535ab7635d8e2aacf78db03a8dd460 SHA1 741a017aa9f5c8c2e7a1e175a32e11cbb05aac17 SHA256 e6804cb3f5f811d00b5fa645e9359c3b7ca8e2cc51e9365ee62d73eac2297e8a AUX kdelibs-4.3.1-dom-docimpl-crash.patch 1547 RMD160 7943693fcdd9e03bab297518fd36b085ac94b760 SHA1 07eb02f50ca172eb9c9f10d675a98bb9647532a0 SHA256 fd3153f39f8fce96be1bb04b7a21308415d8b693b0adf7546ea1a8eec988f169 AUX kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch 349 RMD160 dd79ab167971d1266ce4ef72aae4431caa5c24cb SHA1 fa392cfb329d29c0a8b3a3d8a4b8982cba1b90d3 SHA256 1af1cd5f326eb9538b118083284872706a25d62ad754af2220bf51c8f2895005 -AUX kdelibs-4.3.2-fix-deadlock-in-KLocale.patch 7842 RMD160 2aa83a297e4708b980a0ed6d65ac7e01a8ef3f79 SHA1 a46ab9b2ebc97caf4c5e53538bfb7cdacac42a71 SHA256 94206e03ff381001c9adc5d9bee861a946473af3da098ce07ded326112597df6 -AUX kdelibs-4.3.2-fix-plasma-crash.patch 496 RMD160 919ed996649a7f05ab5e9b4f90d0f0a6663756fd SHA1 aad7d634e1702ee6dc8e3ecfe220a4fe579b06dc SHA256 6d9ae3e0e0f51ef7e28256cc080872a01a3c31761ffb8d9a2212ae98b3f48f58 AUX kdelibs-4.3.3-glibc-2.11.patch 514 RMD160 87304f8319e06b9ce5a0e6c263dfa3544bf78bdd SHA1 ad356e84872e885d5db023a2b966b3efc1382668 SHA256 74a6db7c6370bf21d320896928740bdd9c637e507d33ee86a95b8580d28d7c3a DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec @@ -21,5 +19,5 @@ EBUILD kdelibs-3.5.10-r6.ebuild 7407 RMD160 5b14da6e63445a43c1729a0d75519374914a EBUILD kdelibs-4.3.1-r1.ebuild 6433 RMD160 3f0a829ef8c9c927da8760d367a1c1e9f7d8983d SHA1 5ee2c2e5cfd4b7b3e344dfcc45e484e128b39cdc SHA256 1bf55897439b9f25873fd8d35f8e2f9ccfdbb4f2d13aab61bbd1e96493782a87 EBUILD kdelibs-4.3.1-r2.ebuild 6429 RMD160 e1e0e5698301f1d27cef09a20f18a40815a231d9 SHA1 23675761bdc73b70fd9ae3a98206e3b50097c27b SHA256 c876c4a38c5f6cd77acec396d4bd1e629a3c1c6f30fb72077ae334385ecc3b1f EBUILD kdelibs-4.3.3.ebuild 6336 RMD160 4be81b879855b3adb0e3eaf920ed29cf7139d602 SHA1 f812720df12ad6928fddecd9827d0c2dfd9190ec SHA256 d308f1bb873858ffaf7f1da730d30e7ad60e60a5ed365ef3368fb362e073815b -MISC ChangeLog 107492 RMD160 463e6c9774cf995c7feb06042d776652c62bd4c0 SHA1 4d64c0b947e12963ac5a8fdd19e3626b0d1f1ef5 SHA256 594f1751af2da151cf683f533b9623d4b24b8e7845bfa83b4890b9c81e519ed7 +MISC ChangeLog 107521 RMD160 50f12b98b1110da2279e80a574c6589ea47488e1 SHA1 a3c5bfdbd056feb05a065c3da0b999bc2210099b SHA256 d4dd8915c30deef7cf06e9e419c8e6e100820a17bb959024949efeb222c52bc6 MISC metadata.xml 421 RMD160 1ac2a2321b85031d1a7d25ff97fd87fd7376cc12 SHA1 473e157bcd1bfbef6704dbc47fbe86688973e79e SHA256 03af52377b9a607997590a9cda326fa515c4e21207bf33953cb0e67b5831336d diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index 4841bae77399..33b2332a793b 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.35 2009/11/09 00:19:14 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.36 2009/11/09 10:33:11 abcd Exp $ + + 09 Nov 2009; Jonathan Callen <abcd@gentoo.org> + -files/pykde4-installation-fix.patch, -files/pykde4_sip-4.8.patch: + Drop unneeded patches 08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -pykde4-4.3.2.ebuild: Drop KDE 4.3.2 diff --git a/kde-base/pykde4/files/pykde4-installation-fix.patch b/kde-base/pykde4/files/pykde4-installation-fix.patch deleted file mode 100644 index 40ec5b5b24a9..000000000000 --- a/kde-base/pykde4/files/pykde4-installation-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: python/pykde4/tools/pykdeuic4/CMakeLists.txt -=================================================================== ---- python/pykde4/tools/pykdeuic4/CMakeLists.txt (revision 1001414) -+++ python/pykde4/tools/pykdeuic4/CMakeLists.txt (working copy) -@@ -1,2 +1,4 @@ - PYTHON_INSTALL(kde4.py ${DATA_INSTALL_DIR}/${PROJECT_NAME}) --PYTHON_INSTALL(pykdeuic4.py ${DATA_INSTALL_DIR}/${PROJECT_NAME}) -+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/) -+find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH}) -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) diff --git a/kde-base/pykde4/files/pykde4_sip-4.8.patch b/kde-base/pykde4/files/pykde4_sip-4.8.patch deleted file mode 100644 index 5e7321896eba..000000000000 --- a/kde-base/pykde4/files/pykde4_sip-4.8.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- python/pykde4/sip/plasma/abstractrunner.sip 2009/01/06 06:52:12 906396 -+++ python/pykde4/sip/plasma/abstractrunner.sip 2009/04/25 13:15:30 959021 -@@ -129,7 +129,7 @@ - void setHasRunOptions (bool hasRunOptions); - void setSpeed (Plasma::AbstractRunner::Speed newSpeed); - void setPriority (Plasma::AbstractRunner::Priority newPriority); -- KService::List serviceQuery (const QString& serviceType, const QString& constraint = QString()) const; -+//FIXME KService::List serviceQuery (const QString& serviceType, const QString& constraint = QString()) const; - virtual QList<QAction*> actionsForMatch (const Plasma::QueryMatch& match); - QAction* addAction (const QString& id, const QIcon& icon, const QString& text); - void addAction (const QString& id, QAction* action); ---- python/pykde4/sip/phonon/backendcapabilities.sip 2008/07/04 19:03:58 828140 -+++ python/pykde4/sip/phonon/backendcapabilities.sip 2009/04/25 13:15:30 959021 -@@ -26,7 +26,7 @@ - { - namespace BackendCapabilities - { --class Notifier : QObject /NoDefaultCtors,NoQMetaObject/ -+class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ - { - - signals: ---- python/pykde4/sip/kio/global.sip 2008/12/16 07:51:39 897475 -+++ python/pykde4/sip/kio/global.sip 2009/04/25 13:15:30 959021 -@@ -243,8 +243,8 @@ - { - int iserr = 0; - -- acpp = (QString *)sipForceConvertTo_QString (aelem, &iserr); -- bcpp = (QString *)sipForceConvertTo_QString (belem, &iserr); -+ acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr); -+ bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr); - - if (iserr) - { ---- python/pykde4/sip/kio/kacl.sip 2008/07/04 19:03:58 828140 -+++ python/pykde4/sip/kio/kacl.sip 2009/04/25 13:15:30 959021 -@@ -144,8 +144,7 @@ - { - PyObject *elem = PyList_GET_ITEM (sipPy, i); - PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0); -- p1 = *(QString *)sipForceConvertTo_QString (pyp1, &iserr); -- -+ p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr); - if (iserr) - { - *sipIsErr = 1; ---- python/pykde4/sip/kdecore/kptydevice.sip 2008/07/04 19:03:58 828140 -+++ python/pykde4/sip/kdecore/kptydevice.sip 2009/04/25 13:15:30 959021 -@@ -46,9 +46,9 @@ signals: - void readEof (); - - protected: -- virtual qint64 readData (char*, qint64); -- virtual qint64 readLineData (char*, qint64); -- virtual qint64 writeData (const char*, qint64); -+//ig virtual qint64 readData (char*, qint64); -+//ig virtual qint64 readLineData (char*, qint64); -+//ig virtual qint64 writeData (const char*, qint64); - - }; // class KPtyDevice - ---- python/pykde4/sip/akonadi/messagethreadingattribute.sip 2008/12/30 19:21:36 903526 -+++ python/pykde4/sip/akonadi/messagethreadingattribute.sip 2009/04/25 13:15:30 959021 -@@ -30,7 +30,7 @@ - - public: - MessageThreadingAttribute (); -- MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other); -+//ig MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other); - QList<Akonadi::Entity::Id> perfectParents () const; - void setPerfectParents (const QList<Akonadi::Entity::Id>& parents); - QList<Akonadi::Entity::Id> unperfectParents () const; ---- python/pykde4/sip/dnssd/servicebase.sip 2008/12/30 19:21:36 903526 -+++ python/pykde4/sip/dnssd/servicebase.sip 2009/04/25 13:15:30 959021 -@@ -27,7 +27,7 @@ - %End - - public: -- typedef KSharedPtr<DNSSD::ServiceBase> Ptr; -+// typedef KSharedPtr<DNSSD::ServiceBase> Ptr; - - explicit ServiceBase (const QString& name = QString(), const QString& type = QString(), const QString& domain = QString(), const QString& host = QString(), unsigned short port = 0); - QString serviceName () const; ---- python/pykde4/sip/kdecore/typedefs.sip 2008/07/06 15:57:41 828781 -+++ python/pykde4/sip/kdecore/typedefs.sip 2009/04/25 13:15:30 959021 -@@ -244,7 +244,7 @@ - return PyInstance_Check(sipPy); - - int iserr = 0; -- TYPE *cpp = (TYPE *)sipForceConvertTo_TYPE (sipPy, &iserr); -+ TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr); - - if (iserr) - { - - ---- python/pykde4/sip/kparts/factory.sip 2008/07/04 19:03:58 828140 -+++ python/pykde4/sip/kparts/factory.sip 2009/06/01 19:03:03 976474 -@@ -37,7 +37,7 @@ - - protected: - virtual KParts::Part* createPartObject (QWidget* parentWidget = 0, QObject* parent /Transfer/ = 0, const char* classname = "KParts::Part", const QStringList& args = QStringList()) = 0; -- virtual QObject* createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList()); -+//ig virtual QObject* createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList()); - }; // Factory - - }; // KParts - diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index 964b9d2f804e..36727b7b19df 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.51 2009/11/09 00:22:23 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.52 2009/11/09 10:36:21 abcd Exp $ + + 09 Nov 2009; Jonathan Callen <abcd@gentoo.org> + -files/10_xklavier_adaptor_fix.patch, + -files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch: + Drop unneeded patches 08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -systemsettings-4.3.2.ebuild: diff --git a/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch b/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch deleted file mode 100644 index f52e4ab3bfd6..000000000000 --- a/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kcontrol/kxkb/xklavier_adaptor.cpp.old 2009-07-20 01:25:48.780492221 +0300 -+++ kcontrol/kxkb/xklavier_adaptor.cpp 2009-07-20 01:26:02.047358319 +0300 -@@ -222,7 +222,7 @@ - kDebug() << "Xklavier initialized"; - priv->config = xkl_config_registry_get_instance(priv->engine); - -- xkl_config_registry_load(priv->config); -+ xkl_config_registry_load(priv->config,false); - - void *userData = priv; - diff --git a/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch b/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch deleted file mode 100644 index 04c5707170c3..000000000000 --- a/kde-base/systemsettings/files/systemsettings-4.2.1-kxkb-strip-hot_plugging-support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Gordon Malm <gengor@gentoo.org> - -Strip keyboard hot-plugging support out of systemsettings' kxkb module. -Systemsettings' keyboard hot-plugging code relies on override abilities -found only in GCC 4.1.2 and later. - -See: http://bugs.gentoo.org/256827 - ---- a/kcontrol/kxkb/CMakeLists.txt -+++ b/kcontrol/kxkb/CMakeLists.txt -@@ -51,9 +51,6 @@ if(USE_XKLAVIER STREQUAL ON) - endif(USE_XKLAVIER STREQUAL ON) - macro_log_feature(X11_Xkbfile_FOUND "xkbfile" "X11 KXB library for keyboard handling software" "http://www.x.org" FALSE "" "xkbfile is required to build kxkb.") - --macro_bool_to_01(X11_Xinput_FOUND HAVE_XINPUT) --ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT}) -- - if(X11_Xkbfile_FOUND AND HAVE_XKLAVIER) - - #MESSAGE("xkb support libs:: ${XKB_SUPPORT_LIB}") ---- a/kcontrol/kxkb/x11helper.cpp -+++ b/kcontrol/kxkb/x11helper.cpp -@@ -425,7 +425,7 @@ X11Helper::isNewDeviceEvent(XEvent* even - int - X11Helper::registerForNewDeviceEvent(Display* display) - { -- kWarn() << "Kxkb is compiled without XInput, xkb configuration will be reset when new keyboard device is plugged in!"; -+ kWarning() << "Kxkb is compiled without XInput, xkb configuration will be reset when new keyboard device is plugged in!"; - return -1; - } - #endif ---- a/kcontrol/kxkb/x11helper.h -+++ b/kcontrol/kxkb/x11helper.h -@@ -64,9 +64,9 @@ public: - - static QString getWindowClass(Window winId, Display* dpy); - --#ifdef HAVE_XINPUT - static int registerForNewDeviceEvent(Display* dpy); - static int isNewDeviceEvent(XEvent* event); -+#ifdef HAVE_XINPUT - static int m_xinputEventType; - #endif - |