diff options
Diffstat (limited to 'redhat/tdelibs')
34 files changed, 4079 insertions, 0 deletions
diff --git a/redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch b/redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch new file mode 100644 index 000000000..64fc9b841 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch @@ -0,0 +1,21 @@ +--- branches/trinity/kdelibs/kdecore/fixx11h.h 2011/01/03 05:50:03 1211108 ++++ branches/trinity/kdelibs/kdecore/fixx11h.h 2011/01/12 22:19:14 1214091 +@@ -57,15 +57,18 @@ + + // template ---> + // Affects: Should be without side effects. ++#ifndef _XTYPEDEF_BOOL + #ifdef Bool + #ifndef FIXX11H_Bool + #define FIXX11H_Bool + typedef Bool XBool; + #undef Bool ++#define _XTYPEDEF_BOOL + typedef XBool Bool; + #endif + #undef Bool + #endif ++#endif // _XTYPEDEF_BOOL + // template <--- + + // Affects: Should be without side effects. diff --git a/redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch b/redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch new file mode 100644 index 000000000..e19aa739f --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch @@ -0,0 +1,29 @@ +--- kdelibs/kdecore/kstandarddirs.cpp.ORI 2011-12-09 23:13:50.089238165 +0100 ++++ kdelibs/kdecore/kstandarddirs.cpp 2011-12-09 23:16:23.133210143 +0100 +@@ -839,7 +839,7 @@ + } + // UGLY HACK - Chris CHeney + if (local && (!strcmp("config", type))) +- candidates->append("/etc/kde3/"); ++ candidates->append("/etc/trinity/"); + // + local = false; + } +@@ -1030,7 +1030,7 @@ + if (!strcmp(type, "html-bundle")) + return "share/doc-bundle/HTML/"; + if (!strcmp(type, "html")) +- return "share/doc/kde/HTML/"; ++ return "share/doc/HTML/"; + if (!strcmp(type, "icon")) + return "share/icons/"; + if (!strcmp(type, "config")) +@@ -1336,7 +1336,7 @@ + } + else + { +- localKdeDir = TQDir::homeDirPath() + "/.kde3/"; ++ localKdeDir = TQDir::homeDirPath() + "/.trinity/"; + } + + if (localKdeDir != QString("-/")) diff --git a/redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch b/redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch new file mode 100644 index 000000000..b6f0ea0cb --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch @@ -0,0 +1,139 @@ +commit 3c75231601fb35f0c91022abeee5117c81f70a62 +Author: Timothy Pearson <[email protected]> +Date: 1339293731 -0500 + + Add dynamic label support to kpassworddialog + +diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp +index a9625b8..489e14d 100644 +--- ./kdeui/kpassdlg.cpp.orig 2011-08-11 04:30:26.000000000 +0200 ++++ ./kdeui/kpassdlg.cpp 2012-06-19 20:10:16.766136524 +0200 +@@ -32,6 +32,7 @@ + #include <tqhbox.h> + #include <tqwhatsthis.h> + #include <tqptrdict.h> ++#include <tqtimer.h> + + #include <kglobal.h> + #include <kdebug.h> +@@ -305,7 +306,7 @@ + KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn, + TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, "", Ok|Cancel|extraBttn, +- Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), d(new KPasswordDialogPrivate) ++ Ok, true), m_Keep(enableKeep? 1 : 0), m_keepWarnLbl(0), m_Type(type), d(new KPasswordDialogPrivate) + { + d->iconName = "password"; + init(); +@@ -314,7 +315,7 @@ + KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn, const TQString& icon, + TQWidget *parent, const char *name ) + : KDialogBase(parent, name, true, "", Ok|Cancel|extraBttn, +- Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), d(new KPasswordDialogPrivate) ++ Ok, true), m_Keep(enableKeep? 1 : 0), m_keepWarnLbl(0), m_Type(type), d(new KPasswordDialogPrivate) + { + if ( icon.stripWhiteSpace().isEmpty() ) + d->iconName = "password"; +@@ -326,7 +327,7 @@ + KPasswordDialog::KPasswordDialog(int type, TQString prompt, bool enableKeep, + int extraBttn) + : KDialogBase(0L, "Password Dialog", true, "", Ok|Cancel|extraBttn, +- Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), d(new KPasswordDialogPrivate) ++ Ok, true), m_Keep(enableKeep? 1 : 0), m_keepWarnLbl(0), m_Type(type), d(new KPasswordDialogPrivate) + { + d->iconName = "password"; + init(); +@@ -393,12 +394,20 @@ + m_pGrid->setRowStretch(8, 12); + TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain); + cb->setFixedSize(cb->tqsizeHint()); +- if (m_Keep > 1) ++ m_keepWarnLbl = new TQLabel(m_pMain); ++ m_keepWarnLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); ++ if (m_Keep > 1) { + cb->setChecked(true); +- else ++ m_keepWarnLbl->show(); ++ } ++ else { + m_Keep = 0; ++ m_keepWarnLbl->hide(); ++ } + connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); + m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter)); ++// m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (TQ_Alignment)(AlignLeft|AlignVCenter)); ++ m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3); + } else if (m_Type == NewPassword) { + m_pGrid->addRowSpacing(8, 10); + lbl = new TQLabel(m_pMain); +@@ -475,6 +484,13 @@ + m_pHelpLbl->setFixedSize(275, m_pHelpLbl->heightForWidth(275)); + } + ++void KPasswordDialog::setKeepWarning(TQString warn) ++{ ++ if (m_keepWarnLbl) { ++ m_keepWarnLbl->setText(warn); ++ } ++} ++ + + TQString KPasswordDialog::prompt() const + +@@ -550,9 +566,24 @@ + + void KPasswordDialog::slotKeep(bool keep) + { ++ if (m_keepWarnLbl->text() != "") { ++ if (keep) { ++ m_keepWarnLbl->show(); ++ } ++ else { ++ m_keepWarnLbl->hide(); ++ } ++ TQTimer::singleShot(0, this, SLOT(slotLayout())); ++ } ++ + m_Keep = keep; + } + ++void KPasswordDialog::slotLayout() ++{ ++ resize(sizeHint()); ++} ++ + + // static . antlarr: KDE 4: Make it const TQString & prompt + int KPasswordDialog::getPassword(TQCString &password, TQString prompt, +diff --git a/kdeui/kpassdlg.h b/kdeui/kpassdlg.h +index de83bb3..2d124b0 100644 +--- a/kdeui/kpassdlg.h ++++ b/kdeui/kpassdlg.h +@@ -246,6 +246,11 @@ public: + TQString prompt() const; + + /** ++ * Sets the text to be dynamically displayed when the keep checkbox is checked ++ */ ++ void setKeepWarning(TQString warn); ++ ++ /** + * Adds a line of information to the dialog. + */ + void addLine(TQString key, TQString value); +@@ -380,6 +385,7 @@ protected slots: + void slotOk(); + void slotCancel(); + void slotKeep(bool); ++ void slotLayout(); + + protected: + +@@ -399,6 +405,7 @@ private: + + int m_Keep, m_Type, m_Row; + TQLabel *m_pHelpLbl; ++ TQLabel *m_keepWarnLbl; + TQGridLayout *m_pGrid; + TQWidget *m_pMain; + KPasswordEdit *m_pEdit, *m_pEdit2; diff --git a/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch b/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch new file mode 100644 index 000000000..97afbc7a7 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch @@ -0,0 +1,67 @@ +commit 24f144faf98249012e7b1657a5dfe93750f0dfde +Author: Timothy Pearson <[email protected]> +Date: 1326095653 -0600 + + Add inotify CMake support to tdelibs + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e26c252..ede0a3a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,6 +76,7 @@ + OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF ) + OPTION( WITH_AVAHI "Enable AVAHI support" OFF ) + OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) ++OPTION( WITH_INOTIFY "Enable inotify support for kio" ON ) + + OPTION( WITH_ASPELL "Enable aspell support" OFF ) + OPTION( WITH_HSPELL "Enable hspell support" OFF ) +@@ -726,6 +727,26 @@ if( WITH_GCC_VISIBILITY ) + set( HAVE_PCREPOSIX 1 ) + endif( ) + ++##### check for inotify ########################### ++ ++if( WITH_INOTIFY ) ++ check_include_file( "inotify.h" INOTIFY_FOUND ) ++ check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND ) ++ if( NOT INOTIFY_FOUND ) ++ if( NOT INOTIFY_SYS_FOUND ) ++ message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" ) ++ endif( NOT INOTIFY_SYS_FOUND ) ++ endif( NOT INOTIFY_FOUND ) ++ if( INOTIFY_FOUND ) ++ set( HAVE_INOTIFY 1 ) ++ endif( INOTIFY_FOUND ) ++ if( INOTIFY_SYS_FOUND ) ++ set( HAVE_INOTIFY 1 ) ++ set( HAVE_SYS_INOTIFY 1 ) ++ endif( INOTIFY_SYS_FOUND ) ++endif( ) ++ ++ + ##### check for aspell ########################## + # we need ASPELL_DATADIR too + +diff --git a/config.h.cmake b/config.h.cmake +index 1893270..d9b0ef5 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -234,7 +234,7 @@ + #cmakedefine HAVE_INITGROUPS_PROTO 1 + + /* Define if your system has Linux Inode Notification */ +-#undef HAVE_INOTIFY ++#cmakedefine HAVE_INOTIFY 1 + + /* Define to 1 if you have the <inttypes.h> header file. */ + #cmakedefine HAVE_INTTYPES_H 1 +@@ -555,7 +555,7 @@ + #cmakedefine HAVE_SYS_FILIO_H 1 + + /* Define if your system has glibc support for inotify */ +-#undef HAVE_SYS_INOTIFY ++#cmakedefine HAVE_SYS_INOTIFY 1 + + /* Define to 1 if you have the <sys/mman.h> header file. */ + #cmakedefine HAVE_SYS_MMAN_H 1 diff --git a/redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch b/redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch new file mode 100644 index 000000000..42e1993d3 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch @@ -0,0 +1,79 @@ +commit 2b035349c31fe64c31d2c050892b117a3a807179 +Author: Timothy Pearson <[email protected]> +Date: 1326668093 -0600 + + Add fam/gamin support to tdelibs CMake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ce186b..a1a6429 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,6 +77,7 @@ OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} ) + OPTION( WITH_AVAHI "Enable AVAHI support" OFF ) + OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) + OPTION( WITH_INOTIFY "Enable inotify support for kio" ON ) ++OPTION( WITH_GAMIN "Enable FAM/GAMIN support" OFF ) + + OPTION( WITH_ASPELL "Enable aspell support" OFF ) + OPTION( WITH_HSPELL "Enable hspell support" OFF ) +@@ -786,6 +787,23 @@ if( WITH_INOTIFY ) + endif( ) + + ++##### check for FAM/GAMIN ########################## ++ ++if( WITH_GAMIN ) ++ check_include_file( "fam.h" HAVE_FAM_H ) ++ if( HAVE_FAM_H ) ++ pkg_search_module( GAMIN gamin ) ++ if( GAMIN_FOUND ) ++ set( HAVE_FAM 1 ) ++ else( GAMIN_FOUND ) ++ message(FATAL_ERROR "\nfam/gamin support was requested, but gamin was not found on your system" ) ++ endif( GAMIN_FOUND ) ++ else( HAVE_FAM_H ) ++ message(FATAL_ERROR "\nfam/gamin support was requested, but fam was not found on your system" ) ++ endif( HAVE_FAM_H ) ++endif( WITH_GAMIN ) ++ ++ + ##### check for aspell ########################## + # we need ASPELL_DATADIR too + +diff --git a/config.h.cmake b/config.h.cmake +index d9b0ef5..4e4bd18 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -120,7 +120,7 @@ + #undef HAVE_FADVISE + + /* Define if your system has libfam */ +-#undef HAVE_FAM ++#cmakedefine HAVE_FAM 1 + + /* Define to 1 if you have the <float.h> header file. */ + #cmakedefine HAVE_FLOAT_H 1 +diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt +index 9d8790f..25d4fad 100644 +--- a/kio/kio/CMakeLists.txt ++++ b/kio/kio/CMakeLists.txt +@@ -25,8 +25,12 @@ include_directories( + ${CMAKE_SOURCE_DIR}/kio + ${CMAKE_SOURCE_DIR}/kio/kssl + ${CMAKE_SOURCE_DIR}/interfaces ++ ${GAMIN_INCLUDEDIR} + ) + ++link_directories( ++ ${GAMIN_LIBDIR} ++) + + ##### headers ################################### + +@@ -112,4 +116,5 @@ + + tde_add_library( ${target} STATIC_PIC AUTOMOC + SOURCES ${${target}_SRCS} ++ LINK ${GAMIN_LIBRARIES} + ) + diff --git a/redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch b/redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch new file mode 100644 index 000000000..089570a75 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch @@ -0,0 +1,67 @@ +Index: kjs/CMakeLists.txt +=================================================================== +--- kjs/CMakeLists.txt (revision 1261450) ++++ kjs/CMakeLists.txt (working copy) +@@ -15,10 +15,12 @@ + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/kdecore ++ ${LIBPCRE_INCLUDEDIR} + ) + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${LIBPCRE_LIBDIR} + ) + + +@@ -59,6 +61,6 @@ + tde_add_library( ${target} SHARED + SOURCES ${${target}_SRCS} + VERSION 1.2.0 +- LINK kdecore-shared ++ LINK kdecore-shared ${LIBPCRE_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} + ) +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1261450) ++++ CMakeLists.txt (working copy) +@@ -75,6 +75,7 @@ + OPTION( WITH_OPENEXR "Enable openexr support" OFF ) + OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF ) + OPTION( WITH_AVAHI "Enable AVAHI support" OFF ) ++OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) + + OPTION( WITH_ASPELL "Enable aspell support" OFF ) + OPTION( WITH_HSPELL "Enable hspell support" OFF ) +@@ -715,6 +716,16 @@ + endif( WITH_QT3 ) + endif( ) + ++##### check for pcre ########################### ++ ++if( WITH_PCRE ) ++ pkg_search_module( LIBPCRE libpcre ) ++ if( NOT LIBPCRE_FOUND ) ++ message(FATAL_ERROR "\npcre support are requested, but not found on your system" ) ++ endif( NOT LIBPCRE_FOUND ) ++ set( HAVE_PCREPOSIX 1 ) ++endif( ) ++ + ##### check for aspell ########################## + # we need ASPELL_DATADIR too + +Index: config.h.cmake +=================================================================== +--- config.h.cmake (revision 1261450) ++++ config.h.cmake (working copy) +@@ -366,7 +366,7 @@ + #cmakedefine HAVE_PATHS_H 1 + + /* Define if you have pcreposix libraries and header files. */ +-#undef HAVE_PCREPOSIX ++#cmakedefine HAVE_PCREPOSIX 1 + + /* Define to 1 if you have the `poll' function. */ + #cmakedefine HAVE_POLL 1 diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch new file mode 100644 index 000000000..6fa9a085a --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch @@ -0,0 +1,45 @@ +From 1f37c9cdb9bb47f8453cf26af8006c7c8d4ca3b3 Mon Sep 17 00:00:00 2001
+From: Thorsten Glaser <[email protected]>
+Date: Tue, 27 Dec 2011 14:28:27 +0100
+Subject: [PATCH] fix UTF-8 encoding for WebDAV directories
+
+idea derived from KIO slave http.cpp from KDE 4; reimplemented
+on top of Qt3/KDE3 APIs
+
+Bug: http://bugs.kde.org/show_bug.cgi?id=127251
+
+Signed-off-by: Thorsten Glaser <[email protected]>
+---
+ kioslave/http/http.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
+index a1495d7..16b785d 100644
+--- a/kioslave/http/http.cc
++++ b/kioslave/http/http.cc
+@@ -45,6 +45,7 @@
+ #include <tqregexp.h>
+ #include <tqdatetime.h>
+ #include <tqstringlist.h>
++#include <tqurl.h>
+
+ #include <kurl.h>
+ #include <kidna.h>
+@@ -750,9 +751,14 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
+ entry.clear();
+
+ TQString urlStr = href.text();
++#if 0
+ int encoding = remoteEncoding()->encodingMib();
+ if ((encoding == 106) && (!KStringHandler::isUtf8(KURL::decode_string(urlStr, 4).latin1())))
+ encoding = 4; // Use latin1 if the file is not actually utf-8
++#else
++ TQUrl::decode(urlStr);
++ int encoding = 106;
++#endif
+
+ KURL thisURL ( urlStr, encoding );
+
+--
+1.7.2.3
+
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch new file mode 100644 index 000000000..5fb5aa576 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch @@ -0,0 +1,20 @@ +commit 87201a3741bd9d4b4638be7b3d8c44a737115b0f +Author: Timothy Pearson <[email protected]> +Date: 1325899796 -0600 + + Fix make_driver_db_cups path + This closes Bug 383 + +diff --git a/kdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp +index 635cfd5..4a64248 100644 +--- a/kdeprint/cups/kmcupsmanager.cpp ++++ b/kdeprint/cups/kmcupsmanager.cpp +@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager() + + TQString KMCupsManager::driverDbCreationProgram() + { +- return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups"); ++ return TQString(__KDE_BINDIR).append(TQString::fromLatin1("/make_driver_db_cups")); + } + + TQString KMCupsManager::driverDirectory() diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch new file mode 100644 index 000000000..6b0b93760 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch @@ -0,0 +1,20 @@ +--- kdelibs/kdecore/CMakeLists.txt.ORI 2012-08-09 21:10:26.125863261 +0200 ++++ kdelibs/kdecore/CMakeLists.txt 2012-08-09 21:12:08.928750681 +0200 +@@ -73,7 +73,8 @@ + + ##### other data ################################ + +-tde_install_empty_directory( ${LOCALE_INSTALL_DIR}/all_languages ) ++install( FILES all_languages.desktop ++ DESTINATION ${LOCALE_INSTALL_DIR} RENAME all_languages ) + + install( FILES 40.colors Web.colors Royal.colors Rainbow.colors + DESTINATION ${CONFIG_INSTALL_DIR}/colors ) +@@ -87,7 +88,6 @@ + install( FILES eventsrc + DESTINATION ${DATA_INSTALL_DIR}/knotify ) + +- + ##### libkdecore ################################ + + set( target kdecore ) diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch new file mode 100644 index 000000000..b34f3bf7e --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch @@ -0,0 +1,27 @@ +commit 3e284fadb9110cdd2a2dcf9c2e960c74f15e0360 +Author: Slávek Banko <[email protected]> +Date: 1339570958 +0200 + + Fix FTBFS - incomplete build kspell2 + This closes Bug 657 + +diff --git a/kspell2/ui/CMakeLists.txt b/kspell2/ui/CMakeLists.txt +index 65ea158..a83774d 100644 +--- a/kspell2/ui/CMakeLists.txt ++++ b/kspell2/ui/CMakeLists.txt +@@ -54,12 +54,14 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC + set( target kspell2 ) + + set( ${target}_SRCS ++ configwidget.cpp highlighter.cpp configdialog.cpp ++ kspell2ui.ui configui.ui + dialog.cpp + ) + + tde_add_library( ${target} SHARED AUTOMOC + SOURCES ${${target}_SRCS} + VERSION 1.0.0 +- LINK kspell2-static kspell2base-static kutils-shared ++ LINK kspell2base-static kutils-shared + DESTINATION ${LIB_INSTALL_DIR} + ) diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch new file mode 100644 index 000000000..1192b8616 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch @@ -0,0 +1,159 @@ +commit 41ea89f79d28c456b296e8ddcce0a12c21e13f94 +Author: Timothy Pearson <[email protected]> +Date: 1337872714 -0500 + + Fix composition extension detection + +diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp +index 5c60e6f..b4caefc 100644 +--- a/kdecore/kapplication.cpp ++++ b/kdecore/kapplication.cpp +@@ -1804,9 +1804,7 @@ bool KApplication::isCompositionManagerAvailable() { + + // Now that we did all that by way of introduction...read the file! + FILE *pFile; +- char buffer[255]; + pFile = fopen(filename, "r"); +- int kompmgrpid = 0; + if (pFile) { + have_manager = true; + fclose(pFile); +@@ -1840,18 +1838,23 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool + compositing_manager_available = false; + } + else { +- Window root_window = XDefaultRootWindow(dpy); +- XCompositeRedirectSubwindows(dpy, root_window, CompositeRedirectManual); +- XSync(dpy, false); +- if (x11_composite_error_generated == true) { +- compositing_manager_available = true; ++ if (available) { // FIXME This variable does double duty to avoid breaking the ABI for R14.0. In reality it should be called perform_deep_check ++ Window root_window = XDefaultRootWindow(dpy); ++ XCompositeRedirectSubwindows(dpy, root_window, CompositeRedirectManual); ++ XSync(dpy, false); ++ if (x11_composite_error_generated == true) { ++ compositing_manager_available = true; ++ } ++ else { ++ XCompositeUnredirectSubwindows(dpy, root_window, CompositeRedirectManual); ++ compositing_manager_available = false; ++ } ++ XSetErrorHandler(NULL); ++ XCloseDisplay(dpy); + } + else { +- XCompositeUnredirectSubwindows(dpy, root_window, CompositeRedirectManual); +- compositing_manager_available = false; ++ compositing_manager_available = true; + } +- XSetErrorHandler(NULL); +- XCloseDisplay(dpy); + } + } + +@@ -1913,7 +1916,7 @@ Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) { + return argb_x11_visual; + } + else { +- return NULL; ++ return (Qt::HANDLE)NULL; + } + } + +@@ -1923,7 +1926,7 @@ Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) { + return argb_x11_colormap; + } + else { +- return NULL; ++ return (Qt::HANDLE)NULL; + } + } + +@@ -1997,8 +2000,20 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available) { + strcat(filename, home); + strcat(filename, configfile); + +- /* now that we did all that by way of introduction...remove the file! */ +- unlink(filename); ++ /* now that we did all that by way of introduction...create or remove the file! */ ++ if (force_available) { ++ FILE *pFile; ++ char buffer[255]; ++ sprintf(buffer, "available"); ++ pFile = fopen(filename, "w"); ++ if (pFile) { ++ fwrite(buffer,1,strlen(buffer), pFile); ++ fclose(pFile); ++ } ++ } ++ else { ++ unlink(filename); ++ } + + free(filename); + filename = NULL; +@@ -2886,12 +2901,15 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const + TQString error; + // TODO this should check if cmd has a .desktop file, and use data from it, together + // with sending more ASN data +- if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) +- if (Tty != kapp->type()) ++ if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) { ++ if (Tty != kapp->type()) { + TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"), + i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK")); +- else ++ } ++ else { + kdWarning() << "Could not launch mail client:\n" << error << endl; ++ } ++ } + } + #endif + +@@ -3597,7 +3615,9 @@ void KApplication::sigpipeHandler(int) + #ifndef NDEBUG + char msg[1000]; + sprintf(msg, "*** SIGPIPE *** (ignored, pid = %ld)\n", (long) getpid()); +- write(2, msg, strlen(msg)); ++ if (write(2, msg, strlen(msg)) < 0) { ++ // ERROR ++ } + #endif + + // Do nothing. +diff --git a/kdecore/kdetcompmgr.cpp b/kdecore/kdetcompmgr.cpp +index bfc3ac6..8b9b480 100644 +--- a/kdecore/kdetcompmgr.cpp ++++ b/kdecore/kdetcompmgr.cpp +@@ -84,7 +84,6 @@ int main(int argc, char **argv) + if (lSize > 254) + lSize = 254; + rewind (pFile); +- size_t result = fread (buffer, 1, lSize, pFile); + fclose(pFile); + kompmgrpid = atoi(buffer); + } +@@ -97,9 +96,7 @@ int main(int argc, char **argv) + } + } + +-// app.detectCompositionManagerAvailable(); +- +-// if (!app.isCompositionManagerAvailable()) { ++ if (app.detectCompositionManagerAvailable(false, false)) { // Perform a shallow check for the composite extension (a deep check would cause noticeable flicker) + KConfig config2("kwinrc", true); + config2.setGroup( "Notification Messages" ); + if (config2.readBoolEntry("UseTranslucency",false)) { +@@ -110,6 +107,10 @@ int main(int argc, char **argv) + app.detectCompositionManagerAvailable(true, false); + return 0; + } +-// } ++ } ++ else { ++ app.detectCompositionManagerAvailable(true, false); ++ return 1; ++ } + } + diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch new file mode 100644 index 000000000..b7f4e72dc --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch @@ -0,0 +1,12 @@ +--- ./kdecore/kconfigbackend.cpp.orig 2011-08-11 04:30:15.000000000 +0200 ++++ ./kdecore/kconfigbackend.cpp 2012-06-18 23:27:20.034671093 +0200 +@@ -255,8 +255,7 @@ + mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName; + + if (useKDEGlobals) +- mGlobalFileName = KGlobal::dirs()->saveLocation("config") + +- TQString::tqfromLatin1("kdeglobals"); ++ mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals"); + else + mGlobalFileName = TQString::null; + diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch new file mode 100644 index 000000000..45b622f5b --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch @@ -0,0 +1,22 @@ +--- a/dcop/dcoptypes.h.ORI 2012-04-24 16:24:05.448308109 -0400 ++++ a/dcop/dcoptypes.h 2012-04-24 16:43:55.299809919 -0400 +@@ -22,6 +22,9 @@ + #ifndef DCOPTYPES_H + #define DCOPTYPES_H + ++// generic template fallback for unknown types ++template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; } ++ + #include <dcopref.h> + + // standard c/c++ types +@@ -70,9 +73,6 @@ + // And some KDE types + class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; } + +-// generic template fallback for unknown types +-template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; } +- + // type initialization for standard c/c++ types + inline void dcopTypeInit(bool& b){b=false;} + inline void dcopTypeInit(char& c){c=0;} diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch new file mode 100644 index 000000000..0e9ec5b62 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch @@ -0,0 +1,20 @@ +commit 0536f0b707bf86636096c962e9bb32adf3bb8112 +Author: Timothy Pearson <[email protected]> +Date: 1341041394 -0500 + + Export kdemain symbol in iso kioslave + This closes Bug 465 + +diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp +index 5865139..4bd128e 100644 +--- a/kioslave/iso/iso.cpp ++++ b/kioslave/iso/iso.cpp +@@ -56,7 +56,7 @@ static const unsigned char zisofs_magic[8] = { + + using namespace KIO; + +-extern "C" { int kdemain(int argc, char **argv); } ++extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } + + int kdemain( int argc, char **argv ) + { diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch new file mode 100644 index 000000000..f55310ed8 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch @@ -0,0 +1,171 @@ +commit b4bba7b553995a6b13214dbbabe18ff311007eea +Author: Timothy Pearson <[email protected]> +Date: 1341113466 -0500 + + Fix iso kioslave not parsing large images properly + +diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp +index c6faa65..6403f62 100644 +--- a/kioslave/iso/kiso.cpp ++++ b/kioslave/iso/kiso.cpp +@@ -188,7 +188,7 @@ KIso::~KIso() + } + + /* callback function for libisofs */ +-static int readf(char *buf, int start, int len,void *udata) { ++static int readf(char *buf, long start, long len,void *udata) { + + TQIODevice* dev = ( static_cast<KIso*> (udata) )->device(); + +@@ -212,7 +212,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) { + bool special=false; + KArchiveEntry *entry=NULL,*oldentry=NULL; + char z_algo[2],z_params[2]; +- int z_size=0; ++ long long z_size=0; + + if ((idr->flags[0] & 1) && !iso->showhidden) return 0; + if (iso->level) { +@@ -289,7 +289,8 @@ static int mycallb(struct iso_directory_record *idr,void *udata) { + + void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) { + +- int i,size; ++ int i; ++ long long size; + boot_head boot; + boot_entry *be; + TQString path; +diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp +index afac16b..ffae0d3 100644 +--- a/kioslave/iso/kisofile.cpp ++++ b/kioslave/iso/kisofile.cpp +@@ -20,7 +20,7 @@ + + KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access, + int date, int adate,int cdate, const TQString& user, const TQString& group, +- const TQString& symlink,int pos, int size) : ++ const TQString& symlink,long long pos, long long size) : + KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) { + + +@@ -32,7 +32,7 @@ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access, + KIsoFile::~KIsoFile(){ + } + +-void KIsoFile::setZF(char algo[2],char parms[2],int realsize) { ++void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) { + m_algo[0]=algo[0];m_algo[1]=algo[1]; + m_parms[0]=parms[0];m_parms[1]=parms[1]; + m_realsize=realsize; +diff --git a/kioslave/iso/kisofile.h b/kioslave/iso/kisofile.h +index 193509c..696a8c1 100644 +--- a/kioslave/iso/kisofile.h ++++ b/kioslave/iso/kisofile.h +@@ -29,9 +29,9 @@ class KIsoFile : public KArchiveFile { + public: + KIsoFile( KArchive* archive, const TQString& name, int access, int date, + int adate,int cdate, const TQString& user, const TQString& group, +- const TQString& symlink, int pos, int size); ++ const TQString& symlink, long long pos, long long size); + ~KIsoFile(); +- void setZF(char algo[2],char parms[2],int realsize); ++ void setZF(char algo[2],char parms[2],long long realsize); + int adate() const { return m_adate; } + int cdate() const { return m_cdate; } + long long realsize() const { return m_realsize; } +diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c +index ab13d9e..e599450 100644 +--- a/kioslave/iso/libisofs/isofs.c ++++ b/kioslave/iso/libisofs/isofs.c +@@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) { + boot->defentry=NULL; + } + +-int BootImageSize(int media,int len) { +- int ret; ++int BootImageSize(int media,long len) { ++ long long ret; + + switch(media & 0xf) { + case 0: +@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) { + return entry; + } + +-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) { ++int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) { + + char buf[2048], *c, *be; + int i,end=0; +@@ -221,7 +221,7 @@ err: + /** + * Creates the linked list of the volume descriptors + */ +-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) { ++iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) { + + int i; + struct iso_volume_descriptor buf; +@@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files; + iconv_t iconv_d; + int fd; + +-int readf(char *buf, int start, int len,void *udata) { ++int readf(char *buf, long start, long len,void *udata) { + int ret; + +- if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret; ++ if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret; + ret=read(fd, buf, len << 11); + if (ret<0) return ret; + return (ret >> 11); +diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h +index 52190e6..b8971a4 100644 +--- a/kioslave/iso/libisofs/isofs.h ++++ b/kioslave/iso/libisofs/isofs.h +@@ -50,7 +50,7 @@ typedef struct _rr_entry { + int re; /* relocated */ + char z_algo[2]; /* zizofs algorithm */ + char z_params[2]; /* zizofs parameters */ +- int z_size; /* zizofs real_size */ ++ long z_size; /* zizofs real_size */ + } rr_entry; + + typedef struct _iso_vol_desc { +@@ -78,7 +78,7 @@ typedef struct _boot_head { + /** + * this callback function needs to read 'len' sectors from 'start' into 'buf' + */ +-typedef int readfunc(char *buf,int start, int len,void *); ++typedef int readfunc(char *buf,long start, long len,void *); + + /** + * ProcessDir uses this callback +@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs); + * If the function fails, returns NULL + * Don't forget to call FreeISO9660 after using the volume descriptor list! + */ +-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata); ++iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata); + + /** + * Frees the linked list of volume descriptors +@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd); + /** + * Returns the size of the boot image (in 512 byte sectors) + */ +-int BootImageSize(int media,int len); ++int BootImageSize(int media,long len); + + /** + * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable, +@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot); + /** + * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable! + */ +-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata); ++int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata); + + #ifdef __cplusplus + } //extern "C" diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch new file mode 100644 index 000000000..c6792dfdc --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch @@ -0,0 +1,20 @@ +diff -urN tdelibs/kio/kio/kdirwatch.cpp tdelibs.new/kio/kio/kdirwatch.cpp +--- tdelibs/kio/kio/kdirwatch.cpp 2012-04-05 13:26:08.000000000 -0500 ++++ tdelibs.new/kio/kio/kdirwatch.cpp 2012-04-08 17:51:15.000000000 -0500 +@@ -1155,6 +1155,7 @@ + if(!e->dirty) return NoChange; + e->dirty = false; + } ++ if (e->isDir) return Changed; + #endif + + // Shouldn't happen: Ignore "unknown" notification method +@@ -1184,6 +1185,8 @@ + if (exists) { + + if (e->m_status == NonExistent) { ++ // ctime is the 'creation time' on windows, but with qMax ++ // we get the latest change of any kind, on any platform. + e->m_ctime = stat_buf.st_ctime; + e->m_status = Normal; + e->m_nlink = stat_buf.st_nlink; diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch new file mode 100644 index 000000000..3589e6044 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch @@ -0,0 +1,83 @@ +commit 06b514847fffb79985e4bcde9f8dcc685c5d9ac5 +Author: Timothy Pearson <[email protected]> +Date: 1328040359 -0600 + + Fix konq filter in list view mode + Select all now only selects shown (filtered) items + +diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp +index e1c5811..b52fe68 100644 +--- a/kdeui/klistview.cpp ++++ b/kdeui/klistview.cpp +@@ -2356,6 +2356,52 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, + TQListViewItem::paintCell(p, _cg, column, width, tqalignment); + } + ++/*! ++ If \a select is TRUE, all the items get selected; otherwise all ++ the items get unselected. This only works in the selection modes \c ++ Multi and \c Extended. In \c Single and \c NoSelection mode the ++ selection of the current item is just set to \a select. ++*/ ++ ++void KListView::selectAll( bool select ) ++{ ++ if ( selectionMode() == Multi || selectionMode() == Extended ) { ++ bool b = signalsBlocked(); ++ blockSignals( TRUE ); ++ bool anything = FALSE; ++ TQListViewItemIterator it( this ); ++ while ( it.current() ) { ++ TQListViewItem *i = it.current(); ++ if ( select == TRUE ) { ++ if ( (bool)i->isVisible() == TRUE ) { ++ i->setSelected( TRUE ); ++ anything = TRUE; ++ } ++ if ( (bool)i->isVisible() == FALSE ) { ++ i->setSelected( FALSE ); ++ anything = TRUE; ++ } ++ } ++ else { ++ if ( (bool)i->isSelected() != select ) { ++ i->setSelected( select ); ++ anything = TRUE; ++ } ++ } ++ ++it; ++ } ++ blockSignals( b ); ++ if ( anything ) { ++ emit selectionChanged(); ++// d->useDoubleBuffer = TRUE; ++ triggerUpdate(); ++ } ++ } else if ( currentItem() ) { ++ TQListViewItem * i = currentItem(); ++ setSelected( i, select ); ++ } ++} ++ + void KListView::virtual_hook( int, void* ) + { /*BASE::virtual_hook( id, data );*/ } + +diff --git a/tdeui/klistview.h b/tdeui/klistview.h +index ed10192..c8bb837 100644 +--- a/kdeui/klistview.h ++++ b/kdeui/klistview.h +@@ -660,6 +660,14 @@ public slots: + */ + bool tabOrderedRenaming() const; + ++ /** ++ * Override TQListView selectAll() so that filtered ++ * items are not selected ++ * ++ * @since 14.0 ++ */ ++ virtual void selectAll( bool select ); ++ + protected: + /** + * Determine whether a drop on position @p p would count as diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch new file mode 100644 index 000000000..7f21fe176 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch @@ -0,0 +1,27 @@ +commit 9068fffdf82dc9cf60e83639b3a9b397761304cd +Author: Timothy Pearson <[email protected]> +Date: 1338002515 -0500 + + Fix KTempFile not obeying special bits on file creation + This closes Bug 349 + Add modem category to TDE hardware manager + +diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp +index 2c7b56e..4632f00 100644 +--- a/kdecore/ktempfile.cpp ++++ b/kdecore/ktempfile.cpp +@@ -117,8 +117,12 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension, + // Success! + bOpen = true; + +- // Set uid/gid (necessary for SUID programs) +- fchown(mFd, getuid(), getgid()); ++ uid_t uid = getuid(); ++ uid_t euid = geteuid(); ++ if (uid != euid) { ++ // Set uid/gid (necessary for SUID programs) ++ fchown(mFd, getuid(), getgid()); ++ } + + // Set close on exec + fcntl(mFd, F_SETFD, FD_CLOEXEC); diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch new file mode 100644 index 000000000..e5b499167 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch @@ -0,0 +1,52 @@ +commit a1c30c142a7b631d6ff66f12d8b48c9aec07190f +Author: Timothy Pearson <[email protected]> +Date: 1331881108 -0500 + + Fix slider drawing on external paint devices + +diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp +index d4cb9bd..0220840 100644 +--- a/kdefx/kstyle.cpp ++++ b/kdefx/kstyle.cpp +@@ -1138,11 +1138,14 @@ void KStyle::drawComplexControl( TQ_ComplexControl control, + last = querySubControlMetrics(control, widget, SC_ScrollBarLast, opt); + subline2 = addline; + +- if ( useThreeButtonScrollBar ) +- if (horizontal) ++ if ( useThreeButtonScrollBar ) { ++ if (horizontal) { + subline2.moveBy(-addline.width(), 0); +- else ++ } ++ else { + subline2.moveBy(0, -addline.height()); ++ } ++ } + + // Draw the up/left button set + if ((controls & SC_ScrollBarSubLine) && subline.isValid()) { +@@ -1238,7 +1241,14 @@ void KStyle::drawComplexControl( TQ_ComplexControl control, + } + + p2.end(); +- bitBlt((TQWidget*)widget, r.x(), r.y(), &pix); ++ ++ TQPaintDevice* ppd = p->device(); ++ if (ppd->isExtDev()) { ++ p->drawPixmap(0, 0, pix); ++ } ++ else { ++ bitBlt((TQWidget*)widget, r.x(), r.y(), &pix); ++ } + break; + } + +@@ -2105,7 +2115,6 @@ TQImage TransparencyHandler::handleRealAlpha(TQImage img) { + for (int y = 0; y < h; ++y) { + TQRgb *ls = (TQRgb *)clearImage.scanLine( y ); + for (int x = 0; x < w; ++x) { +- TQRgb l = ls[x]; + ls[x] = tqRgba( 0, 0, 0, 0 ); + } + } diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch new file mode 100644 index 000000000..9a34f74db --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch @@ -0,0 +1,35 @@ +commit d1c71f692f5329dbfe817bbed41c5137be608efa +Author: Timothy Pearson <[email protected]> +Date: 1341199632 -0500 + + Fix spinbox text entry when base is not 10 + +diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp +index 27b86f9..118af6c 100644 +--- a/kdeui/knuminput.cpp ++++ b/kdeui/knuminput.cpp +@@ -206,6 +206,7 @@ KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name) + { + editor()->tqsetAlignment(AlignRight); + val_base = 10; ++ setValidator(new KIntValidator(this, val_base)); + setValue(0); + } + +@@ -219,11 +220,16 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base, + { + editor()->tqsetAlignment(AlignRight); + val_base = base; ++ setValidator(new KIntValidator(this, val_base)); + setValue(value); + } + + void KIntSpinBox::setBase(int base) + { ++ const KIntValidator* kvalidator = dynamic_cast<const KIntValidator*>(validator()); ++ if (kvalidator) { ++ const_cast<KIntValidator*>(kvalidator)->setBase(base); ++ } + val_base = base; + } + diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch new file mode 100644 index 000000000..deb93afaa --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch @@ -0,0 +1,33 @@ +commit e131f10b84dbec07ad49d36c192777a72189a39e +Author: Timothy Pearson <[email protected]> +Date: 1329026747 -0600 + + Fix tdesu internal pathing + This closes Bug 766 + +diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp +index 7f083d7..5b222f5 100644 +--- a/kdesu/stub.cpp ++++ b/kdesu/stub.cpp +@@ -121,11 +121,16 @@ int StubProcess::ConverseStub(int check) + TQCString path = getenv("PATH"); + if (!path.isEmpty() && path[0] == ':') + path = path.mid(1); +- if (m_User == "root") +- if (!path.isEmpty()) +- path = "/sbin:/bin:/usr/sbin:/usr/bin:" + path; +- else +- path = "/sbin:/bin:/usr/sbin:/usr/bin"; ++ if (m_User == "root") ++ if (!path.isEmpty()) ++ path = "/usr/local/sbin:/usr/sbin:/sbin:" + path; ++ else ++ if (strcmp(__KDE_BINDIR, "/usr/bin") == 0) { ++ path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"; ++ } ++ else { ++ path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:" __KDE_BINDIR ":/usr/bin:/bin"; ++ } + writeLine(path); + } else if (line == "user") { + writeLine(m_User); diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch new file mode 100644 index 000000000..1cdb91958 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch @@ -0,0 +1,20 @@ +commit 6c806af1c99890adecb42abf52f4d6dc8ae72899 +Author: Timothy Pearson <[email protected]> +Date: 1337556266 -0500 + + Initialize X11 threading when kinit is used to launch a program + This closes Bug 812 + Thanks to Slávek Banko for the patch! + +diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp +index 2a74368..191757d 100644 +--- a/kinit/kinit.cpp ++++ b/kinit/kinit.cpp +@@ -1615,6 +1615,7 @@ int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err ) + // another X connection for startup notification purposes + static void setupX() + { ++ XInitThreads(); + XSetIOErrorHandler(kdeinit_xio_errhandler); + XSetErrorHandler(kdeinit_x_errhandler); + } diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch new file mode 100644 index 000000000..64cf9d6c1 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch @@ -0,0 +1,987 @@ +--- kdelibs/kdefx/CMakeLists.txt.ORI 2012-09-05 14:49:17.332664590 -0400 ++++ kdelibs/kdefx/CMakeLists.txt 2012-09-05 14:50:29.605179741 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/keramik/CMakeLists.txt.ORI 2012-09-05 14:52:39.488511648 -0400 ++++ kdelibs/kstyles/keramik/CMakeLists.txt 2012-09-05 14:52:46.135375114 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/plastik/CMakeLists.txt.ORI 2012-09-05 14:55:52.184554103 -0400 ++++ kdelibs/kstyles/plastik/CMakeLists.txt 2012-09-05 14:55:59.389406152 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/asteroid/CMakeLists.txt.ORI 2012-09-05 14:57:14.714859423 -0400 ++++ kdelibs/kstyles/asteroid/CMakeLists.txt 2012-09-05 14:57:25.833631121 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/highcolor/CMakeLists.txt.ORI 2012-09-05 14:59:43.880796883 -0400 ++++ kdelibs/kstyles/highcolor/CMakeLists.txt 2012-09-05 14:59:52.769614406 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/highcontrast/CMakeLists.txt.ORI 2012-09-05 15:00:52.531387606 -0400 ++++ kdelibs/kstyles/highcontrast/CMakeLists.txt 2012-09-05 15:00:59.908236179 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/light/CMakeLists.txt.ORI 2012-09-05 15:02:37.873225343 -0400 ++++ kdelibs/kstyles/light/CMakeLists.txt 2012-09-05 15:02:46.535047560 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdecore/CMakeLists.txt.ORI 2012-09-05 15:04:44.597624532 -0400 ++++ kdelibs/kdecore/CMakeLists.txt 2012-09-05 15:04:58.009349300 -0400 +@@ -37,6 +37,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${LIBIDN_LIBRARY_DIRS} ++ ${XCOMPOSITE_LIBRARY_DIRS} + ) + + +--- kdelibs/dcop/client/CMakeLists.txt.ORI 2012-09-05 15:09:40.211558975 -0400 ++++ kdelibs/dcop/client/CMakeLists.txt 2012-09-05 15:09:46.973420255 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kjs/CMakeLists.txt.ORI 2012-09-05 15:10:44.871247689 -0400 ++++ kdelibs/kjs/CMakeLists.txt 2012-09-05 15:10:55.546035695 -0400 +@@ -21,6 +21,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${LIBPCRE_LIBDIR} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/CMakeLists.txt.ORI 2012-09-05 15:11:50.982934593 -0400 ++++ kdelibs/kio/misc/CMakeLists.txt 2012-09-05 15:11:59.380767769 -0400 +@@ -40,6 +40,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdecore/kconfig_compiler/CMakeLists.txt.ORI 2012-09-05 15:12:54.956663587 -0400 ++++ kdelibs/kdecore/kconfig_compiler/CMakeLists.txt 2012-09-05 15:13:01.689529800 -0400 +@@ -17,6 +17,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kwallet/client/CMakeLists.txt.ORI 2012-09-05 15:13:46.102647178 -0400 ++++ kdelibs/kwallet/client/CMakeLists.txt 2012-09-05 15:13:54.441481441 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kwallet/backend/CMakeLists.txt.ORI 2012-09-05 15:14:39.946576908 -0400 ++++ kdelibs/kwallet/backend/CMakeLists.txt 2012-09-05 15:14:46.189452800 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kunittest/CMakeLists.txt.ORI 2012-09-05 15:15:30.724567350 -0400 ++++ kdelibs/kunittest/CMakeLists.txt 2012-09-05 15:15:37.191438762 -0400 +@@ -18,6 +18,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/kdesasl/CMakeLists.txt.ORI 2012-09-05 15:16:23.686514140 -0400 ++++ kdelibs/kio/misc/kdesasl/CMakeLists.txt 2012-09-05 15:16:30.107386437 -0400 +@@ -18,6 +18,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdesu/CMakeLists.txt.ORI 2012-09-05 15:17:18.220429423 -0400 ++++ kdelibs/kdesu/CMakeLists.txt 2012-09-05 15:17:25.132291924 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/kntlm/CMakeLists.txt.ORI 2012-09-05 15:18:10.203395218 -0400 ++++ kdelibs/kio/misc/kntlm/CMakeLists.txt 2012-09-05 15:18:16.090278085 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdewidgets/CMakeLists.txt.ORI 2012-09-05 15:19:01.043383536 -0400 ++++ kdelibs/kdewidgets/CMakeLists.txt 2012-09-05 15:19:08.404237043 -0400 +@@ -29,6 +29,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kded/CMakeLists.txt.ORI 2012-09-05 15:19:53.290343643 -0400 ++++ kdelibs/kded/CMakeLists.txt 2012-09-05 15:19:59.050228986 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kinit/CMakeLists.txt.ORI 2012-09-05 15:20:56.013094954 -0400 ++++ kdelibs/kinit/CMakeLists.txt 2012-09-05 15:21:01.877978180 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kconf_update/CMakeLists.txt.ORI 2012-09-05 15:21:46.470090230 -0400 ++++ kdelibs/kconf_update/CMakeLists.txt 2012-09-05 15:21:52.129977515 -0400 +@@ -17,6 +17,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kabc/vcard/CMakeLists.txt.ORI 2012-09-05 15:22:33.653150519 -0400 ++++ kdelibs/kabc/vcard/CMakeLists.txt 2012-09-05 15:22:39.350037047 -0400 +@@ -21,6 +21,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeui/CMakeLists.txt.ORI 2012-09-05 15:23:43.705755018 -0400 ++++ kdelibs/kdeui/CMakeLists.txt 2012-09-05 15:23:52.102587723 -0400 +@@ -33,6 +33,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kimgio/CMakeLists.txt.ORI 2012-09-05 15:24:52.729379655 -0400 ++++ kdelibs/kimgio/CMakeLists.txt 2012-09-05 15:24:59.825238243 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/kthemestyle/CMakeLists.txt.ORI 2012-09-05 15:25:41.501407611 -0400 ++++ kdelibs/kstyles/kthemestyle/CMakeLists.txt 2012-09-05 15:25:48.051277056 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/libkmid/CMakeLists.txt.ORI 2012-09-05 15:26:30.215436548 -0400 ++++ kdelibs/libkmid/CMakeLists.txt 2012-09-05 15:26:36.349314265 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/http/kcookiejar/CMakeLists.txt.ORI 2012-09-05 15:27:21.689410284 -0400 ++++ kdelibs/kioslave/http/kcookiejar/CMakeLists.txt 2012-09-05 15:27:28.281278845 -0400 +@@ -22,6 +22,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/utils/installtheme/CMakeLists.txt.ORI 2012-09-05 15:28:14.233362491 -0400 ++++ kdelibs/kstyles/utils/installtheme/CMakeLists.txt 2012-09-05 15:28:21.719213198 -0400 +@@ -17,6 +17,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + ##### kinstalltheme ############################# +--- kdelibs/dnssd/CMakeLists.txt.ORI 2012-09-05 15:29:09.718255841 -0400 ++++ kdelibs/dnssd/CMakeLists.txt 2012-09-05 15:29:15.350143500 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + ##### headers ################################### +--- kdelibs/kstyles/highcontrast/config/CMakeLists.txt.ORI 2012-09-05 15:30:26.325727548 -0400 ++++ kdelibs/kstyles/highcontrast/config/CMakeLists.txt 2012-09-05 15:30:31.885616614 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/libkscreensaver/CMakeLists.txt.ORI 2012-09-05 15:31:25.686543044 -0400 ++++ kdelibs/libkscreensaver/CMakeLists.txt 2012-09-05 15:31:31.287431270 -0400 +@@ -21,6 +21,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/pics/CMakeLists.txt.ORI 2012-09-05 15:33:15.116358829 -0400 ++++ kdelibs/pics/CMakeLists.txt 2012-09-05 15:33:22.821205010 -0400 +@@ -28,6 +28,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/tools/escputil/CMakeLists.txt.ORI 2012-09-05 15:34:18.809087161 -0400 ++++ kdelibs/kdeprint/tools/escputil/CMakeLists.txt 2012-09-05 15:34:24.838966757 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/arts/message/CMakeLists.txt.ORI 2012-09-05 15:35:54.035185423 -0400 ++++ kdelibs/arts/message/CMakeLists.txt 2012-09-05 15:35:59.572074829 -0400 +@@ -18,6 +18,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kstyles/plastik/config/CMakeLists.txt.ORI 2012-09-05 15:37:59.047687962 -0400 ++++ kdelibs/kstyles/plastik/config/CMakeLists.txt 2012-09-05 15:38:04.596577086 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/networkstatus/CMakeLists.txt.ORI 2012-09-05 15:39:15.031169518 -0400 ++++ kdelibs/networkstatus/CMakeLists.txt 2012-09-05 15:39:22.330023641 -0400 +@@ -22,6 +22,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/CMakeLists.txt.ORI 2012-09-05 15:40:44.810374939 -0400 ++++ kdelibs/kio/CMakeLists.txt 2012-09-05 15:40:54.052190177 -0400 +@@ -30,6 +30,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/tests/CMakeLists.txt.ORI 2012-09-05 15:41:48.532100927 -0400 ++++ kdelibs/kio/tests/CMakeLists.txt 2012-09-05 15:41:54.080989975 -0400 +@@ -18,6 +18,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/kioexec/CMakeLists.txt.ORI 2012-09-05 15:42:48.434903055 -0400 ++++ kdelibs/kio/kioexec/CMakeLists.txt 2012-09-05 15:42:54.144788864 -0400 +@@ -22,6 +22,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/kfile/CMakeLists.txt.ORI 2012-09-05 15:43:44.232787087 -0400 ++++ kdelibs/kio/misc/kfile/CMakeLists.txt 2012-09-05 15:43:51.120649315 -0400 +@@ -21,6 +21,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +@@ -36,4 +37,4 @@ + SOURCES ${${target}_SRCS} + LINK kio-shared + DESTINATION ${BIN_INSTALL_DIR} +-) +\ No newline at end of file ++) +--- kdelibs/kdoctools/CMakeLists.txt.ORI 2012-09-05 15:44:33.205807471 -0400 ++++ kdelibs/kdoctools/CMakeLists.txt 2012-09-05 15:44:39.466682225 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/ksendbugmail/CMakeLists.txt.ORI 2012-09-05 15:45:24.401783247 -0400 ++++ kdelibs/kio/misc/ksendbugmail/CMakeLists.txt 2012-09-05 15:45:31.286645499 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/interfaces/kscript/CMakeLists.txt.ORI 2012-09-05 15:46:39.496306960 -0400 ++++ kdelibs/interfaces/kscript/CMakeLists.txt 2012-09-05 15:46:45.331193604 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kparts/CMakeLists.txt.ORI 2012-09-05 15:47:41.529101602 -0400 ++++ kdelibs/kparts/CMakeLists.txt 2012-09-05 15:47:47.294989542 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/CMakeLists.txt.ORI 2012-09-05 15:48:34.508071783 -0400 ++++ kdelibs/kdeprint/CMakeLists.txt 2012-09-05 15:48:41.700931937 -0400 +@@ -40,6 +40,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt.ORI 2012-09-05 15:49:26.236065937 -0400 ++++ kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt 2012-09-05 15:49:31.824957243 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/http/CMakeLists.txt.ORI 2012-09-05 15:50:45.284528209 -0400 ++++ kdelibs/kioslave/http/CMakeLists.txt 2012-09-05 15:50:52.468388422 -0400 +@@ -27,6 +27,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/file/CMakeLists.txt.ORI 2012-09-05 15:51:43.357398032 -0400 ++++ kdelibs/kioslave/file/CMakeLists.txt 2012-09-05 15:51:50.506258876 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/ftp/CMakeLists.txt.ORI 2012-09-05 15:52:39.615302790 -0400 ++++ kdelibs/kioslave/ftp/CMakeLists.txt 2012-09-05 15:52:45.935179729 -0400 +@@ -21,6 +21,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/arts/kde/CMakeLists.txt.ORI 2012-09-05 15:53:32.040281826 -0400 ++++ kdelibs/arts/kde/CMakeLists.txt 2012-09-05 15:53:38.541155204 -0400 +@@ -25,6 +25,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${ARTS_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + # pkg-config stripping -I/usr/include +--- kdelibs/interfaces/kimproxy/library/CMakeLists.txt.ORI 2012-09-05 15:54:52.117721726 -0400 ++++ kdelibs/interfaces/kimproxy/library/CMakeLists.txt 2012-09-05 15:55:02.693515629 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kresources/CMakeLists.txt.ORI 2012-09-05 15:55:55.219491830 -0400 ++++ kdelibs/kresources/CMakeLists.txt 2012-09-05 15:56:01.964360344 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/iso/CMakeLists.txt.ORI 2012-09-05 15:57:00.178225273 -0400 ++++ kdelibs/kioslave/iso/CMakeLists.txt 2012-09-05 15:57:06.535101301 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/gzip/CMakeLists.txt.ORI 2012-09-05 15:58:24.363583139 -0400 ++++ kdelibs/kioslave/gzip/CMakeLists.txt 2012-09-05 15:58:29.777477507 -0400 +@@ -18,6 +18,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/bzip2/CMakeLists.txt.ORI 2012-09-05 15:59:29.076320316 -0400 ++++ kdelibs/kioslave/bzip2/CMakeLists.txt 2012-09-05 15:59:34.117221927 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kioslave/metainfo/CMakeLists.txt.ORI 2012-09-05 16:00:23.606255852 -0400 ++++ kdelibs/kioslave/metainfo/CMakeLists.txt 2012-09-05 16:00:29.200146638 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/krsync/CMakeLists.txt.ORI 2012-09-05 16:01:17.567202186 -0400 ++++ kdelibs/krsync/CMakeLists.txt 2012-09-05 16:01:23.763081184 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/kssld/CMakeLists.txt.ORI 2012-09-05 16:02:12.759124170 -0400 ++++ kdelibs/kio/misc/kssld/CMakeLists.txt 2012-09-05 16:02:19.426993911 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeui/kdetrayproxy/CMakeLists.txt.ORI 2012-09-05 16:03:48.650271606 -0400 ++++ kdelibs/kdeui/kdetrayproxy/CMakeLists.txt 2012-09-05 16:03:54.752156274 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/kwalletd/CMakeLists.txt.ORI 2012-09-05 16:04:55.631005088 -0400 ++++ kdelibs/kio/misc/kwalletd/CMakeLists.txt 2012-09-05 16:05:03.666853065 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/knewstuff/CMakeLists.txt.ORI 2012-09-05 16:05:51.805942029 -0400 ++++ kdelibs/knewstuff/CMakeLists.txt 2012-09-05 16:05:57.713830182 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/kpasswdserver/CMakeLists.txt.ORI 2012-09-05 16:06:46.686902706 -0400 ++++ kdelibs/kio/kpasswdserver/CMakeLists.txt 2012-09-05 16:06:53.345776552 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kio/misc/kpac/CMakeLists.txt.ORI 2012-09-05 16:07:43.907818289 -0400 ++++ kdelibs/kio/misc/kpac/CMakeLists.txt 2012-09-05 16:07:49.444713316 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + ##### other data ################################ +--- kdelibs/kabc/CMakeLists.txt.ORI 2012-09-05 16:08:49.154580815 -0400 ++++ kdelibs/kabc/CMakeLists.txt 2012-09-05 16:08:57.154429020 -0400 +@@ -36,6 +36,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/khtml/java/CMakeLists.txt.ORI 2012-09-05 16:09:55.224326707 -0400 ++++ kdelibs/khtml/java/CMakeLists.txt 2012-09-05 16:10:02.194194348 -0400 +@@ -28,6 +28,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kutils/CMakeLists.txt.ORI 2012-09-05 16:10:45.848365097 -0400 ++++ kdelibs/kutils/CMakeLists.txt 2012-09-05 16:10:51.715253615 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/interfaces/kscript/sample/CMakeLists.txt.ORI 2012-09-05 16:11:52.986088900 -0400 ++++ kdelibs/interfaces/kscript/sample/CMakeLists.txt 2012-09-05 16:12:00.529945437 -0400 +@@ -20,6 +20,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/khtml/kmultipart/CMakeLists.txt.ORI 2012-09-05 16:12:49.105021375 -0400 ++++ kdelibs/khtml/kmultipart/CMakeLists.txt 2012-09-05 16:12:55.035908513 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kcert/CMakeLists.txt.ORI 2012-09-05 16:13:43.686982413 -0400 ++++ kdelibs/kcert/CMakeLists.txt 2012-09-05 16:13:51.788828139 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/arts/knotify/CMakeLists.txt.ORI 2012-09-05 16:14:42.802856412 -0400 ++++ kdelibs/arts/knotify/CMakeLists.txt 2012-09-05 16:14:50.217715126 -0400 +@@ -24,6 +24,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${ARTS_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/interfaces/kmediaplayer/CMakeLists.txt.ORI 2012-09-05 16:15:47.850616551 -0400 ++++ kdelibs/interfaces/kmediaplayer/CMakeLists.txt 2012-09-05 16:15:53.805503001 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/management/CMakeLists.txt.ORI 2012-09-05 16:16:51.704398570 -0400 ++++ kdelibs/kdeprint/management/CMakeLists.txt 2012-09-05 16:16:58.402270762 -0400 +@@ -32,6 +32,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/lpdunix/CMakeLists.txt.ORI 2012-09-05 16:18:05.348992771 -0400 ++++ kdelibs/kdeprint/lpdunix/CMakeLists.txt 2012-09-05 16:18:13.274841407 -0400 +@@ -28,6 +28,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/ext/CMakeLists.txt.ORI 2012-09-05 16:19:06.696820851 -0400 ++++ kdelibs/kdeprint/ext/CMakeLists.txt 2012-09-05 16:19:13.589689130 -0400 +@@ -26,6 +26,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt.ORI 2012-09-05 16:20:09.255625011 -0400 ++++ kdelibs/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt 2012-09-05 16:20:16.883479148 -0400 +@@ -28,6 +28,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${ARTS_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/khtml/CMakeLists.txt.ORI 2012-09-05 16:21:17.056328088 -0400 ++++ kdelibs/khtml/CMakeLists.txt 2012-09-05 16:21:23.855197987 -0400 +@@ -46,6 +46,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kspell2/ui/CMakeLists.txt.ORI 2012-09-05 16:22:21.155101145 -0400 ++++ kdelibs/kspell2/ui/CMakeLists.txt 2012-09-05 16:22:28.929952270 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kcmshell/CMakeLists.txt.ORI 2012-09-05 16:23:26.764844457 -0400 ++++ kdelibs/kcmshell/CMakeLists.txt 2012-09-05 16:23:32.943726066 -0400 +@@ -23,6 +23,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kmdi/kmdi/CMakeLists.txt.ORI 2012-09-05 16:24:30.703618985 -0400 ++++ kdelibs/kmdi/kmdi/CMakeLists.txt 2012-09-05 16:24:36.946499290 -0400 +@@ -25,6 +25,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kmdi/CMakeLists.txt.ORI 2012-09-05 16:25:27.631527239 -0400 ++++ kdelibs/kmdi/CMakeLists.txt 2012-09-05 16:25:33.639411986 -0400 +@@ -27,6 +27,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kspell2/plugins/ispell/CMakeLists.txt.ORI 2012-09-05 16:26:26.062406048 -0400 ++++ kdelibs/kspell2/plugins/ispell/CMakeLists.txt 2012-09-05 16:26:31.159308217 -0400 +@@ -19,6 +19,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kspell2/plugins/aspell/CMakeLists.txt.ORI 2012-09-05 16:27:38.670011962 -0400 ++++ kdelibs/kspell2/plugins/aspell/CMakeLists.txt 2012-09-05 16:27:44.931891687 -0400 +@@ -21,6 +21,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${ASPELL_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kabc/formats/CMakeLists.txt.ORI 2012-09-05 16:28:38.501862464 -0400 ++++ kdelibs/kabc/formats/CMakeLists.txt 2012-09-05 16:28:44.382749443 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kabc/plugins/ldapkio/CMakeLists.txt.ORI 2012-09-05 16:29:38.283713293 -0400 ++++ kdelibs/kabc/plugins/ldapkio/CMakeLists.txt 2012-09-05 16:29:44.129600887 -0400 +@@ -27,6 +27,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kabc/plugins/file/CMakeLists.txt.ORI 2012-09-05 16:30:42.311481817 -0400 ++++ kdelibs/kabc/plugins/file/CMakeLists.txt 2012-09-05 16:30:47.634379406 -0400 +@@ -27,6 +27,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/interfaces/ktexteditor/CMakeLists.txt.ORI 2012-09-05 16:31:40.221367404 -0400 ++++ kdelibs/interfaces/ktexteditor/CMakeLists.txt 2012-09-05 16:31:47.174233563 -0400 +@@ -28,6 +28,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kabc/plugins/dir/CMakeLists.txt.ORI 2012-09-05 16:32:39.930217776 -0400 ++++ kdelibs/kabc/plugins/dir/CMakeLists.txt 2012-09-05 16:32:45.775105207 -0400 +@@ -27,6 +27,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kabc/plugins/net/CMakeLists.txt.ORI 2012-09-05 16:33:52.745814992 -0400 ++++ kdelibs/kabc/plugins/net/CMakeLists.txt 2012-09-05 16:34:01.271650687 -0400 +@@ -27,6 +27,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/cups/CMakeLists.txt.ORI 2012-09-05 16:35:01.843483032 -0400 ++++ kdelibs/kdeprint/cups/CMakeLists.txt 2012-09-05 16:35:10.784310629 -0400 +@@ -35,6 +35,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/rlpr/CMakeLists.txt.ORI 2012-09-05 16:36:01.783326981 -0400 ++++ kdelibs/kdeprint/rlpr/CMakeLists.txt 2012-09-05 16:36:08.502197359 -0400 +@@ -29,6 +29,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kate/plugins/wordcompletion/CMakeLists.txt.ORI 2012-09-05 16:37:02.425156810 -0400 ++++ kdelibs/kate/plugins/wordcompletion/CMakeLists.txt 2012-09-05 16:37:08.514039285 -0400 +@@ -21,6 +21,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + ##### other data ################################ +--- kdelibs/kate/plugins/isearch/CMakeLists.txt.ORI 2012-09-05 16:38:01.583014723 -0400 ++++ kdelibs/kate/plugins/isearch/CMakeLists.txt 2012-09-05 16:38:07.610898319 -0400 +@@ -22,6 +22,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kate/interfaces/CMakeLists.txt.ORI 2012-09-05 16:39:02.822865446 -0400 ++++ kdelibs/kate/interfaces/CMakeLists.txt 2012-09-05 16:39:11.673700838 -0400 +@@ -21,6 +21,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kdeprint/lpr/CMakeLists.txt.ORI 2012-09-05 16:40:04.179723987 -0400 ++++ kdelibs/kdeprint/lpr/CMakeLists.txt 2012-09-05 16:40:15.471513833 -0400 +@@ -29,6 +29,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kate/plugins/insertfile/CMakeLists.txt.ORI 2012-09-05 16:41:07.687541674 -0400 ++++ kdelibs/kate/plugins/insertfile/CMakeLists.txt 2012-09-05 16:41:13.326436653 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kate/plugins/kdatatool/CMakeLists.txt.ORI 2012-09-05 16:42:09.313393591 -0400 ++++ kdelibs/kate/plugins/kdatatool/CMakeLists.txt 2012-09-05 16:42:15.058286525 -0400 +@@ -24,6 +24,7 @@ + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + +--- kdelibs/kate/part/CMakeLists.txt.ORI 2012-09-05 16:43:06.975318648 -0400 ++++ kdelibs/kate/part/CMakeLists.txt 2012-09-05 16:43:13.228202040 -0400 +@@ -35,6 +35,7 @@ + link_directories( + ${TQT_LIBRARY_DIRS} + ${LUA_LIBRARY_DIRS} ++ ${XRENDER_LIBRARY_DIRS} + ) + + ##### kate (static library) ##################### diff --git a/redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz b/redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz Binary files differnew file mode 100644 index 000000000..523bdfbfd --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz diff --git a/redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch b/redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch new file mode 100644 index 000000000..ba009c708 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch @@ -0,0 +1,40 @@ +diff -Naur kdelibs.orig/kio/kio/kmimemagic.cpp kdelibs/kio/kio/kmimemagic.cpp +--- kdelibs.orig/kio/kio/kmimemagic.cpp 2011-08-11 04:30:08.000000000 +0200 ++++ kdelibs/kio/kio/kmimemagic.cpp 2011-11-19 23:23:41.000000000 +0100 +@@ -1988,8 +1988,9 @@ + return 1; + } + +-/* Maximal length of a line we consider "reasonable". */ +-#define TEXT_MAXLINELEN 300 ++/* Code removed below: conf files with big lines ARE text files, ++ * there is no "reasonable" length ++ */ + + // This code is taken from the "file" command, where it is licensed + // in the "beer-ware license" :-) +@@ -2007,23 +2008,6 @@ + if ((*cp < 8) || (*cp>13 && *cp<32 && *cp!=27 ) || (*cp==0x7F)) + return 0; + +- /* Now, look whether the file consists of lines of +- * "reasonable" length. */ +- +- for (i = 0; i < nbytes;) { +- cp = (unsigned char *) memchr(buf, '\n', nbytes - i); +- if (cp == NULL) { +- /* Don't fail if we hit the end of buffer. */ +- if (i + TEXT_MAXLINELEN >= nbytes) +- break; +- else +- return 0; +- } +- if (cp - buf > TEXT_MAXLINELEN) +- return 0; +- i += (cp - buf + 1); +- buf = cp + 1; +- } + conf->resultBuf = MIME_TEXT_PLAIN; + return 1; + } + diff --git a/redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch b/redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch new file mode 100644 index 000000000..6a5a8c9d4 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch @@ -0,0 +1,53 @@ +commit e9f29cfb2a76657f150ec585fa6775f372d7e460 +Author: Timothy Pearson <[email protected]> +Date: 1343238048 -0500 + + Prevent XDG autostart files from starting multiple times + This resolves Bug 1096 + +diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp +index 4880039..c7feb17 100644 +--- a/kinit/autostart.cpp ++++ b/kinit/autostart.cpp +@@ -214,6 +214,32 @@ AutoStart::loadAutoStartList() + } + m_startList->append(item); + } ++ ++ // Check for duplicate entries and remove if found ++ TQPtrListIterator<AutoStartItem> it1(*m_startList); ++ TQPtrListIterator<AutoStartItem> it2(*m_startList); ++ AutoStartItem *item1; ++ AutoStartItem *item2; ++ while ((item1 = it1.current()) != 0) { ++ bool dupfound1 = false; ++ it2.toFirst(); ++ while ((item2 = it2.current()) != 0) { ++ bool dupfound2 = false; ++ if (item2 != item1) { ++ if (item1->service == item2->service) { ++ m_startList->removeRef(item2); ++ dupfound1 = true; ++ dupfound2 = true; ++ } ++ } ++ if (!dupfound2) { ++ ++it2; ++ } ++ } ++ if (!dupfound1) { ++ ++it1; ++ } ++ } + } + + TQString +@@ -241,7 +267,7 @@ AutoStart::startService() + } + m_started.remove(m_started.begin()); + } +- ++ + // Check for items that don't depend on anything + AutoStartItem *item; + for(item = m_startList->first(); diff --git a/redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch b/redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch new file mode 100644 index 000000000..62ce343a2 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch @@ -0,0 +1,41 @@ +commit 1c06ae32f64450c38f1294b8adda2fd9a6cc98b1 +Author: Darrell Anderson <[email protected]> +Date: 1331690106 -0500 + + Reduce "More Applications" and extra koffice items from TDE menu. + This partially resolves bug report 653. + +diff --git a/kded/applications.menu b/kded/applications.menu +index 4b30a56..380196e 100644 +--- a/kded/applications.menu ++++ b/kded/applications.menu +@@ -272,16 +272,6 @@ + </And> + </Include> + <Menu> +- <Name>Email</Name> +- <Directory>kde-internet-email.directory</Directory> +- <Include> +- <And> +- <Category>Email</Category> +- <Not><Category>X-KDE-More</Category></Not> +- </And> +- </Include> +- </Menu> +- <Menu> + <Name>Terminal</Name> + <Directory>kde-internet-terminal.directory</Directory> + </Menu> +@@ -321,12 +311,6 @@ + <Directory>kde-office.directory</Directory> + <Layout> + <Merge type="menus"/> +- <Filename>kde-koshell.desktop</Filename> +- <Filename>kde-Kontact.desktop</Filename> +- <Separator/> +- <Filename>kde-kword.desktop</Filename> +- <Filename>kde-kspread.desktop</Filename> +- <Filename>kde-kpresenter.desktop</Filename> + <Merge type="files"/> + <Separator/> + <Menuname>More</Menuname> diff --git a/redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch b/redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch new file mode 100644 index 000000000..8c3f43a11 --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch @@ -0,0 +1,21 @@ +commit 87363770ea3fe6167445b6d445ca563f2a3f05fc +Author: Darrell Anderson <[email protected]> +Date: 1339430277 -0500 + + Restore tdesu dialog "Keep password" check box default to disabled/unchecked. + +diff --git a/tdesu/defaults.h b/tdesu/defaults.h +index 4649b2b..7fd724e 100644 +--- a/kdesu/defaults.h ++++ b/kdesu/defaults.h +@@ -13,9 +13,8 @@ + #ifndef __Defaults_h_included__ + #define __Defaults_h_included__ + +-/*const int defTimeout = 120*60;*/ + const int defTimeout = 120*60; + const int defEchoMode = 0; +-const int defKeep = true; ++const int defKeep = false; + + #endif diff --git a/redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch b/redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch new file mode 100644 index 000000000..601bc41ea --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch @@ -0,0 +1,115 @@ +commit dca4c677237b01768f5d6d798a2d918547d2ee8e +Author: Timothy Pearson <[email protected]> +Date: 1341289561 -0500 + + Update iso kioslave to better handle large images + +diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp +index c9e2d43..9ec1f1c 100644 +--- a/kioslave/iso/kiso.cpp ++++ b/kioslave/iso/kiso.cpp +@@ -188,7 +188,7 @@ KIso::~KIso() + } + + /* callback function for libisofs */ +-static int readf(char *buf, long start, long len,void *udata) { ++static int readf(char *buf, long long start, long long len,void *udata) { + + TQIODevice* dev = ( static_cast<KIso*> (udata) )->device(); + +diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c +index e599450..f1db442 100644 +--- a/kioslave/iso/libisofs/isofs.c ++++ b/kioslave/iso/libisofs/isofs.c +@@ -122,7 +122,7 @@ void FreeBootTable(boot_head *boot) { + boot->defentry=NULL; + } + +-int BootImageSize(int media,long len) { ++int BootImageSize(int media,long long len) { + long long ret; + + switch(media & 0xf) { +@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) { + return entry; + } + +-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) { ++int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) { + + char buf[2048], *c, *be; + int i,end=0; +@@ -221,7 +221,7 @@ err: + /** + * Creates the linked list of the volume descriptors + */ +-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) { ++iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) { + + int i; + struct iso_volume_descriptor buf; +@@ -577,7 +577,7 @@ int level=0,joliet=0,dirs,files; + iconv_t iconv_d; + int fd; + +-int readf(char *buf, long start, long len,void *udata) { ++int readf(char *buf, long long start, long long len,void *udata) { + int ret; + + if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret; +diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h +index b8971a4..1d17de4 100644 +--- a/kioslave/iso/libisofs/isofs.h ++++ b/kioslave/iso/libisofs/isofs.h +@@ -50,13 +50,13 @@ typedef struct _rr_entry { + int re; /* relocated */ + char z_algo[2]; /* zizofs algorithm */ + char z_params[2]; /* zizofs parameters */ +- long z_size; /* zizofs real_size */ ++ long long z_size; /* zizofs real_size */ + } rr_entry; + + typedef struct _iso_vol_desc { + struct _iso_vol_desc *next; + struct _iso_vol_desc *prev; +- struct iso_volume_descriptor data; ++ struct iso_volume_descriptor data; + } iso_vol_desc; + + typedef struct _boot_entry { +@@ -78,7 +78,7 @@ typedef struct _boot_head { + /** + * this callback function needs to read 'len' sectors from 'start' into 'buf' + */ +-typedef int readfunc(char *buf,long start, long len,void *); ++typedef int readfunc(char *buf,long long start, long long len,void *); + + /** + * ProcessDir uses this callback +@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs); + * If the function fails, returns NULL + * Don't forget to call FreeISO9660 after using the volume descriptor list! + */ +-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata); ++iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata); + + /** + * Frees the linked list of volume descriptors +@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd); + /** + * Returns the size of the boot image (in 512 byte sectors) + */ +-int BootImageSize(int media,long len); ++int BootImageSize(int media,long long len); + + /** + * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable, +@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot); + /** + * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable! + */ +-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata); ++int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata); + + #ifdef __cplusplus + } //extern "C" diff --git a/redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch b/redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch new file mode 100644 index 000000000..72346c83b --- /dev/null +++ b/redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch @@ -0,0 +1,15 @@ +--- kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp.ORI 2012-12-29 11:25:06.736204632 +0100 ++++ kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp 2012-12-29 11:25:32.731669416 +0100 +@@ -853,10 +853,12 @@ + permacache = d->cc->isPermanent(pc); + } + ++/* + if (!_IPmatchesCN && cp == KSSLCertificateCache::Accept) { + cp = KSSLCertificateCache::Prompt; + // ksv = KSSLCertificate::Ok; + } ++*/ + + // Precondition: cp is one of Reject, Accept or Prompt + switch (cp) { diff --git a/redhat/tdelibs/tdelibs-r14.spec b/redhat/tdelibs/tdelibs-r14.spec new file mode 100755 index 000000000..d57bea3a6 --- /dev/null +++ b/redhat/tdelibs/tdelibs-r14.spec @@ -0,0 +1,316 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE specific variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/trinity +%define tde_libdir %{_libdir}/trinity + +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + + +Name: tdelibs +Version: r14 +Release: 1%{?dist}%{?_variant} +License: GPL +Summary: TDE Libraries +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <[email protected]> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: tdelibs-%{version}.tar.gz +Patch0: git.patch + +## [kdelibs/kio] Disable 'max line length' detection [Bug #656] +Patch10: kdelibs-3.5.13-maxlinelength.patch + +BuildRequires: libtool +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: avahi-devel +BuildRequires: lua-devel +BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: tqt3-devel >= 3.4.0 +BuildRequires: avahi-tqt-devel +BuildRequires: jasper-devel +BuildRequires: libtiff-devel +BuildRequires: OpenEXR-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: glib2-devel +BuildRequires: gamin-devel +BuildRequires: xorg-x11-proto-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: avahi +Requires: tqt3 >= 3.4.0 +Requires: avahi-tqt + +Obsoletes: trinity-kdelibs <= 3.5.13 + +%if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix} = %{version} +Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10 +%endif + +%description +Libraries for the Trinity Desktop Environment: +KDE Libraries included: kdecore (KDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + + +%package devel +Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Obsoletes: trinity-kdelibs-devel <= 3.5.13 +%if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix}-devel = %{version} +Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10 +%endif + +%description devel +This package includes the header files you will need to compile +applications for TDE. + +%package apidocs +Group: Development/Libraries +Summary: %{name} - API documentation +Requires: %{name} = %{version}-%{release} +Obsoletes: trinity-kdelibs-apidocs <= 3.5.13 +%if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix}-apidocs = %{version} +Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10 +%endif + +%description apidocs +This package includes the TDE API documentation in HTML +format for easy browsing + + +%prep +%setup -q -n tdelibs +#patch0 -p1 +%patch10 -p1 + + +%build +export PATH="%{_bindir}:${PATH}" +export LD_LIBRARY_PATH="%{_libdir}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir build +cd build +%cmake \ + -DHAVE_REAL_TQT=ON \ + -DHTML_INSTALL_DIR=%{tde_docdir}/HTML \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=OFF \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + -DWITH_JASPER=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UTEMPTER=ON \ + -DWITH_AVAHI=ON \ + -DWITH_ASPELL=OFF \ + -DWITH_HSPELL=OFF \ + -DWITH_PCRE=ON \ + -DWITH_INOTIFY=ON \ + -DWITH_GAMIN=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%if "%{?_prefix}" != "/usr" +%{_libdir} +%endif +%{tde_libdir} +EOF + +# Moves the XDG configuration files to TDE directory +%if "%{_prefix}" != "/usr" + %__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu" + %__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" +%else + %__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu" +%endif + + +%clean +%__rm -rf %{?buildroot} + + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README +%doc COPYING.LIB +%{_bindir}/artsmessage +%{_bindir}/cupsdconf +%{_bindir}/cupsdoprint +%{_bindir}/dcop +%{_bindir}/dcopclient +%{_bindir}/dcopfind +%{_bindir}/dcopobject +%{_bindir}/dcopquit +%{_bindir}/dcopref +%{_bindir}/dcopserver +%{_bindir}/dcopserver_shutdown +%{_bindir}/dcopstart +%{_bindir}/filesharelist +%{_bindir}/fileshareset +%{_bindir}/imagetops +%{_bindir}/kab2kabc +%{_bindir}/kaddprinterwizard +%{_bindir}/kbuildsycoca +%{_bindir}/kcmshell +%{_bindir}/kconf_update +%{_bindir}/kcookiejar +%{_bindir}/tde-config +%{_bindir}/kde-menu +%{_bindir}/kded +%{_bindir}/tdeinit +%{_bindir}/tdeinit_shutdown +%{_bindir}/tdeinit_wrapper +%{_bindir}/tdesu_stub +%{_bindir}/kdontchangethehostname +%{_bindir}/kdostartupconfig +%{_bindir}/kfile +%{_bindir}/kfmexec +%{_bindir}/khotnewstuff +%{_bindir}/kinstalltheme +%{_bindir}/kio_http_cache_cleaner +%{_bindir}/kio_uiserver +%{_bindir}/kioexec +%{_bindir}/kioslave +%{_bindir}/klauncher +%{_bindir}/kmailservice +%{_bindir}/kmimelist +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_bindir}/ksendbugmail +%{_bindir}/kshell +%{_bindir}/kstartupconfig +%{_bindir}/ktelnetservice +%{_bindir}/ktradertest +%{_bindir}/kwrapper +%{_bindir}/lnusertemp +%{_bindir}/make_driver_db_cups +%{_bindir}/make_driver_db_lpr +%{_bindir}/meinproc +%{_bindir}/networkstatustestservice +%{_bindir}/start_tdeinit +%{_bindir}/start_tdeinit_wrapper +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libtdeinit_*.so +%{_libdir}/lib*.la +%{tde_libdir}/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/autostart/kab2kabc.desktop +%{_datadir}/applnk/kio_iso.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/apps/ksgmltools2/ +%config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons/* +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/icons/crystalsvg/ +%{tde_docdir}/HTML/en/kspell +# remove conflicts with kdelibs-4 +%if "%{?_prefix}" != "/usr" +%{_bindir}/checkXML +%{_bindir}/ksvgtopng +%{_bindir}/kunittestmodrunner +%{_bindir}/preparetips +%{_datadir}/icons/hicolor/index.theme +%{_datadir}/locale/all_languages +%{tde_docdir}/HTML/en/common/* +%else +%exclude %{_bindir}/checkXML +%exclude %{_bindir}/ksvgtopng +%exclude %{_bindir}/kunittestmodrunner +%exclude %{_bindir}/preparetips +%exclude %{_datadir}/config/colors +%exclude %{_datadir}/config/kdebug.areas +%exclude %{_datadir}/config/kdebugrc +%exclude %{_datadir}/config/ksslcalist +%exclude %{_datadir}/config/ui/ui_standards.rc +%exclude %{_datadir}/icons/hicolor/index.theme +%exclude %{_datadir}/locale/all_languages +%exclude %{tde_docdir}/HTML/en/common/* +%endif +%{_sysconfdir}/ld.so.conf.d/trinity.conf + +# Avoid conflict with 'redhat-menus' package +%if "%{_prefix}" == "/usr" +%{_sysconfdir}/xdg/menus/kde-applications.menu +%else +%{_prefix}/etc/xdg/menus/kde-applications.menu +%endif + +# New in TDE 3.5.13 +%{_bindir}/kdetcompmgr + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_bindir}/kconfig_compiler +%{_bindir}/makekdewidgets +%{_datadir}/apps/ksgmltools2/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libtdeinit_*.so +%{_datadir}/cmake/tdelibs.cmake + +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/ + + +%changelog +* Thu Feb 16 2012 Francois Andriot <[email protected]> - r14-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/tdelibs/trinity-kdelibs-3.5.12.spec b/redhat/tdelibs/trinity-kdelibs-3.5.12.spec new file mode 100755 index 000000000..4c31bba3e --- /dev/null +++ b/redhat/tdelibs/trinity-kdelibs-3.5.12.spec @@ -0,0 +1,369 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%define release 10 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_libdir %{_libdir}/kde3 + +# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. +# whereas newer versions use "qt3", "qt3-devel" ... +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 +%define _qt_suffix 3 +%endif + + +Name: trinity-kdelibs +Version: %{version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: TDE Libraries +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <[email protected]> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdelibs-%{version}.tar.gz + +# TDE 3.5.12 patches for RHEL/Fedora build +## [kdelibs/kio/kio] Removes the maximum line length detection +Patch0: kdelibs-3.5.13-maxlinelength.patch +## [kdecore] sets TDE 3.5.12 defaults directories +Patch1: kdelibs-3.5.12-kstandarddirs_trinity.patch +## [kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h +Patch2: kdelibs-3.5.12-fixx11h.patch + +BuildRequires: libtool +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: avahi-devel +BuildRequires: lua-devel +BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: qt%{?_qt_suffix}-devel +BuildRequires: avahi-qt3-devel +BuildRequires: jasper-devel +BuildRequires: libtiff-devel +BuildRequires: OpenEXR-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: glib2-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: avahi +Requires: qt%{?_qt_suffix} +Requires: avahi-qt3 + + +#Provides: kdelibs%{?_qt_suffix} = %{version} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10 +%endif + +%description +Libraries for the Trinity Desktop Environment: +KDE Libraries included: kdecore (KDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + + +%package devel +Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Provides: kdelibs%{?_qt_suffix}-devel = %{version} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10 +%endif + +%description devel +This package includes the header files you will need to compile +applications for TDE. + +%package apidocs +Group: Development/Libraries +Summary: %{name} - API documentation +Requires: %{name} = %{version}-%{release} +Provides: kdelibs%{?_qt_suffix}-apidocs = %{version} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10 +%endif + +%description apidocs +This package includes the TDE API documentation in HTML +format for easy browsing + + +%prep +%setup -q -n kdelibs +%patch0 -p1 +%patch1 -p1 +%patch2 -p3 + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LD_LIBRARY_PATH="%{_libdir}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +# On older RHEL, libXrandr is too old so krandr cannot be compiled. +# Kspell2 does not compile either. +%if 0%{?rhel} && 0%{?rhel} <= 5 +export DO_NOT_COMPILE="krandr" +%endif + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings --enable-final \ + --disable-fast-malloc \ + --enable-cups \ + --enable-mitshm \ + --enable-pie \ + --enable-sendfile \ + --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \ + --with-alsa \ + --without-aspell \ + --without-hspell \ + --disable-libfam \ + --enable-dnotify \ + --enable-inotify \ + --with-utempter \ + --with-jasper \ + --with-openexr \ + --with-xinerama \ + --enable-closure \ + --with-extra-includes=%{_includedir}/tqt + +# Do NOT use %{?_smp_mflags} for this package, or it will fail to build ! +%__make + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} + +%if "%{?_prefix}" != "/usr" +%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d" +cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf" +%{_libdir} +EOF +%endif + +# Moves the XDG configuration files to TDE directory +%if "%{_prefix}" != "/usr" +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" +%else +%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu" +%endif + + +%clean +%__rm -rf %{?buildroot} + + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING* README TODO +%{_bindir}/artsmessage +%{_bindir}/cupsdconf +%{_bindir}/cupsdoprint +%{_bindir}/dcop +%{_bindir}/dcopclient +%{_bindir}/dcopfind +%{_bindir}/dcopobject +%{_bindir}/dcopquit +%{_bindir}/dcopref +%{_bindir}/dcopserver +%{_bindir}/dcopserver_shutdown +%{_bindir}/dcopstart +%{_bindir}/filesharelist +%{_bindir}/fileshareset +%{_bindir}/imagetops +%{_bindir}/kab2kabc +%{_bindir}/kaddprinterwizard +%{_bindir}/kbuildsycoca +%{_bindir}/kcmshell +%{_bindir}/kconf_update +%{_bindir}/kcookiejar +%{_bindir}/kde-config +%{_bindir}/kde-menu +%{_bindir}/kded +%{_bindir}/kdeinit +%{_bindir}/kdeinit_shutdown +%{_bindir}/kdeinit_wrapper +%{_bindir}/kdesu_stub +%{_bindir}/kdontchangethehostname +%{_bindir}/kdostartupconfig +%{_bindir}/kfile +%{_bindir}/kfmexec +%{_bindir}/khotnewstuff +%{_bindir}/kinstalltheme +%{_bindir}/kio_http_cache_cleaner +%{_bindir}/kio_uiserver +%{_bindir}/kioexec +%{_bindir}/kioslave +%{_bindir}/klauncher +%{_bindir}/kmailservice +%{_bindir}/kmimelist +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_bindir}/ksendbugmail +%{_bindir}/kshell +%{_bindir}/kstartupconfig +%{_bindir}/ktelnetservice +%{_bindir}/ktradertest +%{_bindir}/kwrapper +%{_bindir}/lnusertemp +%{_bindir}/make_driver_db_cups +%{_bindir}/make_driver_db_lpr +%{_bindir}/meinproc +%{_bindir}/networkstatustestservice +%{_bindir}/start_kdeinit +%{_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/lib*.la +%{tde_libdir}/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/autostart/kab2kabc.desktop +%{_datadir}/applnk/kio_iso.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/apps/ksgmltools2/ +%config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons/* +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/icons/crystalsvg/ +%{tde_docdir}/HTML/en/kspell +# remove conflicts with kdelibs-4 +%if "%{?_prefix}" != "/usr" +%{_bindir}/checkXML +%{_bindir}/ksvgtopng +%{_bindir}/kunittestmodrunner +%{_bindir}/preparetips +%{_datadir}/icons/hicolor/index.theme +%{_datadir}/locale/all_languages +%{tde_docdir}/HTML/en/common/* +%else +%exclude %{_bindir}/checkXML +%exclude %{_bindir}/ksvgtopng +%exclude %{_bindir}/kunittestmodrunner +%exclude %{_bindir}/preparetips +%exclude %{_datadir}/config/colors +%exclude %{_datadir}/config/kdebug.areas +%exclude %{_datadir}/config/kdebugrc +%exclude %{_datadir}/config/ksslcalist +%exclude %{_datadir}/config/ui/ui_standards.rc +%exclude %{_datadir}/icons/hicolor/index.theme +%exclude %{_datadir}/locale/all_languages +%exclude %{tde_docdir}/HTML/en/common/* +%endif +# ld.so.conf needed only if installed under '/opt/trinity' +%if "%{?_prefix}" != "/usr" +%{_sysconfdir}/ld.so.conf.d/trinity.conf +%endif + +# Avoid conflict with 'redhat-menus' package +%if "%{_prefix}" == "/usr" +%{_sysconfdir}/xdg/menus/kde-applications.menu +%else +%{_prefix}/etc/xdg/menus/kde-applications.menu +%endif + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_bindir}/kconfig_compiler +%{_bindir}/makekdewidgets +%{_datadir}/apps/ksgmltools2/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libkdeinit_*.so + +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/ +%{tde_docdir}/HTML/en/kdelibs* + + +%changelog +* Fri Dec 09 2011 Francois Andriot <[email protected]> - 3.5.12-10 +- Fix conflict with distro-provided KDE +- Fix HTML directory location +- Change defaults TDE directory to '/etc/trinity' and '~/.trinity' +- Removes 'ld.so.conf.d' when installed under '/usr' + +* Sun Nov 29 2011 Francois Andriot <[email protected]> - 3.5.12-9 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE +- Disable 'max line length' detection +- Add missing BuildRequires + +* Fri Sep 16 2011 Francois Andriot <[email protected]> - 3.5.12-8 +- Add support for RHEL 5. + +* Thu Sep 15 2011 Francois Andriot <[email protected]> - 3.5.12-7 +- Add missings 'BuildRequires' +- Re-add lost 'ld.so.conf' file + +* Mon Sep 12 2011 Francois Andriot <[email protected]> - 3.5.12-6 +- Add "Group" field + +* Sun Sep 04 2011 Francois Andriot <[email protected]> - 3.5.12-5 +- Import to GIT +- Removes cmake stuff, build with autotools only + +* Tue Aug 23 2011 Francois Andriot <[email protected]> - 3.5.12-4 +- Add missing BuildRequires + +* Mon Aug 22 2011 Francois Andriot <[email protected]> - 3.5.12-3 +- Correct macro to install under "/opt", if desired + +* Sun Dec 19 2010 Francois Andriot <[email protected]> - 3.5.12-2 +- Rebuilt + +* Fri Dec 17 2010 Francois Andriot <[email protected]> - 3.5.12-1 +- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity) +- Add '--with-extra-includes=%{_includedir}/tqt' + +* Wed Dec 14 2010 Francois Andriot <[email protected]> - 3.5.12-0 +- Initial version diff --git a/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec b/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec new file mode 100755 index 000000000..82df03623 --- /dev/null +++ b/redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec @@ -0,0 +1,434 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +Name: trinity-tdelibs +Version: 3.5.13.1 +Release: 2%{?dist}%{?_variant} +License: GPL +Summary: TDE Libraries +Group: Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <[email protected]> +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdelibs-3.5.13.1.tar.gz + +# [kdelibs] Security popup always appear on invalid SSL certificate, even when set +# to "always accept" [Bug #1287] +Patch1: kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch + +Obsoletes: tdelibs < %{version}-%{release} +Provides: tdelibs = %{version}-%{release} +Obsoletes: trinity-kdelibs < %{version}-%{release} +Provides: trinity-kdelibs = %{version}-%{release} +Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} +Provides: trinity-kdelibs-apidocs = %{version}-%{release} + + +BuildRequires: cmake >= 2.8 +BuildRequires: libtool +BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-arts-devel >= %{version} +BuildRequires: krb5-devel +BuildRequires: libxslt-devel +BuildRequires: cups-devel +BuildRequires: libart_lgpl-devel +BuildRequires: pcre-devel +BuildRequires: openssl-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: qt3-devel +BuildRequires: libtiff-devel +BuildRequires: glib2-devel +BuildRequires: gamin-devel +BuildRequires: aspell +BuildRequires: aspell-devel +# LUA support are not ready yet +#BuildRequires: lua-devel + + + +# BZIP2 support +%if 0%{?suse_version} +BuildRequires: libbz2-devel +%else +BuildRequires: bzip2-devel +%endif + +# UTEMPTER support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libutempter-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: utempter +%endif +%if 0%{?suse_version} +BuildRequires: utempter-devel +%endif + +# HSPELL support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_hspell 1 +BuildRequires: hspell-devel +%endif + +# JASPER support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_jasper 1 +%if 0%{?suse_version} +BuildRequires: libjasper-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}jasper-devel +%endif +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: jasper-devel +%endif +%endif + +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: trinity-avahi-tqt-devel >= %{version} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: trinity-avahi-tqt-devel >= %{version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + +# OPENEXR support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_openexr 1 +BuildRequires: OpenEXR-devel +%endif + +# LIBTOOL +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}ltdl-devel +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: libtool-ltdl-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: libtool +%endif + +# X11 support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: x11-proto-devel +BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: xorg-x11-proto-devel +BuildRequires: libXcomposite-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-devel +%endif + +# ICEAUTH +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +Requires: iceauth +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} +Requires: xorg-x11-server-utils +%endif +%if 0%{?rhel} == 4 +Requires: xorg-x11 +%endif + +Requires: trinity-tqtinterface >= %{version} +Requires: trinity-arts >= %{version} +Requires: qt3 >= 3.3.8.d + +%description +Libraries for the Trinity Desktop Environment: +TDE Libraries included: tdecore (TDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO +%{tde_bindir}/artsmessage +%{tde_bindir}/cupsdconf +%{tde_bindir}/cupsdoprint +%{tde_bindir}/dcop +%{tde_bindir}/dcopclient +%{tde_bindir}/dcopfind +%{tde_bindir}/dcopobject +%{tde_bindir}/dcopquit +%{tde_bindir}/dcopref +%{tde_bindir}/dcopserver +%{tde_bindir}/dcopserver_shutdown +%{tde_bindir}/dcopstart +%{tde_bindir}/filesharelist +%{tde_bindir}/fileshareset +%{tde_bindir}/imagetops +%{tde_bindir}/kab2kabc +%{tde_bindir}/kaddprinterwizard +%{tde_bindir}/kbuildsycoca +%{tde_bindir}/kcmshell +%{tde_bindir}/kconf_update +%{tde_bindir}/kcookiejar +%{tde_bindir}/kde-config +%{tde_bindir}/kde-menu +%{tde_bindir}/kded +%{tde_bindir}/kdeinit +%{tde_bindir}/kdeinit_shutdown +%{tde_bindir}/kdeinit_wrapper +%{tde_bindir}/kdesu_stub +%{tde_bindir}/kdontchangethehostname +%{tde_bindir}/kdostartupconfig +%{tde_bindir}/kfile +%{tde_bindir}/kfmexec +%{tde_bindir}/khotnewstuff +%{tde_bindir}/kinstalltheme +%{tde_bindir}/kio_http_cache_cleaner +%{tde_bindir}/kio_uiserver +%{tde_bindir}/kioexec +%{tde_bindir}/kioslave +%{tde_bindir}/klauncher +%{tde_bindir}/kmailservice +%{tde_bindir}/kmimelist +%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper +%{tde_bindir}/ksendbugmail +%{tde_bindir}/kshell +%{tde_bindir}/kstartupconfig +%{tde_bindir}/ktelnetservice +%{tde_bindir}/ktradertest +%{tde_bindir}/kwrapper +%{tde_bindir}/lnusertemp +%{tde_bindir}/make_driver_db_cups +%{tde_bindir}/make_driver_db_lpr +%{tde_bindir}/meinproc +%{tde_bindir}/networkstatustestservice +%{tde_bindir}/start_kdeinit +%{tde_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{tde_bindir}/kgrantpty +%{tde_tdelibdir}/* +%{tde_libdir}/lib*.so.* +%{tde_libdir}/lib[kt]deinit_*.la +%{tde_libdir}/lib[kt]deinit_*.so +%{tde_datadir}/applications/kde/*.desktop +%{tde_datadir}/autostart/kab2kabc.desktop +%{tde_datadir}/applnk/kio_iso.desktop +%{tde_datadir}/apps/* +%exclude %{tde_datadir}/apps/ksgmltools2/ +%config(noreplace) %{tde_datadir}/config/* +%{tde_datadir}/emoticons/* +%{tde_datadir}/icons/default.kde +%{tde_datadir}/mimelnk/magic +%{tde_datadir}/mimelnk/*/*.desktop +%{tde_datadir}/services/* +%{tde_datadir}/servicetypes/* +%{tde_datadir}/icons/crystalsvg/ +%{tde_tdedocdir}/HTML/en/kspell/ +# remove conflicts with kdelibs-4 +%if "%{?tde_prefix}" != "/usr" +%{tde_bindir}/checkXML +%{tde_bindir}/ksvgtopng +%{tde_bindir}/kunittestmodrunner +%{tde_bindir}/preparetips +%{tde_datadir}/icons/hicolor/index.theme +%{tde_datadir}/locale/all_languages +%{tde_tdedocdir}/HTML/en/common/* +%{_sysconfdir}/ld.so.conf.d/trinity.conf +%else +%exclude %{tde_bindir}/checkXML +%exclude %{tde_bindir}/ksvgtopng +%exclude %{tde_bindir}/kunittestmodrunner +%exclude %{tde_bindir}/preparetips +%exclude %{tde_datadir}/config/colors +%exclude %{tde_datadir}/config/kdebug.areas +%exclude %{tde_datadir}/config/kdebugrc +%exclude %{tde_datadir}/config/ksslcalist +%exclude %{tde_datadir}/config/ui/ui_standards.rc +%exclude %{tde_datadir}/icons/hicolor/index.theme +%exclude %{tde_datadir}/locale/all_languages +%exclude %{tde_tdedocdir}/HTML/en/common/* +%endif + +# Avoid conflict with 'redhat-menus' package +%if "%{tde_prefix}" == "/usr" +%{_sysconfdir}/xdg/menus/kde-applications.menu +%else +%{tde_prefix}/etc/xdg/menus/kde-applications.menu +%endif + +# New in TDE 3.5.13 +%{tde_bindir}/kdetcompmgr + +%pre +# Bug 1074 +if [ -d %{tde_datadir}/locale/all_languages ]; then + rm -rf %{tde_datadir}/locale/all_languages +fi + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +########## + +%package devel +Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +Obsoletes: tdelibs-devel < %{version}-%{release} +Provides: tdelibs-devel = %{version}-%{release} +Obsoletes: trinity-kdelibs-devel < %{version}-%{release} +Provides: trinity-kdelibs-devel = %{version}-%{release} + +%description devel +This package includes the header files you will need to compile +applications for TDE. + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/dcopidl* +%{tde_bindir}/kconfig_compiler +%{tde_bindir}/makekdewidgets +%{tde_datadir}/apps/ksgmltools2/ +%{tde_tdeincludedir}/* +%{tde_libdir}/*.la +%{tde_libdir}/*.so +%{tde_libdir}/*.a +%exclude %{tde_libdir}/libkdeinit_*.la +%exclude %{tde_libdir}/libkdeinit_*.so + +# New in TDE 3.5.13 +%{tde_datadir}/cmake/kdelibs.cmake + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +########## + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + +########## + +%prep +%setup -q -n kdelibs-3.5.13.1 +%patch1 -p1 + + +%build +unset QTDIR || : ; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" + +# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet +export LD_LIBRARY_PATH="%{tde_libdir}" + +if [ -d /usr/X11R6 ]; then + export CXXFLAGS="${CXXFLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include" +fi + + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DDOC_INSTALL_DIR=%{tde_docdir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=ON \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + %{?with_jasper:-DWITH_JASPER=ON} \ + %{?with_hspell:-DWITH_HSPELL=ON} \ + %{?with_openexr:-DWITH_OPENEXR=ON} \ + %{?with_avahi:-DWITH_AVAHI=ON} \ +%if 0%{?rhel} == 4 + -DWITH_PCRE=OFF \ + -DWITH_INOTIFY=OFF \ +%else + -DWITH_PCRE=ON \ + -DWITH_INOTIFY=ON \ +%endif + -DWITH_UTEMPTER=ON \ + -DWITH_ASPELL=ON \ + -DWITH_GAMIN=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%if "%{?tde_prefix}" != "/usr" +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%{tde_libdir} +EOF +%endif + +# Moves the XDG configuration files to TDE directory +%if "%{tde_prefix}" != "/usr" +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" +%else +%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu" +%endif + + +%clean +%__rm -rf %{?buildroot} + + +%changelog +* Tue Sep 11 2012 Francois Andriot <[email protected]> - 3.5.13.1-1 +- Initial build for TDE 3.5.13.1 diff --git a/redhat/tdelibs/trinity-kdelibs-3.5.13.spec b/redhat/tdelibs/trinity-kdelibs-3.5.13.spec new file mode 100755 index 000000000..0392162bf --- /dev/null +++ b/redhat/tdelibs/trinity-kdelibs-3.5.13.spec @@ -0,0 +1,520 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +Name: trinity-tdelibs +Version: 3.5.13 +Release: 12%{?dist}%{?_variant} +License: GPL +Summary: TDE Libraries +Group: Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <[email protected]> +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kdelibs-%{version}.tar.gz + +Obsoletes: tdelibs < %{version}-%{release} +Provides: tdelibs = %{version}-%{release} +Obsoletes: trinity-kdelibs < %{version}-%{release} +Provides: trinity-kdelibs = %{version}-%{release} +Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} +Provides: trinity-kdelibs-apidocs = %{version}-%{release} + +## [kdelibs/kio] Disable 'max line length' detection [Bug #656] +Patch10: kdelibs-3.5.13-maxlinelength.patch +## [kdelibs/kjs] Enable pcre support in kdelibs [Bug #569] +Patch11: kdelibs-3.5.13-enable_pcre.patch +## [kdelibs/kate] Updated syntax highlighting files [Bug #764] +Patch12: kdelibs-3.5.13-kate_syntax.patch.gz +## [kdelibs] Adds Inotify support (backport commit 24f144fa) +Patch13: kdelibs-3.5.13-add_inotify_support.patch +## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349) +Patch14: kdelibs-3.5.13-enable_fam_gamin.patch +## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories [Bug #766] [Commit #e131f10b] +Patch15: kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch +## [kdelibs/kdeprint] Fix add printer [Bug #383] +Patch16: kdelibs-3.5.13-fix_add_printer.patch +## [kdelibs/kio/kdirwatch] Fix "Konqueror: Does not update file pane with file changes" [Bug #756] +Patch17: kdelibs-3.5.13-fix_kdirwatch.patch +## [kdelibs/dcop] Fix 'dcoptypes.h' for compilation with GCC 4.7 +Patch18: kdelibs-3.5.13-fix_dcoptypes_h.patch +## [tdelibs] Fix konq filter in list view mode. [Commit #06b51484] +Patch19: kdelibs-3.5.13-fix_konq_filter.patch +## [tdelibs] Fix tdesu internal pathing [Bug #766] [Commit #e131f10b] +Patch20: kdelibs-3.5.13-fix_tdesu_internal_pathing.patch +## [tdelibs] Fix slider drawing on external paint devices [Commit #a1c30c14] +Patch21: kdelibs-3.5.13-fix_slide_drawing.patch +## [tdelibs] Reduce "More Applications" and extra koffice items from TDE menu. [Commit #1c06ae32] +Patch22: kdelibs-3.5.13-reduce_more_applications.patch +## [tdelibs] Fix creation of profile directory in system root [Bug #293] [Commit #049525ee] +Patch23: kdelibs-3.5.13-fix_creation_of_profile_directory.patch +## [tdelibs] Initialize X11 threading when kinit is used to launch a program [Bug #812] [Commit #6c806af1] +Patch24: kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch +## [tdelibs] Fix composition extension detection [Commit #41ea89f7] +Patch25: kdelibs-3.5.13-fix_composition_extension_detection.patch +## [tdelibs] Fix KTempFile not obeying special bits on file creation [Bug #349] [Commit #9068fffd] +Patch26: kdelibs-3.5.13-fix_ktempfile_special_bits.patch +## [tdelibs] Add dynamic label support to kpassworddialog [Commit #3c752316] +Patch27: kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch +## [tdelibs] Fix FTBFS - incomplete build kspell2 [Bug #657] [Commit #3e284fad] +Patch28: kdelibs-3.5.13-fix_build_kspell2.patch +## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7] +Patch29: kdelibs-3.5.13-fix_iso_kioslave.patch +## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5] +Patch30: kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch +## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69] +Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch +## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677] +Patch33: kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch +## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770] +Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch +## [tdelibs] Fix language switch inside application [Bug #1074] +Patch35: kdelibs-3.5.13-fix_all_languages_installation.patch +## [tdelibs] Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb] +Patch36: kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch +## [tdelibs] Fix xrender include dir +Patch37: kdelibs-3.5.13-fix_xrender_libdir.patch + +BuildRequires: cmake >= 2.8 +BuildRequires: libtool +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: avahi-tqt-devel >= 3.5.13 +BuildRequires: krb5-devel +BuildRequires: libxslt-devel +BuildRequires: cups-devel +BuildRequires: libart_lgpl-devel +BuildRequires: pcre-devel +BuildRequires: openssl-devel +BuildRequires: gcc-c++ +BuildRequires: alsa-lib-devel +BuildRequires: libidn-devel +BuildRequires: qt3-devel +BuildRequires: libtiff-devel +BuildRequires: glib2-devel +BuildRequires: gamin-devel +BuildRequires: aspell +BuildRequires: aspell-devel +BuildRequires: OpenEXR-devel +# LUA support are not ready yet +#BuildRequires: lua-devel + +%if 0%{?suse_version} +BuildRequires: utempter-devel +BuildRequires: libbz2-devel +%else +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +%endif + +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-devel +%else + +# Hspell support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_hspell 1 +BuildRequires: hspell-devel +%endif + +# Jasper support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_jasper 1 +%if 0%{?suse_version} +BuildRequires: libjasper-devel +%else +BuildRequires: jasper-devel +%endif +%endif + + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +BuildRequires: %{_lib}ltdl-devel +BuildRequires: x11-proto-devel +BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel +Requires: %{_lib}avahi-client3 +%else +BuildRequires: avahi-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: libXcomposite-devel +%endif + +Requires: avahi +%endif + +Requires: tqtinterface >= 3.5.13 +Requires: trinity-arts >= 3.5.13 +Requires: qt3 + + +%description +Libraries for the Trinity Desktop Environment: +TDE Libraries included: tdecore (TDE core library), kdeui (user interface), +kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking), +kspell (spelling checker), jscript (javascript), kab (addressbook), +kimgio (image manipulation). + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO +%{tde_bindir}/artsmessage +%{tde_bindir}/cupsdconf +%{tde_bindir}/cupsdoprint +%{tde_bindir}/dcop +%{tde_bindir}/dcopclient +%{tde_bindir}/dcopfind +%{tde_bindir}/dcopobject +%{tde_bindir}/dcopquit +%{tde_bindir}/dcopref +%{tde_bindir}/dcopserver +%{tde_bindir}/dcopserver_shutdown +%{tde_bindir}/dcopstart +%{tde_bindir}/filesharelist +%{tde_bindir}/fileshareset +%{tde_bindir}/imagetops +%{tde_bindir}/kab2kabc +%{tde_bindir}/kaddprinterwizard +%{tde_bindir}/kbuildsycoca +%{tde_bindir}/kcmshell +%{tde_bindir}/kconf_update +%{tde_bindir}/kcookiejar +%{tde_bindir}/kde-config +%{tde_bindir}/kde-menu +%{tde_bindir}/kded +%{tde_bindir}/kdeinit +%{tde_bindir}/kdeinit_shutdown +%{tde_bindir}/kdeinit_wrapper +%{tde_bindir}/kdesu_stub +%{tde_bindir}/kdontchangethehostname +%{tde_bindir}/kdostartupconfig +%{tde_bindir}/kfile +%{tde_bindir}/kfmexec +%{tde_bindir}/khotnewstuff +%{tde_bindir}/kinstalltheme +%{tde_bindir}/kio_http_cache_cleaner +%{tde_bindir}/kio_uiserver +%{tde_bindir}/kioexec +%{tde_bindir}/kioslave +%{tde_bindir}/klauncher +%{tde_bindir}/kmailservice +%{tde_bindir}/kmimelist +%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper +%{tde_bindir}/ksendbugmail +%{tde_bindir}/kshell +%{tde_bindir}/kstartupconfig +%{tde_bindir}/ktelnetservice +%{tde_bindir}/ktradertest +%{tde_bindir}/kwrapper +%{tde_bindir}/lnusertemp +%{tde_bindir}/make_driver_db_cups +%{tde_bindir}/make_driver_db_lpr +%{tde_bindir}/meinproc +%{tde_bindir}/networkstatustestservice +%{tde_bindir}/start_kdeinit +%{tde_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{tde_bindir}/kgrantpty +%{tde_tdelibdir}/* +%{tde_libdir}/lib*.so.* +%{tde_libdir}/lib[kt]deinit_*.la +%{tde_libdir}/lib[kt]deinit_*.so +%{tde_datadir}/applications/kde/*.desktop +%{tde_datadir}/autostart/kab2kabc.desktop +%{tde_datadir}/applnk/kio_iso.desktop +%{tde_datadir}/apps/* +%exclude %{tde_datadir}/apps/ksgmltools2/ +%config(noreplace) %{tde_datadir}/config/* +%{tde_datadir}/emoticons/* +%{tde_datadir}/icons/default.kde +%{tde_datadir}/mimelnk/magic +%{tde_datadir}/mimelnk/*/*.desktop +%{tde_datadir}/services/* +%{tde_datadir}/servicetypes/* +%{tde_datadir}/icons/crystalsvg/ +%{tde_tdedocdir}/HTML/en/kspell/ +# remove conflicts with kdelibs-4 +%if "%{?tde_prefix}" != "/usr" +%{tde_bindir}/checkXML +%{tde_bindir}/ksvgtopng +%{tde_bindir}/kunittestmodrunner +%{tde_bindir}/preparetips +%{tde_datadir}/icons/hicolor/index.theme +%{tde_datadir}/locale/all_languages +%{tde_tdedocdir}/HTML/en/common/* +%{_sysconfdir}/ld.so.conf.d/trinity.conf +%else +%exclude %{tde_bindir}/checkXML +%exclude %{tde_bindir}/ksvgtopng +%exclude %{tde_bindir}/kunittestmodrunner +%exclude %{tde_bindir}/preparetips +%exclude %{tde_datadir}/config/colors +%exclude %{tde_datadir}/config/kdebug.areas +%exclude %{tde_datadir}/config/kdebugrc +%exclude %{tde_datadir}/config/ksslcalist +%exclude %{tde_datadir}/config/ui/ui_standards.rc +%exclude %{tde_datadir}/icons/hicolor/index.theme +%exclude %{tde_datadir}/locale/all_languages +%exclude %{tde_tdedocdir}/HTML/en/common/* +%endif + +# Avoid conflict with 'redhat-menus' package +%if "%{tde_prefix}" == "/usr" +%{_sysconfdir}/xdg/menus/kde-applications.menu +%else +%{tde_prefix}/etc/xdg/menus/kde-applications.menu +%endif + +# New in TDE 3.5.13 +%{tde_bindir}/kdetcompmgr + +%pre +# Bug 1074 +if [ -d %{tde_datadir}/locale/all_languages ]; then + rm -rf %{tde_datadir}/locale/all_languages +fi + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +########## + +%package devel +Summary: %{name} - Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +Obsoletes: tdelibs-devel < %{version}-%{release} +Provides: tdelibs-devel = %{version}-%{release} +Obsoletes: trinity-kdelibs-devel < %{version}-%{release} +Provides: trinity-kdelibs-devel = %{version}-%{release} + +%description devel +This package includes the header files you will need to compile +applications for TDE. + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/dcopidl* +%{tde_bindir}/kconfig_compiler +%{tde_bindir}/makekdewidgets +%{tde_datadir}/apps/ksgmltools2/ +%{tde_tdeincludedir}/* +%{tde_libdir}/*.la +%{tde_libdir}/*.so +%{tde_libdir}/*.a +%exclude %{tde_libdir}/libkdeinit_*.la +%exclude %{tde_libdir}/libkdeinit_*.so + +# New in TDE 3.5.13 +%{tde_datadir}/cmake/kdelibs.cmake + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +########## + +%if 0%{?suse_version} +%debug_package +%endif + +########## + +%prep +%setup -q -n kdelibs +%patch10 -p1 +%patch11 -p0 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 + + +%build +unset QTDIR || : ; . /etc/profile.d/qt?.sh +export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" + +# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet +export LD_LIBRARY_PATH="%{tde_libdir}" + + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DDOC_INSTALL_DIR=%{tde_docdir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=ON \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + %{?with_jasper:-DWITH_JASPER=ON} \ + %{?with_hspell:-DWITH_HSPELL=ON} \ +%if 0%{?rhel} == 4 + -DWITH_OPENEXR=OFF \ + -DWITH_PCRE=OFF \ + -DWITH_INOTIFY=OFF \ + -DWITH_AVAHI=OFF \ +%else + -DWITH_OPENEXR=ON \ + -DWITH_PCRE=ON \ + -DWITH_INOTIFY=ON \ + -DWITH_AVAHI=ON \ +%endif + -DWITH_UTEMPTER=ON \ + -DWITH_ASPELL=ON \ + -DWITH_GAMIN=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%if "%{?tde_prefix}" != "/usr" +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%{tde_libdir} +EOF +%endif + +# Moves the XDG configuration files to TDE directory +%if "%{tde_prefix}" != "/usr" +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" +%else +%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu" +%endif + + +%clean +%__rm -rf %{?buildroot} + + +%changelog +* Sat Aug 18 2012 Francois Andriot <[email protected]> - 3.5.13-12 +- Fix language switch inside application [Bug #1074] +- Removes patch 'Add ability to set KLed off color [Commit #513ffc6e]' +- Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb] + +* Sun Jul 22 2012 Francois Andriot <[email protected]> - 3.5.13-11 +- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5] +- Add ability to set KLed off color [Commit #513ffc6e] +- Fix spinbox text entry when base is not 10 [Commit #d1c71f69] +- Update iso kioslave to better handle large images [Commit #dca4c677] +- Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770] + +* Tue Jun 26 2012 Francois Andriot <[email protected]> - 3.5.13-10 +- Renames to 'trinity-tdelibs' +- Enable 'aspell', 'hspell' and 'libidn' +- Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7] + +* Tue Jun 19 2012 Francois Andriot <[email protected]> - 3.5.13-9 +- Renames to 'tdelibs' +- Fix 'ld.so.conf' file +- Fix konq filter in list view mode. [Commit #06b51484] +- Fix tdesu internal pathing [Bug #766] [Commit #e131f10b] +- Fix slider drawing on external paint devices [Commit #a1c30c14] +- Reduce "More Applications" and extra koffice items from TDE menu. [Commit #1c06ae32] +- Fix creation of profile directory in system root [Bug #293] [Commit #049525ee] +- Initialize X11 threading when kinit is used to launch a program [Bug #812] [Commit #6c806af1] +- Fix composition extension detection [Commit #41ea89f7] +- Fix KTempFile not obeying special bits on file creation [Bug #349] [Commit #9068fffd] +- Add dynamic label support to kpassworddialog [Commit #3c752316] +- Fix FTBFS - incomplete build kspell2 [Bug #657] [Commit #3e284fad] + +* Tue Apr 24 2012 Francois Andriot <[email protected]> - 3.5.13-8 +- Fix "Konqueror: Does not update file pane with file changes" [Bug #756] +- Fix compilation with GCC 4.7 + +* Sat Jan 21 2012 Francois Andriot <[email protected]> - 3.5.13-7 +- Fix UTF8 Encoding for WebDAV directories +- Fix hardcoded path in 'add printer' [Bug #383] + +* Mon Jan 16 2012 Francois Andriot <[email protected]> - 3.5.13-6 +- Adds 'fam' and 'gamin' support + +* Sat Jan 14 2012 Francois Andriot <[email protected]> - 3.5.13-5 +- Adds 'inotify' support + +* Sat Dec 31 2011 Francois Andriot <[email protected]> - 3.5.13-4 +- Enable pcre support in kdelibs [Bug #569] +- Updated Kate syntax highlighting files [Bug #764] +- Disable 'max line length' detection [Bug #656] +- Add 'Provides: kdelibs3' to avoid installing distro-provided KDE3 libraries + +* Sat Nov 12 2011 Francois Andriot <[email protected]> - 3.5.13-3 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE + +* Thu Nov 03 2011 Francois Andriot <[email protected]> - 3.5.13-2 +- Add missing BuildRequires + +* Sun Oct 30 2011 Francois Andriot <[email protected]> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Wed Sep 02 2011 Francois Andriot <[email protected]> - 3.5.13-0 +- Import to GIT |