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

Accepting request 1195342 from KDE:Applications

Browse Source 
KDE Release gear 24.08.0 (forwarded request 1194683 from krop)

OBS-URL: https://build.opensuse.org/request/show/1195342
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=162
This commit is contained in:
Ana Guerrero
2024-08-26 20:06:11 +00:00
committed by Git OBS Bridge
parent 6ccc9b8267 0f9d3eb361
commit c61ddcb7c8
7 changed files with 90 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
0001-Revert-Enable-the-k3b-helper-by-default.patch
View File

@@ -1,4 +1,4 @@
From 50e466004d9eefb7c54d8f20f99c730aa9d33fc3 Mon Sep 17 00:00:00 2001
From 45609f881bd8cd8cfd0a1c53b04192bab8969c5d Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Mon, 3 Jun 2019 22:31:35 +0200
Subject: [PATCH] Revert "Enable the k3b helper by default"
@@ -15,11 +15,11 @@ This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b.
src/option/k3bexternalbinwidget.h | 2 ++
8 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bc9152..ae8aa40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support for querying metadata about audio tracks
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/CMakeLists.txt
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/CMakeLists.txt
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/CMakeLists.txt
@@ -36,6 +36,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support f
option(K3B_ENABLE_DVD_RIPPING "Support for ripping Video DVDs with optional decryption." ON)
option(K3B_ENABLE_TAGLIB "Support for reading audio file metadata using Taglib." ON)
option(K3B_BUILD_API_DOCS "Build the API documentation for the K3b libs." OFF)
@@ -27,7 +27,7 @@ index 9bc9152..ae8aa40 100644
# plugin options
option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON)
@@ -287,6 +288,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B_BUILD_EXTERNAL_ENCODER_PLUGIN}")
@@ -272,6 +273,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B
set(ENABLE_HAL_SUPPORT "${K3B_ENABLE_HAL_SUPPORT}")
set(ENABLE_AUDIO_PLAYER "${QT_QTMULTIMEDIA_FOUND}")
@@ -35,10 +35,10 @@ index 9bc9152..ae8aa40 100644
if(IS_ABSOLUTE ${KDE_INSTALL_DATADIR})
set(K3B_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/k3b)
diff --git a/INSTALL.txt b/INSTALL.txt
index 9cd107d..f1ae322 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/INSTALL.txt
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/INSTALL.txt
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/INSTALL.txt
@@ -44,6 +44,7 @@ For debug:
-DKDE_INSTALL_LIBEXECDIR=lib \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
@@ -55,10 +55,10 @@ index 9cd107d..f1ae322 100644
-DK3B_DEBUG=ON
If the cmake run was successful you are presented with a list of configure results that shows
diff --git a/config-k3b.h.cmake b/config-k3b.h.cmake
index 1ef4180..0c7a1a1 100644
--- a/config-k3b.h.cmake
+++ b/config-k3b.h.cmake
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/config-k3b.h.cmake
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/config-k3b.h.cmake
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/config-k3b.h.cmake
@@ -20,6 +20,8 @@
#cmakedefine ENABLE_AUDIO_PLAYER
@@ -68,10 +68,10 @@ index 1ef4180..0c7a1a1 100644
#cmakedefine HAVE_BYTESWAP_H
#cmakedefine WORDS_BIGENDIAN
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2a0ac3..81962d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/CMakeLists.txt
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/src/CMakeLists.txt
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/CMakeLists.txt
@@ -1,5 +1,7 @@
-add_subdirectory( helper )
@@ -81,11 +81,11 @@ index c2a0ac3..81962d4 100644
add_subdirectory( icons )
add_subdirectory( pics )
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index 4108ba3..9445517 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -50,7 +50,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bdevicewidget.cpp
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/src/option/k3bdevicewidget.cpp
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bdevicewidget.cpp
@@ -50,7 +50,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De
m_messageWidget = new KMessageWidget( this );
m_messageWidget->hide();
m_messageWidget->setWordWrap( true );
@@ -95,7 +95,7 @@ index 4108ba3..9445517 100644
// buttons
// ------------------------------------------------
@@ -87,7 +89,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p
@@ -87,7 +89,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De
// ------------------------------------------------
connect( buttonRefreshDevices, SIGNAL(clicked()), SIGNAL(refreshButtonClicked()) );
connect( m_deviceManager, SIGNAL(changed()), SLOT(init()) );
@@ -105,7 +105,7 @@ index 4108ba3..9445517 100644
// ------------------------------------------------
}
@@ -236,10 +240,16 @@ void K3b::DeviceWidget::updateDeviceListViews()
@@ -236,10 +240,16 @@ void K3b::DeviceWidget::updateDeviceList
if (!groupNames.contains(m_deviceGroup)) {
QString messageText = i18n("In order to give K3b full access to the writer device the current user needs be added to a group <em>%1</em>.", m_deviceGroup);
@@ -122,7 +122,7 @@ index 4108ba3..9445517 100644
m_messageWidget->animatedShow();
}
}
@@ -248,6 +258,7 @@ void K3b::DeviceWidget::updateDeviceListViews()
@@ -248,6 +258,7 @@ void K3b::DeviceWidget::updateDeviceList
void K3b::DeviceWidget::addUserToGroup()
{
@@ -130,7 +130,7 @@ index 4108ba3..9445517 100644
QVariantMap args;
args["groupName"] = m_deviceGroup;
args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name);
@@ -275,6 +286,7 @@ void K3b::DeviceWidget::addUserToGroup()
@@ -271,6 +282,7 @@ void K3b::DeviceWidget::addUserToGroup()
}
} );
job->start();
@@ -138,11 +138,11 @@ index 4108ba3..9445517 100644
}
#include "moc_k3bdevicewidget.cpp"
diff --git a/src/option/k3bexternalbinpermissionmodel.cpp b/src/option/k3bexternalbinpermissionmodel.cpp
index 02b608c..e6bcd0c 100644
--- a/src/option/k3bexternalbinpermissionmodel.cpp
+++ b/src/option/k3bexternalbinpermissionmodel.cpp
@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel::buddy( const QModelIndex& index ) const
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bexternalbinpermissionmodel.cpp
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/src/option/k3bexternalbinpermissionmodel.cpp
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bexternalbinpermissionmodel.cpp
@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel::
void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
{
@@ -150,7 +150,7 @@ index 02b608c..e6bcd0c 100644
if( burningGroup != d->burningGroup ) {
beginResetModel();
d->burningGroup = burningGroup;
@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurn
}
endResetModel();
}
@@ -158,11 +158,11 @@ index 02b608c..e6bcd0c 100644
}
void ExternalBinPermissionModel::update()
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 85c1ae8..f0068a1 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -103,7 +103,12 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bexternalbinwidget.cpp
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/src/option/k3bexternalbinwidget.cpp
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bexternalbinwidget.cpp
@@ -103,7 +103,12 @@ K3b::ExternalBinWidget::ExternalBinWidge
// setup permissions tab
// ------------------------------------------------------------
QWidget* permissionsTab = new QWidget( m_mainTabWidget );
@@ -175,7 +175,7 @@ index 85c1ae8..f0068a1 100644
permissionsLabel->setWordWrap( true );
m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab );
m_permissionView = new QTreeView( permissionsTab );
@@ -111,11 +116,15 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
@@ -111,11 +116,15 @@ K3b::ExternalBinWidget::ExternalBinWidge
m_permissionView->setAllColumnsShowFocus( true );
m_permissionView->setRootIsDecorated( false );
m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents );
@@ -191,7 +191,7 @@ index 85c1ae8..f0068a1 100644
m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") );
@@ -134,9 +143,11 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
@@ -134,13 +143,16 @@ K3b::ExternalBinWidget::ExternalBinWidge
m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") );
@@ -203,15 +203,12 @@ index 85c1ae8..f0068a1 100644
connect( m_rescanButton, SIGNAL(clicked(bool)), this, SLOT(rescan()) );
qRegisterMetaType<HelperProgramItem>();
@@ -144,6 +155,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
qRegisterMetaTypeStreamOperators<HelperProgramItem>("K3b::HelperProgramItem");
#endif
+#ifdef ENABLE_PERMISSION_HELPER
while (::group *g = ::getgrent()) {
const QString groupName = QString::fromLocal8Bit(g->gr_name);
if (groupName == "cdrom" ||
@@ -153,6 +165,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
@@ -150,6 +162,7 @@ K3b::ExternalBinWidget::ExternalBinWidge
}
}
::endgrent();
@@ -219,7 +216,7 @@ index 85c1ae8..f0068a1 100644
}
@@ -199,12 +212,15 @@ void K3b::ExternalBinWidget::saveSearchPath()
@@ -196,12 +209,15 @@ void K3b::ExternalBinWidget::saveSearchP
void K3b::ExternalBinWidget::slotPermissionModelChanged()
{
@@ -235,7 +232,7 @@ index 85c1ae8..f0068a1 100644
KAuth::Action action("org.kde.k3b.updatepermissions");
action.setHelperId("org.kde.k3b");
@@ -256,6 +272,7 @@ void K3b::ExternalBinWidget::slotChangePermissions()
@@ -249,6 +265,7 @@ void K3b::ExternalBinWidget::slotChangeP
}
} );
job->start();
@@ -243,10 +240,10 @@ index 85c1ae8..f0068a1 100644
}
diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h
index b610147..d53a4fc 100644
--- a/src/option/k3bexternalbinwidget.h
+++ b/src/option/k3bexternalbinwidget.h
Index: k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bexternalbinwidget.h
===================================================================
--- k3b-%{_kapp6_version}git.20240423T012727~d1088c4.orig/src/option/k3bexternalbinwidget.h
+++ k3b-%{_kapp6_version}git.20240423T012727~d1088c4/src/option/k3bexternalbinwidget.h
@@ -66,7 +66,9 @@ namespace K3b {
QTreeView* m_permissionView;
KEditListWidget* m_searchPathBox;
@@ -257,6 +254,3 @@ index b610147..d53a4fc 100644
QPushButton* m_rescanButton;
};
}
--
2.44.0

