From 6cf7c41b1e179f7bb4ac4782343ad649134fd853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= Date: Mon, 8 Jun 2015 16:45:10 +0200 Subject: [PATCH] Don't barf on parted 3.2 --- calamares-libparted-detection.patch | 12 ++++++++++++ calamares.spec | 1 + 2 files changed, 13 insertions(+) create mode 100644 calamares-libparted-detection.patch diff --git a/calamares-libparted-detection.patch b/calamares-libparted-detection.patch new file mode 100644 index 0000000..6d8f37b --- /dev/null +++ b/calamares-libparted-detection.patch @@ -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) diff --git a/calamares.spec b/calamares.spec index 8928b94..0c1be07 100644 --- a/calamares.spec +++ b/calamares.spec @@ -41,6 +41,7 @@ Source23: omv-removeuser.conf Source99: openmandriva-install.svg Source100: OpenMandriva-adverts.tar.xz Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch +Patch2: calamares-libparted-detection.patch BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Xml)