Author: glen Date: Sun Apr 24 00:05:19 2011 GMT
Module: packages Tag: TRINITY
---- Log message:
- save old work (TRINITY branch), not finished
---- Files affected:
packages/kdelibs:
kde-common-PLD.patch (1.11 -> 1.11.2.1) , kdelibs-konqueror-agent.patch (1.2
-> 1.2.4.1) , kdelibs-konqueror-ti-agent.patch (1.1 -> 1.1.2.1) ,
kdelibs-lib_loader.patch (1.4 -> 1.4.2.1) , kdelibs-xgl.patch (1.1 -> 1.1.2.1)
, kdelibs.spec (1.601 -> 1.601.2.1)
---- Diffs:
================================================================
Index: packages/kdelibs/kde-common-PLD.patch
diff -u packages/kdelibs/kde-common-PLD.patch:1.11
packages/kdelibs/kde-common-PLD.patch:1.11.2.1
--- packages/kdelibs/kde-common-PLD.patch:1.11 Wed Oct 8 18:10:15 2008
+++ packages/kdelibs/kde-common-PLD.patch Sun Apr 24 02:05:14 2011
@@ -152,23 +152,3 @@
}
for $opt (@kde_options) {
---- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200
-+++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200
-@@ -4612,7 +4612,8 @@
-
- AC_DEFUN([KDE_CHECK_PYTHON],
- [
-- KDE_CHECK_PYTHON_INTERN("2.5",
-+ KDE_CHECK_PYTHON_INTERN("2.6",
-+ [KDE_CHECK_PYTHON_INTERN("2.5",
- [KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
-@@ -4624,6 +4625,7 @@
- ])
- ])
- ])
-+ ])
- ])
-
- AC_DEFUN([KDE_CHECK_STL],
================================================================
Index: packages/kdelibs/kdelibs-konqueror-agent.patch
diff -u packages/kdelibs/kdelibs-konqueror-agent.patch:1.2
packages/kdelibs/kdelibs-konqueror-agent.patch:1.2.4.1
--- packages/kdelibs/kdelibs-konqueror-agent.patch:1.2 Fri Jul 13 09:24:57 2007
+++ packages/kdelibs/kdelibs-konqueror-agent.patch Sun Apr 24 02:05:14 2011
@@ -1,11 +1,11 @@
---- kdelibs-3.5.6/kio/kio/kprotocolmanager.cpp.orig 2006-01-19
18:06:11.000000000 +0100
-+++ kdelibs-3.5.6/kio/kio/kprotocolmanager.cpp 2007-03-22 01:37:08.000000000
+0100
+--- kdelibs-3.5.12/kio/kio/kprotocolmanager.cpp~ 2010-08-12
11:30:00.000000000 +0300
++++ kdelibs-3.5.12/kio/kio/kprotocolmanager.cpp 2011-01-04
19:52:05.449016262 +0200
@@ -72,7 +72,7 @@
// DEFAULT USERAGENT STRING
#define CFG_DEFAULT_UAGENT(X) \
--QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko)") \
-+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko) PLD/3.0 (Th)") \
+-TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko)") \
++TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko) PLD/3.0 (Th)") \
.arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
void KProtocolManager::reparseConfiguration()
================================================================
Index: packages/kdelibs/kdelibs-konqueror-ti-agent.patch
diff -u packages/kdelibs/kdelibs-konqueror-ti-agent.patch:1.1
packages/kdelibs/kdelibs-konqueror-ti-agent.patch:1.1.2.1
--- packages/kdelibs/kdelibs-konqueror-ti-agent.patch:1.1 Sat May 24
20:51:18 2008
+++ packages/kdelibs/kdelibs-konqueror-ti-agent.patch Sun Apr 24 02:05:14 2011
@@ -1,11 +1,11 @@
---- kdelibs-3.5.6/kio/kio/kprotocolmanager.cpp.orig 2006-01-19
18:06:11.000000000 +0100
-+++ kdelibs-3.5.6/kio/kio/kprotocolmanager.cpp 2007-03-22 01:37:08.000000000
+0100
+--- kdelibs-3.5.12/kio/kio/kprotocolmanager.cpp~ 2010-08-12
11:30:00.000000000 +0300
++++ kdelibs-3.5.12/kio/kio/kprotocolmanager.cpp 2011-01-04
19:53:45.755609490 +0200
@@ -72,7 +72,7 @@
// DEFAULT USERAGENT STRING
#define CFG_DEFAULT_UAGENT(X) \
--QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko)") \
-+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko) PLD/Titanium") \
+-TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko)") \
++TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like
Gecko) PLD/Titanium") \
.arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
void KProtocolManager::reparseConfiguration()
================================================================
Index: packages/kdelibs/kdelibs-lib_loader.patch
diff -u packages/kdelibs/kdelibs-lib_loader.patch:1.4
packages/kdelibs/kdelibs-lib_loader.patch:1.4.2.1
--- packages/kdelibs/kdelibs-lib_loader.patch:1.4 Mon Feb 18 15:49:47 2008
+++ packages/kdelibs/kdelibs-lib_loader.patch Sun Apr 24 02:05:14 2011
@@ -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_regex
libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck
$(srcdir)/libqt-mt_weak.nmcheck \
@@ -29,21 +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,59 @@
- 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 )
+#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)
@@ -71,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 );
@@ -105,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' */
@@ -158,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());
}
================================================================
Index: packages/kdelibs/kdelibs-xgl.patch
diff -u packages/kdelibs/kdelibs-xgl.patch:1.1
packages/kdelibs/kdelibs-xgl.patch:1.1.2.1
--- packages/kdelibs/kdelibs-xgl.patch:1.1 Tue Feb 21 04:11:27 2006
+++ packages/kdelibs/kdelibs-xgl.patch Sun Apr 24 02:05:14 2011
@@ -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);
-+
-+ if (tray != None)
-+ {
-+ /* found it */
-+ XSelectInput (qt_xdisplay(), tray, StructureNotifyMask);
-+ }
-+
-+ XUngrabServer (qt_xdisplay());
-+ XFlush (qt_xdisplay());
-+
-+ 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 );
-+ }
-+ }
-+
+
++ {
++ 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);
++
++ if (tray != None)
++ {
++ /* found it */
++ XSelectInput (qt_xdisplay(), tray,
StructureNotifyMask);
++ }
++
++ XUngrabServer (qt_xdisplay());
++ XFlush (qt_xdisplay());
++
++ 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);
================================================================
Index: packages/kdelibs/kdelibs.spec
diff -u packages/kdelibs/kdelibs.spec:1.601
packages/kdelibs/kdelibs.spec:1.601.2.1
--- packages/kdelibs/kdelibs.spec:1.601 Thu Jan 6 12:37:49 2011
+++ packages/kdelibs/kdelibs.spec Sun Apr 24 02:05:14 2011
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-# TODO
-# - switch to kde trinity: http://trinity.pearsoncomputing.net/
#
# Conditional build:
%bcond_without alsa # build without ALSA support
@@ -21,13 +19,13 @@
Summary(ru.UTF-8): K Desktop Environment - Библиотеки
Summary(uk.UTF-8): K Desktop Environment - Бібліотеки
Name: kdelibs
-Version: 3.5.10
-Release: 23
+Version: 3.5.12
+Release: 0.4
Epoch: 9
License: LGPL
Group: X11/Libraries
-Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 43cd55ed15f63b5738d620ef9f9fd568
+Source0:
http://mirror2.quickbuild.pearsoncomputing.net/trinity/releases/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: d072e836ff592a3ead3bd015617034e2
Source1: %{name}-wmfplugin.tar.bz2
# Source1-md5: df0d7c2a13bb68fe25e1d6c009df5b8d
Source2: pnm.protocol
@@ -35,28 +33,19 @@
Source4: x-mplayer2.desktop
Source5: https://www.cacert.org/certs/root.crt
# Source5-md5: fb262d55709427e2e9acadf2c1298c99
-Patch100: %{name}-branch.diff
+#Patch100: %{name}-branch.diff
Patch0: kde-common-PLD.patch
-Patch1: %{name}-kstandarddirs.patch
-Patch2: %{name}-inotify.patch
Patch3: %{name}-use_system_sgml.patch
Patch4: %{name}-fileshareset.patch
Patch5: %{name}-appicon_themable.patch
-Patch6: %{name}-kbugreport-https.patch
Patch7: %{name}-xgl.patch
-Patch8: kde-ac260-lt.patch
Patch9: %{name}-lib_loader.patch
-# http://kate-editor.org/downloads/syntax_highlighting?kateversion=2.5
-Patch10: %{name}-kate-syntax.patch
Patch11: %{name}-konqueror-ti-agent.patch
Patch12: %{name}-konqueror-agent.patch
-Patch13: kde-am.patch
Patch14: ac264.patch
Patch15: dcopobject-destruct-crash.patch
-Patch16: kdelibs-3.5.10-gcc_4.4-2.patch
-Patch17: kdelibs-3.5.10-LDFLAG_fix-1.patch
-# http://www.thel.ro/kde3-fedora/SOURCES/kdelibs-3.5.10-ossl-1.x.patch
-Patch18: kdelibs-3.5.10-ossl-1.x.patch
+Patch17: %{name}-3.5.10-LDFLAG_fix-1.patch
+Patch18: gcc45.patch
URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.4.0.a
BuildRequires: acl-devel
@@ -67,6 +56,7 @@
BuildRequires: audiofile-devel
BuildRequires: autoconf >= 2.52
BuildRequires: automake >= 1.6.1
+BuildRequires: avahi-qt-devel >= 0.4
BuildRequires: boost-devel >= 1.35.0
BuildRequires: bzip2-devel
BuildRequires: cups-devel >= 1:1.3.0
@@ -89,7 +79,8 @@
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel >= 2.0
BuildRequires: libtiff-devel
-BuildRequires: libtool >= 2:1.5-2
+BuildRequires: libtool >= 2:2.2
+BuildRequires: libtqtinterface-devel
BuildRequires: libvorbis-devel
BuildRequires: libwmf-devel >= 2:0.2.0
BuildRequires: libxml2-devel >= 2.4.9
@@ -185,6 +176,9 @@
# build broken with spaces in CC
%undefine with_ccache
+# unresolved symbols in libkscreensaver.so.X (by design)
+%define no_install_post_check_so 1
+
%description
This package includes libraries that are central to the development
and execution of a KDE program, misc HTML documentation and theme
@@ -344,41 +338,34 @@
nieobsługującej pts-ów typu Unix98 i obawiasz się inwigilacji ze
strony innych użytkowników lokalnych.
-# unresolved symbols in libkscreensaver.so.X (by design)
-%define no_install_post_check_so 1
-
%prep
-%setup -q -a1
-%patch100 -p0
+%setup -q -n %{name} -a1
+#%patch100 -p0
%patch0 -p1
-%patch2 -p1
-%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
-%patch8 -p1
%patch9 -p1
-%patch10 -p1
%if "%{pld_release}" == "ti"
%patch11 -p1
%else
%patch12 -p1
%endif
-%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
%patch17 -p1
%patch18 -p1
-mv -f configure{,.dist}
+test -f configure && mv -f configure{,.dist}
# add https://www.cacert.org/ root certificate
cp -a %{SOURCE5} kio/kssl/kssl/cacert.pem
echo 'cacert.pem' >> kio/kssl/kssl/localcerts
+# /usr/include/tqt/tqt.h contains c++ style comments
+sed -i -e /std=iso9899:1990/d admin/acinclude.m4.in
+
%build
# merge cacert root certificate
cd kio/kssl/kssl
@@ -389,6 +376,8 @@
export kde_htmldir=%{_kdedocdir}
export kde_libs_htmldir=%{_kdedocdir}
if [ ! -f configure ]; then
+ cp -p /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ cp -p /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
%{__make} -f admin/Makefile.common cvs
fi
@@ -397,20 +386,25 @@
--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
%{!?debug:--disable-rpath} \
--disable-final \
+ --enable-closure \
%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
%if "%{_lib}" == "lib64"
--enable-libsuffix=64 \
%endif
+ --with-extra-includes=%{_includedir}/tqt \
--enable-mitshm \
--with%{!?with_alsa:out}-alsa \
--with%{!?with_arts:out}-arts \
--with-distribution="PLD Linux Distribution" \
- --with-ldap=no \
--with-lua-includes=%{_includedir}/lua50 \
--with-qt-libraries=%{_libdir} \
--with-sudo-kdesu-backend
-%{__make}
+#configure: WARNING: unrecognized options: --with-ldap
+
+# -j1 or random truncation occours, like uiserver.h is partial
+%{__make} -j1
+
%{?with_apidocs:%{__make} apidox}
rm -f makeinstall.stamp
@@ -1011,6 +1005,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.601.2.1 2011/04/24 00:05:14 glen
+- save old work (TRINITY branch), not finished
+
Revision 1.601 2011/01/06 11:37:49 glen
- boost rebuild
- release 23
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kde-common-PLD.patch?r1=1.11&r2=1.11.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-konqueror-agent.patch?r1=1.2&r2=1.2.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-konqueror-ti-agent.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-lib_loader.patch?r1=1.4&r2=1.4.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-xgl.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs.spec?r1=1.601&r2=1.601.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