3
k3b-24.05.2.tar.xz
View File

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

16
k3b-24.05.2.tar.xz.sig
View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmaDmhEACgkQu0YzUNbv
Me9qGg/9GnPcHOnhFoNcS7N9jeYEHtyMHSKeggOLF/hlDI8EVlMhn76sN4Rvqzni
q4GX9MfVayxSl/KVOZDqlnNTJz8jccb0IxgNQBm57XBvQi34Zpdhju815RJXesAa
xlqjYOEomJjHv6Z+USrKq3/NCN/O88+54pA9ye756e90VwOilF+XjShE2+5LMDKG
Ph+kxUELdIs6hDSRxw73hGbtFa9r+xJgmMP3VvxTlsgQF6LDyF2EWr3PP4OrxK+g
aJEUZmO4tC88EFEz1cefnqp8VuhXCKoIhXcchlGB7l8h4+qzY4EBGtgqBIPsMUN6
NqeTr7NpUFcukHh5TsekSyvMIi/XJhkEOnFLHdZYRrXwuUbmKzfSd15eqsY8PRCi
o0SLREgtoyxTsdO5v4rJQF5X3AaODuqrJ1U9P9fOptW/6HXDTAr5gckeBCGqMJSo
MpVip/hzXsJdDTqrbLKMYm4xL4oV07PUExTSNExjXi/hI7aA+4Dl4J+EaIBD2YPa
x74FvQ8Jr8+0dFbgWsTOX0GQWhgAq86MgOwthpLHDZQst8PoZ2GIFPN5dyyilopp
t7vucPcOE4yaqM0yQu2uO6B7gc2aWBBbo8i4BZ7n1pTdSewgBXnSweoOjySwRkDM
RRI0ytqK75+z8Qt0GNq4XlQj9wB+V+fhTUh3H4Lq309Uny7HrYk=
=dt9a
-----END PGP SIGNATURE-----

