strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

consistent naming of externals: png -> libpng

Browse source 
Change-Id: I82d95e74318600b390d5add716773c658817e504
Reviewed-on: https://gerrit.libreoffice.org/42296
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Michael Stahl 2017-09-14 14:12:40 +02:00
parent 871d75e9c2
commit b0e0ee45d6
15 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.fetch
View file

@ -158,7 +158,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
$(call fetch_Optional,LIBPNG,PNG_TARBALL) \
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
LIBXMLSEC_TARBALL \

12
RepositoryExternal.mk
View file

@ -2644,7 +2644,7 @@ endif # ENABLE_DBUS
ifneq ($(SYSTEM_LIBPNG),)
define gb_LinkTarget__use_png
define gb_LinkTarget__use_libpng
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBPNG_CFLAGS) \
@ -2656,25 +2656,25 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
gb_ExternalProject__use_png :=
gb_ExternalProject__use_libpng :=
else # !SYSTEM_LIBPNG
define gb_LinkTarget__use_png
define gb_LinkTarget__use_libpng
$(call gb_LinkTarget_set_include,$(1),\
$(LIBPNG_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
png \
libpng \
)
$(call gb_LinkTarget__use_zlib,$(1))
endef
define gb_ExternalProject__use_png
define gb_ExternalProject__use_libpng
$(call gb_ExternalProject_use_static_libraries,$(1),\
png \
libpng \
)
endef

2
avmedia/Library_avmedia.mk
View file

@ -67,7 +67,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
collada2gltf \
libxml2 \
opencollada_parser \
png \
libpng \
))
endif

2
configure.ac
View file

@ -11266,7 +11266,7 @@ dnl ===================================================================
dnl Test whether to build libpng or rely on the system version
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/png"],["-L${WORKDIR}/LinkTarget/StaticLibrary -lpng"])
libo_CHECK_SYSTEM_MODULE([libpng],[LIBPNG],[libpng],["-I${WORKDIR}/UnpackedTarball/libpng"],["-L${WORKDIR}/LinkTarget/StaticLibrary -llibpng"])
dnl ===================================================================
dnl Check for runtime JVM search path

2
desktop/Executable_oosplash.mk
View file

@ -48,7 +48,7 @@ $(eval $(call gb_Executable_add_defs,oosplash,\
))
$(eval $(call gb_Executable_use_externals,oosplash,\
png \
libpng \
))
endif

4
download.lst
View file

@ -191,8 +191,8 @@ export PDFIUM_SHA256SUM := 76b08c5bc9cd41ccdd58aa41491d3f8e1fad517d7cb3e16d285b6
export PDFIUM_TARBALL := pdfium-3196.tar.bz2
export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
export PNG_SHA256SUM := 267c332ffff70cc599d3929207869f698798f1df143aa5f9597b007c14353666
export PNG_TARBALL := libpng-1.6.30.tar.xz
export LIBPNG_SHA256SUM := 267c332ffff70cc599d3929207869f698798f1df143aa5f9597b007c14353666
export LIBPNG_TARBALL := libpng-1.6.30.tar.xz
export POPPLER_SHA256SUM := a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641
export POPPLER_TARBALL := poppler-0.59.0.tar.xz
export POSTGRESQL_SHA256SUM := db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461

4
external/cairo/ExternalProject_cairo.mk vendored
View file

@ -13,13 +13,13 @@ $(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
$(eval $(call gb_ExternalProject_use_externals,cairo,\
freetype \
png \
libpng \
zlib \
))
ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalProject_use_unpacked,cairo,fontconfig))
$(eval $(call gb_ExternalProject_use_unpacked,cairo,png))
$(eval $(call gb_ExternalProject_use_unpacked,cairo,libpng))
endif
$(eval $(call gb_ExternalProject_register_targets,cairo,\

2
external/collada2gltf/StaticLibrary_collada2gltf.mk vendored
View file

@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,collada2gltf,collada2gltf))
$(eval $(call gb_StaticLibrary_use_externals,collada2gltf, \
opencollada_parser \
png \
libpng \
))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,collada2gltf))

4
external/libpng/Module_libpng.mk vendored
View file

