From 2ca6cad4601b1c61a13f1ee7a26d35295f2f896a Mon Sep 17 00:00:00 2001 From: Romain B Date: Wed, 3 Jan 2018 18:04:36 +0100 Subject: [PATCH] Remove now useless XFCE_GLADE_*_PATH variables - No need to export theses useless variables, and they are not used by glade gtk3 anymore: https://mail.gnome.org/archives/gtk-devel-list/2011-October/msg00031.html - This fix bug #13945 - libxfce4ui needs to remove theses variables from .pc too --- configure.ac.in | 8 -------- scripts/xinitrc.in.in | 9 --------- 2 files changed, 17 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 6673f6d1..0cbde173 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -201,14 +201,6 @@ if test x$with_backend = xopenbsd; then AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend]) fi -dnl check for location Xfce glade files were installed to -XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`" -XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`" -XFCE_GLADE_MODULE_PATH="`pkg-config --variable glade_moduledir libxfce4ui-1`" -AC_SUBST(XFCE_GLADE_CATALOG_PATH) -AC_SUBST(XFCE_GLADE_PIXMAP_PATH) -AC_SUBST(XFCE_GLADE_MODULE_PATH) - AC_CONFIG_FILES([ Makefile doc/Makefile diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index 01a5dcc9..8aea66cb 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -50,15 +50,6 @@ if which xdg-user-dirs-update >/dev/null 2>&1; then xdg-user-dirs-update fi -# Modify libglade and glade environment variables so that -# it will find the files installed by Xfce -GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" -GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:@XFCE_GLADE_PIXMAP_PATH@" -GLADE_MODULE_PATH="$GLADE_MODULE_PATH:@XFCE_GLADE_MODULE_PATH@" -export GLADE_CATALOG_PATH -export GLADE_PIXMAP_PATH -export GLADE_MODULE_PATH - # For now, start with an empty list XRESOURCES="" -- 2.15.1