vcl/Package_opengl_blacklist.mk | 2 +- vcl/opengl/win/WinDeviceInfo.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 19131619fdcb44267b1f12722e5c7154990dc303 Author: Tor Lillqvist <[email protected]> Date: Thu Jan 7 12:53:03 2016 +0200 The OpenGL Windows driver blacklist file should be in share, not user config We don't want a potentially outdated copy to be used. Besides, when it was in the user profile, it did not exist the first time after an installation, or a user profile removal, when we attempted to read it. Change-Id: I21290090a3bbb44864730dff84c81e80add89fb3 (cherry picked from commit 989f0fa8dbe6af56aa33fc6b8c63364811f8635c) Reviewed-on: https://gerrit.libreoffice.org/21204 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk index b858a56..35dbfcb 100644 --- a/vcl/Package_opengl_blacklist.mk +++ b/vcl/Package_opengl_blacklist.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl)) -$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ +$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_FOLDER)/opengl,\ opengl_blacklist_windows.xml \ )) diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index e1d86a1..81e8d68 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -920,10 +920,10 @@ namespace { OUString getBlacklistFile() { - OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/config/opengl_blacklist_windows.xml"); + OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER); rtl::Bootstrap::expandMacros(url); - return url; + return url + "/opengl/opengl_blacklist_windows.xml"; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
