commit fa783651e1799ade4b894f3f4e909a4c83e758d7
Author: Elan Ruusamäe <[email protected]>
Date: Sat Mar 21 12:12:56 2015 +0200
update source and patches to R14.0.0
kde-common-PLD.patch | 8 ++--
kdelibs-appicon_themable.patch | 4 +-
kdelibs-fileshareset.patch | 4 +-
kdelibs-gcc4.patch | 4 +-
kdelibs-konqueror-agent.patch | 10 ++---
kdelibs-kstandarddirs.patch | 4 +-
kdelibs-lib_loader.patch | 75 ++++++++++++++++-------------------
kdelibs-use_system_sgml.patch | 88 +++++++++++++++++++++---------------------
kdelibs-xgl.patch | 4 +-
kdelibs.spec | 11 +++---
10 files changed, 102 insertions(+), 110 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 386c2cf..1b641b2 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8): Bibliotecas de fundação do KDE 3
Summary(ru.UTF-8): K Desktop Environment 3 - Библиотеки
Summary(uk.UTF-8): K Desktop Environment 3 - Бібліотеки
Name: kdelibs
-Version: 3.5.13.2
+Version: R14.0.0
Release: 0.21
Epoch: 9
License: LGPL v2
Group: X11/Libraries
-Source0:
http://ftp.fau.de/trinity/releases/%{version}/%{name}-trinity-%{version}.tar.xz
-# Source0-md5: 0449c1386d15c744b76ba35c227b14a6
+Source0:
http://tde-mirror.yosemite.net/trinity/releases/%{version}/tdelibs-%{version}.tar.bz2
+# Source0-md5: 64b4550fb22ba700f38027379eab246e
Source1: %{name}-wmfplugin.tar.bz2
# Source1-md5: df0d7c2a13bb68fe25e1d6c009df5b8d
Source2: pnm.protocol
@@ -59,7 +59,7 @@ Patch15: dcopobject-destruct-crash.patch
Patch17: %{name}-3.5.10-LDFLAG_fix-1.patch
Patch19: %{name}-gcc4.patch
Patch20: xdg-menu-prefix.patch
-URL: http://www.kde.org/
+URL: https://www.trinitydesktop.org/
%{?with_openexr:BuildRequires: OpenEXR-devel >= 1.4.0.a}
BuildRequires: acl-devel
BuildRequires: alsa-lib-devel
@@ -290,7 +290,8 @@ nieobsługującej pts-ów typu Unix98 i obawiasz się
inwigilacji ze
strony innych użytkowników lokalnych.
%prep
-%setup -q -n %{name}-trinity-%{version} %{?with_wmf:-a1}
+%setup -q -c %{?with_wmf:-a1}
+mv tdelibs/* .
%patch0 -p1
%patch1 -p1
%patch3 -p1
diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 47d155a..9792932 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -1,5 +1,5 @@
---- kdelibs-trinity-3.5.13.2/admin/acinclude.m4.in~ 2014-05-26
12:13:20.000000000 +0300
-+++ kdelibs-trinity-3.5.13.2/admin/acinclude.m4.in 2014-05-26
12:14:18.383811167 +0300
+--- kdelibs-R14.0.0/admin/acinclude.m4.in~ 2015-03-21 10:12:32.000000000
+0200
++++ kdelibs-R14.0.0/admin/acinclude.m4.in 2015-03-21 10:14:49.202936534
+0200
@@ -468,7 +468,7 @@
if test "$1" = "default"; then
@@ -109,11 +109,11 @@
])
-@@ -5536,7 +5478,7 @@
+@@ -5975,7 +5975,7 @@
kde_qtdir="$with_qt_dir"
fi
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html
/usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc
/usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc
/usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
+-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html
/usr/share/doc/packages/tqt3/html /usr/share/doc/packages/qt3/html
/usr/lib/qt/doc /usr/lib/tqt3/doc /usr/lib/qt3/doc /usr/lib/tqt3/doc/html
/usr/lib/qt3/doc/html /usr/doc/tqt3/html /usr/doc/qt3/html /usr/doc/tqt3
/usr/doc/qt3 /usr/share/doc/tqt3-doc /usr/share/doc/qt3-doc
/usr/share/tqt3/doc/html /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html
], QTDOCDIR)
+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
diff --git a/kdelibs-appicon_themable.patch b/kdelibs-appicon_themable.patch
index f0b3a07..440b1b8 100644
--- a/kdelibs-appicon_themable.patch
+++ b/kdelibs-appicon_themable.patch
@@ -1,5 +1,5 @@
---- kdelibs-3.2.3/kdecore/kiconloader.cpp.orig 2004-06-02 13:15:48.869011792
+0000
-+++ kdelibs-3.2.3/kdecore/kiconloader.cpp 2004-06-02 13:22:09.558138248
+0000
+--- kdelibs-3.2.3/tdecore/kiconloader.cpp.orig 2004-06-02 13:15:48.869011792
+0000
++++ kdelibs-3.2.3/tdecore/kiconloader.cpp 2004-06-02 13:22:09.558138248
+0000
@@ -216,7 +216,11 @@
if (!d->mpGroups[i].size)
d->mpGroups[i].size = d->mpThemeRoot->theme->defaultSize(i);
diff --git a/kdelibs-fileshareset.patch b/kdelibs-fileshareset.patch
index 9988e59..226cdd5 100644
--- a/kdelibs-fileshareset.patch
+++ b/kdelibs-fileshareset.patch
@@ -1,5 +1,5 @@
---- kdelibs/kio/misc/fileshareset.orig 2003-11-21 19:38:11.000000000 +0100
-+++ kdelibs/kio/misc/fileshareset 2003-11-21 19:41:50.000000000 +0100
+--- kdelibs/tdeio/misc/fileshareset.orig 2003-11-21 19:38:11.000000000
+0100
++++ kdelibs/tdeio/misc/fileshareset 2003-11-21 19:41:50.000000000 +0100
@@ -80,15 +80,19 @@
$< = $>;
@ARGV == 2 && ($cmd eq '--add' || $cmd eq '--remove') or error($usage);
diff --git a/kdelibs-gcc4.patch b/kdelibs-gcc4.patch
index c1fc5ee..8e2b2bf 100644
--- a/kdelibs-gcc4.patch
+++ b/kdelibs-gcc4.patch
@@ -1,5 +1,5 @@
---- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c~ 2007-10-08
11:52:10.000000000 +0200
-+++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c 2011-08-03
12:48:35.120781904 +0200
+--- kdelibs-3.5.10/tdeprint/cups/cupsdconf2/cups-util.c~ 2007-10-08
11:52:10.000000000 +0200
++++ kdelibs-3.5.10/tdeprint/cups/cupsdconf2/cups-util.c 2011-08-03
12:48:35.120781904 +0200
@@ -1,6 +1,7 @@
#include <cups/ipp.h>
#include <cups/http.h>
diff --git a/kdelibs-konqueror-agent.patch b/kdelibs-konqueror-agent.patch
index eabbe2a..7939783 100644
--- a/kdelibs-konqueror-agent.patch
+++ b/kdelibs-konqueror-agent.patch
@@ -1,11 +1,11 @@
---- kdelibs-trinity-3.5.13.2/kio/kio/kprotocolmanager.cpp~ 2012-09-16
12:38:15.000000000 +0300
-+++ kdelibs-trinity-3.5.13.2/kio/kio/kprotocolmanager.cpp 2014-05-26
12:35:26.638836529 +0300
+--- kdelibs-R14.0.0/tdeio/tdeio/tdeprotocolmanager.cpp~ 2014-12-10
01:18:24.000000000 +0200
++++ kdelibs-R14.0.0/tdeio/tdeio/tdeprotocolmanager.cpp 2015-03-21
11:17:49.675253931 +0200
@@ -72,7 +72,7 @@
// DEFAULT USERAGENT STRING
#define CFG_DEFAULT_UAGENT(X) \
--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)
+-TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/TDEHTML/%4.%5.%6
(like Gecko)") \
++TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/TDEHTML/%4.%5.%6
(like Gecko) PLD/3.0 (Th)") \
+
.arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(X).arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)
void KProtocolManager::reparseConfiguration()
diff --git a/kdelibs-kstandarddirs.patch b/kdelibs-kstandarddirs.patch
index 4383b1f..03f9499 100644
--- a/kdelibs-kstandarddirs.patch
+++ b/kdelibs-kstandarddirs.patch
@@ -1,5 +1,5 @@
---- kdelibs-trinity-3.5.13.2/kdecore/kstandarddirs.cpp~ 2012-09-16
12:38:12.000000000 +0300
-+++ kdelibs-trinity-3.5.13.2/kdecore/kstandarddirs.cpp 2014-05-26
12:23:16.870502052 +0300
+--- tdelibs-R14.0.0/tdecore/kstandarddirs.cpp~ 2013-01-31 21:40:07.000000000
+0200
++++ tdelibs-R14.0.0/tdecore/kstandarddirs.cpp 2015-03-21 10:26:51.180307355
+0200
@@ -1039,7 +1039,7 @@
if (!strcmp(type, "html-bundle"))
return "share/doc-bundle/HTML/";
diff --git a/kdelibs-lib_loader.patch b/kdelibs-lib_loader.patch
index 4fc630f..9e773ae 100644
--- a/kdelibs-lib_loader.patch
+++ b/kdelibs-lib_loader.patch
@@ -1,47 +1,38 @@
---- 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
+--- kdelibs-R14.0.0/tdecore/Makefile.am~ 2013-09-04 06:50:46.000000000
+0300
++++ kdelibs-R14.0.0/tdecore/Makefile.am 2015-03-21 11:03:32.124213040
+0200
@@ -121,9 +121,11 @@
- kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
+ kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.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 \
- $(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 \
- $(top_srcdir)/dcop/libDCOP_weak.nmcheck
$(top_srcdir)/kdecore/standard_weak.nmcheck
---- kdelibs-trinity-3.5.13.2/kdecore/CMakeLists.txt 2012-09-16
12:38:11.000000000 +0300
-+++ kdelibs-trinity-3.5.13.2/kdecore/CMakeLists.txt 2014-05-28
11:47:09.882367608 +0300
-@@ -125,11 +125,13 @@
- kqiodevicegzip_p.cpp ktimezones.cpp
+ libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
$(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+ libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la
$(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
+ $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT)
$(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
++libtdecore_la_LIBADD += -lboost_filesystem -lboost_system -lboost_regex
+ libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
+ libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck
$(srcdir)/libqt-mt_weak.nmcheck \
+ $(top_srcdir)/dcop/libDCOP_weak.nmcheck
$(top_srcdir)/tdecore/standard_weak.nmcheck
+--- kdelibs-R14.0.0/tdecore/CMakeLists.txt~ 2014-10-07 03:27:58.000000000
+0300
++++ kdelibs-R14.0.0/tdecore/CMakeLists.txt 2015-03-21 11:04:45.424672110
+0200
+@@ -130,13 +130,15 @@
+ kqiodevicegzip_p.cpp ktimezones.cpp ksimpledirwatch.cpp
)
+add_definitions(-fexceptions)
+
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
- VERSION 4.2.0
- EMBED kdecorenetwork-static
-- LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES}
${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
-+ LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES}
${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM boost_filesystem boost_regex
boost_system
+ VERSION 14.0.0
+ EMBED tdecorenetwork-static ${TDEHW_LIB}
+ LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
+ ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
+- ${LIBBFD_LIBRARIES} ${LIB_UTIL}
++ ${LIBBFD_LIBRARIES} ${LIB_UTIL} boost_filesystem boost_regex boost_system
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
---- kdelibs-3.5.5/kdecore/klibloader.h.orig 2005-10-10 17:06:03.000000000
+0200
-+++ kdelibs-3.5.5/kdecore/klibloader.h 2007-01-04 23:19:39.868039250 +0100
-@@ -270,7 +270,7 @@
- * wants to open modules.
- * @param name of the library. If it is not a path, the function searches
in
- * the "module" and "lib" resources. If there is no extension,
-- * ".la" will be appended.
-+ * ".so*" will be appended.
- * @param instance a KInstance used to get the standard paths
- */
- static QString findLibrary( const char * name, const KInstance * instance
= KGlobal::instance() );
---- kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp 2012-09-16
12:38:12.000000000 +0300
-+++ kdelibs-trinity-3.5.13.2/kdecore/klibloader.cpp 2014-05-28
11:16:42.469374659 +0300
+--- kdelibs-R14.0.0/tdecore/klibloader.cpp~ 2015-03-21 11:01:44.000000000
+0200
++++ kdelibs-R14.0.0/tdecore/klibloader.cpp 2015-03-21 11:08:51.194055871
+0200
@@ -25,6 +25,12 @@
#include <tqtimer.h>
#include <tqobjectdict.h>
@@ -52,10 +43,10 @@
+#include <boost/filesystem/path.hpp>
+#include <boost/regex.hpp>
+
- #include "kapplication.h"
+ #include "tdeapplication.h"
#include "klibloader.h"
#include "kstandarddirs.h"
-@@ -331,46 +337,56 @@
+@@ -331,46 +337,57 @@
d = 0L;
}
@@ -92,13 +83,13 @@
+ }
+ return TQCString();
}
--
--//static
-+
- TQString KLibLoader::findLibrary( const char * name, const KInstance *
instance )
- {
+
+ //static
+-TQString KLibLoader::findLibrary( const char * name, const TDEInstance *
instance )
+-{
- TQCString libname = makeLibName( name );
--
++TQString KLibLoader::findLibrary( const char * name, const TDEInstance *
instance )
+
- // only look up the file if it is not an absolute filename
- // (mhk, 20000228)
- TQString libfile;
@@ -111,7 +102,7 @@
- {
- libfile = instance->dirs()->findResource( "lib", libname );
-#ifndef NDEBUG
-- if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn
for kdeinit modules
+- if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn
for tdeinit modules
- kdDebug(150) << "library " << libname << " not found under 'module'
but under 'lib'" << endl;
-#endif
- }
@@ -159,8 +150,8 @@
return 0;
}
---- 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
+--- kdelibs-R14.0.0/tdeinit/tdeinit.cpp~ 2013-11-25 09:52:45.000000000
+0200
++++ kdelibs-R14.0.0/tdeinit/tdeinit.cpp 2015-03-21 11:16:01.079634445
+0200
@@ -447,7 +447,7 @@
{
/* Relative name without '.la' */
diff --git a/kdelibs-use_system_sgml.patch b/kdelibs-use_system_sgml.patch
index 06220bb..b6f2539 100644
--- a/kdelibs-use_system_sgml.patch
+++ b/kdelibs-use_system_sgml.patch
@@ -1,5 +1,5 @@
---- kdelibs-031105/kdoctools/customization/dtd/kdex.dtd.orig 2002-12-10
12:16:25.000000000 +0100
-+++ kdelibs-031105/kdoctools/customization/dtd/kdex.dtd 2003-11-06
00:21:35.000000000 +0100
+--- tdelibs-031105/kdoctools/customization/dtd/kdex.dtd.orig 2002-12-10
12:16:25.000000000 +0100
++++ tdelibs-031105/kdoctools/customization/dtd/kdex.dtd 2003-11-06
00:21:35.000000000 +0100
@@ -97,7 +97,7 @@
<!ENTITY % DocBookDTD PUBLIC
@@ -9,8 +9,8 @@
%DocBookDTD;
---- kdelibs-031105/kdoctools/customization/kde-chunk.xsl.orig 2002-01-09
13:29:06.000000000 +0100
-+++ kdelibs-031105/kdoctools/customization/kde-chunk.xsl 2003-11-05
22:58:50.000000000 +0100
+--- tdelibs-R14.0.0/kdoctools/customization/tde-chunk.xsl~ 2014-01-30
04:18:32.000000000 +0200
++++ tdelibs-R14.0.0/kdoctools/customization/tde-chunk.xsl 2015-03-21
10:30:53.436180279 +0200
@@ -1,8 +1,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
@@ -19,11 +19,11 @@
-<xsl:import href="../docbook/xsl/html/chunk.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
- <xsl:include href="kde-navig.xsl"/>
- <xsl:include href="kde-ttlpg.xsl"/>
- <xsl:include href="kde-style.xsl"/>
---- kdelibs-031105/kdoctools/customization/kde-chunk-online.xsl.orig
2002-12-19 22:23:58.000000000 +0100
-+++ kdelibs-031105/kdoctools/customization/kde-chunk-online.xsl
2003-11-06 13:06:54.000000000 +0100
+ <xsl:include href="tde-navig.xsl"/>
+ <xsl:include href="tde-ttlpg.xsl"/>
+ <xsl:include href="tde-style.xsl"/>
+--- tdelibs-031105/kdoctools/customization/tde-chunk-online.xsl.orig
2002-12-19 22:23:58.000000000 +0100
++++ tdelibs-031105/kdoctools/customization/tde-chunk-online.xsl
2003-11-06 13:06:54.000000000 +0100
@@ -1,8 +1,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
@@ -32,11 +32,11 @@
-<xsl:import href="../docbook/xsl/html/chunk.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
- <xsl:include href="kde-navig-online.xsl"/>
- <xsl:include href="kde-ttlpg.xsl"/>
- <xsl:include href="kde-style.xsl"/>
---- kdelibs-031105/kdoctools/customization/kde-nochunk.xsl.orig
2002-03-30 14:19:21.000000000 +0100
-+++ kdelibs-031105/kdoctools/customization/kde-nochunk.xsl 2003-11-06
11:41:43.000000000 +0100
+ <xsl:include href="tde-navig-online.xsl"/>
+ <xsl:include href="tde-ttlpg.xsl"/>
+ <xsl:include href="tde-style.xsl"/>
+--- tdelibs-031105/kdoctools/customization/tde-nochunk.xsl.orig
2002-03-30 14:19:21.000000000 +0100
++++ tdelibs-031105/kdoctools/customization/tde-nochunk.xsl 2003-11-06
11:41:43.000000000 +0100
@@ -1,8 +1,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
@@ -45,11 +45,11 @@
-<xsl:import href="../docbook/xsl/html/docbook.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl"/>
- <!-- <xsl:include href="kde-print-navig.xsl"/> -->
- <xsl:include href="kde-ttlpg.xsl"/>
- <xsl:include href="kde-style.xsl"/>
---- kdelibs-031105/kdoctools/customization/kde-web.xsl.orig 2003-10-02
23:40:02.000000000 +0200
-+++ kdelibs-031105/kdoctools/customization/kde-web.xsl 2003-11-06
11:41:19.000000000 +0100
+ <!-- <xsl:include href="tde-print-navig.xsl"/> -->
+ <xsl:include href="tde-ttlpg.xsl"/>
+ <xsl:include href="tde-style.xsl"/>
+--- tdelibs-031105/kdoctools/customization/tde-web.xsl.orig 2003-10-02
23:40:02.000000000 +0200
++++ tdelibs-031105/kdoctools/customization/tde-web.xsl 2003-11-06
11:41:19.000000000 +0100
@@ -1,8 +1,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
@@ -58,11 +58,11 @@
-<xsl:import href="../docbook/xsl/html/chunk.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/>
+<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
- <xsl:include href="kde-web-navig.xsl"/>
- <xsl:include href="kde-ttlpg.xsl"/>
- <xsl:include href="kde-style.xsl"/>
---- kdelibs-031105/kdoctools/customization/obsolete/kdex.dtd.orig
2002-12-11 16:10:26.000000000 +0100
-+++ kdelibs-031105/kdoctools/customization/obsolete/kdex.dtd 2003-11-06
01:02:56.000000000 +0100
+ <xsl:include href="tde-web-navig.xsl"/>
+ <xsl:include href="tde-ttlpg.xsl"/>
+ <xsl:include href="tde-style.xsl"/>
+--- tdelibs-031105/kdoctools/customization/obsolete/kdex.dtd.orig
2002-12-11 16:10:26.000000000 +0100
++++ tdelibs-031105/kdoctools/customization/obsolete/kdex.dtd 2003-11-06
01:02:56.000000000 +0100
@@ -89,7 +89,7 @@
<!ENTITY % DocBookDTD PUBLIC
@@ -72,8 +72,8 @@
%DocBookDTD;
---- kdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd.orig
2002-12-13 15:01:55.000000000 +0100
-+++ kdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd
2003-11-06 02:29:29.000000000 +0100
+--- tdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd.orig
2002-12-13 15:01:55.000000000 +0100
++++ tdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd
2003-11-06 02:29:29.000000000 +0100
@@ -24,7 +24,7 @@
<!ENTITY % DocBookDTD PUBLIC
@@ -83,34 +83,34 @@
%DocBookDTD;
<!-- The current obsolete version will do (see below) -->
---- kdelibs-031105/kdoctools/meinproc.cpp.orig 2003-10-27 01:03:48.000000000
+0100
-+++ kdelibs-031105/kdoctools/meinproc.cpp 2003-11-05 22:46:59.000000000
+0100
-@@ -142,7 +142,7 @@
- QString catalogs;
- catalogs += locate( "dtd", "customization/catalog" );
+--- kdelibs-R14.0.0/kdoctools/meinproc.cpp~ 2014-07-26 03:30:43.000000000
+0300
++++ kdelibs-R14.0.0/kdoctools/meinproc.cpp 2015-03-21 10:35:11.412867331
+0200
+@@ -155,7 +155,7 @@
+ TQString catalogs;
+ catalogs += locate( "dtd", "customization/catalog.xml" );
catalogs += " ";
-- catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/docbook.cat" );
+- catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/catalog.xml" );
+ catalogs += "/usr/share/sgml/docbook/xml-dtd-4.1.2/catalog";
- setenv( "SGML_CATALOG_FILES", QFile::encodeName( catalogs ).data(),
1);
- QString exe;
---- kdelibs-031105/kdoctools/xslt.cpp.orig 2003-10-19 23:31:11.000000000
+0200
-+++ kdelibs-031105/kdoctools/xslt.cpp 2003-11-05 22:55:13.000000000 +0100
-@@ -182,10 +182,10 @@
+ setenv( "XML_CATALOG_FILES", TQFile::encodeName( catalogs ).data(),
1);
+ TQString exe;
+--- kdelibs-R14.0.0/kdoctools/xslt.cpp~ 2014-07-26 03:30:43.000000000
+0300
++++ kdelibs-R14.0.0/kdoctools/xslt.cpp 2015-03-21 10:35:56.258522034 +0200
+@@ -185,10 +185,10 @@
if ( srcdir.isEmpty() ) {
- catalogs += ins.dirs()->findResource("data",
"ksgmltools2/customization/catalog");
+ catalogs += ins.dirs()->findResource("data",
"ksgmltools2/customization/catalog.xml");
catalogs += ':';
-- catalogs += ins.dirs()->findResource("data",
"ksgmltools2/docbook/xml-dtd-4.2/docbook.cat");
+- catalogs += ins.dirs()->findResource("data",
"ksgmltools2/docbook/xml-dtd-4.2/catalog.xml");
+ catalogs += "/usr/share/sgml/docbook/xml-dtd-4.2/catalog";
- ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data")
+ "ksgmltools2");
+ ins.dirs()->addResourceType("dtd",
TDEStandardDirs::kde_default("data") + "ksgmltools2");
} else {
-- catalogs += srcdir +"/customization/catalog:" + srcdir +
"/docbook/xml-dtd-4.2/docbook.cat";
+- catalogs += srcdir +"/customization/catalog.xml:" + srcdir +
"/docbook/xml-dtd-4.2/catalog.xml";
+ catalogs += srcdir +"/customization/catalog:" +
"/usr/share/sgml/docbook/xml-dtd-4.2/catalog";
ins.dirs()->addResourceDir("dtd", srcdir);
}
---- kdelibs/kdoctools/Makefile.am.orig 2005-06-20 14:12:01.000000000 +0200
-+++ kdelibs/kdoctools/Makefile.am 2005-06-20 15:14:29.000000000 +0200
+--- tdelibs/kdoctools/Makefile.am.orig 2005-06-20 14:12:01.000000000 +0200
++++ tdelibs/kdoctools/Makefile.am 2005-06-20 15:14:29.000000000 +0200
@@ -45,7 +45,7 @@
$(XGETTEXT) *.cpp -o $(podir)/kio_help.pot
@@ -118,5 +118,5 @@
- @(for subdir in customization docbook; do \
+ @(for subdir in customization; do \
for dir in `( cd $(srcdir)/$$subdir && find . -type d ! -name CVS |
grep -v '\.svn' )`; do \
- $(mkinstalldirs)
$(DESTDIR)$(kde_datadir)/ksgmltools2/$$subdir/$$dir ;\
+ $(mkinstalldirs)
$(DESTDIR)$(tde_datadir)/ksgmltools2/$$subdir/$$dir ;\
for file in `(cd $(srcdir)/$$subdir && ls -1 $$dir/*)`; do \
diff --git a/kdelibs-xgl.patch b/kdelibs-xgl.patch
index 4cc0946..b49e72e 100644
--- a/kdelibs-xgl.patch
+++ b/kdelibs-xgl.patch
@@ -1,5 +1,5 @@
---- 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
+--- kdelibs-3.5.12/tdeui/ksystemtray.cpp~ 2011-01-04 19:06:54.000000000
+0200
++++ kdelibs-3.5.12/tdeui/ksystemtray.cpp 2011-01-04 19:09:28.517100570
+0200
@@ -32,6 +32,7 @@
#include <kwin.h>
#include <kwinmodule.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/fa783651e1799ade4b894f3f4e909a4c83e758d7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
