[packages/kdelibs/dev-trinity] merge lib_loader and xgl patches from TRINITY branch f7ece20e8129364d25c813a0db0c4f62adafc631
glen
glen at pld-linux.org
Wed May 28 12:55:32 CEST 2014
commit 185216f4ab98cb9f7d439f251308679d315713f7
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 28 11:14:46 2014 +0300
merge lib_loader and xgl patches from TRINITY branch f7ece20e8129364d25c813a0db0c4f62adafc631
boost-1.50.patch | 11 +++----
kdelibs-lib_loader.patch | 85 +++++++++++++++++++++++++++---------------------
kdelibs-xgl.patch | 75 +++++++++++++++++++++---------------------
kdelibs.spec | 10 +++---
4 files changed, 96 insertions(+), 85 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 5e5e6c3..8219cc7 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -37,7 +37,7 @@ Summary(ru.UTF-8): K Desktop Environment 3 - Библиотеки
Summary(uk.UTF-8): K Desktop Environment 3 - Бібліотеки
Name: kdelibs
Version: 3.5.13.2
-Release: 0.4
+Release: 0.5
Epoch: 9
License: LGPL v2
Group: X11/Libraries
@@ -373,9 +373,9 @@ strony innych użytkowników lokalnych.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-#%patch7 -p1 CHECK if needed
+%patch7 -p1
#%patch8 -p1 # assume it's outdated ed5e85d7833180d4cb5a21a77758f95f50a2087c in admin repo
-#%patch9 -p1 PORT IT
+%patch9 -p1
#%patch10 -p1 does not apply, drop
%patch12 -p1
#%patch13 -p1 assume outdated
@@ -385,7 +385,8 @@ strony innych użytkowników lokalnych.
%patch17 -p1
#%patch18 -p1 assume outdated
%patch19 -p1
-#%patch20 -p1 # MERGE WITH lib_loader.patch
+# TODO: MERGE WITH lib_loader.patch
+%patch20 -p1
#%patch21 -p1 seems outdated
#mv -f configure{,.dist}
@@ -402,6 +403,7 @@ install -d build
cd build
%cmake \
+ -Wno-dev \
-DPLUGIN_INSTALL_DIR=%{_libexecdir} \
-DHTML_INSTALL_DIR=%{_kdedocdir} \
-DAPPS_INSTALL_DIR=%{_applnkdir} \
diff --git a/boost-1.50.patch b/boost-1.50.patch
index 5dd2f19..48c935e 100644
--- a/boost-1.50.patch
+++ b/boost-1.50.patch
@@ -1,10 +1,9 @@
---- kdelibs-3.5.10/kdecore/klibloader.cpp.orig 2012-07-11 11:33:20.950241266 +0200
-+++ kdelibs-3.5.10/kdecore/klibloader.cpp 2012-07-11 11:34:19.250239206 +0200
-@@ -331,7 +331,7 @@
- d = 0L;
- }
+--- kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp~ 2014-05-27 23:28:54.291178525 +0300
++++ kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp 2014-05-27 23:30:56.593147558 +0300
+@@ -25,6 +25,7 @@
+ #include <tqtimer.h>
+ #include <tqobjectdict.h>
--#define BOOST_FILESYSTEM_VERSION 2
+#define BOOST_FILESYSTEM_VERSION 3
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
diff --git a/kdelibs-lib_loader.patch b/kdelibs-lib_loader.patch
index b320f85..dbc7238 100644
--- a/kdelibs-lib_loader.patch
+++ b/kdelibs-lib_loader.patch
@@ -5,15 +5,16 @@
kinit/kinit.cpp | 8 +---
4 files changed, 55 insertions(+), 43 deletions(-)
---- kdelibs-3.5.5/kdecore/Makefile.am.orig 2006-10-01 19:33:38.000000000 +0200
-+++ kdelibs-3.5.5/kdecore/Makefile.am 2007-01-05 00:17:27.235678750 +0100
-@@ -115,8 +115,10 @@
+--- kdelibs-3.5.12/kdecore/Makefile.am~ 2010-08-12 06:04:03.000000000 +0300
++++ kdelibs-3.5.12/kdecore/Makefile.am 2011-01-04 19:13:22.247155923 +0200
+@@ -121,9 +121,11 @@
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
kqiodevicegzip_p.cpp ktimezones.cpp
+CXXFLAGS += -fexceptions
libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+ libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
+ $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libkdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+libkdecore_la_LIBADD += -lboost_filesystem -lboost_system -lboost_regex
libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
@@ -29,22 +30,28 @@
* @param instance a KInstance used to get the standard paths
*/
static QString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
---- kdelibs-3.5.5/kdecore/klibloader.cpp.orig 2006-01-19 17:06:18.000000000 +0000
-+++ kdelibs-3.5.5/kdecore/klibloader.cpp 2007-01-05 00:08:39.215039750 +0000
-@@ -331,43 +331,60 @@
- d = 0L;
- }
+--- kdelibs-3.5.12/kdecore/klibloader.cpp~ 2010-08-12 11:30:26.000000000 +0300
++++ kdelibs-3.5.12/kdecore/klibloader.cpp 2011-01-04 19:22:53.611031525 +0200
+@@ -25,6 +25,11 @@
+ #include <tqtimer.h>
+ #include <tqobjectdict.h>
--static inline QCString makeLibName( const char* name )
-+#define BOOST_FILESYSTEM_VERSION 2
+#include <boost/filesystem/exception.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/regex.hpp>
+
-+QCString makeSharedLibraryName( char const* name, QString const& dir )
+ #include "kapplication.h"
+ #include "klibloader.h"
+ #include "kstandarddirs.h"
+@@ -331,46 +336,56 @@
+ d = 0L;
+ }
+
+-static inline TQCString makeLibName( const char* name )
++TQCString makeSharedLibraryName( char const* name, TQString const& dir )
{
-- QCString libname(name);
+- TQCString libname(name);
- // only append ".la" if there is no extension
- // this allows to load non-libtool libraries as well
- // (mhk, 20000228)
@@ -72,19 +79,20 @@
+ catch ( boost::filesystem::filesystem_error const& )
+ {
+ }
-+ return QCString();
++ return TQCString();
}
-
+-
-//static
- QString KLibLoader::findLibrary( const char * name, const KInstance * instance )
++
+ TQString KLibLoader::findLibrary( const char * name, const KInstance * instance )
{
-- QCString libname = makeLibName( name );
+- TQCString libname = makeLibName( name );
-
- // only look up the file if it is not an absolute filename
- // (mhk, 20000228)
-- QString libfile;
-- if (!QDir::isRelativePath(libname))
-- libfile = QFile::decodeName( libname );
+- TQString libfile;
+- if (!TQDir::isRelativePath(libname))
+- libfile = TQFile::decodeName( libname );
- else
- {
- libfile = instance->dirs()->findResource( "module", libname );
@@ -106,39 +114,42 @@
+ catch ( boost::filesystem::filesystem_error const& )
+ {
+ }
-+ QStringList dirs = instance->dirs()->resourceDirs( "module" );
-+ for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
++ TQStringList dirs = instance->dirs()->resourceDirs( "module" );
++ for ( TQStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
+ {
-+ QCString p = makeSharedLibraryName( name, *i );
++ TQCString p = makeSharedLibraryName( name, *i );
+ if ( !p.isNull() )
+ return p;
+ }
+ dirs = instance->dirs()->resourceDirs( "lib" );
-+ for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
++ for ( TQStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
+ {
-+ QCString p = makeSharedLibraryName( name, *i );
++ TQCString p = makeSharedLibraryName( name, *i );
+ if ( !p.isNull() )
+ return p;
+ }
-+ return QString::null;
++ return TQString::null;
}
-
-@@ -418,11 +434,7 @@
- QString libfile = findLibrary( name );
+-
+ KLibrary* KLibLoader::globalLibrary( const char *name )
+ {
+ KLibrary *tmp;
+@@ -418,11 +433,7 @@
+ TQString libfile = findLibrary( name );
if ( libfile.isEmpty() )
{
-- const QCString libname = makeLibName( name );
+- const TQCString libname = makeLibName( name );
-#ifndef NDEBUG
- kdDebug(150) << "library=" << name << ": No file named " << libname << " found in paths." << endl;
-#endif
-- d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(libname);
+- d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(TQString(libname));
+ d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(name);
return 0;
}
---- kdelibs-3.5.5/kinit/kinit.cpp.orig 2006-10-01 19:33:32.000000000 +0200
-+++ kdelibs-3.5.5/kinit/kinit.cpp 2007-01-04 23:39:00.780591750 +0100
+--- kdelibs-3.5.12/kinit/kinit.cpp~ 2011-01-04 19:12:44.000000000 +0200
++++ kdelibs-3.5.12/kinit/kinit.cpp 2011-01-04 19:14:15.985867931 +0200
@@ -447,7 +447,7 @@
{
/* Relative name without '.la' */
@@ -159,12 +170,12 @@
execpath = exec;
}
if (!args)
-@@ -1807,7 +1805,7 @@
+@@ -1804,7 +1804,7 @@
#ifndef __CYGWIN__
if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
{
-- QString konq = locate("lib", "libkonq.la", s_instance);
-+ QString konq = KLibLoader::findLibrary( "libkonq", s_instance );
+- TQString konq = locate("lib", "libkonq.la", s_instance);
++ TQString konq = KLibLoader::findLibrary( "libkonq", s_instance );
if (!konq.isEmpty())
- (void) lt_dlopen(QFile::encodeName(konq).data());
+ (void) lt_dlopen(TQFile::encodeName(konq).data());
}
diff --git a/kdelibs-xgl.patch b/kdelibs-xgl.patch
index 9a627c3..4cc0946 100644
--- a/kdelibs-xgl.patch
+++ b/kdelibs-xgl.patch
@@ -1,9 +1,9 @@
---- kdelibs-3.5.1/kdeui/ksystemtray.cpp 2005-10-10 11:06:38.000000000 -0400
-+++ kdelibs-3.5.1-patched/kdeui/ksystemtray.cpp 2006-02-18 11:52:01.000000000 -0500
+--- kdelibs-3.5.12/kdeui/ksystemtray.cpp~ 2011-01-04 19:06:54.000000000 +0200
++++ kdelibs-3.5.12/kdeui/ksystemtray.cpp 2011-01-04 19:09:28.517100570 +0200
@@ -32,6 +32,7 @@
- #include <kwin.h>
- #include <kwinmodule.h>
- #include <qxembed.h>
+ #include <kwin.h>
+ #include <kwinmodule.h>
+ #include <qxembed.h>
+#include <X11/Xlib.h>
#endif
@@ -17,46 +17,45 @@
class KSystemTrayPrivate
{
public:
-@@ -63,6 +66,43 @@
+@@ -65,6 +66,42 @@
QXEmbed::initialize();
#endif
-
-+ {
-+ XGrabServer (qt_xdisplay());
-+ static Atom selection = XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_S" + QCString().setNum( qt_xscreen()), False );
-+
-+ /* look for the system tray window */
-+ Window tray = XGetSelectionOwner (qt_xdisplay(), selection);
+
++ {
++ XGrabServer (qt_xdisplay());
++ static Atom selection = XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_S" + QCString().setNum( qt_xscreen()), False );
+
-+ if (tray != None)
-+ {
-+ /* found it */
-+ XSelectInput (qt_xdisplay(), tray, StructureNotifyMask);
-+ }
++ /* look for the system tray window */
++ Window tray = XGetSelectionOwner (qt_xdisplay(), selection);
+
-+ XUngrabServer (qt_xdisplay());
-+ XFlush (qt_xdisplay());
++ if (tray != None)
++ {
++ /* found it */
++ XSelectInput (qt_xdisplay(), tray, StructureNotifyMask);
++ }
+
-+ if ( tray != None )
-+ {
-+ XEvent ev;
-+ memset(&ev, 0, sizeof( ev ));
-+ static Atom atom = XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_OPCODE", False );
-+ ev.xclient.type = ClientMessage;
-+ ev.xclient.window = tray;
-+ ev.xclient.message_type = atom;
-+ ev.xclient.format = 32;
-+ ev.xclient.data.l[ 0 ] = qt_x_time;
-+ ev.xclient.data.l[ 1 ] = 0; // SYSTEM_TRAY_REQUEST_DOCK
-+ ev.xclient.data.l[ 2 ] = winId();
-+ ev.xclient.data.l[ 3 ] = 0; // unused
-+ ev.xclient.data.l[ 4 ] = 0; // unused
++ XUngrabServer (qt_xdisplay());
++ XFlush (qt_xdisplay());
+
-+ XSendEvent( qt_xdisplay(), tray, False, NoEventMask, (XEvent *)&ev );
-+ XSync(qt_xdisplay(), FALSE );
-+ }
-+ }
++ if ( tray != None )
++ {
++ XEvent ev;
++ memset(&ev, 0, sizeof( ev ));
++ static Atom atom = XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_OPCODE", False );
++ ev.xclient.type = ClientMessage;
++ ev.xclient.window = tray;
++ ev.xclient.message_type = atom;
++ ev.xclient.format = 32;
++ ev.xclient.data.l[ 0 ] = qt_x_time;
++ ev.xclient.data.l[ 1 ] = 0; // SYSTEM_TRAY_REQUEST_DOCK
++ ev.xclient.data.l[ 2 ] = winId();
++ ev.xclient.data.l[ 3 ] = 0; // unused
++ ev.xclient.data.l[ 4 ] = 0; // unused
+
++ XSendEvent( qt_xdisplay(), tray, False, NoEventMask, (XEvent *)&ev );
++ XSync(qt_xdisplay(), FALSE );
++ }
++ }
+
d = new KSystemTrayPrivate;
d->actionCollection = new KActionCollection(this);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/848a40b8c13b70528acf57d9f12dbb4a107c153d
More information about the pld-cvs-commit
mailing list