3
k3b-24.08.0.tar.xz Normal file
View File

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

16
k3b-24.08.0.tar.xz.sig Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAma+3esACgkQu0YzUNbv
Me/kWRAAh0gafc0whZRyZBOJ+lxs31lUHqUxNOceZDyDi+0k6Qh73b1JkUTssMZ5
lD5uNUa7OPxl2tlOBb0uinAMmqm2Cze1Zdk4zRAKA0HfHoB9GccjsfNqDD0Ys+0g
vqh0MkGfTUw/dR00PLHmUN7Gm4qEIc9z39FkvzoY4QeCcJMXi26lJ8a9JhCVY60a
6DjqLVkaHvn/6edPeejEWwTcGAteZ90q0k/672v9GbiXFtm4txJPyxSWXHeynuEH
Bw0O6jV8SmcADlD7vAn22HaEc8sR+GDWWFsn5NN5YmG8y8AnKRFFW9TIXqiTfWiX
90kBytWBrklxDay3XPu1Huy7XF10sWqGSF1MvNLJdI7U2/ZCg8J7JIjya8xfZvh9
/APd1x8Ik5qeBjOfImm8BbwYhylVj581LfaV5+7ijC/VhL1iDDXOyHCWLFiUYbcc
dSYRwRWqxXFuFiOr0v47ukVA89k94emY8WJcoZeEuypxxhl6rpMyVP7yhnp+slLw
8nnWP3aY348bQvk847atEt7H+BbN6+05crjZ5XSsENq3A6l1nEGs5Q/xFl+a9HJh
kWXbdVeljlwTZmmBGoirW8hqBPyFMCHeFhPVZj68S83L8ftn449mCYZv5Rt8qcfW
ZKc405p46Dw32HTDYMyVYDtQRb4OBb2UY+uqwIsMSzjVhtb8Ex0=
=mImN
-----END PGP SIGNATURE-----

