From 00dce30dddac9b7f8626561e68ce559481285dd45c6ae5a653a1f6ec3ad82da7 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 23 May 2024 10:59:40 +0000 Subject: [PATCH] KDE release 24.05.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=255 --- ...ert-Enable-the-k3b-helper-by-default.patch | 31 ++++++++++--------- k3b-24.02.2.tar.xz | 3 -- k3b-24.02.2.tar.xz.sig | 16 ---------- k3b-24.05.0.tar.xz | 3 ++ k3b-24.05.0.tar.xz.sig | 16 ++++++++++ k3b.changes | 26 ++++++++++++++++ k3b.spec | 8 ++--- 7 files changed, 66 insertions(+), 37 deletions(-) delete mode 100644 k3b-24.02.2.tar.xz delete mode 100644 k3b-24.02.2.tar.xz.sig create mode 100644 k3b-24.05.0.tar.xz create mode 100644 k3b-24.05.0.tar.xz.sig diff --git a/0001-Revert-Enable-the-k3b-helper-by-default.patch b/0001-Revert-Enable-the-k3b-helper-by-default.patch index 27b7716..c7ec8d5 100644 --- a/0001-Revert-Enable-the-k3b-helper-by-default.patch +++ b/0001-Revert-Enable-the-k3b-helper-by-default.patch @@ -1,4 +1,4 @@ -From 45609f881bd8cd8cfd0a1c53b04192bab8969c5d Mon Sep 17 00:00:00 2001 +From 50e466004d9eefb7c54d8f20f99c730aa9d33fc3 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 3 Jun 2019 22:31:35 +0200 Subject: [PATCH] Revert "Enable the k3b helper by default" @@ -16,7 +16,7 @@ This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b. 8 files changed, 42 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0eb74a0..39a0624 100644 +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 @@ -139,7 +139,7 @@ index 4108ba3..9445517 100644 #include "moc_k3bdevicewidget.cpp" diff --git a/src/option/k3bexternalbinpermissionmodel.cpp b/src/option/k3bexternalbinpermissionmodel.cpp -index c3e24d0..2f64497 100644 +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 @@ -159,10 +159,10 @@ index c3e24d0..2f64497 100644 void ExternalBinPermissionModel::update() diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp -index e029226..0f6cc28 100644 +index 85c1ae8..f0068a1 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp -@@ -104,7 +104,12 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -103,7 +103,12 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi // setup permissions tab // ------------------------------------------------------------ QWidget* permissionsTab = new QWidget( m_mainTabWidget ); @@ -175,7 +175,7 @@ index e029226..0f6cc28 100644 permissionsLabel->setWordWrap( true ); m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab ); m_permissionView = new QTreeView( permissionsTab ); -@@ -112,11 +117,15 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -111,11 +116,15 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi m_permissionView->setAllColumnsShowFocus( true ); m_permissionView->setRootIsDecorated( false ); m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents ); @@ -191,7 +191,7 @@ index e029226..0f6cc28 100644 m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") ); -@@ -135,9 +144,11 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -134,9 +143,11 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") ); @@ -203,7 +203,7 @@ index e029226..0f6cc28 100644 connect( m_rescanButton, SIGNAL(clicked(bool)), this, SLOT(rescan()) ); qRegisterMetaType(); -@@ -145,6 +156,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -144,6 +155,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi qRegisterMetaTypeStreamOperators("K3b::HelperProgramItem"); #endif @@ -211,7 +211,7 @@ index e029226..0f6cc28 100644 while (::group *g = ::getgrent()) { const QString groupName = QString::fromLocal8Bit(g->gr_name); if (groupName == "cdrom" || -@@ -154,6 +166,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -153,6 +165,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi } } ::endgrent(); @@ -219,7 +219,7 @@ index e029226..0f6cc28 100644 } -@@ -200,12 +213,15 @@ void K3b::ExternalBinWidget::saveSearchPath() +@@ -199,12 +212,15 @@ void K3b::ExternalBinWidget::saveSearchPath() void K3b::ExternalBinWidget::slotPermissionModelChanged() { @@ -235,19 +235,19 @@ index e029226..0f6cc28 100644 KAuth::Action action("org.kde.k3b.updatepermissions"); action.setHelperId("org.kde.k3b"); -@@ -252,6 +268,7 @@ void K3b::ExternalBinWidget::slotChangePermissions() +@@ -256,6 +272,7 @@ void K3b::ExternalBinWidget::slotChangePermissions() } } ); job->start(); +#endif } - #include "moc_k3bexternalbinwidget.cpp" + diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h -index dceaba8..9426412 100644 +index b610147..d53a4fc 100644 --- a/src/option/k3bexternalbinwidget.h +++ b/src/option/k3bexternalbinwidget.h -@@ -57,7 +57,9 @@ namespace K3b { +@@ -66,7 +66,9 @@ namespace K3b { QTreeView* m_permissionView; KEditListWidget* m_searchPathBox; @@ -257,3 +257,6 @@ index dceaba8..9426412 100644 QPushButton* m_rescanButton; }; } +-- +2.44.0 + diff --git a/k3b-24.02.2.tar.xz b/k3b-24.02.2.tar.xz deleted file mode 100644 index 3b2385f..0000000 --- a/k3b-24.02.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6047d94193ba1650ce71f4100bba0786023455f4c6a12e14c9d543058a4e8e45 -size 10968224 diff --git a/k3b-24.02.2.tar.xz.sig b/k3b-24.02.2.tar.xz.sig deleted file mode 100644 index 989be77..0000000 --- a/k3b-24.02.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmYU0UMACgkQu0YzUNbv -Me95PQ/+PkQeJ5lCAEFDay0tiJtosRcQiiQqGA+vfyZux7bzZrtjF/oP0JUgOJjV -j7T19jPWFcag5ZWLVisPdE8C2sbqZdy0+7J4ccXyfr9ofJI3iWwT6d9g7SXfqmzP -xoTP4O7szAb5z8ADMchT/+k6EglehVU+5GxxsjpjJ4ms5pBMnvgGNWiaQbtd2hmW -3PWjg0G722+beeKM3kw27pNam6fx6hNRVu0VUrtxqsYUSMhG3K4q84dL/v9OYLAs -+S1tnzdYAk5b2ITmcH4tnRNLra8kIqnJnuxereamDwcm+VlTHg4SRTHWa73t93PX -AbnsbAAi0DoRlBmpuwOquP3pUwSmZa6LL7Vj2OLEAdNADyPPIfwy2fMdsRU4ChW4 -HKZ4PosP9lyyJLwgZI3Yw5Ll4EFRFs/NkUKtWhDnQoOfBs+hvfLHtnOwNw0JgZrw -ij85M0H9MgjwaXw7deI6cP8bRddvt3n3ciL8yxUGmMKpVFefF+1iqrn9PIWiB3aL -hb53UeDwYhhhP0P3X21GbLDAFHm4h9uIrxOh0H1QAUmFdyZDTvcAlvRwjBEhTyZM -gepjHmkxsY1mE5w2VZziuvji1lBaZaLxOz/TiwR89raC7dcKcAJVTJSp8mhMxSc2 -YQ6s1+wEJ45yGKSKoQ6re2NWzr/ewNoOS42d5FToyIevuosc0cE= -=6BVl ------END PGP SIGNATURE----- diff --git a/k3b-24.05.0.tar.xz b/k3b-24.05.0.tar.xz new file mode 100644 index 0000000..e0ae2d9 --- /dev/null +++ b/k3b-24.05.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e0c47f6f2c8d3c2e3895dc8e9b0205b1a8ce037293b20c47cd37d4246453ad0 +size 10691312 diff --git a/k3b-24.05.0.tar.xz.sig b/k3b-24.05.0.tar.xz.sig new file mode 100644 index 0000000..49a9351 --- /dev/null +++ b/k3b-24.05.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmZG+/EACgkQu0YzUNbv +Me9m5w//Q256Nf/GkRBwrBtvURy0GTPG0acSknFMaRvZb408l64dmmeH9G2m/Ydw +2EZyPNSztYRY7Noct+RN5azlRq2oQq9bxDE1n7RqkI0CCRE/aUkPgDeGght3sdK0 +zBjGtnYsnQWbEa2k64awabrgeQhaoN2UxDk8+lHKqC9a1iIAXeK4KShkjgGW5gI0 +LXQvIg6J7VyKmrB0ST7oGoCeh4MLGXqZytX7ofVBL5wceJOswjB3rUPbgmKF4Psd +sj9zspSb9AB7uM80xDsp/k2jJ/1p9lPV8SrkxOTPBxlGv5KSIoz7F1rVZah7+NXm +5tFB9pLs9uuvYnVwHetmEEejEu3y4K+vzdm3sBGc5dt+ZAxqAMgjhivGOjWdJJPn +AhS+rxhVwu+BDunCz7llThzG0vAp4EB8w6wvIEqkyALAPiYj+t/FFI/isZso9yId +lSR1zhHgqBQ3Xf5aigzDZlp9pHfZK/AzrKyr5to55tfUw5QtD11nlb3fmv9ibMcN +2OidUlWoQ7hD7Ao07+gsHTPLN2Fk7E9Ss+gHns/be6i1OBHnvZR70+d9qN2coPSp +rlNmyDi30wvzJOTU5fOd1WJckMTKVYIli2umR7JWxGJlKCtGzevJU3Uie7E2LraY +jXdOZcj9qAu+s6RBBkVNkwkXeI7CwrirCnmPxPSBSCfspm/ve6E= +=3i2j +-----END PGP SIGNATURE----- diff --git a/k3b.changes b/k3b.changes index 36684b4..6330f43 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun May 19 09:55:11 UTC 2024 - Christophe Marin + +- Update to 24.05.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.05.0/ +- Changes since 24.04.80: + * K3b::Device::debugBitfield: Fix crash when using Qt6 (kde#486314) + +------------------------------------------------------------------- +Fri May 3 09:15:01 UTC 2024 - Christophe Marin + +- Update to 24.04.80 + * New feature release +- Changes since 24.02.2: + * Port more parts of libk3b away from QRegExp + * kde#485432: Fix libavcodec version major typo + * kde#485432: Add libavcodec version major check for FFmpeg avutil: remove deprecated FF_API_OLD_CHANNEL_LAYOUT + * Port libk3bdevice away from Qt::Core5Compat + * Add dontAskAgain about add hidden files for DataUrlAddingDialog + * Remove unused out parameter + * Remove QTextCodec use + * Settings (External Programs): Give a useful error message on failure + * Settings (External Programs): Consistent permissions format for both columns + ------------------------------------------------------------------- Tue Apr 9 18:07:22 UTC 2024 - Christophe Marin diff --git a/k3b.spec b/k3b.spec index d44665f..bd62e7d 100644 --- a/k3b.spec +++ b/k3b.spec @@ -24,14 +24,14 @@ %bcond_without lame %bcond_without mad Name: k3b -Version: 24.02.2 +Version: 24.05.0 Release: 0 Summary: CD/DVD/Blu-ray Burning Application by KDE License: GPL-2.0-or-later URL: https://apps.kde.org/k3b -Source: %{name}-%{version}.tar.xz +Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: %{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE @@ -65,7 +65,7 @@ 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 +%ifarch x86_64 aarch64 riscv64 BuildRequires: cmake(Qt6WebEngineWidgets) >= %{qt6_version} %endif BuildRequires: pkgconfig(dvdread)