From 57b3c458320219e9d12b8641f682eaeddd616cc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2015 05:17:52 +0100 Subject: less patching is good patching, disable patching of calamares modules configuration && create a sepparate package instead --- app-admin/calamares/calamares-999.ebuild | 10 +- .../files/calamares-disable-debug-window.patch | 342 --------------------- .../calamares-find-gentoo-python3-boost-libs.patch | 44 --- .../files/calamares-kogaion-system-defaults.patch | 126 -------- 4 files changed, 5 insertions(+), 517 deletions(-) delete mode 100644 app-admin/calamares/files/calamares-disable-debug-window.patch delete mode 100644 app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch delete mode 100644 app-admin/calamares/files/calamares-kogaion-system-defaults.patch (limited to 'app-admin') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 5deea8b6..1d31ab2f 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -21,7 +21,8 @@ IUSE="+python" S="${WORKDIR}/${PN}-${PV}" -DEPEND="dev-vcs/git +DEPEND=" + dev-vcs/git python? ( >=dev-lang/python-3.3.5-r1:3.3 >=dev-libs/boost-1.55.0-r2[python_targets_python3_3] @@ -45,12 +46,11 @@ DEPEND="dev-vcs/git >=dev-cpp/yaml-cpp-0.5.1 >=kde-frameworks/extra-cmake-modules-5.10.0" -RDEPEND=">=app-misc/calamares-runtime-2.0[branding]" +RDEPEND=" + >=app-misc/calamares-runtime-2.0[branding] + >=app-misc/calamares-config-kogaion-2.0" src_prepare() { - # configure calamares with Kogaion specific paths, binary names && system defaults - epatch "${FILESDIR}/${PN}-kogaion-system-defaults.patch" - # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. # Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild) export QT_SELECT=qt5 diff --git a/app-admin/calamares/files/calamares-disable-debug-window.patch b/app-admin/calamares/files/calamares-disable-debug-window.patch deleted file mode 100644 index 13309b2c..00000000 --- a/app-admin/calamares/files/calamares-disable-debug-window.patch +++ /dev/null @@ -1,342 +0,0 @@ -diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp -index c9f4df3..873f026 100644 ---- a/src/calamares/CalamaresWindow.cpp -+++ b/src/calamares/CalamaresWindow.cpp -@@ -22,9 +22,7 @@ - #include "progresstree/ProgressTreeView.h" - #include "utils/CalamaresUtilsGui.h" - #include "utils/Logger.h" --#include "utils/DebugWindow.h" - #include "utils/Retranslator.h" --#include "Settings.h" - #include "Branding.h" - - #include -@@ -35,7 +33,6 @@ - - CalamaresWindow::CalamaresWindow( QWidget* parent ) - : QWidget( parent ) -- , m_debugWindow( nullptr ) - { - // Hide close button - setWindowFlags( Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint ); -@@ -90,40 +87,6 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) - ProgressTreeView* tv = new ProgressTreeView( sideBox ); - sideLayout->addWidget( tv ); - tv->setFocusPolicy( Qt::NoFocus ); -- -- if ( Calamares::Settings::instance()->debugMode() ) -- { -- QPushButton* debugWindowBtn = new QPushButton; -- CALAMARES_RETRANSLATE( -- debugWindowBtn->setText( tr( "Show debug information" ) ); -- ) -- sideLayout->addWidget( debugWindowBtn ); -- debugWindowBtn->setFlat( true ); -- debugWindowBtn->setCheckable( true ); -- connect( debugWindowBtn, &QPushButton::clicked, -- [ this, debugWindowBtn ]( bool checked ) -- { -- if ( checked ) -- { -- m_debugWindow = new Calamares::DebugWindow(); -- m_debugWindow->show(); -- connect( m_debugWindow, &Calamares::DebugWindow::closed, -- [ this, debugWindowBtn ] -- { -- m_debugWindow->deleteLater(); -- debugWindowBtn->setChecked( false ); -- } ); -- } -- else -- { -- if ( m_debugWindow ) -- { -- m_debugWindow->deleteLater(); -- } -- } -- } ); -- } -- - CalamaresUtils::unmarginLayout( sideLayout ); - CalamaresUtils::unmarginLayout( mainLayout ); - -diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h -index 6ea9602..763c11f 100644 ---- a/src/calamares/CalamaresWindow.h -+++ b/src/calamares/CalamaresWindow.h -@@ -19,14 +19,8 @@ - #ifndef CALAMARESWINDOW_H - #define CALAMARESWINDOW_H - --#include - #include - --namespace Calamares --{ --class DebugWindow; --} -- - class CalamaresWindow : public QWidget - { - Q_OBJECT -@@ -34,8 +28,6 @@ public: - CalamaresWindow( QWidget* parent = nullptr ); - virtual ~CalamaresWindow() {} - --private: -- QPointer< Calamares::DebugWindow > m_debugWindow; - }; - - #endif //CALAMARESWINDOW_H -diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt -index df36f3b..49ccb7f 100644 ---- a/src/libcalamaresui/CMakeLists.txt -+++ b/src/libcalamaresui/CMakeLists.txt -@@ -7,7 +7,6 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES - modulesystem/ViewModule.cpp - - utils/CalamaresUtilsGui.cpp -- utils/DebugWindow.cpp - utils/ImageRegistry.cpp - utils/YamlUtils.cpp - -@@ -28,7 +27,6 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES - ) - - list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_UI -- utils/DebugWindow.ui - ) - - if( WITH_PYTHON ) -diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp -deleted file mode 100644 -index d94a539..0000000 ---- a/src/libcalamaresui/utils/DebugWindow.cpp -+++ /dev/null -@@ -1,107 +0,0 @@ --/* === This file is part of Calamares - === -- * -- * Copyright 2015, Teo Mrnjavac -- * -- * Calamares is free software: you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation, either version 3 of the License, or -- * (at your option) any later version. -- * -- * Calamares is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with Calamares. If not, see . -- */ -- --#include "DebugWindow.h" --#include "utils/Retranslator.h" --#include "utils/qjsonmodel.h" --#include "JobQueue.h" --#include "Job.h" --#include "GlobalStorage.h" --#include "modulesystem/ModuleManager.h" --#include "modulesystem/Module.h" -- --#include --#include --#include --#include -- --namespace Calamares { -- --DebugWindow::DebugWindow() -- : QWidget( nullptr ) --{ -- setupUi( this ); -- -- // GlobalStorage page -- QJsonModel* jsonModel = new QJsonModel( this ); -- -- globalStorageView->setModel( jsonModel ); -- GlobalStorage* gs = JobQueue::instance()->globalStorage(); -- -- connect( gs, &GlobalStorage::changed, [ = ] -- { -- jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() ); -- globalStorageView->expandAll(); -- } ); -- jsonModel->loadJson( QJsonDocument::fromVariant( gs->m ).toJson() ); -- globalStorageView->expandAll(); -- -- // JobQueue page -- jobQueueText->setReadOnly( true ); -- connect( JobQueue::instance(), &JobQueue::queueChanged, -- [ this ]( const QList< Calamares::job_ptr >& jobs ) -- { -- QStringList text; -- foreach( auto job, jobs ) -- { -- text.append( job->prettyName() ); -- } -- -- jobQueueText->setText( text.join( '\n' ) ); -- } ); -- -- // Modules page -- QSplitter* splitter = new QSplitter( modulesTab ); -- modulesTab->layout()->addWidget( splitter ); -- splitter->addWidget( modulesListView ); -- splitter->addWidget( moduleConfigView ); -- -- QStringListModel* modulesModel = new QStringListModel( ModuleManager::instance()->availableModules() ); -- modulesListView->setModel( modulesModel ); -- modulesListView->setSelectionMode( QAbstractItemView::SingleSelection ); -- -- QJsonModel* moduleConfigModel = new QJsonModel( this ); -- moduleConfigView->setModel( moduleConfigModel ); -- -- connect( modulesListView->selectionModel(), &QItemSelectionModel::selectionChanged, -- [ this, moduleConfigModel ] -- { -- QString moduleName = modulesListView->currentIndex().data().toString(); -- Module* module = ModuleManager::instance()->module( moduleName ); -- if ( module ) -- { -- moduleConfigModel->loadJson( QJsonDocument::fromVariant( module->configurationMap() ).toJson() ); -- moduleConfigView->expandAll(); -- } -- } ); -- -- CALAMARES_RETRANSLATE( -- retranslateUi( this ); -- setWindowTitle( tr( "Debug information" ) ); -- ) --} -- -- --void --DebugWindow::closeEvent( QCloseEvent* e ) --{ -- Q_UNUSED( e ) -- emit closed(); --} -- --} // namespace Calamares -diff --git a/src/libcalamaresui/utils/DebugWindow.h b/src/libcalamaresui/utils/DebugWindow.h -deleted file mode 100644 -index ee06199..0000000 ---- a/src/libcalamaresui/utils/DebugWindow.h -+++ /dev/null -@@ -1,45 +0,0 @@ --/* === This file is part of Calamares - === -- * -- * Copyright 2015, Teo Mrnjavac -- * -- * Calamares is free software: you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation, either version 3 of the License, or -- * (at your option) any later version. -- * -- * Calamares is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with Calamares. If not, see . -- */ -- --#ifndef CALAMARES_DEBUGWINDOW_H --#define CALAMARES_DEBUGWINDOW_H -- --#include "ui_DebugWindow.h" -- --#include -- --namespace Calamares { -- --class DebugWindow : public QWidget, private Ui::DebugWindow --{ -- Q_OBJECT -- --public: -- explicit DebugWindow(); -- --signals: -- void closed(); -- --protected: -- void closeEvent( QCloseEvent* e ) override; -- --}; -- -- --} // namespace Calamares --#endif // CALAMARES_DEBUGWINDOW_H -diff --git a/src/libcalamaresui/utils/DebugWindow.ui b/src/libcalamaresui/utils/DebugWindow.ui -deleted file mode 100644 -index a445e8a..0000000 ---- a/src/libcalamaresui/utils/DebugWindow.ui -+++ /dev/null -@@ -1,61 +0,0 @@ -- -- -- Calamares::DebugWindow -- -- -- -- 0 -- 0 -- 632 -- 497 -- -- -- -- Form -- -- -- -- -- -- 0 -- -- -- -- GlobalStorage -- -- -- -- -- -- -- -- -- -- JobQueue -- -- -- -- -- -- -- -- -- -- Modules -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch b/app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch deleted file mode 100644 index 1756b02f..00000000 --- a/app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 774d301..afd4f80 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,34 +33,13 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools S - find_package( YamlCpp 0.5.1 REQUIRED ) - find_package( PolkitQt5-1 REQUIRED ) - --option( WITH_PYTHON "Enable Python modules support." ON ) -- --macro_optional_find_package( PythonLibs 3.3 ) --macro_log_feature( -- PYTHONLIBS_FOUND -- "Python" -- "C interface libraries for the Python 3 interpreter." -- "http://python.org" -- FALSE "3.3" -- "Python 3 is used for some Calamares job modules." --) -+find_package( PythonLibs 3.3 REQUIRED ) -+include_directories( ${PYTHON_INCLUDE_DIRS} ) - --if ( PYTHONLIBS_FOUND ) -- include( BoostPython3 ) -- find_boost_python3( 1.54.0 ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) -- macro_log_feature( -- CALAMARES_BOOST_PYTHON3_FOUND -- "Boost.Python" -- "A C++ library which enables seamless interoperability between C++ and Python 3." -- "http://www.boost.org" -- FALSE "1.54.0" -- "Boost.Python is used for interfacing with Calamares job modules written in Python 3." -- ) --endif() -+find_package( Boost COMPONENTS python REQUIRED ) -+include_directories( ${Boost_INCLUDE_DIR}) - --if ( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND ) -- set( WITH_PYTHON OFF ) --endif() -+option( WITH_PYTHON "Enable Python modules support." ON ) - - ### - ### Calamares application info diff --git a/app-admin/calamares/files/calamares-kogaion-system-defaults.patch b/app-admin/calamares/files/calamares-kogaion-system-defaults.patch deleted file mode 100644 index 7d2d0bee..00000000 --- a/app-admin/calamares/files/calamares-kogaion-system-defaults.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Nur a/calamares.desktop b/calamares.desktop ---- a/calamares.desktop 2015-06-11 14:31:51.840916810 +0100 -+++ b/calamares.desktop 2015-06-11 14:35:11.936914561 +0100 -@@ -2,10 +2,10 @@ - Type=Application - Version=1.0 - Name=Calamares --GenericName=System Installer -+GenericName=Kogaion Linux System Installer - TryExec=calamares - Exec=pkexec /usr/bin/calamares --Comment=Calamares — System Installer -+Comment=Calamares — Kogaion Linux System Installer - Icon=calamares - Terminal=false - StartupNotify=false -diff -Nur a/settings.conf b/settings.conf ---- a/settings.conf 2015-06-11 14:31:51.855916810 +0100 -+++ b/settings.conf 2015-06-11 14:35:52.658914103 +0100 -@@ -4,7 +4,7 @@ - # Modules can be job modules (with different interfaces) and QtWidgets view modules. - # They could all be placed in a number of different paths. - # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules --modules-search: [ local, /path/to/dir/with/more/modules ] -+modules-search: [ local ] - - # We define the module names in the order they should show up (QtWidget view modules, - # with one or more pages) OR be executed if enqueued (all other modules). -@@ -38,8 +38,6 @@ - - locale - - keyboard - - localecfg --- initcpiocfg --- initcpio - - users - - displaymanager - - networkcfg -@@ -65,7 +63,7 @@ - # paths relative to the current directory. - # Only the name of the branding component (directory) should be specified here, Calamares - # then takes care of finding it and loading the contents. --branding: default -+branding: kogaion_branding - - # If this is set to true, Calamares will show an "are you sure?" prompt right before the - # install phase, i.e. at the point of no return. If it's false, no prompt is shown. -diff -Nur a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf ---- a/src/modules/bootloader/bootloader.conf 2015-06-11 14:31:51.861916810 +0100 -+++ b/src/modules/bootloader/bootloader.conf 2015-06-11 14:37:03.310913309 +0100 -@@ -5,9 +5,8 @@ - - # systemd-boot configuration files settings, set kernel and initramfs file names - # and amount of time before default selection boots --kernel: "/vmlinuz-linux" --img: "/initramfs-linux.img" --fallback: "/initramfs-linux-fallback.img" -+kernel: "/bzImage" -+img: "/Initrd" - timeout: "10" - # Optionally set the menu entry name and kernel name to use in systemd-boot. - # If not specified here, these settings will be taken from branding.desc. -@@ -17,8 +16,8 @@ - - # GRUB 2 binary names and boot directory - # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. --grubInstall: "grub-install" --grubMkconfig: "grub-mkconfig" -+grubInstall: "grub2-install" -+grubMkconfig: "grub2-mkconfig" - grubCfg: "/boot/grub/grub.cfg" - # Optionally set the --bootloader-id to use for EFI. If not set, this defaults - # to the bootloaderEntryName from branding.desc with problematic characters -diff -Nur a/src/modules/keyboard/keyboard.conf b/src/modules/keyboard/keyboard.conf ---- a/src/modules/keyboard/keyboard.conf 2015-06-11 14:31:51.863916810 +0100 -+++ b/src/modules/keyboard/keyboard.conf 2015-06-11 14:37:41.437912881 +0100 -@@ -2,7 +2,7 @@ - # The name of the file to write X11 keyboard settings to - # The default value is the name used by upstream systemd-localed. - # Relative paths are assumed to be relative to /etc/X11/xorg.conf.d --xOrgConfFileName: "/etc/X11/xorg.conf.d/00-keyboard.conf" -+xOrgConfFileName: "/usr/share/X11/xorg.conf.d/00-keyboard.conf" - # The path to search for keymaps converted from X11 to kbd format - # Leave this empty if the setting does not make sense on your distribution. --convertedKeymapPath: "/lib/kbd/keymaps/xkb" -+convertedKeymapPath: "/usr/share/keymaps" -diff -Nur a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf ---- a/src/modules/packages/packages.conf 2015-06-11 14:31:51.871916810 +0100 -+++ b/src/modules/packages/packages.conf 2015-06-11 14:38:00.537912666 +0100 -@@ -11,7 +11,7 @@ - # - portage - Gentoo package manager - # - entropy - Sabayon package manager - # --backend: packagekit -+backend: entropy - # - # List of maps with package operations such as install or remove. - # Distro developers can provide a list of packages to remove -diff -Nur a/src/modules/removeuser/removeuser.conf b/src/modules/removeuser/removeuser.conf ---- a/src/modules/removeuser/removeuser.conf 2015-06-11 14:31:51.875916810 +0100 -+++ b/src/modules/removeuser/removeuser.conf 2015-06-11 14:38:13.451912521 +0100 -@@ -1,2 +1,2 @@ - --- --username: live -+username: kogaionuser -diff -Nur a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf ---- a/src/modules/unpackfs/unpackfs.conf 2015-06-11 14:31:51.876916810 +0100 -+++ b/src/modules/unpackfs/unpackfs.conf 2015-06-11 14:38:46.549912149 +0100 -@@ -1,8 +1,5 @@ - --- - unpack: -- - source: "/path/to/filesystem.img" -- sourcefs: "ext4" -- destination: "" -- - source: "/path/to/another/filesystem.sqfs" -+ - source: "/livecd.squashfs" - sourcefs: "squashfs" - destination: "" -diff -Nur a/src/modules/users/users.conf b/src/modules/users/users.conf ---- a/src/modules/users/users.conf 2015-06-11 14:31:51.892916809 +0100 -+++ b/src/modules/users/users.conf 2015-06-11 14:39:01.648911979 +0100 -@@ -8,5 +8,4 @@ - - wheel - - audio - autologinGroup: autologin --sudoersGroup: wheel - setRootPassword: true -- cgit v1.2.3