[packages/libldm] - fix building with glib 2.35.0+ - rel 3

baggins baggins at pld-linux.org
Fri Oct 21 07:38:58 CEST 2016


commit bf93322ab8829b97ebbb5abadf9d9234069be6f2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 21 07:38:39 2016 +0200

    - fix building with glib 2.35.0+
    - rel 3

 libldm-gtype.patch | 12 ++++++++++++
 libldm.spec        |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/libldm.spec b/libldm.spec
index c6d6bef..c900da2 100644
--- a/libldm.spec
+++ b/libldm.spec
@@ -7,12 +7,13 @@ Summary:	A tool to manage Windows dynamic disks
 Summary(pl.UTF-8):	Narzędzie do zarządzania dynamicznymi dyskami Windows
 Name:		libldm
 Version:	0.2.3
-Release:	2
+Release:	3
 License:	LGPL v3+ (libldm), GPL v3+ (ldmtool)
 Group:		Libraries
 Source0:	https://github.com/mdbooth/libldm/downloads/%{name}-%{version}.tar.gz
 # Source0-md5:	a7771c0a0f84dab6d7ce6a565ede4229
 Patch0:		%{name}-warnings.patch
+Patch1:		%{name}-gtype.patch
 URL:		https://github.com/mdbooth/libldm/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake >= 1.6
@@ -92,6 +93,7 @@ Dokumentacja API biblioteki libldm.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/libldm-gtype.patch b/libldm-gtype.patch
new file mode 100644
index 0000000..a378d26
--- /dev/null
+++ b/libldm-gtype.patch
@@ -0,0 +1,12 @@
+--- libldm-0.2.3/src/ldmtool.c.orig	2013-08-04 11:41:00.357706797 +0100
++++ libldm-0.2.3/src/ldmtool.c	2013-08-04 11:41:58.605069312 +0100
+@@ -777,7 +777,9 @@
+     }
+     g_option_context_free(context);
+ 
++#if (GLIB_MAJOR_VERSION <= 2 && GLIB_MINOR_VERSION <= 35 && GLIB_MICRO_VERSION <= 0)
+     g_type_init();
++#endif
+ 
+     LDM * const ldm = ldm_new(&err);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libldm.git/commitdiff/bf93322ab8829b97ebbb5abadf9d9234069be6f2



More information about the pld-cvs-commit mailing list