21
k3b.changes
View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Aug 19 07:13:21 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.08.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/24.08.0/
- Changes since 24.05.2:
* Make it compatible with the Sound Naming spec
* AudioCdView: Port to new connect syntax
* AudioTrackModel: Clear CDDB data on medium change
* JobProgressDialog: Add icons to buttons
* LsofWrapperDialog: Add icons to buttons
* Update the CD Audio title banner after a CDDB lookup
* UI files: use notr="true" instead of old comment="KDE::DoNotExtract"
* K3b::Device::debugBitfield: Fix crash when using Qt6 (kde#486314)
* Enforce passing tests
* Switch to KF6 by default
* Fix Qt 5 build
* Port away from Qt5Compat
-------------------------------------------------------------------
Tue Jul 2 13:53:49 UTC 2024 - Christophe Marin <christophe@krop.fr>

5
k3b.spec
View File

@@ -16,7 +16,7 @@
#
%define kf6_version 6.0.0
%define kf6_version 6.3.0
%define qt6_version 6.6.0
%bcond_without released
@@ -24,7 +24,7 @@
%bcond_without lame
%bcond_without mad
Name: k3b
Version: 24.05.2
Version: 24.08.0
Release: 0
Summary: CD/DVD/Blu-ray Burning Application by KDE
License: GPL-2.0-or-later
@@ -62,7 +62,6 @@ BuildRequires: cmake(KF6Solid) >= %{kf6_version}
BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version}
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version}
BuildRequires: cmake(Qt6DBus) >= %{qt6_version}
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
%ifarch x86_64 %{x86_64} aarch64 riscv64