diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 12:15:55 +0100 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 13:50:28 +0000 |
commit | 3cf557c12d27f1b2250e69a543136da098112d80 (patch) | |
tree | a4b988a42e3cef7a019f118914572063c0f73d37 /instsetoo_native | |
parent | e00697d9738196f11f331335b256d7bacc17277d (diff) |
drop gconf integration as per ESC decision
Conflicts:
shell/source/backends/gconfbe/gconfbackend.cxx
Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh deleted file mode 100644 index 4be8766870fa..000000000000 --- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -cat > /dev/null -[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" -if [[ "${OS}" == "AIX" ]]; then - echo "libgconf-2.a(libgconf-2.so.4${mark64})" -else - echo "libgconf-2.so.4${mark64}" -fi |