[packages/kde4-kdelibs] - drop obsolete files
arekm
arekm at pld-linux.org
Thu Oct 16 21:50:45 CEST 2014
commit c413c60529b0e5370acdbf6367d2ff6fb7db0013
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Oct 16 21:50:37 2014 +0200
- drop obsolete files
kde4-kdelibs-bindingsfix.patch | 28 -----
kde4-kdelibs-findboost.patch | 18 ----
kde4-kdelibs-fixPopupForPlasmaboard.patch | 43 --------
kde4-kdelibs-glibc-2.11.patch | 163 ------------------------------
kdelibs4-findqt4.patch | 13 ---
5 files changed, 265 deletions(-)
---
diff --git a/kde4-kdelibs-bindingsfix.patch b/kde4-kdelibs-bindingsfix.patch
deleted file mode 100644
index 66b7680..0000000
--- a/kde4-kdelibs-bindingsfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- kdeui/itemviews/kcategorydrawer.h 2009/07/28 23:30:16 1003882
-+++ kdeui/itemviews/kcategorydrawer.h.new 2009/10/29 00:24:36 1042035
-@@ -78,6 +78,8 @@
- */
- void setRightMargin(int rightMargin);
-
-+ KCategoryDrawer &operator=(const KCategoryDrawer &cd);
-+
- private:
- class Private;
- Private *const d;
---- kdeui/itemviews/kcategorydrawer.cpp 2009/07/28 23:30:16 1003882
-+++ kdeui/itemviews/kcategorydrawer.cpp.new 2009/10/29 00:24:36 1042035
-@@ -189,6 +189,13 @@
- d->rightMargin = rightMargin;
- }
-
-+KCategoryDrawer &KCategoryDrawer::operator=(const KCategoryDrawer &cd)
-+{
-+ d->leftMargin = cd.d->leftMargin;
-+ d->rightMargin = cd.d->rightMargin;
-+ return *this;
-+}
-+
- KCategoryDrawerV2::KCategoryDrawerV2(QObject *parent)
- : QObject(parent)
- , KCategoryDrawer()
-
diff --git a/kde4-kdelibs-findboost.patch b/kde4-kdelibs-findboost.patch
deleted file mode 100644
index 16d96fb..0000000
--- a/kde4-kdelibs-findboost.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cmake/modules/FindBoost.cmake.old 2008-07-23 11:56:52.633942000 +0200
-+++ cmake/modules/FindBoost.cmake 2008-07-23 11:57:25.732010500 +0200
-@@ -211,12 +211,15 @@
- # cdrom inserted it will popup a very annoying dialog
- #D:/boost/include
- /sw/local/include
-+ /usr/include
- )
-
- SET(_boost_LIBRARIES_SEARCH_DIRS
- C:/boost/lib
- "C:/Program Files/boost/boost_${Boost_MINIMUM_VERSION}/lib"
- /sw/local/lib
-+ /usr/lib
-+ /usr/lib64
- )
-
- IF( NOT $ENV{BOOST_ROOT} STREQUAL "" )
diff --git a/kde4-kdelibs-fixPopupForPlasmaboard.patch b/kde4-kdelibs-fixPopupForPlasmaboard.patch
deleted file mode 100644
index cf6dec7..0000000
--- a/kde4-kdelibs-fixPopupForPlasmaboard.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdelibs/plasma/popupapplet.cpp
-===================================================================
---- kdelibs/plasma/popupapplet.cpp (Revision 976120)
-+++ kdelibs/plasma/popupapplet.cpp (Arbeitskopie)
-@@ -275,11 +275,7 @@
- //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
- //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
- //else.
-- dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-- updateDialogFlags();
-- KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-- dialog->installEventFilter(q);
--
-+
- q->setMinimumSize(QSize(0, 0));
- if (gWidget) {
- Corona *corona = qobject_cast<Corona *>(gWidget->scene());
-@@ -289,14 +285,25 @@
- corona->addOffscreenWidget(gWidget);
- dialog->setGraphicsWidget(gWidget);
- }
-+
-+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
- } else if (qWidget) {
- QVBoxLayout *l_layout = new QVBoxLayout(dialog);
- l_layout->setSpacing(0);
- l_layout->setMargin(0);
- l_layout->addWidget(qWidget);
- dialog->adjustSize();
-+
-+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (qWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
- }
-+ else {
-+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-+ }
-+ updateDialogFlags();
-+ KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-+ dialog->installEventFilter(q);
-
-+
- QObject::connect(dialog, SIGNAL(dialogResized()), q, SLOT(dialogSizeChanged()));
- QObject::connect(dialog, SIGNAL(dialogVisible(bool)), q, SLOT(dialogStatusChanged(bool)));
- }
diff --git a/kde4-kdelibs-glibc-2.11.patch b/kde4-kdelibs-glibc-2.11.patch
deleted file mode 100644
index 280670b..0000000
--- a/kde4-kdelibs-glibc-2.11.patch
+++ /dev/null
@@ -1,163 +0,0 @@
---- trunk/KDE/kdelibs/kdecore/fakes.c 2009/10/31 22:24:52 1043164
-+++ trunk/KDE/kdelibs/kdecore/fakes.c 2009/11/06 19:59:40 1045794
-@@ -31,7 +31,7 @@
-
-
- #define KDE_open open
--#define KDE_mkdir mkdir
-+#define KDE_mkdir mkdir
-
-
- #ifndef HAVE_SETENV
-@@ -39,10 +39,15 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--
-+#ifdef HAVE_STRING_H
- #include <string.h>
-+#endif
-+#ifdef HAVE_STDLIB_H
- #include <stdlib.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
-
- KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
- int i;
-@@ -67,11 +72,18 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
--
-+#ifdef HAVE_STRING_H
- #include <string.h>
-+#endif
-+#ifdef HAVE_STDLIB_H
- #include <stdlib.h>
-+#endif
-+#ifdef HAVE_ERRNO_H
- #include <errno.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
-
- #ifndef environ
- extern char ** environ;
-@@ -154,24 +166,32 @@
- {
- srand48(seed);
- }
--#endif
-+#endif /* !HAVE_RANDOM */
-
- #ifndef HAVE_SETEUID
- int seteuid(uid_t euid)
- {
- return setreuid(-1, euid); /* Well, if you have neither you are in trouble :) */
- }
--#endif
-+#endif /* !HAVE_SETEUID */
-
- #ifndef HAVE_MKSTEMPS
-+#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
- #include <fcntl.h>
-+#ifdef HAVE_STRING_H
- #include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
- #include <strings.h>
-+#endif
-+#ifdef HAVE_STDLIB_H
- #include <stdlib.h>
-+#endif
-
- /* this is based on code taken from the GNU libc, distributed under the LGPL license */
-
-@@ -244,12 +264,14 @@
- {
- return mkstemps( _template, 0 );
- }
--#endif
-+#endif /* !HAVE_MKSTEMP */
-
- #ifndef HAVE_MKDTEMP
-
- #ifndef HAVE_MKSTEMPS
-+#ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -306,13 +328,18 @@
- value += 7777;
-
- if (!KDE_mkdir(_template,0700))
-- return _template;
-+ return _template;
- }
- return 0;
- }
- #endif /* !HAVE_MKDTEMP */
-
- #ifndef HAVE_STRLCPY
-+
-+#ifdef HAVE_STRING_H
-+#include <string.h>
-+#endif
-+
- KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
- {
- unsigned long len, ret = strlen(s);
-@@ -325,12 +352,17 @@
- }
- } else
- memcpy(d, s, ret + 1);
--
-+
- return ret;
- }
--#endif
-+#endif /* !HAVE_STRLCPY */
-
- #ifndef HAVE_STRLCAT
-+
-+#ifdef HAVE_STRING_H
-+#include <string.h>
-+#endif
-+
- KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
- {
- char *cp;
-@@ -350,7 +382,7 @@
-
- return ret;
- }
--#endif
-+#endif /* !HAVE_STRLCAT */
-
- #ifndef HAVE_STRCASESTR
- /*
-@@ -450,7 +482,7 @@
- ret0:
- return 0;
- }
--#endif
-+#endif /* !HAVE_STRCASESTR */
-
- #ifndef HAVE_TRUNC
-
-@@ -467,4 +499,4 @@
- {
- return x < 0 ? -floor(-x) : floor(x);
- }
--#endif
-+#endif /* !HAVE_TRUNC */
diff --git a/kdelibs4-findqt4.patch b/kdelibs4-findqt4.patch
deleted file mode 100644
index d645db2..0000000
--- a/kdelibs4-findqt4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/modules/FindQt4.cmake 2007-02-19 10:56:10.000000000 +0100
-+++ cmake/modules/FindQt4.cmake-new 2007-03-21 22:31:27.232501236 +0100
-@@ -174,6 +174,10 @@
- INCLUDE(CheckSymbolExists)
- INCLUDE(MacroAddFileDependencies)
-
-+SET(QT_QMAKE_EXECUTABLE /usr/bin/qmake-qt4)
-+SET(QT_DBUSXML2CPP_EXECUTABLE /usr/bin/qdbusxml2cpp)
-+SET(QT_DBUSCPP2XML_EXECUTABLE /usr/bin/qdbuscpp2xml)
-+
- SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
-
- SET( QT_DEFINITIONS "")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/c413c60529b0e5370acdbf6367d2ff6fb7db0013
More information about the pld-cvs-commit
mailing list