pool/k3b
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1105634 from KDE:Applications

Browse Source 
KDE Release Gear 23.08.0 (forwarded request 1105409 from krop)

OBS-URL: https://build.opensuse.org/request/show/1105634
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=151
This commit is contained in:
Ana Guerrero 2023-08-31 11:44:03 +00:00 committed by Git OBS Bridge
commit 79444707d2
7 changed files with 86 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 8758abbdc54b674b4d005cfa296d96b8c92f8bec 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(-)
Index: k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt
Index: k3b-19.11.70git.20230721T020132~9035e34b0/CMakeLists.txt
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/CMakeLists.txt
+++ k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt
@@ -35,6 +35,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support f
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/CMakeLists.txt
+++ k3b-19.11.70git.20230721T020132~9035e34b0/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: k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt
# plugin options
option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON)
@@ -268,6 +269,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B
@@ -287,6 +288,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: k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt
if(IS_ABSOLUTE ${KDE_INSTALL_DATADIR})
set(K3B_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/k3b)
Index: k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt
Index: k3b-19.11.70git.20230721T020132~9035e34b0/INSTALL.txt
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/INSTALL.txt
+++ k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/INSTALL.txt
+++ k3b-19.11.70git.20230721T020132~9035e34b0/INSTALL.txt
@@ -44,6 +44,7 @@ For debug:
-DKDE_INSTALL_LIBEXECDIR=lib \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
@ -55,10 +55,10 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt
-DK3B_DEBUG=ON
If the cmake run was successful you are presented with a list of configure results that shows
Index: k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake
Index: k3b-19.11.70git.20230721T020132~9035e34b0/config-k3b.h.cmake
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/config-k3b.h.cmake
+++ k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/config-k3b.h.cmake
+++ k3b-19.11.70git.20230721T020132~9035e34b0/config-k3b.h.cmake
@@ -20,6 +20,8 @@
#cmakedefine ENABLE_AUDIO_PLAYER
@ -68,10 +68,10 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake
#cmakedefine HAVE_BYTESWAP_H
#cmakedefine WORDS_BIGENDIAN
Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/CMakeLists.txt
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/CMakeLists.txt
+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/CMakeLists.txt
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/CMakeLists.txt
@@ -1,5 +1,7 @@
-add_subdirectory( helper )
@ -81,11 +81,11 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt
add_subdirectory( icons )
add_subdirectory( pics )
Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bdevicewidget.cpp
+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp
@@ -55,7 +55,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bdevicewidget.cpp
+++ k3b-19.11.70git.20230721T020132~9035e34b0/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: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp
// buttons
// ------------------------------------------------
@@ -92,7 +94,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De
@@ -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: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp
// ------------------------------------------------
}
@@ -241,10 +245,16 @@ void K3b::DeviceWidget::updateDeviceList
@@ -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: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp
m_messageWidget->animatedShow();
}
}
@@ -253,6 +263,7 @@ void K3b::DeviceWidget::updateDeviceList
@@ -248,6 +258,7 @@ void K3b::DeviceWidget::updateDeviceList
void K3b::DeviceWidget::addUserToGroup()
{
@ -130,16 +130,18 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp
QVariantMap args;
args["groupName"] = m_deviceGroup;
args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name);
@@ -276,4 +287,5 @@ void K3b::DeviceWidget::addUserToGroup()
@@ -271,6 +282,7 @@ void K3b::DeviceWidget::addUserToGroup()
}
} );
job->start();
+#endif
}
Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermissionmodel.cpp
#include "moc_k3bdevicewidget.cpp"
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinpermissionmodel.cpp
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinpermissionmodel.cpp
+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermissionmodel.cpp
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bexternalbinpermissionmodel.cpp
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinpermissionmodel.cpp
@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel::
void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
@ -156,11 +158,11 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermis
}
void ExternalBinPermissionModel::update()
Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.cpp
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.cpp
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinwidget.cpp
+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.cpp
@@ -109,7 +109,12 @@ K3b::ExternalBinWidget::ExternalBinWidge
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bexternalbinwidget.cpp
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.cpp
@@ -104,7 +104,12 @@ K3b::ExternalBinWidget::ExternalBinWidge
// setup permissions tab
// ------------------------------------------------------------
QWidget* permissionsTab = new QWidget( m_mainTabWidget );
@ -173,7 +175,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget
permissionsLabel->setWordWrap( true );
m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab );
m_permissionView = new QTreeView( permissionsTab );
@@ -117,11 +122,15 @@ K3b::ExternalBinWidget::ExternalBinWidge
@@ -112,11 +117,15 @@ K3b::ExternalBinWidget::ExternalBinWidge
m_permissionView->setAllColumnsShowFocus( true );
m_permissionView->setRootIsDecorated( false );
m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents );
@ -189,7 +191,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget
m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") );
@@ -140,14 +149,17 @@ K3b::ExternalBinWidget::ExternalBinWidge
@@ -135,9 +144,11 @@ K3b::ExternalBinWidget::ExternalBinWidge
m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") );
@ -201,13 +203,15 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget
connect( m_rescanButton, SIGNAL(clicked(bool)), this, SLOT(rescan()) );
qRegisterMetaType<HelperProgramItem>();
@@ -145,6 +156,7 @@ K3b::ExternalBinWidget::ExternalBinWidge
qRegisterMetaTypeStreamOperators<HelperProgramItem>("K3b::HelperProgramItem");
#endif
+#ifdef ENABLE_PERMISSION_HELPER
while (::group *g = ::getgrent()) {
const QString groupName = QString::fromLocal8Bit(g->gr_name);
if (groupName == "cdrom" ||
@@ -157,6 +169,7 @@ K3b::ExternalBinWidget::ExternalBinWidge
@@ -154,6 +166,7 @@ K3b::ExternalBinWidget::ExternalBinWidge
}
}
::endgrent();
@ -215,7 +219,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget
}
@@ -203,12 +216,15 @@ void K3b::ExternalBinWidget::saveSearchP
@@ -200,12 +213,15 @@ void K3b::ExternalBinWidget::saveSearchP
void K3b::ExternalBinWidget::slotPermissionModelChanged()
{
@ -231,18 +235,18 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget
KAuth::Action action("org.kde.k3b.updatepermissions");
action.setHelperId("org.kde.k3b");
action.setParentWidget(this);
@@ -250,6 +266,7 @@ void K3b::ExternalBinWidget::slotChangeP
@@ -247,6 +263,7 @@ void K3b::ExternalBinWidget::slotChangeP
}
} );
job->start();
+#endif
}
Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.h
#include "moc_k3bexternalbinwidget.cpp"
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.h
===================================================================
--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinwidget.h
+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.h
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bexternalbinwidget.h
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.h
@@ -57,7 +57,9 @@ namespace K3b {
QTreeView* m_permissionView;
KEditListWidget* m_searchPathBox;

3
k3b-23.04.3.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmSjsf4ACgkQu0YzUNbv
Me8DWw/7B1Emc8efXt8YMr0kTpig2g4HadhZQoA86fkbMcdveqA97RTxpS0NOaaR
A4HRLy98vZ49xvIup0fYpKNcrUTZZSIksGaRN9xX1Egl2hY/6pbW3Lg+E/lXdAyC
nyUaR3ELnTetlJ104LCHUIyiFq6xP88F+q2AaTqaJFf+YtIluGBtzxT7DjeKRT3m
/1NqTX5DhhbaENhWnKq4cZMaIgEL9bJKl0jz2x+V0r8KksWg0hTeAlsfOzOi9hR9
Pcxw6osXn3RhtZA3S62y/yVQemxDYJwJDxutvKUvdEX95OFOotCtWdJ+PBvd8Qjq
BoDuYvLF3/1xvGDk8G3nQv6aHXY/KG5EQ4dYTUJa/ff/kVqH89EBHDtqY0Y0U3iT
uCzZTQv2B2TPpWnKSOvep8uLxP0cj3Tj66UJet3pyCM82AA5jpASadkog2Ag6UxI
uuBQqzuKGlNe2ZrZKvISI8WmhobzJ9PVVH1EakQ9KeYxISGKDqG/b5hEsv6HLdkE
1zIFjClK5+zV1myEXv8TmrX9Re0IGu4KKtDqU35Ryan8N5avQYfcWJQxwbdYM89K
zP3xBBFR+5YQQqcEZuBd8w6GzGSTO6mHCsbVI0DR93i7Y0XW9ASZrS5iI87aV+2w
uOW4AVMxcDvY8aipp1jRnSWzW2rxcJG7iqhDMdIxXErJ92vkeB8=
=CEf0
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmTfBsAACgkQu0YzUNbv
Me/6GQ/+IAcmMkaRMF3vkVozIe7lfwcUUogKB5HgC/1gNjByRWODp3Mj+uFE3zyu
aoIFVc5lUh09joNHDTp5d3nbWhmoG/xdD/1CNFe3Fr0Fne3ZHEu3k/oyG0kMoTJH
jSdJxdArD7XtnQYREoQVTJLxKQEHxNLqpCD4VLgWyRRPqpMaoWb1gZ4WiUfXY1gH
V2K66Ryrl8Owzs8Uaa2Kn6MEvkQTGpPM/OKvVThH3PqjO6KTMQ6tPpNqVY6lz/hE
LaVoEcGAcvWCO56aQmxPmP1TERQq41zFMXcgkvGfpCRCj1r2YfPdlLEGshZJlE+l
qh0yyZulmELL+w4EmfaoBNfuvQJeRS0HyfL4hqRpw6GWfuInOuMeHFpGYcWgMe62
uD9wUdzCPEJNcq9U2rH4RAKb9fl6piDGDuK79bk6nTCwKBT+DMXeCkHta6szBIM8
kJZHYth0yHxf2AAaPCi9QBn83+I89034OEduLEODyRb3cznEtjlowx3/OX0Nj57s
lJTKe9JK5jOIpgTbLuB3Vac/iU4+945rKDcm4VrUQ6UH9PG5pANOEHPm+Xjcl4Kb
nAZuoar2IR/aymuVqtdBBnwkqXp1g5CMxlFVadufF1+xXS4sB7+eICZ3R87Kj4Kn
dL0DFsMTFSM+93yDBlCtjGBW8NprlaPnm3p1F2dWGRqDrnYuqT4=
=FWLm
-----END PGP SIGNATURE-----

23
k3b.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Sun Aug 20 13:59:04 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 23.08.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/23.08.0/
- No code change since 23.07.90
-------------------------------------------------------------------
Mon Aug 14 08:02:20 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 23.07.90
* New feature release
- Changes since 23.07.80:
* Add an Open Age content rating.
-------------------------------------------------------------------
Tue Aug 1 10:21:24 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 23.07.80
* New feature release
-------------------------------------------------------------------
Tue Jul 4 10:19:22 UTC 2023 - Christophe Marin <christophe@krop.fr>

2
k3b.spec
View File

@ -21,7 +21,7 @@
%bcond_without lame
%bcond_without mad
Name: k3b
Version: 23.04.3
Version: 23.08.0
Release: 0
Summary: CD/DVD/Blu-ray Burning Application by KDE
License: GPL-2.0-or-later