Djam/calamares
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/calamares.git synced 2025-02-23 15:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't barf on parted 3.2

Browse source
This commit is contained in:
Bernhard Rosenkränzer 2015-06-08 16:45:10 +02:00
parent 1777145ada
commit 6cf7c41b1e
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
calamares-libparted-detection.patch Normal file
View file

@ -0,0 +1,12 @@
--- calamares-1.0.0-20150606/src/modules/welcome/CMakeModules/FindLIBPARTED.cmake.omv~ 2015-06-08 16:12:21.899501944 +0200
+++ calamares-1.0.0-20150606/src/modules/welcome/CMakeModules/FindLIBPARTED.cmake 2015-06-08 16:42:26.016334393 +0200
@@ -51,7 +51,8 @@ unset(CMAKE_C_FLAGS)
set(CMAKE_REQUIRED_INCLUDES ${LIBPARTED_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${LIBPARTED_LIBS})
-CHECK_FUNCTION_EXISTS("ped_file_system_clobber" LIBPARTED_FILESYSTEM_SUPPORT) # parted < 3.0
+# ped_file_system_clobber is declared static in parted 3.2
+#CHECK_FUNCTION_EXISTS("ped_file_system_clobber" LIBPARTED_FILESYSTEM_SUPPORT) # parted < 3.0
CHECK_FUNCTION_EXISTS("ped_file_system_resize" LIBPARTED_FS_RESIZE_LIBRARY_SUPPORT) # parted != 3.0
MARK_AS_ADVANCED(LIBPARTED_LIBRARY LIBPARTED_INCLUDE_DIR LIBPARTED_FILESYSTEM_SUPPORT LIBPARTED_FS_RESIZE_LIBRARY LIBPARTED_FS_RESIZE_LIBRARY_SUPPORT)

1
calamares.spec
View file

@ -41,6 +41,7 @@ Source23: omv-removeuser.conf
Source99: openmandriva-install.svg Source99: openmandriva-install.svg
Source100: OpenMandriva-adverts.tar.xz Source100: OpenMandriva-adverts.tar.xz
Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch
Patch2: calamares-libparted-detection.patch
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Xml)