[lightdm] use gir SCANNERFLAGS

Rex Dieter rdieter at fedoraproject.org
Wed Mar 27 17:16:43 UTC 2013


commit 1ee35ddf2d5e589c9277a283d0ac0fca0400b9ed
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 27 12:15:30 2013 -0500

    use gir SCANNERFLAGS
    
    per https://live.gnome.org/GObjectIntrospection/AutotoolsIntegration
    fixes build using gobject-introspection-1.36.0+

 lightdm-1.5.2-gir_scannerflags.patch |   26 ++++++++++++++++++++++++++
 lightdm.spec                         |    3 +++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/lightdm-1.5.2-gir_scannerflags.patch b/lightdm-1.5.2-gir_scannerflags.patch
new file mode 100644
index 0000000..e100ab4
--- /dev/null
+++ b/lightdm-1.5.2-gir_scannerflags.patch
@@ -0,0 +1,26 @@
+diff -up lightdm-1.5.2/liblightdm-gobject/Makefile.am.gir_scannerflags lightdm-1.5.2/liblightdm-gobject/Makefile.am
+--- lightdm-1.5.2/liblightdm-gobject/Makefile.am.gir_scannerflags	2013-03-05 20:40:10.000000000 -0600
++++ lightdm-1.5.2/liblightdm-gobject/Makefile.am	2013-03-27 12:12:51.121158173 -0500
+@@ -41,7 +41,8 @@ INTROSPECTION_GIRS = LightDM-1.gir
+ 
+ LightDM-1.gir: liblightdm-gobject-1.la
+ LightDM_1_gir_INCLUDES = GObject-2.0
+-LightDM_1_gir_CFLAGS = $(INCLUDES) --symbol-prefix=lightdm
++LightDM_1_gir_CFLAGS = $(INCLUDES)
++LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm
+ LightDM_1_gir_LIBS = liblightdm-gobject-1.la
+ LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)
+ 
+diff -up lightdm-1.5.2/liblightdm-gobject/Makefile.in.gir_scannerflags lightdm-1.5.2/liblightdm-gobject/Makefile.in
+--- lightdm-1.5.2/liblightdm-gobject/Makefile.in.gir_scannerflags	2013-03-26 20:44:23.000000000 -0500
++++ lightdm-1.5.2/liblightdm-gobject/Makefile.in	2013-03-27 12:13:35.490603479 -0500
+@@ -375,7 +375,8 @@ liblightdm_gobject_1_la_SOURCES = \
+ @HAVE_INTROSPECTION_TRUE at INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ @HAVE_INTROSPECTION_TRUE at INTROSPECTION_GIRS = LightDM-1.gir
+ @HAVE_INTROSPECTION_TRUE at LightDM_1_gir_INCLUDES = GObject-2.0
+- at HAVE_INTROSPECTION_TRUE@LightDM_1_gir_CFLAGS = $(INCLUDES) --symbol-prefix=lightdm
++ at HAVE_INTROSPECTION_TRUE@LightDM_1_gir_CFLAGS = $(INCLUDES)
++ at HAVE_INTROSPECTION_TRUE@LightDM_1_gir_SCANNERFLAGS = --symbol-prefix=lightdm
+ @HAVE_INTROSPECTION_TRUE at LightDM_1_gir_LIBS = liblightdm-gobject-1.la
+ @HAVE_INTROSPECTION_TRUE at LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)
+ @HAVE_INTROSPECTION_TRUE at girdir = $(datadir)/gir-1.0
diff --git a/lightdm.spec b/lightdm.spec
index 935e5a2..2f5e22d 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -30,6 +30,8 @@ Patch11: lightdm-1.2.2-nodaemon_option.patch
 ## upstreamable patches
 # initial support for org.freedesktop.login1 powerOff/Reboot actions
 Patch50: lightdm-1.5.1-systemd_login1_power.patch
+# fix gir/scannerflags
+Patch51: lightdm-1.5.2-gir_scannerflags.patch
 
 BuildRequires: gettext
 BuildRequires: gnome-common
@@ -135,6 +137,7 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
 # FIXME: keep patch conditional, not 100% sure the fallback to ConsoleKit works yet -- rex
 %patch50 -p1 -b .systemd_login1_power
 %endif
+%patch51 -p1 -b .gir_scannerflags
 
 # rpath hack
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure


More information about the scm-commits mailing list