File 0001-Revert-Enable-the-k3b-helper-by-default.patch of Package k3b

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-Enable-the-k3b-helper-by-default.patch of Package k3b (Revision 529c7b903ab6b7cc6dd59a7b7159a4b0)

Currently displaying revision 529c7b903ab6b7cc6dd59a7b7159a4b0 , Show latest

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"

This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b.
---
 CMakeLists.txt                               |  2 ++
 INSTALL.txt                                  |  2 ++
 config-k3b.h.cmake                           |  2 ++
 src/CMakeLists.txt                           |  4 +++-
 src/option/k3bdevicewidget.cpp               | 12 ++++++++++++
 src/option/k3bexternalbinpermissionmodel.cpp |  2 ++
 src/option/k3bexternalbinwidget.cpp          | 17 +++++++++++++++++
 src/option/k3bexternalbinwidget.h            |  2 ++
 8 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eb74a0..39a0624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support for querying metadata about audio tracks
 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)
+option(K3B_ENABLE_PERMISSION_HELPER "Build the permissions helper program" OFF)
 
 # 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}")
 
 set(ENABLE_HAL_SUPPORT "${K3B_ENABLE_HAL_SUPPORT}")
 set(ENABLE_AUDIO_PLAYER "${QT_QTMULTIMEDIA_FOUND}")
+set(ENABLE_PERMISSION_HELPER "${K3B_ENABLE_PERMISSION_HELPER}")
 
 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
@@ -44,6 +44,7 @@ For debug:
     -DKDE_INSTALL_LIBEXECDIR=lib    \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON   \
     -DK3B_BUILD_API_DOCS=ON \
+    -DK3B_ENABLE_PERMISSION_HELPER=ON   \
     -DK3B_DEBUG=ON
 
   dynamic analyzer and fuzzer:
@@ -56,6 +57,7 @@ For debug:
     -DKDE_INSTALL_LIBEXECDIR=lib    \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON   \
     -DK3B_BUILD_API_DOCS=ON \
+    -DK3B_ENABLE_PERMISSION_HELPER=ON   \
     -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
@@ -20,6 +20,8 @@
 
 #cmakedefine ENABLE_AUDIO_PLAYER
 
+#cmakedefine ENABLE_PERMISSION_HELPER
+
 #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
@@ -1,5 +1,7 @@
 
-add_subdirectory( helper )
+if(ENABLE_PERMISSION_HELPER)
+  add_subdirectory( helper )
+endif(ENABLE_PERMISSION_HELPER)
 
 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
     m_messageWidget = new KMessageWidget( this );
     m_messageWidget->hide();
     m_messageWidget->setWordWrap( true );
+#ifdef ENABLE_PERMISSION_HELPER
     m_addToGroupAction = new QAction( QIcon::fromTheme("dialog-password"), QString(), this );
+#endif
 
     // buttons
     // ------------------------------------------------
@@ -87,7 +89,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p
     // ------------------------------------------------
     connect( buttonRefreshDevices, SIGNAL(clicked()), SIGNAL(refreshButtonClicked()) );
     connect( m_deviceManager, SIGNAL(changed()), SLOT(init()) );
+#ifdef ENABLE_PERMISSION_HELPER
     connect( m_addToGroupAction, SIGNAL(triggered(bool)), SLOT(addUserToGroup()) );
+#endif
     // ------------------------------------------------
 }
 
@@ -236,10 +240,16 @@ void K3b::DeviceWidget::updateDeviceListViews()
 
             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);
+#ifndef ENABLE_PERMISSION_HELPER
+		messageText += i18n("<br/>The Permission helper that could do this for you was not enabled during build.<br/>"
+                                    "Please rebuild the package with the Permission helper enabled or contact your distribution.");
+#endif
                 m_messageWidget->setMessageType(KMessageWidget::Warning);
                 m_messageWidget->setText(messageText);
+#ifdef ENABLE_PERMISSION_HELPER
                 m_messageWidget->addAction(m_addToGroupAction);
                 m_addToGroupAction->setText(i18n("Add"));
+#endif
                 m_messageWidget->animatedShow();
             }
         }
@@ -248,6 +258,7 @@ void K3b::DeviceWidget::updateDeviceListViews()
 
 void K3b::DeviceWidget::addUserToGroup()
 {
+#ifdef ENABLE_PERMISSION_HELPER
     QVariantMap args;
     args["groupName"] = m_deviceGroup;
     args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name);
@@ -275,6 +286,7 @@ void K3b::DeviceWidget::addUserToGroup()
         }
     } );
     job->start();
+#endif
 }
 
 #include "moc_k3bdevicewidget.cpp"
diff --git a/src/option/k3bexternalbinpermissionmodel.cpp b/src/option/k3bexternalbinpermissionmodel.cpp
index c3e24d0..2f64497 100644
--- a/src/option/k3bexternalbinpermissionmodel.cpp
+++ b/src/option/k3bexternalbinpermissionmodel.cpp
@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel::buddy( const QModelIndex& index ) const
 
 void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
 {
+#ifdef ENABLE_PERMISSION_HELPER
     if( burningGroup != d->burningGroup ) {
         beginResetModel();
         d->burningGroup = burningGroup;
@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
         }
         endResetModel();
     }
+#endif
 }
 
 void ExternalBinPermissionModel::update()
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index e029226..0f6cc28 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -104,7 +104,12 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
     // setup permissions tab
     // ------------------------------------------------------------
     QWidget* permissionsTab = new QWidget( m_mainTabWidget );
+#ifdef ENABLE_PERMISSION_HELPER
     QLabel* permissionsLabel = new QLabel( i18n("Check the programs whose permissions you want to be changed:"), permissionsTab );
+#else
+    QLabel* permissionsLabel = new QLabel( i18n("The Permissions helper was not enabled during build.\n"
+                                                "Check the programs whose permissions should be changed:"), permissionsTab );
+#endif
     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
     m_permissionView->setAllColumnsShowFocus( true );
     m_permissionView->setRootIsDecorated( false );
     m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents );
+#ifdef ENABLE_PERMISSION_HELPER
     m_changePermissionsButton = new QPushButton( QIcon::fromTheme("dialog-password"), i18n( "Change Permissions..." ), this );
+#endif
     QVBoxLayout* permissionsTabLayout = new QVBoxLayout( permissionsTab );
     permissionsTabLayout->addWidget( permissionsLabel );
     permissionsTabLayout->addWidget( m_permissionView );
+#ifdef ENABLE_PERMISSION_HELPER
     permissionsTabLayout->addWidget( m_changePermissionsButton );
+#endif
     m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") );
 
 
@@ -135,9 +144,11 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
 
     m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") );
 
+#ifdef ENABLE_PERMISSION_HELPER
     connect( m_changePermissionsButton, SIGNAL(clicked()), SLOT(slotChangePermissions()) );
     connect( m_permissionModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), SLOT(slotPermissionModelChanged()) );
     connect( m_permissionModel, SIGNAL(modelReset()), SLOT(slotPermissionModelChanged()) );
+#endif
     connect( m_rescanButton, SIGNAL(clicked(bool)), this, SLOT(rescan()) );
 
     qRegisterMetaType<HelperProgramItem>();
@@ -145,6 +156,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" ||
@@ -154,6 +166,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
         }
     }
     ::endgrent();
+#endif
 }
 
 
@@ -200,12 +213,15 @@ void K3b::ExternalBinWidget::saveSearchPath()
 
 void K3b::ExternalBinWidget::slotPermissionModelChanged()
 {
+#ifdef ENABLE_PERMISSION_HELPER
     m_changePermissionsButton->setEnabled(m_permissionModel->changesNeeded());
+#endif
 }
 
 
 void K3b::ExternalBinWidget::slotChangePermissions()
 {
+#ifdef ENABLE_PERMISSION_HELPER
     KAuth::Action action("org.kde.k3b.updatepermissions");
     action.setHelperId("org.kde.k3b");
 
@@ -252,6 +268,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
--- a/src/option/k3bexternalbinwidget.h
+++ b/src/option/k3bexternalbinwidget.h
@@ -57,7 +57,9 @@ namespace K3b {
         QTreeView* m_permissionView;
         KEditListWidget* m_searchPathBox;
 
+#ifdef ENABLE_PERMISSION_HELPER
         QPushButton* m_changePermissionsButton;
+#endif
         QPushButton* m_rescanButton;
     };
 }

Places

File 0001-Revert-Enable-the-k3b-helper-by-default.patch of Package k3b (Revision 529c7b903ab6b7cc6dd59a7b7159a4b0)

Places