From eadb41c62a2a31e87d23984e2f7cb14f73c7dc45fac58850fe506bf50302d8e3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 1 Oct 2010 23:59:03 +0000 Subject: [PATCH] Accepting request 49470 from KDE:Distro:Factory Copy from KDE:Distro:Factory/kaffeine based on submit request 49470 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/49470 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=32 --- kaffeine-1.0.tar.bz2 | 3 --- kaffeine-1.1.tar.bz2 | 3 +++ kaffeine-icons.tar.bz2 | 4 ++-- kaffeine.changes | 15 +++++++++++++++ kaffeine.spec | 7 +++---- ksuseinstall.diff | 32 +++++++++++++++++--------------- 6 files changed, 40 insertions(+), 24 deletions(-) delete mode 100644 kaffeine-1.0.tar.bz2 create mode 100644 kaffeine-1.1.tar.bz2 diff --git a/kaffeine-1.0.tar.bz2 b/kaffeine-1.0.tar.bz2 deleted file mode 100644 index e178a85..0000000 --- a/kaffeine-1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2eae80adcbd6a7e83077206dc4b06d45d72e9cfe2e406efbf268efb9e1c9c563 -size 289648 diff --git a/kaffeine-1.1.tar.bz2 b/kaffeine-1.1.tar.bz2 new file mode 100644 index 0000000..646082b --- /dev/null +++ b/kaffeine-1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17eed8dd0641e3d90cd32cac44361501294f7e4f58ec4955fb20f439b6694efe +size 300838 diff --git a/kaffeine-icons.tar.bz2 b/kaffeine-icons.tar.bz2 index 62f538a..11491ab 100644 --- a/kaffeine-icons.tar.bz2 +++ b/kaffeine-icons.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dc0abc487015e1f1514e88a9a4e6253dc1e643a175f3441b5b7cbcf14456298 -size 26305 +oid sha256:a5ad1e6bd665cda72cf5008c2dab03ce6cbb366a341c7c3c7168c4118405a0c2 +size 26307 diff --git a/kaffeine.changes b/kaffeine.changes index f9c2eee..ed1f21a 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Sep 27 23:28:47 UTC 2010 - initialZero@gmail.com + +- update to 1.1: + * adapt to new shared-mime-info (so that .m2t is assigned to + kaffeine again) + * workaround issue that video isn't shown without changing tabs + when using QT 4.7 + * recording schedule: fix sorting, improve column and dialog + sizes, show a warning about active and pending recordings + when closing kaffeine + * program guide: remove the "Refresh" button (not necessary + anymore) + * channel editor: allow sorting by drag and drop + ------------------------------------------------------------------- Wed Jul 7 13:41:48 UTC 2010 - initialZero@gmail.com diff --git a/kaffeine.spec b/kaffeine.spec index 79c495a..2c5ba0d 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,5 +1,5 @@ # -# spec file for package kaffeine (Version 1.0) +# spec file for package kaffeine (Version 1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,9 +27,9 @@ Url: http://kaffeine.sourceforge.net/ License: GPLv2+ Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player -Version: 1.0 +Version: 1.1 Release: 1 -%define rversion 1.0 +%define rversion 1.1 # http://kaffeine.kde.org/?q=node/22 Source0: kaffeine-%rversion.tar.bz2 Source1: kaffeine-icons.tar.bz2 @@ -38,7 +38,6 @@ Patch2: fix_plasma_startup_error.diff Patch3: ksuseinstall.diff Patch4: initial-preference.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libqt4-sql-sqlite %kde4_runtime_requires %description diff --git a/ksuseinstall.diff b/ksuseinstall.diff index 06ecb9a..a039b9b 100644 --- a/ksuseinstall.diff +++ b/ksuseinstall.diff @@ -34,9 +34,9 @@ XinePipeWriterBase *writer; }; ---- src/backend-xine/xinemediawidget.cpp.sav 2010-04-14 14:02:32.000000000 +0200 -+++ src/backend-xine/xinemediawidget.cpp 2010-04-14 14:38:25.957512431 +0200 -@@ -22,13 +22,17 @@ +--- src/backend-xine/xinemediawidget.cpp.sav 2010-09-27 16:08:49.648890045 -0600 ++++ src/backend-xine/xinemediawidget.cpp 2010-09-27 16:21:39.342889627 -0600 +@@ -22,12 +22,16 @@ #include "xinemediawidget_p.h" #include @@ -44,7 +44,6 @@ #include +#include #include - #include #include #include #include @@ -54,7 +53,7 @@ static QString binInstallPath() { return QString::fromUtf8(KAFFEINE_BIN_INSTALL_DIR "/"); -@@ -214,6 +218,15 @@ void XineProcess::readyRead() +@@ -213,6 +217,15 @@ break; } @@ -70,7 +69,7 @@ default: kError() << "unknown command" << command; continue; -@@ -795,6 +808,45 @@ void XineMediaWidget::updateVideoSize(un +@@ -844,6 +857,45 @@ } } @@ -116,6 +115,7 @@ void XineMediaWidget::playEncodedUrl(const QByteArray &encodedUrl, StateFlags stateFlags) { ++sequenceNumber; + --- src/backend-xine/xinemediawidget.h.sav 2010-01-31 18:04:50.000000000 +0100 +++ src/backend-xine/xinemediawidget.h 2010-04-14 14:31:17.301512132 +0200 @@ -127,6 +127,9 @@ public: @@ -136,16 +136,18 @@ void playEncodedUrl(const QByteArray &encodedUrl, StateFlags stateFlags = 0); void stateChanged(); ---- src/backend-xine/xineapplication.cpp.sav 2010-04-14 14:02:32.000000000 +0200 -+++ src/backend-xine/xineapplication.cpp 2010-04-14 14:38:37.521511436 +0200 -@@ -292,6 +292,10 @@ void XineObject::init(quint64 windowId) +--- src/backend-xine/xineapplication.cpp.sav 2010-09-27 16:30:01.619888519 -0600 ++++ src/backend-xine/xineapplication.cpp 2010-09-27 16:39:05.239888392 -0600 +@@ -295,7 +295,11 @@ + xine_config_load(engine, QFile::encodeName(KStandardDirs::locateLocal("data", "kaffeine/xine-config"))); xine_init(engine); - -+ if( char* mimes = xine_get_mime_types( engine )) { -+ parentProcess->supportedMimeTypes( mimes ); -+ } -+ +- ++ ++ if( char* mimes = xine_get_mime_types( engine )) { ++ parentProcess->supportedMimeTypes( mimes ); ++ } ++ QVector audioDrivers; audioDrivers.append("auto"); - + \ No newline at end of file