5c1d67fbac
...similar tob721a1cecb"external/jfreereport: Get rid of apache-commons-logging", but where the external tarballs contain copies of commons-logging-api-1.0.4.jar to compile against, so6de0b1710a"Get rid of apache-commons-logging" did not affect them at build- but only at run-time. The sources of the seven new patch files (and which have further been adapted as necessary) are taken from <4a8cd85e49> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <c7f7d4ed67> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <feb5be4b39> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <53eeb19460> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <9fa7021dfe> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", <027e1a16f7> "Related: rhbz#1895921 replace apache-commons-logging with java.util.logging", and <74538ea7cd> "add missing patch". Change-Id: I98bbe0e24398d3652cda09b0664b4775661cd939 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114053 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
27 lines
955 B
Makefile
27 lines
955 B
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
# for VERSION
|
|
include $(SRCDIR)/external/jfreereport/version.mk
|
|
|
|
$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0))
|
|
|
|
$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\
|
|
common_build.xml \
|
|
))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\
|
|
external/jfreereport/patches/common_build.patch \
|
|
external/jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \
|
|
external/jfreereport/patches/libbase-1.1.3-remove-commons-logging.patch.1 \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|