diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2011-08-02 19:43:22 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-08-02 19:43:22 +0000 |
commit | 38aff928b6b1d280b8231fdd16c5c7aaf7b9c70f (patch) | |
tree | ecceae7f222b480012ced9e4d311e801683c088a /kde-base | |
parent | Don't install medium weight fonts as they look too bold in Qt, bug 370851. (diff) | |
download | historical-38aff928b6b1d280b8231fdd16c5c7aaf7b9c70f.tar.gz historical-38aff928b6b1d280b8231fdd16c5c7aaf7b9c70f.tar.bz2 historical-38aff928b6b1d280b8231fdd16c5c7aaf7b9c70f.zip |
Backport patch so kdepim-4.4 and kdepim-4.6 builds with shared-desktop-ontologies-0.7
Package-Manager: portage-2.1.10.9/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
-rw-r--r-- | kde-base/kdelibs/Manifest | 32 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch | 323 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild | 333 |
4 files changed, 681 insertions, 16 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 70ef22078597..f4f8a2dc6ea7 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.776 2011/07/27 14:04:40 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.777 2011/08/02 19:43:22 dilfridge Exp $ + +*kdelibs-4.6.5-r1 (02 Aug 2011) + + 02 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +kdelibs-4.6.5-r1.ebuild, +files/kdelibs-4.6.5-cardinality.patch: + Backport patch so kdepim-4.4 and kdepim-4.6 builds with + shared-desktop-ontologies-0.7 *kdelibs-4.7.0 (27 Jul 2011) diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 63a28ab1b8e1..3de7883bbdd2 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 RMD160 80ac0ae419f0f721a044053cdaeaf2f1f982f74e SHA1 80e9a70b108cab0b05efc50d6fa66665b711f149 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3 @@ -19,6 +19,7 @@ AUX kdelibs-4.6.3-bytecode.patch 3511 RMD160 a91034b19ad7eef7bf37aebdd0149371f9d AUX kdelibs-4.6.3-doublepost.patch 1212 RMD160 eca05c22984e2e39ed3ecd59bb313a070d249f89 SHA1 c8ef05943e71a28c4604217d31fc6ca83e48476c SHA256 54f2cfbce01f4c82679b2d44c4e064edba799721adcc67073c2d632ebe43c3a8 AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa949ad19b67814 SHA1 8536664b5d46f2dfd32828a4a0523f280ebe6bdf SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb AUX kdelibs-4.6.3-use_QWeakPointer.patch 3884 RMD160 c23d4f6a2eea9a16e89720a5b3a4562097ee0366 SHA1 10fbbac1cb70e6032d918302824e6ceff98e9ff5 SHA256 dabf4e8e8b451783f0f3b474141ffae7557d28dbfe9276a5e148ff0e0117c6b6 +AUX kdelibs-4.6.5-cardinality.patch 11947 RMD160 2712fadedc0504d622a54a72cf3e35cd655ca3c9 SHA1 3159edd0252436ab755a3e4970116af6fa69a2e4 SHA256 aae50b729cfc116654d01313062bc5a6a02a1f8c475eceef723ff99d3f395282 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38 DIST kdelibs-4.6.4.tar.bz2 12919058 RMD160 9f733c2952872552134146c1ae7937e5e1e95a42 SHA1 088778bdda8b8c7a7b192abbf0d2a0660a20626d SHA256 e1ba403c5da138b593635b28f0f29d0239142a5ca3a329e18140e1c1dc27079a DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8f6c SHA1 9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120 SHA256 d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0 @@ -27,24 +28,25 @@ EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95 EBUILD kdelibs-4.6.3-r3.ebuild 10317 RMD160 66ab258e9c360dc84b17e4ae2932ba2b2cdac7aa SHA1 ce71cfa98a6642744cddc5a8f616b7032cef091e SHA256 cdb146d2cd4d45203d91ec3b890a407cb195a7edbaa40d33456ab4553a40a4aa EBUILD kdelibs-4.6.4-r1.ebuild 10091 RMD160 bbd7541bdf8d17fb99e4494750f6348a9abaa0ea SHA1 2efceca33ca0306d4e4d12f9fd7a485383694298 SHA256 5b17304b28cb99fa91f0a14b3f96348575442608b5dff2fbf22910ee62dc085a EBUILD kdelibs-4.6.4.ebuild 9999 RMD160 7125dfccaef7e8ff4d99ff31d74700842bf5bc37 SHA1 a5fac3a8cf61d48d4d8dc8278e8868a25225acdc SHA256 fb18a2441a51850704db3789004b81b858da1ab8e509852bb7a6736b83cc0994 +EBUILD kdelibs-4.6.5-r1.ebuild 10230 RMD160 743b3d28569dd790dabc0f58d500690d195506a1 SHA1 bf8e6f7ed2434585f9c39c8a11cb59fe292772a7 SHA256 3b30ea9b25a47b6b0c3846bfb2b6ece34eb26d34b00727ae37ba48bee2fb232d EBUILD kdelibs-4.6.5.ebuild 10179 RMD160 ab2505eb9c0512fcb8e165063c6628ffc762688f SHA1 0c50d9abb1cff71d8011c7192fb0a0dae1c6a74c SHA256 55c2d3baa02334de601ce2b5c89b10f8d0ae866ab6b435bbeffad8b677f95552 EBUILD kdelibs-4.7.0.ebuild 9723 RMD160 c8385a1229de11dfa282d25608948dccb32b9642 SHA1 c0a16ac99e2d63dac5143b4e415006ed8d1d9b49 SHA256 c73674336af8bca99b690512a151c979dcea580c994c72bf12088d4d1166a2e7 -MISC ChangeLog 129843 RMD160 53fec5b0e5805f573fb3320b1424af50e731b63f SHA1 e280ca9bddab9f11c1351b3156fdce310ae9a465 SHA256 fe2a25cad30a39a465c702dbe963fcbba2ce101c63ac6db4995e3006c7881959 +MISC ChangeLog 130095 RMD160 52921e2e9af0f5e11aaf6ec524fad7aeff80fbb8 SHA1 f243f2fa540f8625a41a881b98587d0e30ab51f0 SHA256 cd5cb39f56fea455400c0a53921e29cdebd2085efa12aa89e24c05b15bcb62c7 MISC metadata.xml 400 RMD160 2464c52adb57c7f5949a31aea4b1e5e2e10a5081 SHA1 487530dfca818a8ff2b2583b808303778c19b6da SHA256 a5ce1ca62fd98100220bea78ba6b85c7b086b07a2b93ec153020ba06ec9f4e80 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJOMBupAAoJEOf+E+/4L5LmhJgP/R88it0NZZEu0m6s3orZYJ+v -RQnFLHAxsTKpPdl25O0ZAKo2resA2fZgd7CkBU4AcK+dtg/EeukRPAKkQNykCY55 -1VFOg3z3TgB8qy0vAxq7EY7CA9paJ1vrhxhtqhjw3JqYMeBo+io8kLU4TfYIq37W -diT9WsIysUHO3w+YNJrPMahWKtMtMU1qsZlHfNO/REXcA5hMFjYRzUoOdNJzIzKa -d4d3byjPmkJJDAT1hbYokZZWk4I2bUcVFPjEReQcU4QMFNpKN+4B9fsfzb9BHYrB -xn9aAduJnzGcUPMt6yOOAfWJsF/YKl1uHcQuhbZBI4CyanKeFju5pQf55BpZRQCh -vsRG/dJ3nyFot3f7Hlu+eGoxjJhmRZuAQ2RDnAJtEWqIWPpf/HJn5bUa1Ev4WO6A -e8H8mn1mWRUO3Nzp1rXydJiQ5ErRrT5aVKTzAbhFboziuWmQcJlzVf/bDJa9p4OX -Si/EDbuJ1TmKxIYg01OWa5WYGeEcx4BLI5c5j5C2LA20ktwBCV8csjfEE4zkx+C/ -obmwWmhHlgkoKYw15FtZ3UbPhLlvY9nj3SpV4wjhZ1SWgmGQRUakKX6s3995LoTH -sCzHcpsNIUl1dToVFGdNSL5vsQ2TcEuOXeWS+0y50rvIvxIDFBYZKfBWj0yqUu3r -ogYdT5lZXSPdkoHGtSyd -=GdIS +iQIcBAEBCgAGBQJOOFNlAAoJENwGBM22xffeub8QAJM2lujqcNqSVe92ykkdOGMc +iCJDpem1nZQWztPiDkDqv9+I/lDJLRHeO0m6KP4eXDQADQJG8abDgYX3ugxRUwKa +V1pX3Ng9X4YwJXdHXpM3nJyRVFXrmkvzq9hy1S+w24bUJ+LctiEGKom0R5UZNe4P +972nL3ASgcq1Krx0+8kEsuI5K801LSzaOXa1r1rwq9IXkXAyvXdztp5X3n1gOJv/ +L1eZVd4ahdevwGgo55NCxgrQTDQeMGeF9P0Ia18h+d4MQLKSpevpaahfne9jh+Zu +FTJTQ38jMbSw9t1wYOxzFbxztj4V6m9TXcOF0c3Wm4KMctMHho3PKsXJoQ53zDT/ +o4yYWr5LYDd9Qqpoa7cEkhc/c4HzR4fO53QjvAkfxd2xFxHLAsaNHeAxUOUi39La +12yT8YBOtO/HDL6s8nL3gzywKWX2w7XqEjHL7d8b0GLzv81FAjzBLpAkZGdXqKqy +8ie7YuAgaQLh1Y/08Lfn4pxGxDp1wPDw8YTV4ss190TmyumUO0FD0PVBSS4So/H5 +eZRoKg8iaHqNaJjMZaa8vVm1za4sUyLk2WxCbJDOf/jCbfwaV5dVHb9v19NAFIvM +XUD1J30a921VexL5NGSnKGKFAMKi73zahZi1kgmXJvJ2vATf7VoQJLfBwEgnmYkQ +l+VQ8igOt2dUrnYURsXr +=k4bk -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch b/kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch new file mode 100644 index 000000000000..cb892aec6a87 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch @@ -0,0 +1,323 @@ +commit 1f796983aa8385da77f30813041b40e208c17391 +Author: Vishesh Handa <handa.vish@gmail.com> +Date: Thu May 19 20:52:30 2011 +0530 + + Make KDEPIM 4.6 compile with master + + This makes the rcgen produce add/setProperty( QList<T> ) functions for + properties with nrl:maxCardinality and nrl:cardinality = 1. This was + required because with SDO 0.7 the cardinalities of many properties + have been set. + + BUG: 268595 + +diff --git a/nepomuk/rcgen/codegenerator.cpp b/nepomuk/rcgen/codegenerator.cpp +index bc670e6..1bb2736 100644 +--- a/nepomuk/rcgen/codegenerator.cpp ++++ b/nepomuk/rcgen/codegenerator.cpp +@@ -194,33 +194,28 @@ bool CodeGenerator::writeHeader( const ResourceClass *resourceClass, QTextStream + while( it.hasNext() ) { + const Property* p = it.next(); + +- if( p->literalRange().isEmpty() && +- !p->range() ) { +- if ( !quiet ) +- qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl; +- continue; +- } +- +- if ( m_mode == SafeMode ) { +- ms << writeComment( QString("Get property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl; +- ms << " " << m_code->propertyGetterDeclaration( p, resourceClass ) << ";" << endl; +- ms << endl; ++ if( p->maxCardinality() == 1 || p->cardinality() == 1 ) { ++ Property * prop = const_cast<Property *>(p); ++ bool isList = prop->isList(); ++ ++ prop->setIsList( true ); ++ if( !writePropertyHeader( prop, resourceClass, ms ) ) ++ continue; ++ ++ prop->setIsList( false ); ++ if( !writePropertyHeader( prop, resourceClass, ms ) ) ++ continue; ++ ++ writePropertyUriHeader( prop, ms ); ++ ++ prop->setIsList( isList ); + } +- +- ms << writeComment( QString("Set property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl; +- ms << " " << m_code->propertySetterDeclaration( p, resourceClass ) << ";" << endl; +- ms << endl; +- +- if( p->isList() ) { +- ms << writeComment( QString("Add a value to property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl; +- ms << " " << m_code->propertyAdderDeclaration( p, resourceClass ) << ";" << endl; +- ms << endl; ++ else { ++ if( !writePropertyHeader( p, resourceClass, ms ) ) ++ continue; ++ writePropertyUriHeader( p, ms ); + } +- +- ms << writeComment( QString( "\\return The URI of the property '%1'." ).arg( p->name() ), 2*4 ) << endl; +- ms << " " << "static QUrl " << p->name()[0].toLower() << p->name().mid(1) << "Uri();" << endl; +- ms << endl; +- ++ + if( !p->hasSimpleType() ) + includes.insert( p->typeString( true ) ); + } +@@ -299,6 +294,42 @@ bool CodeGenerator::writeHeader( const ResourceClass *resourceClass, QTextStream + return true; + } + ++bool CodeGenerator::writePropertyHeader(const Property* p, const ResourceClass* resourceClass, QTextStream& ms) const ++{ ++ if( p->literalRange().isEmpty() && ++ !p->range() ) { ++ if ( !quiet ) ++ qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl; ++ return false; ++ } ++ ++ if ( m_mode == SafeMode ) { ++ ms << writeComment( QString("Get property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl; ++ ms << " " << m_code->propertyGetterDeclaration( p, resourceClass ) << ";" << endl; ++ ms << endl; ++ } ++ ++ ms << writeComment( QString("Set property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl; ++ ms << " " << m_code->propertySetterDeclaration( p, resourceClass ) << ";" << endl; ++ ms << endl; ++ ++ if( p->isList() ) { ++ ms << writeComment( QString("Add a value to property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl; ++ ms << " " << m_code->propertyAdderDeclaration( p, resourceClass ) << ";" << endl; ++ ms << endl; ++ } ++ ++ return true; ++} ++ ++void CodeGenerator::writePropertyUriHeader(const Property* p, QTextStream& ts) const ++{ ++ ts << writeComment( QString( "\\return The URI of the property '%1'." ).arg( p->name() ), 2*4 ) << endl; ++ ts << " " << "static QUrl " << p->name()[0].toLower() << p->name().mid(1) << "Uri();" << endl; ++ ts << endl; ++} ++ ++ + bool CodeGenerator::writeSource( const ResourceClass* resourceClass, QTextStream& stream ) const + { + QString s = sourceTemplate( m_mode ); +@@ -318,29 +349,31 @@ bool CodeGenerator::writeSource( const ResourceClass* resourceClass, QTextStream + while( it.hasNext() ) { + const Property* p = it.next(); + +- if( p->literalRange().isEmpty() && +- !p->range() ) { +- if ( !quiet ) +- qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl; +- continue; ++ if( p->maxCardinality() == 1 || p->cardinality() == 1 ) { ++ Property * prop = const_cast<Property *>(p); ++ bool isList = prop->isList(); ++ ++ prop->setIsList( true ); ++ if( !writePropertySource( prop, resourceClass, ms ) ) ++ continue; ++ ++ prop->setIsList( false ); ++ if( !writePropertySource( prop, resourceClass, ms ) ) ++ continue; ++ ++ writePropertyUriSource( prop, resourceClass, ms ); ++ ++ prop->setIsList( isList ); + } +- ++ else { ++ if( !writePropertySource( p, resourceClass, ms ) ) ++ continue; ++ writePropertyUriSource( p, resourceClass, ms ); ++ } ++ + if ( !p->hasSimpleType() ) { + includes.append( QString( "#include \"%1.h\"" ).arg( p->typeString( true ).toLower() ) ); + } +- +- if ( m_mode == SafeMode ) +- ms << m_code->propertyGetterDefinition( p, resourceClass ) << endl; +- +- ms << m_code->propertySetterDefinition( p, resourceClass ) << endl; +- if( p->isList() ) +- ms << m_code->propertyAdderDefinition( p, resourceClass ) << endl; +- +- // write the static method that returns the property's Uri +- ms << "QUrl " << resourceClass->name( m_nameSpace ) << "::" << p->name()[0].toLower() << p->name().mid(1) << "Uri()" << endl +- << "{" << endl +- << " return QUrl::fromEncoded(\"" << p->uri().toString() << "\");" << endl +- << "}" << endl << endl; + } + + it = resourceClass->allReverseProperties(); +@@ -395,6 +428,32 @@ bool CodeGenerator::writeSource( const ResourceClass* resourceClass, QTextStream + return true; + } + ++bool CodeGenerator::writePropertySource(const Property* p, const ResourceClass* resourceClass, QTextStream& ms) const ++{ ++ if( p->literalRange().isEmpty() && !p->range() ) { ++ if ( !quiet ) ++ qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl; ++ return false; ++ } ++ ++ if ( m_mode == SafeMode ) ++ ms << m_code->propertyGetterDefinition( p, resourceClass ) << endl; ++ ++ ms << m_code->propertySetterDefinition( p, resourceClass ) << endl; ++ if( p->isList() ) ++ ms << m_code->propertyAdderDefinition( p, resourceClass ) << endl; ++ ++ return true; ++} ++ ++void CodeGenerator::writePropertyUriSource(const Property* p, const ResourceClass* resourceClass, QTextStream& ts) const ++{ ++ // write the static method that returns the property's Uri ++ ts << "QUrl " << resourceClass->name( m_nameSpace ) << "::" << p->name()[0].toLower() << p->name().mid(1) << "Uri()" << endl ++ << "{" << endl ++ << " return QUrl::fromEncoded(\"" << p->uri().toString() << "\");" << endl ++ << "}" << endl << endl; ++} + + bool CodeGenerator::writeSources( const QString& dir ) + { +diff --git a/nepomuk/rcgen/codegenerator.h b/nepomuk/rcgen/codegenerator.h +index dc786a4..f26a875 100644 +--- a/nepomuk/rcgen/codegenerator.h ++++ b/nepomuk/rcgen/codegenerator.h +@@ -22,6 +22,7 @@ class AbstractCode; + class ResourceClass; + class QString; + class QTextStream; ++class Property; + + class CodeGenerator + { +@@ -47,7 +48,13 @@ private: + bool writeHeader( const ResourceClass* resourceClass, QTextStream& ) const; + bool writeSource( const ResourceClass* resourceClass, QTextStream& ) const; + bool writeDummyClasses( const QString &folder ) const; ++ ++ bool writePropertyHeader( const Property* p, const ResourceClass* resourceClass, QTextStream& ms ) const; ++ bool writePropertySource( const Property* p, const ResourceClass* resourceClass, QTextStream& ms ) const; + ++ void writePropertyUriHeader( const Property* p, QTextStream& ts ) const; ++ void writePropertyUriSource( const Property* p, const ResourceClass* resourceClass, QTextStream& ts ) const; ++ + QString visibilityHeader() const; + QString visibilityExportMacro() const; + +diff --git a/nepomuk/rcgen/ontologyparser.cpp b/nepomuk/rcgen/ontologyparser.cpp +index 50e3397..f9f8673 100644 +--- a/nepomuk/rcgen/ontologyparser.cpp ++++ b/nepomuk/rcgen/ontologyparser.cpp +@@ -164,7 +164,14 @@ bool OntologyParser::parse( const QString& filename, const QString& serializatio + } + else if( s.predicate().uri() == Soprano::Vocabulary::NRL::maxCardinality() || + s.predicate().uri() == Soprano::Vocabulary::NRL::cardinality() ) { +- d->getProperty(s.subject().uri())->setIsList( s.object().literal().toInt() > 1 ); ++ Property * p = d->getProperty(s.subject().uri()); ++ int cValue = s.object().literal().toInt(); ++ ++ p->setIsList( cValue > 1 ); ++ if( s.predicate().uri() == Soprano::Vocabulary::NRL::maxCardinality() ) ++ p->setMaxCardinality( cValue ); ++ else ++ p->setCardinality( cValue ); + } + else if( s.predicate().uri() == Soprano::Vocabulary::RDFS::comment() ) { + d->comments[s.subject().uri()] = s.object().literal().toString(); +diff --git a/nepomuk/rcgen/property.cpp b/nepomuk/rcgen/property.cpp +index 1baa04c..51d9c07 100644 +--- a/nepomuk/rcgen/property.cpp ++++ b/nepomuk/rcgen/property.cpp +@@ -27,7 +27,9 @@ Property::Property() + : m_range( 0 ), + m_isList( true ), + m_domain( 0 ), +- m_inverseProperty( 0 ) ++ m_inverseProperty( 0 ), ++ m_maxCardinality( -1 ), ++ m_cardinality( -1 ) + { + } + +@@ -204,3 +206,24 @@ QString Property::literalTypeConversionMethod() const + + return QString(); + } ++ ++void Property::setMaxCardinality(int value) ++{ ++ m_maxCardinality = value; ++} ++ ++int Property::maxCardinality() const ++{ ++ return m_maxCardinality; ++} ++ ++int Property::cardinality() const ++{ ++ return m_cardinality; ++} ++ ++void Property::setCardinality(int value) ++{ ++ m_cardinality = value; ++} ++ +diff --git a/nepomuk/rcgen/property.h b/nepomuk/rcgen/property.h +index a72ab5d..a09006d 100644 +--- a/nepomuk/rcgen/property.h ++++ b/nepomuk/rcgen/property.h +@@ -139,6 +139,25 @@ public: + */ + bool hasSimpleType() const; + ++ /** ++ * Sets the max cardinality of the property ++ */ ++ void setMaxCardinality( int value ); ++ ++ /** ++ * Returns the max cardinality of the property ++ */ ++ int maxCardinality() const; ++ ++ /** ++ * Sets the cardinality of the property ++ */ ++ void setCardinality( int value ); ++ ++ /** ++ * Returns the cardinality of the property ++ */ ++ int cardinality() const; + private: + QUrl m_uri; + ResourceClass* m_range; +@@ -147,6 +166,8 @@ private: + bool m_isList; + ResourceClass* m_domain; + Property* m_inverseProperty; ++ int m_maxCardinality; ++ int m_cardinality; + }; + + #endif diff --git a/kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild b/kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild new file mode 100644 index 000000000000..ceafeb122633 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild @@ -0,0 +1,333 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild,v 1.1 2011/08/02 19:43:22 dilfridge Exp $ + +EAPI=4 + +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +OPENGL_REQUIRED="optional" +KDE_SCM="git" +inherit kde4-base fdo-mime toolchain-funcs + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos +lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks +upower zeroconf" + +REQUIRED_USE=" + udisks? ( udev ) + upower? ( udev ) +" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-crypt/qca:2 + >=app-misc/strigi-0.6.3 + >=dev-libs/libattica-0.1.90 + >=dev-libs/libdbusmenu-qt-0.3.2 + dev-libs/libpcre[unicode] + dev-libs/libxml2 + dev-libs/libxslt + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib + >=media-libs/libpng-1.4 + >=media-libs/phonon-4.4.3 + sys-libs/zlib + virtual/jpeg + >=x11-misc/shared-mime-info-0.60 + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + !aqua? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + !kernel_SunOS? ( sys-libs/libutempter ) + ) + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + lzma? ( app-arch/xz-utils ) + openexr? ( + media-libs/openexr + media-libs/ilmbase + ) + policykit? ( >=sys-auth/polkit-qt-0.99 ) + semantic-desktop? ( + >=dev-libs/shared-desktop-ontologies-0.5 + >=dev-libs/soprano-2.5.63_pre[dbus,raptor,redland] + ) + spell? ( app-text/enchant ) + ssl? ( dev-libs/openssl ) + udev? ( sys-fs/udev ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND="${COMMONDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !dev-libs/conversion + !dev-libs/kunitconversion + !x11-libs/qt-phonon + !<=kde-misc/kdnssd-avahi-0.1.2:0 + !<=kde-misc/knetworkmanager-4.4.0_p20100820 + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + $(add_kdebase_dep kde-env) + !aqua? ( + x11-apps/iceauth + x11-apps/rgb + >=x11-misc/xdg-utils-1.0.2-r3 + udisks? ( sys-fs/udisks ) + upower? ( sys-power/upower ) + ) +" +PDEPEND=" + || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) + handbook? ( $(add_kdebase_dep khelpcenter) ) + policykit? ( + >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 + >=sys-auth/polkit-kde-agent-0.99 + ) + semantic-desktop? ( $(add_kdebase_dep nepomuk) ) +" + +# Blockers added due to packages from old versions, removed in the meanwhile +# as well as for file collisions +add_blocker libknotificationitem +add_blocker libkworkspace '<4.3.66' +add_blocker kcontrol '<4.5.80' +# @since 4.4 - kpilot is gone (blocker added to help upgrades) +add_blocker kpilot +# Block some old versions of KDE-3.5 packages that don't work well with KDE-4 +add_blocker kdebase 0 3.5.9-r4:3.5 +add_blocker kdebase-startkde 0 3.5.10:3.5 +add_blocker kdelibs 0 '<3.5.10:3.5' +# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75 +add_blocker plasma-workspace '<4.3.75' + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" + "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" + "${FILESDIR}/${PN}-4.6.3-bytecode.patch" + "${FILESDIR}/${PN}-4.6.5-cardinality.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." + fi +} + +src_prepare() { + kde4-base_src_prepare + use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) + sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + + if use aqua; then + sed -i -e \ + "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ + cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" + + #if [[ ${CHOST} == *-darwin8 ]]; then + sed -i -e \ + "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ + cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" + #fi + + # solid/solid/backends/iokit doesn't properly link, so disable it. + sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ + || die "disabling solid/solid/backends/iokit failed" + sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ + || die "disabling solid/solid/backends/iokit failed" + + # There's no fdatasync on OSX and the check fails to detect that. + sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ + || die "disabling fdatasync failed" + + # Fix nameser include to nameser8_compat + sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ + || die "fixing nameser include failed" + append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 + + # Try to fix kkeyserver_mac + epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" + # getgrouplist not in solaris libc + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" + # solaris has no d_type element in dir_ent + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" + fi +} + +src_configure() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) + elif has_version net-misc/mDNSResponder; then + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + else + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) + fi + mycmakeargs+=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=.kde4 + -DKAUTH_BACKEND=POLKITQT-1 + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_has 3dnow X86_3DNOW) + $(cmake-utils_use_has altivec PPC_ALTIVEC) + $(cmake-utils_use_has mmx X86_MMX) + $(cmake-utils_use_has sse X86_SSE) + $(cmake-utils_use_has sse2 X86_SSE2) + $(cmake-utils_use_with acl) + $(cmake-utils_use_with alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with fam) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with kerberos GSSAPI) + $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_with nls Libintl) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with policykit PolkitQt-1) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + $(cmake-utils_use_with udev UDev) + ) + kde4-base_src_configure +} + +src_compile() { + kde4-base_src_compile + + # The building of apidox is not managed anymore by the build system + if use doc; then + einfo "Building API documentation" + cd "${S}"/doc/api/ + ./doxygen.sh "${S}" || die "APIDOX generation failed" + fi +} + +src_install() { + kde4-base_src_install + + # use system certificates + rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt + + if use doc; then + einfo "Installing API documentation. This could take a bit of time." + cd "${S}"/doc/api/ + docinto /HTML/en/kdelibs-apidox + dohtml -r ${P}-apidocs/* + fi + + if use aqua; then + einfo "fixing ${PN} plugins" + + local _PV=${PV:0:3}.0 + local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script + + install_name_tool -id \ + "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ + "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ + || die "failed fixing libkrossqtsplugin.${_PV}.dylib" + + einfo "fixing ${PN} cmake detection files" + #sed -i -e \ + # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ + echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ + "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ + || die "failed fixing FindXKB.cmake" + fi + + einfo Installing environment file. + echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" + echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" + doenvd "${T}/77kde" +} + +pkg_postinst() { + fdo-mime_mime_database_update + + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" + elog "is running." + echo + einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" + einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" + einfo "to include 'mdns', e.g.:" + einfo " hosts: files mdns dns" + echo + fi + + if has_version 'net-libs/libproxy'; then + echo + elog "You have net-libs/libproxy installed. This may lead to serious problems, e.g." + elog "not being able to log in. We used to prohibit that combination via a blocker," + elog "however the blocker has been removed because of popular request. Now everyone" + elog "may shoot himself in the foot as much as he wants." + ewarn "If you encounter timeouts and/or hangs, please have a look at bug 365479," + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=365479" + fi + + elog "Your homedir is set to \${HOME}/.kde4" + echo + + kde4-base_pkg_postinst +} + +pkg_prerm() { + # Remove ksycoca4 global database + rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} |