* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2012-05-30 14:45 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2012-05-30 14:45 UTC (permalink / raw
To: gentoo-commits
commit: c9b59f99cf444d40028ed6c8728c37834c9d3ba2
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 14:37:02 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 30 14:37:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c9b59f99
[kde-base/nepomuk-core] Add upstream patches to fix file collisions properly.
(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)
---
.../files/nepomuk-core-4.8.80-remove-rcgen.patch | 23 +++++++++++++++++++
.../files/nepomuk-core-4.8.80-workspace.patch | 24 ++++++++++++++++++++
kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild | 5 ++++
3 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch
new file mode 100644
index 0000000..0f96371
--- /dev/null
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch
@@ -0,0 +1,23 @@
+commit 6ec4e729e2426dac37e9e27932d4d9e579d53ba4
+Author: Vishesh Handa <handa.vish@gmail.com>
+Date: Fri May 25 19:57:26 2012 +0530
+
+ Do not compile and install the rcgen
+
+ Conflicts with kdelibs.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c7c8ab..3bd49c2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,7 +57,9 @@ include_directories(
+ )
+
+ add_subdirectory(libnepomukcore)
+-add_subdirectory(rcgen)
++# Do not install rcgen, it's installed by kdelibs
++# If it needs to be installed then we need to change the name
++#add_subdirectory(rcgen)
+ add_subdirectory(ontologies)
+ add_subdirectory(common)
+ add_subdirectory(server)
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch
new file mode 100644
index 0000000..24616b4
--- /dev/null
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch
@@ -0,0 +1,24 @@
+commit b60025c6d5d6201b2bbe6881f11c431ec2671677
+Author: Vishesh Handa <handa.vish@gmail.com>
+Date: Fri May 25 23:31:47 2012 +0530
+
+ Do not depend on KDE4Workspace
+
+ Weird cyclic dependency. Plus we do not need anything from the
+ workspace.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3bd49c2..32e1909 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,8 +14,8 @@ set(CMAKE_NEPOMUK_CORE_VERSION_STRING "${CMAKE_NEPOMUK_CORE_VERSION_MAJOR}.${CMA
+ set(KDE_MIN_VERSION "4.7.00")
+ find_package(KDE4 4.7.00 REQUIRED)
+ include(KDE4Defaults)
+-find_package(KDE4Workspace)
+-include(MacroLibrary)
++#find_package(KDE4Workspace)
++#include(MacroLibrary)
+
+ set(SDO_MIN_VERSION "0.7")
+ find_package(SharedDesktopOntologies)
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
index e43b6df..741c13e 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
@@ -21,3 +21,8 @@ add_blocker nepomuk '<4.8.80'
RESTRICT="test"
# bug 392989
+
+PATCHES=(
+ "${FILESDIR}/${P}-remove-rcgen.patch"
+ "${FILESDIR}/${P}-workspace.patch"
+)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2012-06-01 16:13 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2012-06-01 16:13 UTC (permalink / raw
To: gentoo-commits
commit: b1827c1a10e4b92b66d4f64aea5aaaac35dea82a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 1 16:12:58 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 1 16:12:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b1827c1a
[[kde-base/nepomuk-core] Drop patches, now included in re-packed tarball.
(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)
---
.../files/nepomuk-core-4.8.80-remove-rcgen.patch | 23 -------------------
.../files/nepomuk-core-4.8.80-workspace.patch | 24 --------------------
kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild | 5 ----
3 files changed, 0 insertions(+), 52 deletions(-)
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch
deleted file mode 100644
index 0f96371..0000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-remove-rcgen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 6ec4e729e2426dac37e9e27932d4d9e579d53ba4
-Author: Vishesh Handa <handa.vish@gmail.com>
-Date: Fri May 25 19:57:26 2012 +0530
-
- Do not compile and install the rcgen
-
- Conflicts with kdelibs.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c7c8ab..3bd49c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,7 +57,9 @@ include_directories(
- )
-
- add_subdirectory(libnepomukcore)
--add_subdirectory(rcgen)
-+# Do not install rcgen, it's installed by kdelibs
-+# If it needs to be installed then we need to change the name
-+#add_subdirectory(rcgen)
- add_subdirectory(ontologies)
- add_subdirectory(common)
- add_subdirectory(server)
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch
deleted file mode 100644
index 24616b4..0000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.8.80-workspace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit b60025c6d5d6201b2bbe6881f11c431ec2671677
-Author: Vishesh Handa <handa.vish@gmail.com>
-Date: Fri May 25 23:31:47 2012 +0530
-
- Do not depend on KDE4Workspace
-
- Weird cyclic dependency. Plus we do not need anything from the
- workspace.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3bd49c2..32e1909 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,8 +14,8 @@ set(CMAKE_NEPOMUK_CORE_VERSION_STRING "${CMAKE_NEPOMUK_CORE_VERSION_MAJOR}.${CMA
- set(KDE_MIN_VERSION "4.7.00")
- find_package(KDE4 4.7.00 REQUIRED)
- include(KDE4Defaults)
--find_package(KDE4Workspace)
--include(MacroLibrary)
-+#find_package(KDE4Workspace)
-+#include(MacroLibrary)
-
- set(SDO_MIN_VERSION "0.7")
- find_package(SharedDesktopOntologies)
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
index 741c13e..e43b6df 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.8.80.ebuild
@@ -21,8 +21,3 @@ add_blocker nepomuk '<4.8.80'
RESTRICT="test"
# bug 392989
-
-PATCHES=(
- "${FILESDIR}/${P}-remove-rcgen.patch"
- "${FILESDIR}/${P}-workspace.patch"
-)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2012-08-06 20:42 Dennis Schridde
0 siblings, 0 replies; 7+ messages in thread
From: Dennis Schridde @ 2012-08-06 20:42 UTC (permalink / raw
To: gentoo-commits
commit: ca56132cd123b061963b6f19aa099e557edd4080
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Mon Aug 6 20:40:29 2012 +0000
Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Mon Aug 6 20:40:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca56132c
[kde-base/nepomuk-core-4.9.0-r1] Fix for KDE bug #304476 - nepomukfilewatch memleak
Bug: 430226
KDE-Bug: 304476
---
...notify-do-not-store-the-paths-to-be-added.patch | 80 ++++++++++++++++++++
kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild | 28 +++++++
2 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch
new file mode 100644
index 0000000..7c2cff2
--- /dev/null
+++ b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch
@@ -0,0 +1,80 @@
+diff --git a/services/filewatch/kinotify.cpp b/services/filewatch/kinotify.cpp
+index e8843c8..5e6ff05 100644
+--- a/services/filewatch/kinotify.cpp
++++ b/services/filewatch/kinotify.cpp
+@@ -79,8 +79,8 @@ public:
+ QHash<int, QByteArray> watchPathHash;
+ QHash<QByteArray, int> pathWatchHash;
+
+- /// queue of paths to install watches for
+- QQueue<QByteArray> pathsToWatch;
++ /// A list of all the current dirIterators
++ QQueue<QDirIterator*> dirIterators;
+
+ unsigned char eventBuffer[EVENT_BUFFER_SIZE];
+
+@@ -136,20 +136,6 @@ public:
+ }
+ }
+
+- bool addWatchesRecursively( const QByteArray& path )
+- {
+- if ( !addWatch( path ) )
+- return false;
+-
+- const QString stringPath = QFile::decodeName(path);
+- QDirIterator iter( stringPath, QDir::Dirs | QDir::NoDotAndDotDot );
+- while( iter.hasNext() ) {
+- pathsToWatch.enqueue( QFile::encodeName(iter.next()) );
+- }
+-
+- return true;
+- }
+-
+ void removeWatch( int wd ) {
+ kDebug() << wd << watchPathHash[wd];
+ pathWatchHash.remove( watchPathHash.take( wd ) );
+@@ -159,19 +145,24 @@ public:
+ void _k_addWatches() {
+ // add the next batch of paths
+ for ( int i = 0; i < 100; ++i ) {
+- if ( pathsToWatch.isEmpty() ||
+- !addWatchesRecursively( pathsToWatch.dequeue() ) ) {
+- return;
++ QDirIterator* it = dirIterators.front();
++ if( it->hasNext() ) {
++ it->next();
++ addWatch( QFile::encodeName(it->filePath()) );
++ }
++ else {
++ delete dirIterators.dequeue();
++ if( dirIterators.isEmpty() ) {
++ kDebug() << "Done adding watches";
++ return;
++ }
+ }
+ }
+
+ // asyncroneously add the next batch
+- if ( !pathsToWatch.isEmpty() ) {
++ if ( !dirIterators.isEmpty() ) {
+ QMetaObject::invokeMethod( q, "_k_addWatches", Qt::QueuedConnection );
+ }
+- else {
+- kDebug() << "All watches installed";
+- }
+ }
+
+ private:
+@@ -245,7 +236,10 @@ bool KInotify::addWatch( const QString& path, WatchEvents mode, WatchFlags flags
+
+ d->mode = mode;
+ d->flags = flags;
+- d->pathsToWatch.append( QFile::encodeName( path ) );
++ d->addWatch( QFile::encodeName(path) );
++ QDirIterator* iter = new QDirIterator( path, QDir::Dirs | QDir::NoDotAndDotDot,
++ QDirIterator::Subdirectories );
++ d->dirIterators.append( iter );
+ d->_k_addWatches();
+ return true;
+ }
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
new file mode 100644
index 0000000..4c95084
--- /dev/null
+++ b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Nepomuk core libraries"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ >=app-misc/strigi-0.7.7[dbus,qt4]
+ >=dev-libs/soprano-2.8.0[dbus,raptor,redland,virtuoso]
+ !~dev-db/virtuoso-server-6.1.5
+ !~dev-db/virtuoso-odbc-6.1.5
+ !~dev-db/virtuoso-jdbc-6.1.5
+"
+RDEPEND="${DEPEND}"
+
+add_blocker nepomuk '<4.8.80'
+
+RESTRICT="test"
+# bug 392989
+
+PATCHES=( "${FILESDIR}/${P}-kinotify-do-not-store-the-paths-to-be-added.patch" )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2012-08-07 17:49 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2012-08-07 17:49 UTC (permalink / raw
To: gentoo-commits
commit: 91533276f522d75ef043672c3d98d288e1cd8aca
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 17:54:14 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 17:54:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=91533276
[kde-base/nepomuk-core] Removed, patch with metadata in tree.
(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)
---
...notify-do-not-store-the-paths-to-be-added.patch | 80 --------------------
kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild | 28 -------
2 files changed, 0 insertions(+), 108 deletions(-)
diff --git a/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch b/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch
deleted file mode 100644
index 7c2cff2..0000000
--- a/kde-base/nepomuk-core/files/nepomuk-core-4.9.0-kinotify-do-not-store-the-paths-to-be-added.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/services/filewatch/kinotify.cpp b/services/filewatch/kinotify.cpp
-index e8843c8..5e6ff05 100644
---- a/services/filewatch/kinotify.cpp
-+++ b/services/filewatch/kinotify.cpp
-@@ -79,8 +79,8 @@ public:
- QHash<int, QByteArray> watchPathHash;
- QHash<QByteArray, int> pathWatchHash;
-
-- /// queue of paths to install watches for
-- QQueue<QByteArray> pathsToWatch;
-+ /// A list of all the current dirIterators
-+ QQueue<QDirIterator*> dirIterators;
-
- unsigned char eventBuffer[EVENT_BUFFER_SIZE];
-
-@@ -136,20 +136,6 @@ public:
- }
- }
-
-- bool addWatchesRecursively( const QByteArray& path )
-- {
-- if ( !addWatch( path ) )
-- return false;
--
-- const QString stringPath = QFile::decodeName(path);
-- QDirIterator iter( stringPath, QDir::Dirs | QDir::NoDotAndDotDot );
-- while( iter.hasNext() ) {
-- pathsToWatch.enqueue( QFile::encodeName(iter.next()) );
-- }
--
-- return true;
-- }
--
- void removeWatch( int wd ) {
- kDebug() << wd << watchPathHash[wd];
- pathWatchHash.remove( watchPathHash.take( wd ) );
-@@ -159,19 +145,24 @@ public:
- void _k_addWatches() {
- // add the next batch of paths
- for ( int i = 0; i < 100; ++i ) {
-- if ( pathsToWatch.isEmpty() ||
-- !addWatchesRecursively( pathsToWatch.dequeue() ) ) {
-- return;
-+ QDirIterator* it = dirIterators.front();
-+ if( it->hasNext() ) {
-+ it->next();
-+ addWatch( QFile::encodeName(it->filePath()) );
-+ }
-+ else {
-+ delete dirIterators.dequeue();
-+ if( dirIterators.isEmpty() ) {
-+ kDebug() << "Done adding watches";
-+ return;
-+ }
- }
- }
-
- // asyncroneously add the next batch
-- if ( !pathsToWatch.isEmpty() ) {
-+ if ( !dirIterators.isEmpty() ) {
- QMetaObject::invokeMethod( q, "_k_addWatches", Qt::QueuedConnection );
- }
-- else {
-- kDebug() << "All watches installed";
-- }
- }
-
- private:
-@@ -245,7 +236,10 @@ bool KInotify::addWatch( const QString& path, WatchEvents mode, WatchFlags flags
-
- d->mode = mode;
- d->flags = flags;
-- d->pathsToWatch.append( QFile::encodeName( path ) );
-+ d->addWatch( QFile::encodeName(path) );
-+ QDirIterator* iter = new QDirIterator( path, QDir::Dirs | QDir::NoDotAndDotDot,
-+ QDirIterator::Subdirectories );
-+ d->dirIterators.append( iter );
- d->_k_addWatches();
- return true;
- }
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
deleted file mode 100644
index 4c95084..0000000
--- a/kde-base/nepomuk-core/nepomuk-core-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Nepomuk core libraries"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=app-misc/strigi-0.7.7[dbus,qt4]
- >=dev-libs/soprano-2.8.0[dbus,raptor,redland,virtuoso]
- !~dev-db/virtuoso-server-6.1.5
- !~dev-db/virtuoso-odbc-6.1.5
- !~dev-db/virtuoso-jdbc-6.1.5
-"
-RDEPEND="${DEPEND}"
-
-add_blocker nepomuk '<4.8.80'
-
-RESTRICT="test"
-# bug 392989
-
-PATCHES=( "${FILESDIR}/${P}-kinotify-do-not-store-the-paths-to-be-added.patch" )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2013-06-23 18:49 David Heidelberger
0 siblings, 0 replies; 7+ messages in thread
From: David Heidelberger @ 2013-06-23 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sun Jun 23 18:44:05 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sun Jun 23 18:44:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=957f6a26
[kde-base/nepomuk-core] 4.10.80, fix code to compile with new libav
Package-Manager: portage-2.1.12.9
---
kde-base/nepomuk-core/files/libav_fix.patch | 19 +++++++++++++++++++
kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild | 2 ++
2 files changed, 21 insertions(+)
diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch
new file mode 100644
index 0000000..209be53
--- /dev/null
+++ b/kde-base/nepomuk-core/files/libav_fix.patch
@@ -0,0 +1,19 @@
+diff -Naur a/services/fileindexer/indexer/ffmpegextractor.cpp b/services/fileindexer/indexer/ffmpegextractor.cpp
+--- a/services/fileindexer/indexer/ffmpegextractor.cpp 2013-06-10 20:50:24.000000000 +0200
++++ b/services/fileindexer/indexer/ffmpegextractor.cpp 2013-06-23 20:36:27.336844353 +0200
+@@ -158,12 +158,12 @@
+ subRes.addProperty( NFO::height(), codec->height );
+
+ int aspectRatio = codec->sample_aspect_ratio.num;
+- int frameRate = stream->r_frame_rate.num;
++ int frameRate = stream->avg_frame_rate.num;
+
+ if( codec->sample_aspect_ratio.den )
+ aspectRatio /= codec->sample_aspect_ratio.den;
+- if( stream->r_frame_rate.den )
+- frameRate /= stream->r_frame_rate.den;
++ if( stream->avg_frame_rate.den )
++ frameRate /= stream->avg_frame_rate.den;
+
+ subRes.addProperty( NFO::aspectRatio(), aspectRatio );
+ subRes.addProperty( NFO::frameRate(), frameRate );
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild
index 533ef56..dd794d4 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild
@@ -25,6 +25,8 @@ add_blocker nepomuk '<4.8.80'
RESTRICT="test"
# bug 392989
+PATCHES=( "${FILESDIR}/libav_fix.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with exif Exiv2)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2013-06-28 12:58 David Heidelberger
0 siblings, 0 replies; 7+ messages in thread
From: David Heidelberger @ 2013-06-28 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 6640de8c912e3d88e5fb46c03703adc3f3016543
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri Jun 28 12:56:31 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Jun 28 12:56:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6640de8c
[kde-base/nepomuk-core] also fix 4.10.90
Package-Manager: portage-2.1.12.10
---
kde-base/nepomuk-core/files/libav_fix.patch | 2 +-
kde-base/nepomuk-core/nepomuk-core-4.10.90.ebuild | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch
index 7cedbfa..108310d 100644
--- a/kde-base/nepomuk-core/files/libav_fix.patch
+++ b/kde-base/nepomuk-core/files/libav_fix.patch
@@ -6,7 +6,7 @@ diff -Naur a/services/fileindexer/indexer/ffmpegextractor.cpp b/services/fileind
int aspectRatio = codec->sample_aspect_ratio.num;
- int frameRate = stream->r_frame_rate.num;
-+ float frameRate = stream->avg_frame_rate.num;
++ double frameRate = stream->avg_frame_rate.num;
if( codec->sample_aspect_ratio.den )
aspectRatio /= codec->sample_aspect_ratio.den;
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.10.90.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.10.90.ebuild
index 533ef56..dd794d4 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.10.90.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.10.90.ebuild
@@ -25,6 +25,8 @@ add_blocker nepomuk '<4.8.80'
RESTRICT="test"
# bug 392989
+PATCHES=( "${FILESDIR}/libav_fix.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with exif Exiv2)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
@ 2013-12-20 12:20 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2013-12-20 12:20 UTC (permalink / raw
To: gentoo-commits
commit: af596d07eca3289d73ab80c782330eb2694a4725
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 11:19:47 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 11:19:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=af596d07
[kde-base/nepomuk-core] Use subslot for media-gfx/exiv2
Package-Manager: portage-2.2.7
---
kde-base/nepomuk-core/files/libav_fix.patch | 19 -------------------
.../nepomuk-core/nepomuk-core-4.11.49.9999.ebuild | 2 +-
.../nepomuk-core/nepomuk-core-4.12.49.9999.ebuild | 2 +-
kde-base/nepomuk-core/nepomuk-core-9999.ebuild | 2 +-
4 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch
deleted file mode 100644
index 108310d..0000000
--- a/kde-base/nepomuk-core/files/libav_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur a/services/fileindexer/indexer/ffmpegextractor.cpp b/services/fileindexer/indexer/ffmpegextractor.cpp
---- a/services/fileindexer/indexer/ffmpegextractor.cpp 2013-06-10 20:50:24.000000000 +0200
-+++ b/services/fileindexer/indexer/ffmpegextractor.cpp 2013-06-23 20:36:27.336844353 +0200
-@@ -158,12 +158,12 @@
- subRes.addProperty( NFO::height(), codec->height );
-
- int aspectRatio = codec->sample_aspect_ratio.num;
-- int frameRate = stream->r_frame_rate.num;
-+ double frameRate = stream->avg_frame_rate.num;
-
- if( codec->sample_aspect_ratio.den )
- aspectRatio /= codec->sample_aspect_ratio.den;
-- if( stream->r_frame_rate.den )
-- frameRate /= stream->r_frame_rate.den;
-+ if( stream->avg_frame_rate.den )
-+ frameRate /= stream->avg_frame_rate.den;
-
- subRes.addProperty( NFO::aspectRatio(), aspectRatio );
- subRes.addProperty( NFO::frameRate(), frameRate );
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild
index f8a5388..85bbead 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild
@@ -14,7 +14,7 @@ DEPEND="
>=dev-libs/shared-desktop-ontologies-0.11.0
>=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso]
epub? ( app-text/ebook-tools )
- exif? ( media-gfx/exiv2 )
+ exif? ( media-gfx/exiv2:= )
ffmpeg? ( virtual/ffmpeg )
pdf? ( app-text/poppler[qt4] )
taglib? ( media-libs/taglib )
diff --git a/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild
index f8a5388..85bbead 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild
@@ -14,7 +14,7 @@ DEPEND="
>=dev-libs/shared-desktop-ontologies-0.11.0
>=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso]
epub? ( app-text/ebook-tools )
- exif? ( media-gfx/exiv2 )
+ exif? ( media-gfx/exiv2:= )
ffmpeg? ( virtual/ffmpeg )
pdf? ( app-text/poppler[qt4] )
taglib? ( media-libs/taglib )
diff --git a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
index f8a5388..85bbead 100644
--- a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
@@ -14,7 +14,7 @@ DEPEND="
>=dev-libs/shared-desktop-ontologies-0.11.0
>=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso]
epub? ( app-text/ebook-tools )
- exif? ( media-gfx/exiv2 )
+ exif? ( media-gfx/exiv2:= )
ffmpeg? ( virtual/ffmpeg )
pdf? ( app-text/poppler[qt4] )
taglib? ( media-libs/taglib )
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-12-20 12:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 14:45 [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2012-06-01 16:13 Johannes Huber
2012-08-06 20:42 Dennis Schridde
2012-08-07 17:49 Johannes Huber
2013-06-23 18:49 David Heidelberger
2013-06-28 12:58 David Heidelberger
2013-12-20 12:20 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox