rpm/k3b
SHA256
1
0
Fork 0
forked from pool/k3b
Code Pull Requests Activity

Accepting request 58417 from KDE:Distro:Factory

Browse Source 
Accepted submit request 58417 from user tittiatcoke

OBS-URL: https://build.opensuse.org/request/show/58417
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=28
This commit is contained in:
Marcus Rückert 2011-01-17 18:05:48 +00:00 committed by Git OBS Bridge
parent 710d13872c
commit 972572c63c
8 changed files with 40 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
add_mimetypes_bnc661777.diff
View File

@ -1,6 +1,6 @@
--- src/k3b.desktop 2010-06-12 09:06:28.000000000 +0200
+++ src/k3b.desktop_patched 2010-12-30 20:06:00.000000000 +0100
@@ -135,7 +135,7 @@
--- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100
+++ src/k3b.desktop 2011-01-16 12:08:05.698000050 +0100
@@ -137,7 +137,7 @@
Name[x-test]=xxK3bxx
Name[zh_CN]=K3b
Name[zh_TW]=K3b
@ -8,4 +8,4 @@
+MimeType=application/x-k3b;application/x-iso;application/x-cd-image;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
X-KDE-StartupNotify=true
X-KDE-NativeMimeType=application/x-k3b;
Categories=KDE;Qt;AudioVideo;DiscBurning;
Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;

105
device-detection-fix.patch
View File

@ -1,105 +0,0 @@
Don't assume optical Solid device has also Solid::Block interface. For some reason it can lack it (hardware issue or Solid bug)
BUG: 249371
---
--- k3b/libk3bdevice/k3bdevicemanager.cpp 2010/09/09 18:58:01 1173574
+++ k3b/libk3bdevice/k3bdevicemanager.cpp 2010/09/09 19:01:06 1173575
@@ -1,6 +1,7 @@
/*
*
* Copyright (C) 2003-2009 Sebastian Trueg <trueg@k3b.org>
+ * Copyright (C) 2010 Michal Malek <michalm@jabster.pl>
*
* This file is part of the K3b project.
* Copyright (C) 1998-2009 Sebastian Trueg <trueg@k3b.org>
@@ -290,7 +291,7 @@
emit changed( this );
emit changed();
-
+
qDeleteAll( devicesToDelete );
}
@@ -354,12 +355,13 @@
K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::Device& solidDevice )
{
- if ( findDevice( solidDevice.as<Solid::Block>()->device() ) ) {
- kDebug() << "(K3b::Device::DeviceManager) dev " << solidDevice.as<Solid::Block>()->device() << " already found";
- return 0;
+ if( const Solid::Block* blockDevice = solidDevice.as<Solid::Block>() ) {
+ if( !findDevice( blockDevice->device() ) )
+ return addDevice( new K3b::Device::Device( solidDevice ) );
+ else
+ kDebug() << "(K3b::Device::DeviceManager) dev " << blockDevice->device() << " already found";
}
-
- return addDevice( new K3b::Device::Device( solidDevice ) );
+ return 0;
}
@@ -409,19 +411,21 @@
void K3b::Device::DeviceManager::removeDevice( const Solid::Device& dev )
{
- if( Device* device = findDevice( dev.as<Solid::Block>()->device() ) ) {
- d->cdReader.removeAll( device );
- d->dvdReader.removeAll( device );
- d->bdReader.removeAll( device );
- d->cdWriter.removeAll( device );
- d->dvdWriter.removeAll( device );
- d->bdWriter.removeAll( device );
- d->allDevices.removeAll( device );
+ if( const Solid::Block* blockDevice = dev.as<Solid::Block>() ) {
+ if( Device* device = findDevice( blockDevice->device() ) ) {
+ d->cdReader.removeAll( device );
+ d->dvdReader.removeAll( device );
+ d->bdReader.removeAll( device );
+ d->cdWriter.removeAll( device );
+ d->dvdWriter.removeAll( device );
+ d->bdWriter.removeAll( device );
+ d->allDevices.removeAll( device );
- emit changed( this );
- emit changed();
+ emit changed( this );
+ emit changed();
- delete device;
+ delete device;
+ }
}
}
--- k3b/src/k3bappdevicemanager.cpp 2010/09/09 18:58:01 1173574
+++ k3b/src/k3bappdevicemanager.cpp 2010/09/09 19:01:06 1173575
@@ -1,6 +1,7 @@
/*
*
* Copyright (C) 2005-2008 Sebastian Trueg <trueg@k3b.org>
+ * Copyright (C) 2010 Michal Malek <michalm@jabster.pl>
*
* This file is part of the K3b project.
* Copyright (C) 1998-2008 Sebastian Trueg <trueg@k3b.org>
@@ -125,13 +126,15 @@
void K3b::AppDeviceManager::removeDevice( const Solid::Device& solidDev )
{
- if( findDevice( solidDev.as<Solid::Block>()->device() ) == currentDevice() )
- setCurrentDevice( 0 );
+ if( const Solid::Block* blockDevice = solidDev.as<Solid::Block>() ) {
+ if( findDevice( blockDevice->device() ) == currentDevice() )
+ setCurrentDevice( 0 );
- K3b::Device::DeviceManager::removeDevice( solidDev );
+ K3b::Device::DeviceManager::removeDevice( solidDev );
- if( currentDevice() == 0 && !allDevices().isEmpty() )
- setCurrentDevice( allDevices().first() );
+ if( currentDevice() == 0 && !allDevices().isEmpty() )
+ setCurrentDevice( allDevices().first() );
+ }
}

14
initial-preference.diff
View File

@ -1,13 +1,7 @@
Subject: Make K3B the default handler for .iso files
From: Lubos Lunak
Patch-upstream: no
Otherwise Ark is the default handler.
--- src/k3b.desktop.sav 2010-06-16 21:36:44.000000000 +0200
+++ src/k3b.desktop 2010-06-18 16:54:12.154664826 +0200
@@ -140,3 +140,4 @@ X-KDE-StartupNotify=true
--- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100
+++ src/k3b.desktop 2011-01-16 12:06:51.077000058 +0100
@@ -142,3 +142,4 @@
X-KDE-NativeMimeType=application/x-k3b;
Categories=KDE;Qt;AudioVideo;DiscBurning;
Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;
X-DBUS-ServiceType=Unique
+InitialPreference=5

37
k3b-2.0.1-qt47_settings_crash.patch
View File

@ -1,37 +0,0 @@
Index: src/option/k3bpluginoptiontab.cpp
===================================================================
--- src/option/k3bpluginoptiontab.cpp (revision 1168967)
+++ src/option/k3bpluginoptiontab.cpp (working copy)
@@ -43,12 +43,28 @@
layout->addWidget( label );
layout->addWidget( pluginSelector );
+ // find all categories
+ QHash<QString, QString> categoryNames;
+
foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
- kDebug() << "Adding plugin" << plugin->pluginInfo().name();
- pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(),
+ categoryNames[ plugin->category() ] = plugin->categoryName();
+ }
+
+ // add all plugins in each category
+ foreach( const QString &category, categoryNames.keys() ) {
+ QList<KPluginInfo> plugins;
+
+ foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
+ if ( plugin->category() == category ) {
+ plugins << plugin->pluginInfo();
+ kDebug() << "Adding plugin" << plugin->pluginInfo().name();
+ }
+ }
+ pluginSelector->addPlugins( plugins,
KPluginSelector::ReadConfigFile,
- plugin->categoryName(),
- plugin->category() );
+ categoryNames[ category ],
+ category
+ );
}
}

3
k3b-2.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8631460e617833a1f907145271ae4e3224c53e391339f273d2bd340c451ccdb7
size 12269204

3
k3b-2.0.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd
size 12833321

26
k3b.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Sun Jan 16 10:59:26 UTC 2011 - tittiatcoke@gmail.com
- Update to 2.0.2:
* Changes:
- Added K3B_ENABLE_HAL_SUPPORT option to the build configuration.
It allows to disable any direct calls to HAL (bko#253388)
- Using Oxygen sounds for events (bko#242395)
* Bugfixes:
- Crash on start when checking device capabilities (bko#246822)
- Search paths on "Programs" options are not saved (bko#248648)
- Crash on generation of DVD previews in DVD ripping list
(bko#249941, bko#253639)
- Crash on closing dialog after succesful audio CD ripping
(bko#241630)
- Crash on device detection (bko#249371)
- Crash when showing settings window (bko#238819)
- Fixed playlist sort order (bko#249395)
- Show K3b also in "System" category in KDE launch menus
(bko#250749)
- Crash when multiple instances start at the same time
(bko#253794)
- Crash after track splitting (bko#261188)
- Inline editing of tracks in CD ripping view no longer works
(bko#250600)
-------------------------------------------------------------------
Thu Dec 30 19:08:39 UTC 2010 - ctrippe@gmx.net

12
k3b.spec
View File

@ -42,15 +42,12 @@ Group: Productivity/Multimedia/CD/Record
Summary: A Universal CD and DVD Burning Application
Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools
Requires: hal
Version: 2.0.1
Release: 5
Version: 2.0.2
Release: 1
%define rversion %version
# svn.kde.org/home/kde/trunk/extragear/multimedia/k3b
Source0: k3b-%{version}.tar.bz2
Patch0: device-detection-fix.patch
Patch1: initial-preference.diff
# fixed in 2.0.2 / 2.1: https://bugs.kde.org/show_bug.cgi?id=238819
Patch2: k3b-2.0.1-qt47_settings_crash.patch
Patch3: add_mimetypes_bnc661777.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@ -90,13 +87,11 @@ Authors:
%lang_package
%prep
%setup -q -n k3b-%{version}
%patch0 -p1
%patch1
%patch2
%patch3
%build
%cmake_kde4 -d build
%cmake_kde4 -d build -- -DK3B_ENABLE_HAL_SUPPORT=OFF
%make_jobs
%install
@ -141,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/kde4/services/kcm_k3b*.desktop
/usr/share/kde4/services/videodvd.protocol
/usr/share/kde4/servicetypes/k3bplugin.desktop
/usr/share/sounds/k3b_*
%if %suse_version < 1120
/usr/share/PolicyKit/policy/org.kde.kcontrol.k3bsetup.policy
%else