diff options
Diffstat (limited to 'dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch')
-rw-r--r-- | dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch b/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch deleted file mode 100644 index 01ce2265ecaf..000000000000 --- a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Thu, 04 Nov 2010 19:23:22 +0000 -Subject: gsettings.m4: Fix rules to work when there are no schemas - -If there are no schemas, don't try to install "" at install time. -(In particular, automake conditionals don't work properly with -@-expanded rules, so if you conditionally build a schema, you'll -still unconditionally get the install rule.) - -https://bugzilla.gnome.org/show_bug.cgi?id=633381 ---- -diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 -index 4e4352f..f0ed838 100644 ---- a/m4macros/gsettings.m4 -+++ b/m4macros/gsettings.m4 -@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas - - install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) -- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" -- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)" -- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) -+ if test -n "$^"; then \ -+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ -+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ -+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ -+ fi - - uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) --- -cgit v0.8.3.1 |