Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08c5125d2b313a92b46f43db5f9c0bc7f85f5bd6
commit 08c5125d2b313a92b46f43db5f9c0bc7f85f5bd6 Author: crazy <[email protected]> Date: Tue Oct 3 15:49:57 2017 +0200 calamares-frugalware-3.1.5-1-x86_64 * Version bump * removed patches are now upstream diff --git a/source/kde5-extra/calamares-frugalware/FrugalBuild b/source/kde5-extra/calamares-frugalware/FrugalBuild index 7edd788..3bc38a3 100644 --- a/source/kde5-extra/calamares-frugalware/FrugalBuild +++ b/source/kde5-extra/calamares-frugalware/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: DeX77 <[email protected]> pkgname=calamares-frugalware -pkgver=3.1.4 -pkgrel=3 +pkgver=3.1.5 +pkgrel=1 pkgdesc="Distribution-independent installer framework" archs=("x86_64") groups=('kde5-extra') @@ -16,9 +16,7 @@ source+=(calamares-locale.service \ calamares-frugalware.svg \ 49-nopasswd_calamares.rules \ 0001-packages-virtualbox-and-pacman-flags-workarounds.patch \ - 0002-workaround-vbox-with-efi.patch \ - do-not-force-any-autologin-group.patch \ - https://github.com/abucodonosor/calamares/commit/457fa9fab88b7b0bed83ff94c4084ce1b669b94d.patch) + 0002-workaround-vbox-with-efi.patch) depends=('kpmcore>=3.1.2' 'qt5-webengine>=5.9.1' 'pyqt5-python3>=5.9' 'libboost' \ "kcoreaddons>=$_F_kf5_full" "kconfig>=$_F_kf5_full" \ "ki18n>=$_F_kf5_full" "kiconthemes>=$_F_kf5_full" \ @@ -26,15 +24,13 @@ depends=('kpmcore>=3.1.2' 'qt5-webengine>=5.9.1' 'pyqt5-python3>=5.9' 'libboost' makedepends+=('qt5-tools>=5.9.1' 'boost' 'yaml-cpp') rodepends=('rsync' 'squashfs') _F_cd_path="calamares-$pkgver" -sha1sums=('500f7913f556eb60f706e865f4bf3d245b1c3cb2' \ +sha1sums=('c1f92cb2880a14de93e99446b95683bc2cb68152' \ 'a496ee65a14fad4c96fe2a51d59f5769a9286411' \ 'abd9098e0b3f988182a4b0f3173bffb9f0f7c215' \ '134ca1a53f3b628ba459ec450e84ea0b4f0c11f2' \ '02e4c49a4ff57712ffa94dbb79abc1dd701692c7' \ '67fead29419ba303c096a0473d23b701e321e760' \ - '8ea80c581ca29a49e685c4809bac03e8c607e555' \ - '66a3cb2ffca37cd1da59d7ce747b1f33290e5f5d' \ - 'd0699563bd84792db1df64c38c03ffa912ad11f1') + '8ea80c581ca29a49e685c4809bac03e8c607e555') ## don't install stuff we never need.. ## - dummy* -- no need to be installed diff --git a/source/kde5-extra/calamares-frugalware/do-not-force-any-autologin-group.patch b/source/kde5-extra/calamares-frugalware/do-not-force-any-autologin-group.patch deleted file mode 100644 index 0c414b7..0000000 --- a/source/kde5-extra/calamares-frugalware/do-not-force-any-autologin-group.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp -index c666bd9ad..2f26ec9f4 100644 ---- a/src/modules/users/CreateUserJob.cpp -+++ b/src/modules/users/CreateUserJob.cpp -@@ -116,12 +116,11 @@ CreateUserJob::exec() - QString autologinGroup; - if ( gs->contains( "autologinGroup" ) && - !gs->value( "autologinGroup" ).toString().isEmpty() ) -- autologinGroup = gs->value( "autologinGroup" ).toString(); -- else -- autologinGroup = QStringLiteral( "autologin" ); -- -- CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } ); -- defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) ); -+ { -+ autologinGroup = gs->value( "autologinGroup" ).toString(); -+ CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } ); -+ defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) ); -+ } - } - - // If we're looking to reuse the contents of an existing /home _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
