Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c494368a1a80034166ee5094289425e77c9f262
commit 7c494368a1a80034166ee5094289425e77c9f262 Author: crazy <cr...@frugalware.org> Date: Sun Nov 12 15:09:27 2017 +0100 kpmcore-3.1.2-6-x86_64 * backport https://cgit.kde.org/kpmcore.git/commit/?id=58f2decdf84225fa640035e5e82a22ecf7870ba0 diff --git a/source/kde5/kpmcore/FrugalBuild b/source/kde5/kpmcore/FrugalBuild index 36428c4..af17740 100644 --- a/source/kde5/kpmcore/FrugalBuild +++ b/source/kde5/kpmcore/FrugalBuild @@ -3,14 +3,16 @@ pkgname=kpmcore pkgver=3.1.2 -pkgrel=5 +pkgrel=6 pkgdesc="Library for managing partitions" archs=("x86_64") groups=('kde5') up2date="Flastverdir http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/kde//stable/$pkgname/"; -source=("http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/kde//stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz";) +source=(http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/kde//stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz \ + newer-f2fs-tools.patch) Finclude kf5 -sha1sums=('811b57485650e3f504c07e44db414428bc7e3bdd') +sha1sums=('811b57485650e3f504c07e44db414428bc7e3bdd' \ + '4f98d0ae9682dc7f86e3c62abefd70f392a05495') depends=("kio>=$_F_kf5_full" 'parted>=3.2-5' 'libatasmart' "qt5-svg>=$_F_kdever_qt5") build() { @@ -18,7 +20,7 @@ build() { KDE_build ## until this is fixed : ## https://bugs.kde.org/show_bug.cgi?id=364648 - ## this break cala and breks KPM itself + ## this break cala and breaks KPM itself Frm usr/share/locale } # optimization OK diff --git a/source/kde5/kpmcore/newer-f2fs-tools.patch b/source/kde5/kpmcore/newer-f2fs-tools.patch new file mode 100644 index 0000000..58fbaed --- /dev/null +++ b/source/kde5/kpmcore/newer-f2fs-tools.patch @@ -0,0 +1,65 @@ +From 58f2decdf84225fa640035e5e82a22ecf7870ba0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andr...@stikonas.eu> +Date: Sun, 12 Nov 2017 13:07:39 +0000 +Subject: Support newer f2fs-tools versions. + +BUG: 386771 +--- + src/fs/f2fs.cpp | 11 +++++++++++ + src/fs/f2fs.h | 4 ++++ + 2 files changed, 15 insertions(+) + +diff --git a/src/fs/f2fs.cpp b/src/fs/f2fs.cpp +index 23d80aa..298ec71 100644 +--- a/src/fs/f2fs.cpp ++++ b/src/fs/f2fs.cpp +@@ -43,6 +43,7 @@ FileSystem::CommandSupportType f2fs::m_Backup = FileSystem::cmdSupportNone; + FileSystem::CommandSupportType f2fs::m_SetLabel = FileSystem::cmdSupportNone; + FileSystem::CommandSupportType f2fs::m_UpdateUUID = FileSystem::cmdSupportNone; + FileSystem::CommandSupportType f2fs::m_GetUUID = FileSystem::cmdSupportNone; ++bool f2fs::oldVersion = false; // 1.8.x or older + + f2fs::f2fs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : + FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::F2fs) +@@ -54,6 +55,11 @@ void f2fs::init() + m_Create = findExternal(QStringLiteral("mkfs.f2fs")) ? cmdSupportFileSystem : cmdSupportNone; + m_Check = findExternal(QStringLiteral("fsck.f2fs")) ? cmdSupportFileSystem : cmdSupportNone; + ++ if (m_Create == cmdSupportFileSystem) { ++ ExternalCommand cmd(QStringLiteral("mkfs.f2fs"), {}); ++ oldVersion = cmd.run(-1) && !cmd.output().contains(QStringLiteral("-f")); ++ } ++ + m_GetLabel = cmdSupportCore; + // m_SetLabel = findExternal(QStringLiteral("nilfs-tune")) ? cmdSupportFileSystem : cmdSupportNone; + // m_UpdateUUID = findExternal(QStringLiteral("nilfs-tune")) ? cmdSupportFileSystem : cmdSupportNone; +@@ -115,6 +121,11 @@ bool f2fs::check(Report& report, const QString& deviceNode) const + + bool f2fs::create(Report& report, const QString& deviceNode) + { ++ QStringList args; ++ if (oldVersion) ++ args << deviceNode; ++ else ++ args << QStringLiteral("-f") << deviceNode; + ExternalCommand cmd(report, QStringLiteral("mkfs.f2fs"), { deviceNode }); + return cmd.run(-1) && cmd.exitCode() == 0; + } +diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h +index ab65cf9..550d67d 100644 +--- a/src/fs/f2fs.h ++++ b/src/fs/f2fs.h +@@ -110,6 +110,10 @@ public: + static CommandSupportType m_SetLabel; + static CommandSupportType m_UpdateUUID; + static CommandSupportType m_GetUUID; ++ ++private: ++ static bool oldVersion; ++ + }; + } + +-- +cgit v0.11.2 + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
