diff options
Diffstat (limited to 'gentoo/trinity-base/kdebase-kioslaves')
6 files changed, 264 insertions, 0 deletions
diff --git a/gentoo/trinity-base/kdebase-kioslaves/Manifest b/gentoo/trinity-base/kdebase-kioslaves/Manifest new file mode 100644 index 000000000..381340c4b --- /dev/null +++ b/gentoo/trinity-base/kdebase-kioslaves/Manifest @@ -0,0 +1,2 @@ +DIST kdebase-3.5.13.1.tar.gz 29403228 SHA256 ddd4bd4b508ad027b9d1af2701c6ba64bfc9f8f1d32099e6dd5e7866714f759e SHA512 e1aac19c941a5f2b43a57928fdb43e5ebd646f49c60911d9d317550df96642870792c4e77ecd06e123244e2425ccd4bcb00f0a21011ba7e651d7fcf4553e79cf WHIRLPOOL 931debbf6a65c280221025dcbc02cbb3387b66eb72eddd28a510ee8f97075cd2cc96535dde25d0a32280c399e4a868e9c027772f5d28e7e79b7c1a9080c58034 +DIST kdebase-trinity-3.5.13.2.tar.xz 25890636 SHA256 b9d552226daff64437dfb9699669b95dd7ebc2ca7c43755ba71c10cc6c9ed789 SHA512 df545d44c7d4550d1d77ff6504572b622853c2b8d80062b1aee1a5bdca19f0e708cde35cff54cf2d5098f06a41bde0c89522a3958dea9bb18205dea87c11b797 WHIRLPOOL 79144273bc7985c59a593a3394b12a2053532d2c4c890ce96adad21f6de0413baf3c6270d6d06173ec4546b20d401aa0cc81603d01b8ee41dbdefc825b39b2b1 diff --git a/gentoo/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch b/gentoo/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch new file mode 100644 index 000000000..ebde62e50 --- /dev/null +++ b/gentoo/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.1-fix-kioslaves-with-hal.patch @@ -0,0 +1,24 @@ +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 3834f6d..8dc8a3f 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -233,7 +233,6 @@ find_package( TQt ) + find_package( TDE ) + + +-# dbus-tqt need Qt flags + # dbus (kdm, ksmserver) + if( BUILD_KDM OR BUILD_KSMSERVER ) + +@@ -242,6 +241,11 @@ if( BUILD_KDM OR BUILD_KSMSERVER ) + tde_message_fatal( "dbus-1 is required, but was not found on your system" ) + endif( ) + ++endif( ) ++ ++ ++# dbus-tqt (kdm, ksmserver, kioslaves(media)) ++if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) ) + # check for dbus-tqt + pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) + tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) diff --git a/gentoo/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch b/gentoo/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch new file mode 100644 index 000000000..4e981bc91 --- /dev/null +++ b/gentoo/trinity-base/kdebase-kioslaves/files/kdebase-3.5.13.2-fix-mandb-support-in-kio-man.patch @@ -0,0 +1,146 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d36ee0e..e91f8e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,15 +220,6 @@ if( BUILD_STARTKDE ) + endif() + + +-##### Determine whether older manpage support is used ########## +- +-if( EXISTS "/usr/sbin/makewhatis" ) +- set( WITH_MAKEWHATIS "1" ) +- message( STATUS "Selected makewhatis for kio-man on your system" ) +-else() +- message( STATUS "Selected man-db for kio-man on your system" ) +-endif() +- + ##### Checks for a distribution-specific 1st menu item, generally a control center + if(EXISTS "/usr/share/applications/YaST.desktop") + set( KICKOFF_DIST_CONFIG_SHORTCUT1 "/usr/share/applications/YaST.desktop" ) +diff --git a/config.h.cmake b/config.h.cmake +index d41643b..7a86d97 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -182,9 +182,6 @@ + // Defined when wanting ksmserver shutdown debugging timing markers in .xsession-errors + #cmakedefine BUILD_PROFILE_SHUTDOWN 1 + +-// Use makewhatis manpage support +-#cmakedefine WITH_MAKEWHATIS "@WITH_MAKEWHATIS@" +- + // Kickoff menu + #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT1 "@KICKOFF_DIST_CONFIG_SHORTCUT1@" + #cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT2 "@KICKOFF_DIST_CONFIG_SHORTCUT2@" +diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp +index 63fed2e..4da85ba 100644 +--- a/kioslave/man/kio_man.cpp ++++ b/kioslave/man/kio_man.cpp +@@ -580,48 +580,64 @@ char *MANProtocol::readManPage(const char *_filename) + kdDebug(7107) << "resolved to " << filename << endl; + } + lastdir = filename.left(filename.findRev('/')); +- +-#ifdef WITH_MAKEWHATIS +- TQIODevice *fd= KFilterDev::deviceForFile(filename); + +- if ( !fd || !fd->open(IO_ReadOnly)) +- { +- delete fd; +- return 0; +- } +- TQByteArray array(fd->readAll()); +- kdDebug(7107) << "read " << array.size() << endl; +- fd->close(); +- delete fd; ++ size_t len; + +- if (array.isEmpty()) +- return 0; ++ if( hasManRecode() ) { ++ myStdStream = TQString::null; ++ KProcess proc; + +- const int len = array.size(); +- buf = new char[len + 4]; +- tqmemmove(buf + 1, array.data(), len); +-#else +- myStdStream = TQString::null; +- KProcess proc; +- /* TODO: detect availability of 'man --recode' so that this can go +- * upstream */ +- proc << "man" << "--recode" << "UTF-8" << filename; ++ proc << "man" << "--recode" << "UTF-8" << filename; + +- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)), +- this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int))); +- proc.start(KProcess::Block, KProcess::All); ++ TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)), ++ this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int))); ++ proc.start(KProcess::Block, KProcess::All); ++ ++ const TQCString cstr=myStdStream.utf8(); ++ len = cstr.size() != 0 ? cstr.size() - 1 : 0; ++ buf = new char[len + 4]; ++ tqmemmove(buf + 1, cstr.data(), len); ++ } else { ++ TQIODevice *fd= KFilterDev::deviceForFile(filename); ++ ++ if ( !fd || !fd->open(IO_ReadOnly)) ++ { ++ delete fd; ++ return 0; ++ } ++ TQByteArray array(fd->readAll()); ++ kdDebug(7107) << "read " << array.size() << endl; ++ fd->close(); ++ delete fd; ++ ++ if (array.isEmpty()) ++ return 0; ++ ++ len = array.size(); ++ buf = new char[len + 4]; ++ tqmemmove(buf + 1, array.data(), len); ++ } + +- const TQCString cstr=myStdStream.utf8(); +- const int len = cstr.size()-1; +- buf = new char[len + 4]; +- tqmemmove(buf + 1, cstr.data(), len); +-#endif + buf[0]=buf[len]='\n'; // Start and end with a end of line + buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end + } + return buf; + } + ++bool MANProtocol::hasManRecode(bool force) { ++ static bool rv=0, wasChecked=0; ++ if ( !wasChecked || force ) { ++ KProcess proc; ++ // lets' try to recode the man page of man. ++ // that should be enough to be sure that man-db is installed. ++ proc << "man" << "--recode" << "UTF-8" << "man"; ++ ++ proc.start(KProcess::Block, KProcess::All); ++ rv = proc.exitStatus() == 0; ++ wasChecked = 1; ++ } ++ return rv; ++} + + void MANProtocol::outputError(const TQString& errmsg) + { +diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h +index 617245f..1a28dcf 100644 +--- a/kioslave/man/kio_man.h ++++ b/kioslave/man/kio_man.h +@@ -66,6 +66,7 @@ private slots: + private: + void checkManPaths(); + TQStringList manDirectories(); ++ static bool hasManRecode(bool force=0); + TQMap<TQString, TQString> buildIndexMap(const TQString& section); + bool addWhatIs(TQMap<TQString, TQString>& i, const TQString& f, const TQString& mark); + void parseWhatIs( TQMap<TQString, TQString> &i, TQTextStream &t, const TQString &mark ); diff --git a/gentoo/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild b/gentoo/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild new file mode 100644 index 000000000..564014691 --- /dev/null +++ b/gentoo/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI="5" +TRINITY_MODULE_NAME="kdebase" + +inherit trinity-meta + +TSM_EXTRACT="kioslave" + +DESCRIPTION="Generic Trinity KIOslaves" +KEYWORDS="x86 amd64" +IUSE="hal ldap openexr samba sasl" + +DEPEND=" + x11-libs/libXcursor + openexr? ( >=media-libs/openexr-1.2.2-r2 ) + samba? ( net-fs/samba ) + ldap? ( net-nds/openldap ) + sasl? ( dev-libs/cyrus-sasl:2 ) + hal? ( dev-libs/dbus-tqt =sys-apps/hal-0.5* )" + +RDEPEND="${DEPEND} + virtual/ssh + trinity-base/kdeeject:${SLOT}" + +PATCHES=( "${FILESDIR}/${TRINITY_MODULE_NAME}-3.5.13.1-fix-kioslaves-with-hal.patch" ) + +src_configure() { + mycmakeargs=( + -DWITH_XCURSOR=ON + $(cmake-utils_use_with hal HAL) + $(cmake-utils_use_with ldap LDAP) + $(cmake-utils_use_with openexr OPENEXR) + $(cmake-utils_use_with samba SAMBA) + $(cmake-utils_use_with sasl SASL) + ) + + trinity-meta_src_configure +} diff --git a/gentoo/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild b/gentoo/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild new file mode 100644 index 000000000..90dde1cec --- /dev/null +++ b/gentoo/trinity-base/kdebase-kioslaves/kdebase-kioslaves-3.5.13.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI="5" +TRINITY_MODULE_NAME="kdebase" + +inherit trinity-meta + +TSM_EXTRACT="kioslave" + +DESCRIPTION="Generic Trinity KIOslaves" +KEYWORDS="~amd64 ~x86" +IUSE="hal ldap openexr samba sasl" + +DEPEND=" + x11-libs/libXcursor + openexr? ( >=media-libs/openexr-1.2.2-r2 ) + samba? ( net-fs/samba ) + ldap? ( net-nds/openldap ) + sasl? ( dev-libs/cyrus-sasl:2 ) + hal? ( dev-libs/dbus-tqt =sys-apps/hal-0.5* )" + +RDEPEND="${DEPEND} + virtual/ssh + trinity-base/kdeeject:${SLOT}" + +PATCHES=( "${FILESDIR}/${TRINITY_MODULE_NAME}-3.5.13.2-fix-mandb-support-in-kio-man.patch" ) + +src_configure() { + mycmakeargs=( + -DWITH_XCURSOR=ON + $(cmake-utils_use_with hal HAL) + $(cmake-utils_use_with ldap LDAP) + $(cmake-utils_use_with openexr OPENEXR) + $(cmake-utils_use_with samba SAMBA) + $(cmake-utils_use_with sasl SASL) + ) + + trinity-meta_src_configure +} diff --git a/gentoo/trinity-base/kdebase-kioslaves/metadata.xml b/gentoo/trinity-base/kdebase-kioslaves/metadata.xml new file mode 100644 index 000000000..a8b413944 --- /dev/null +++ b/gentoo/trinity-base/kdebase-kioslaves/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>fatzer2@gmail.com</email> + <name>Alexander Golubev</name> + </maintainer> + <longdescription> + kioslaves is the Trinity VFS framework which plugins present a filesystem-like view of arbitrary data. + This package provides most generic KIOslaves provided by kdebase. + </longdescription> +</pkgmetadata> |