@ -10,8 +10,8 @@
$(eval $(call gb_Module_Module,libpng))
$(eval $(call gb_Module_add_targets,libpng,\
StaticLibrary_png \
UnpackedTarball_png \
StaticLibrary_libpng \
UnpackedTarball_libpng \
))
# vim: set noet sw=4 ts=4:

42
external/libpng/StaticLibrary_libpng.mk vendored Normal file
View file

@ -0,0 +1,42 @@
# -*- 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/.
#
$(eval $(call gb_StaticLibrary_StaticLibrary,libpng))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libpng))
$(eval $(call gb_StaticLibrary_use_unpacked,libpng,libpng))
$(eval $(call gb_StaticLibrary_use_externals,libpng,\
zlib \
))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
UnpackedTarball/libpng/png \
UnpackedTarball/libpng/pngerror \
UnpackedTarball/libpng/pngget \
UnpackedTarball/libpng/pngmem \
UnpackedTarball/libpng/pngpread \
UnpackedTarball/libpng/pngread \
UnpackedTarball/libpng/pngrio \
UnpackedTarball/libpng/pngrtran \
UnpackedTarball/libpng/pngrutil \
UnpackedTarball/libpng/pngset \
UnpackedTarball/libpng/pngtrans \
UnpackedTarball/libpng/pngwio \
UnpackedTarball/libpng/pngwrite \
UnpackedTarball/libpng/pngwtran \
UnpackedTarball/libpng/pngwutil \
$(if $(filter ARM,$(CPUNAME)),\
UnpackedTarball/libpng/arm/arm_init \
UnpackedTarball/libpng/arm/filter_neon_intrinsics \
) \
))
# vim: set noet sw=4 ts=4:

42
external/libpng/StaticLibrary_png.mk vendored
View file

@ -1,42 +0,0 @@
# -*- 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/.
#
$(eval $(call gb_StaticLibrary_StaticLibrary,png))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,png))
$(eval $(call gb_StaticLibrary_use_unpacked,png,png))
$(eval $(call gb_StaticLibrary_use_externals,png,\
zlib \
))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,png,\
UnpackedTarball/png/png \
UnpackedTarball/png/pngerror \
UnpackedTarball/png/pngget \
UnpackedTarball/png/pngmem \
UnpackedTarball/png/pngpread \
UnpackedTarball/png/pngread \
UnpackedTarball/png/pngrio \
UnpackedTarball/png/pngrtran \
UnpackedTarball/png/pngrutil \
UnpackedTarball/png/pngset \
UnpackedTarball/png/pngtrans \
UnpackedTarball/png/pngwio \
UnpackedTarball/png/pngwrite \
UnpackedTarball/png/pngwtran \
UnpackedTarball/png/pngwutil \
$(if $(filter ARM,$(CPUNAME)),\
UnpackedTarball/png/arm/arm_init \
UnpackedTarball/png/arm/filter_neon_intrinsics \
) \
))
# vim: set noet sw=4 ts=4:

6
external/libpng/UnpackedTarball_png.mk → external/libpng/UnpackedTarball_libpng.mk vendored
View file

@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,png))
$(eval $(call gb_UnpackedTarball_UnpackedTarball,libpng))
$(eval $(call gb_UnpackedTarball_set_tarball,png,$(PNG_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_tarball,libpng,$(LIBPNG_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_files,png,.,\
$(eval $(call gb_UnpackedTarball_add_files,libpng,.,\
external/libpng/configs/pnglibconf.h \
))

2
external/libzmf/ExternalProject_libzmf.mk vendored
View file

@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,libzmf,\
$(eval $(call gb_ExternalProject_use_externals,libzmf,\
boost_headers \
icu \
png \
libpng \
revenge \
zlib \
))

2
vcl/commonfuzzer.mk
View file

@ -31,7 +31,7 @@ fuzzer_externals = \
libxslt \
libxml2 \
libjpeg \
png \
libpng \
clew \
openssl \
expat \

2
writerperfect/Library_wpftdraw.mk
View file

@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
mwaw \
odfgen \
zmf \
png \
libpng \
pagemaker \
qxp \
revenge \