[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 93ff02a31364bd334d8bee2e4bc6715f9f30d847 Author: Michael Stahl mst...@redhat.com Date: Thu Jan 3 17:23:44 2013 +0100 RepositoryExternal: typo in gb_LinkTarget__use_sane_headers Change-Id: I011a946311498cbe42ebcd5cd6517f855ea5e8d8 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0b3fc76..0d3058b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -129,7 +129,7 @@ endif ifeq (SANE,$(filter SANE,$(BUILD_TYPE))$(filter WNT,$(OS))) define gb_LinkTarget__use_sane_headers -$(call gb_Library_use_packages,$(1),\ +$(call gb_LinkTarget_use_packages,$(1),\ sane_inc \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit ff7735d7a1e0aa9ed753553cf20acf10fbd3f81b Author: David Tardon dtar...@redhat.com Date: Sun Dec 2 17:02:44 2012 +0100 fix build with internal libxml2 Change-Id: I2dbef5bbe93cd8561ae0fba24f8d30771747098c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bec2abd..5ead103 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2409,7 +2409,6 @@ else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint gb_ExternalExecutable__xmllint_TARGET := $(call gb_Executable_get_target_for_build,xmllint) -gb_ExternalExecutable__xmllint_COMMAND := $(gb_Helper_set_ld_path) $(ICECREAM_RUN) $(gb_ExternalExecutable__xmllint_TARGET) endef @@ -2423,7 +2422,6 @@ else # ! SYSTEM_LIBXSLT_FOR_BUILD define gb_ExternalExecutable__register_xsltproc gb_ExternalExecutable__xsltproc_TARGET := $(call gb_Executable_get_target_for_build,xsltproc) -gb_ExternalExecutable__xsltproc_COMMAND := $(gb_Helper_set_ld_path) $(ICECREAM_RUN) $(gb_ExternalExecutable__xsltproc_TARGET) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk xmlsecurity/Library_xsec_xmlsec.mk
RepositoryExternal.mk |2 +- xmlsecurity/Library_xsec_xmlsec.mk | 31 +-- 2 files changed, 2 insertions(+), 31 deletions(-) New commits: commit ea64122c013f0b6c9fc862eeba81b154901ae6ab Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 19 16:40:33 2012 +0100 Further SYSTEM_MOZILLA/SYSTEM_NSS clean-up ...past 8648c974ea5e222027a5ac1c9a01cd9ac6e344a8 Clean-up 'SYSTEM_MOZILLA' - 'SYSTEM_NSS.' Looks like -DSYSTEM_MOZILLA in RepositoryExternal.mk's gb_LinkTarget__use_nss3 was only relevant for xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (for which it had been set explicitly in xmlsecurity/Library_xsec_xmlsec.mk, and renamed to SYSTEM_NSS already). And looks like xmlsecurity/Library_xsec_xmlsec.mk's explicit SYSTEM_NSS code was more or less a duplication of RepositoryExternal.mk's gb_LinkTarget__use_nss3, so made that DRY. Change-Id: Ie6eca2c4eb7fb70f6a36c97d8681b4140f9870cb diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d6c6fca..ad12be0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2153,7 +2153,7 @@ ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_nss3 $(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_MOZILLA \ + -DSYSTEM_NSS \ ) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 6808cbc..29010b7 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ + nss3 \ )) $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ @@ -148,36 +149,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT) -ifeq ($(SYSTEM_NSS),YES) - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - $(NSS_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,xsec_xmlsec,\ - -DSYSTEM_NSS \ -)) - -$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(NSS_LIBS) \ -)) - -else - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ -)) - -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - nspr4 \ - nss3 \ -)) - -endif # ifeq ($(SYSTEM_NSS),YES) - ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ -ldl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 3dee92e135ea71e9ee448a43dbf879d62e38f1ec Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Nov 13 19:44:44 2012 +0100 library definitions for lcms2 and curl are in Extarnal*Package*_foo.mk using external_project breaks a uniprocessor build since the libraries are only partially copied to solver. Change-Id: I0a83486e466e1c062a1dad89d9ea3d9e78d8c9b1 Reviewed-on: https://gerrit.libreoffice.org/1048 Reviewed-by: Peter Foley jpfol...@gmail.com Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9808e14..38b1635 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1218,7 +1218,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_use_external_project,$(1),lcms2) +$(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ @@ -1236,7 +1236,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_use_external_project,$(1),lcms2) +$(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ @@ -1527,7 +1527,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl -$(call gb_LinkTarget_use_external_project,$(1),curl) +$(call gb_LinkTarget_use_package,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,curl/include) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dff0a481db662816b06f8496b30786cee5fc3dd5 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Nov 14 17:32:14 2012 +0100 gb_LinkTarget_get_preparation_target is not defined and in turn build breaks because boost headers are not ready. use the suggestion by mst and use gb_LinkTarget_use_unpacked instead. Also use gb_ExternalProject_use_unpacked for consistency Change-Id: Ie52ba7cd99ae6622b11f32eca8895ca004b8ae95 Reviewed-on: https://gerrit.libreoffice.org/1066 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 38b1635..bc35717 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -454,12 +454,12 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef define gb_LinkTarget__use_boost_headers -$(call gb_LinkTarget_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) +$(call gb_LinkTarget_use_unpacked,$(1),boost) endef define gb_ExternalProject__use_boost_headers -$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) +$(call gb_ExternalProject_use_unpacked,$(1),boost) endef endif # SYSTEM_BOOST ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6d5d057a1963fb6fdd044b7cfa1c818e84c9d4c2 Author: Tor Lillqvist t...@iki.fi Date: Wed Nov 14 18:45:42 2012 +0200 Revert gb_LinkTarget_get_preparation_target is not defined Nah, this then caused a repeatable other problem; in liborcus: /bin/sh: line 1: ./configure: No such file or directory This reverts commit dff0a481db662816b06f8496b30786cee5fc3dd5. diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bc35717..38b1635 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -454,12 +454,12 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef define gb_LinkTarget__use_boost_headers -$(call gb_LinkTarget_use_unpacked,$(1),boost) +$(call gb_LinkTarget_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) endef define gb_ExternalProject__use_boost_headers -$(call gb_ExternalProject_use_unpacked,$(1),boost) +$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) endef endif # SYSTEM_BOOST ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1654a1e71bc66ccfb0f809c7a2eac1522b684cd4 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Nov 14 18:11:30 2012 +0100 gb_LinkTarget_get_preparation_target is not defined (2nd try) gb_ExternalProject_use_unpacked has completely different different side-effects, so use the manual way/the actually expected part of the rule Change-Id: I35edb19c3e768608bbb70314cac7ca908a426c7c Reviewed-on: https://gerrit.libreoffice.org/1067 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 38b1635..7d56e35 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -454,12 +454,12 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef define gb_LinkTarget__use_boost_headers -$(call gb_LinkTarget_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) +$(call gb_LinkTarget_use_unpacked,$(1),boost) endef define gb_ExternalProject__use_boost_headers -$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) +$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,boost) endef endif # SYSTEM_BOOST ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) New commits: commit 8905c0e4b0a01297875359282ba4bdd748be0cf1 Author: Peter Foley pefol...@verizon.net Date: Thu Nov 8 21:00:30 2012 -0500 fix system lcms2 Change-Id: I1dfb345d3047b59c79454d60747d192a761071ef diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 007f7a4..3c0dc3a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1189,8 +1189,15 @@ $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) endef +gb_ExternalProject__use_lcms2 := + else # !SYSTEM_LCMS2 +define gb_ExternalProject__use_lcms2 +$(call gb_ExternalProject_use_package,$(1),lcms2) + +endef + ifeq ($(OS),ANDROID) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ @@ -1227,11 +1234,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef -define gb_ExternalProject__use_lcms2 -$(call gb_ExternalProject_use_package,$(1),lcms2) - -endef - endif # ANDROID endif # SYSTEM_LCMS2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) New commits: commit ac3c7ba458040410736b46927dac91130d8adb08 Author: Rene Engelhard r...@debian.org Date: Tue Nov 6 20:38:47 2012 +0100 make gb_LinkTarget__use_gthread/_gobject work again; used in vcl/connectivity Change-Id: I30b249de52822dbd8c327c2213c5a7868a460fdd diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6d68b30..c943f85 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1300,7 +1300,7 @@ endif endef define gb_LinkTarget__use_gthread -$(error gb_LinkTarget__use_gthread should not be used any more) +$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) endef ifeq ($(ENABLE_CUPS),TRUE) @@ -1621,7 +1621,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ endif # SYSTEM_CLUCENE define gb_LinkTarget__use_gobject -$(error gb_LinkTarget__use_gobject should not be used any more) +$(call gb_LinkTarget_add_libs,$(1),\ + $(GOBJECT_LIBS) \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(GOBJECT_CFLAGS) \ +) endef ifeq ($(SYSTEM_HSQLDB),YES) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e98bb470a7cb27558ea84eec8b8e30d467835f5 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 6 20:09:57 2012 + leave gio blank for sfx2 --disable-gio case Change-Id: I670e5c04b56a59321efc59e7a92961362f47f706 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c943f85..9159962 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1271,7 +1271,7 @@ endef else # ENABLE_GIO define gb_LinkTarget__use_gio -$(error gb_LinkTarget__use_gio should not be used any more) + endef endif # ENABLE_GIO ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 23a324d282865d2a95142e0c758d266f1a0dc080 Author: Tor Lillqvist t...@iki.fi Date: Tue Oct 30 13:18:40 2012 +0200 Try to fix a highly parallel build of libcmis with a non-system curl The problem us that gb_LinkTarget__use_curl only declared a dependency on an *unpacked* curl tarball, but the curlbuild.h file is *generated* during curl configury. So something that depends on a (non-system) curl needs to depend on curl having been configured at least. Let's try like this. Change-Id: I87b2a3292807d9bb873c3656caf58c4d98d8f622 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 23f14ad..ca87908 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1624,7 +1624,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl -$(call gb_LinkTarget_use_unpacked,$(1),curl) +$(call gb_LinkTarget_use_external_project,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,curl/include) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit 7a030393a022622ab2179034332b55da0eb4783b Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Oct 29 23:29:37 2012 +0100 add more missing use_unpacked Change-Id: I92395d5883ce862f1dca7b88aa4291a9608c1a52 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ab76d7d..23f14ad 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -357,9 +357,10 @@ define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ -DHUNSPELL_STATIC \ ) +$(call gb_LinkTarget_use_unpacked,$(1),hunspell) $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\ + $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ hunspell \ @@ -661,6 +662,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_neon +$(call gb_LinkTarget_use_unpacked,$(1),neon) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,neon/src) \ $$(INCLUDE) \ @@ -832,6 +834,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ graphite \ )) define gb_LinkTarget__use_graphite +$(call gb_LinkTarget_use_unpacked,$(1),graphite) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,graphite/include) \ $$(INCLUDE) \ @@ -1621,6 +1624,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl +$(call gb_LinkTarget_use_unpacked,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,curl/include) \ $$(INCLUDE) \ @@ -1807,14 +1811,12 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ )) define gb_LinkTarget__use_openldap - +$(call gb_LinkTarget_use_unpacked,$(1),openldap) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include) \ $$(INCLUDE) \ ) - $(call gb_LinkTarget_use_package,$(1),openldap) - $(call gb_LinkTarget_use_static_libraries,$(1),\ ldap \ lber \ @@ -2181,6 +2183,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ )) define gb_LinkTarget__use_orcus +$(call gb_LinkTarget_use_unpacked,$(1),orcus) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 99ef1f57a18794e784aa9921d62310395496320c Author: Rene Engelhard r...@debian.org Date: Sun Oct 28 23:00:03 2012 +0100 add mythes stuff to RepositoryExternal.mk for system-mythes Change-Id: I004825342646f839f72d8c180efdba6a7f835da7 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 52d99a2..d58b27b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -243,6 +243,12 @@ endif # SYSTEM_JPEG ifeq ($(SYSTEM_MYTHES),YES) define gb_LinkTarget__use_mythes +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(MYTHES_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(MYTHES_LIBS)) + endef else # !SYSTEM_MYTHES ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 1e925461d5371fc6cbaa9facbdf40a6c99a85549 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Oct 26 13:37:59 2012 +0200 RepositoryExternal: add disabled graphite case Change-Id: I16c40fceb2fc84147eb298aa86987b8682a81c8e diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 04a2aab..83d90ad 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -774,7 +774,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS)) endef -else # !SYSTEM_GRAPHITE +else ifeq ($(SYSTEM_GRAPHITE),NO) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ graphite \ @@ -790,6 +790,10 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef +else # DISABLED GRAPHITE + +gb_LinkTarget__use_graphite := + endif # SYSTEM_GRAPHITE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 582265477d0ef819125e906cd08e5bf32916088a Author: Peter Foley pefol...@verizon.net Date: Thu Oct 25 18:55:47 2012 -0400 fix gbuildified expat Change-Id: Idaa56eb209e356c434804ce86b644b33773f44d1 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cf389b8..04a2aab 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -248,7 +248,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(if $(filter-out ascii_expat_xmlparse,$(2)),\ +$(if $(filter-out ascii_expat_xmlparse expat_xmltok,$(2)),\ $(call gb_LinkTarget_add_defs,$(1),\ -DXML_UNICODE \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: RepositoryExternal.mk
Hi, On Sat, Oct 13, 2012 at 12:35:06AM -0700, Libreoffice Gerrit user wrote: RepositoryExternal.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3818933e351cd1d5f950c8891ec3974c066ce99e Author: Lubo?? Luk l.lu...@suse.cz Date: Sat Oct 13 09:32:27 2012 +0200 fix build I'm not sure why this makes a difference, the real problem is probably elsewhere. Change-Id: Ie52b0b9b5b1279badaa8815aeef054c8bbb125b4 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5a3cf89..8c8e449 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1253,6 +1253,7 @@ ifeq ($(SYSTEM_GLIB),YES) define gb_LinkTarget__use_gthread $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) + endef else # !SYSTEM_GLIB This is one of the idiosyncrasies of GNU make. Not using newline here may (will) cause problem when the function is called from foreach function. That is because foreach joins the results by a space, so one can end up with two (or more) make statements concatenated into one. E.g., define foo target : VAR += $(1) endef define foos $(foreach var,$(1),$(call foo,$(var endef $(eval $(call foos,a b)) will expand into (and be evaluated as) target : VAR += a target : VAR += b With the additional newline, it will correctly expand into target : VAR += a target : VAR += b D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: RepositoryExternal.mk
On 2012-10-17 08:37, David Tardon wrote: This is one of the idiosyncrasies of GNU make. Not using newline here may (will) cause problem when the function is called from foreach function. Yuck. The more I see stuff like this, the more I am convinced that gmake just doesn't scale, and that for large projects (like LibreOffice), we should just write our build scripts in some reasonably decent scripting language. Maybe then, more that just the Jedi Gmake Masters could learn to debug the stuff :-) Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3818933e351cd1d5f950c8891ec3974c066ce99e Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Oct 13 09:32:27 2012 +0200 fix build I'm not sure why this makes a difference, the real problem is probably elsewhere. Change-Id: Ie52b0b9b5b1279badaa8815aeef054c8bbb125b4 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5a3cf89..8c8e449 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1253,6 +1253,7 @@ ifeq ($(SYSTEM_GLIB),YES) define gb_LinkTarget__use_gthread $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) + endef else # !SYSTEM_GLIB ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 53b7bdc787a1bca69066df2435b6e1c3fa541759 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 5 17:19:47 2012 +0200 RepositoryExternal.mk: add package dependency for libwpg Change-Id: Ic0dc429a4ef11eba2afe23d4e5f101689517 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d56accc..cbf3379 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1058,6 +1058,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpg +$(call gb_LinkTarget_use_package,$(1),\ + libwpg_inc \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ wpglib \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 1 file changed, 4 insertions(+) New commits: commit 8a026375dc838362888aad41927ddf312da93e04 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Sep 11 16:19:19 2012 +0200 we still need to register the library Change-Id: Ia3c38ec42bcf5b36465bca3bfee81c4008c937c3 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3e0a650..1390585 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1909,6 +1909,10 @@ endef else # !SYSTEM_LIBORCUS +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + orcus \ +)) + define gb_LinkTarget__use_orcus $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk |2 +- solenv/gbuild/LinkTarget.mk |9 - 2 files changed, 1 insertion(+), 10 deletions(-) New commits: commit f4889fa21f7fb99477148dfed7fa40ba583cb63d Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Sep 11 18:23:27 2012 +0200 use _use_static_libraries here again to ensure proper dependency Change-Id: I04fb35b6eac1c1777e67de9877417cfe7cc5aac8 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1390585..fcc4782 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1918,7 +1918,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_static_external_library,$(1),orcus,liborcus) +$(call gb_LinkTarget_use_static_libraries,$(1),orcus) endef endif # SYSTEM_LIBORCUS diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 7d54809..96178bc 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -745,15 +745,6 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib))) endef -# gb_LinkTarget_use_static_external_library linktarget library externalproject -define gb_LinkTarget_use_static_external_library -$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2) - -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ExternalProject_get_target,$(3)) -$(call gb_LinkTarget_get_external_headers_target,$(1)) : $(call gb_ExternalProject_get_target,$(3)) - -endef - define gb_LinkTarget_add_cobject $(if $(wildcard $(call gb_CObject_get_source,$(SRCDIR),$(2))),,$(eval $(call gb_Output_error,No such source file $(call gb_CObject_get_source,$(SRCDIR),$(2) $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 1 file changed, 4 insertions(+) New commits: commit f5ff45b9b2150fc23bc550c5c6a01139019658de Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Sep 8 16:29:05 2012 +0200 add include path for internal zlib Change-Id: I8d98a62a3ad573508a5c40134ae22183f89b2f13 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index eef3e8f..b61de4b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -174,6 +174,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_zlib +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/external/zlib \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ zlib \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9ec0a3ec629a05809852728482fdb3f3d997edef Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 30 13:44:53 2012 +0100 these ENABLE_FOOs are set to TRUE not YES Change-Id: I821a41752643fe78cc99ea20e5d7ef11e7a5e91a diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cf41f69..96709fb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1157,7 +1157,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) endef -ifeq ($(ENABLE_DBUS),YES) +ifeq ($(ENABLE_DBUS),TRUE) define gb_LinkTarget__use_dbus $(call gb_LinkTarget_set_include,$(1),\ @@ -1727,7 +1727,7 @@ endef endif # ENABLE_KDE4 -ifeq ($(ENABLE_TDE),YES) +ifeq ($(ENABLE_TDE),TRUE) define gb_LinkTarget__use_tde $(call gb_LinkTarget_add_libs,$(1),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk sd/Library_sd.mk sd/source sfx2/Library_qstart.mk
RepositoryExternal.mk | 13 +
sd/Library_sd.mk |5 -
sd/source/ui/remotecontrol/BluetoothServer.cxx |5 ++---
sfx2/Library_qstart.mk |1 +
4 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit aabc73d04a4c97272576edd4f73bde0cfa2392b2
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 30 13:58:15 2012 +0100
Do the same thing for gio as we do for dbus
and add -DENABLE_GIO to flags at build-time and an empty
gb_LinkTarget__use_gio
when disabled.
Change-Id: I4adf0701a3d490cceecc00f6b81d6416a1e83088
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 96709fb..8401164 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1117,6 +1117,7 @@ endef
endif # SYSTEM_LPSOLVE
+ifeq ($(ENABLE_GIO),TRUE)
define gb_LinkTarget__use_gio
$(call gb_LinkTarget_set_include,$(1),\
@@ -1124,10 +1125,22 @@ $(call gb_LinkTarget_set_include,$(1),\
$(GIO_CFLAGS) \
)
+$(call gb_LinkTarget_add_defs,$(1),\
+-DENABLE_GIO \
+)
+
$(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS))
endef
+else # ENABLE_GIO
+
+define gb_LinkTarget__use_gio
+
+endef
+
+endif # ENABLE_GIO
+
define gb_LinkTarget__use_gtk
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 35d9002..e2c7191 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -108,13 +108,8 @@ $(eval $(call gb_Library_use_libraries,sd,\
$(eval $(call gb_Library_use_externals,sd,\
libxml2 \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_externals,sd,\
gio \
))
-endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_libraries,sd,\
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index a2de11c..0fc4624 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -9,7 +9,7 @@
#include BluetoothServer.hxx
#include stdio.h
-#ifdef LINUX
+#if defined(LINUX) defined(ENABLE_GIO) defined(ENABLE_DBUS)
#include glib.h
#include gio/gio.h
#include sys/unistd.h
@@ -53,7 +53,7 @@ struct oslSocketImpl {
void BluetoothServer::execute()
{
-#ifdef LINUX
+#if defined(LINUX) defined(ENABLE_GIO) defined(ENABLE_DBUS)
#ifdef GLIB_VERSION_2_26
g_type_init();
GError* aError = NULL;
@@ -218,4 +218,4 @@ void BluetoothServer::setup( std::vectorCommunicator**
pCommunicators )
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 84d4e5d..ccd254c 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\
))
$(eval $(call gb_Library_use_externals,qstart_gtk,\
+ gio \
gtk \
libxml2 \
))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk vcl/Library_vcl.mk vcl/source
RepositoryExternal.mk |1
vcl/Library_vcl.mk| 32 +
vcl/source/gdi/pdfwriter_impl.cxx | 129 +++---
3 files changed, 152 insertions(+), 10 deletions(-)
New commits:
commit 500261a6b6e9dbeacce7f693b01a1c32a112f4fb
Author: Gökçen Eraslan gokcen.eras...@gmail.com
Date: Sat Aug 11 23:09:14 2012 +0300
Use NSS to create a PKCS7 object and write it to PDF file.
After calculating the SHA1 sum of the PDF file, a PKCS7 object is
created using the SEC_PKCS7CreateSignedData function of NSS
library. Then, created PKCS7 object is encoded and written to PDF
file.
Change-Id: Ied747f2e31ede1bc44109e5d4223a18f0af59633
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4216bf2..342f5fb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1900,6 +1900,7 @@ else
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
nspr4 \
+smime3 \
nss3 \
plc4 \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index daa5176..ebd1f56 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -83,6 +83,38 @@ $(eval $(call gb_Library_use_libraries,vcl,\
$(gb_STDLIBS) \
))
+ifeq ($(SYSTEM_NSS),YES)
+
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ $(NSS_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_defs,vcl,\
+ -DSYSTEM_MOZILLA \
+))
+
+$(eval $(call gb_Library_add_libs,vcl,\
+ $(NSS_LIBS) \
+))
+
+else
+
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/mozilla/nspr \
+ -I$(OUTDIR)/inc/mozilla/nss \
+))
+
+$(eval $(call gb_Library_use_libraries,vcl,\
+ nspr4 \
+ nss3 \
+ smime3 \
+))
+
+endif # ifeq ($(SYSTEM_NSS),YES)
+
+
ifneq ($(OS),IOS)
$(eval $(call gb_Library_use_libraries,vcl,\
jvmaccess \
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index aafea05..6104d55 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -82,6 +82,14 @@
#include cppuhelper/implbase1.hxx
+// NSS header files for PDF signing support
+#include nss.h
+#include cert.h
+#include hasht.h
+#include sechash.h
+#include pkcs7t.h
+#include secpkcs7.h
+
using namespace vcl;
using ::rtl::OUString;
@@ -6098,7 +6106,7 @@ bool PDFWriterImpl::emitSignature()
OStringBuffer aContentFiller( MAX_SIGNATURE_CONTENT_LENGTH );
comphelper::string::padToLength(aContentFiller,
MAX_SIGNATURE_CONTENT_LENGTH, '0');
aLine.append( aContentFiller.makeStringAndClear() );
-aLine.append( \n/Type/Sig/SubFilter/adbe.pkcs7.sha1);
+aLine.append( \n/Type/Sig/SubFilter/adbe.pkcs7.detached);
if( m_aContext.DocumentInfo.Author.Len() )
{
@@ -6152,6 +6160,23 @@ bool PDFWriterImpl::emitSignature()
return true;
}
+void PDFSigningPKCS7Callback(void *arg, const char *buf, unsigned long len)
+{
+OStringBuffer outbuffer;
+
+for (unsigned int i = 0; i len ; i++)
+appendHex(buf[i], outbuffer);
+
+sal_uInt64 nWritten = 0;
+
+osl_writeFile((oslFileHandle)arg, outbuffer.getStr(),
outbuffer.getLength(), nWritten);
+}
+
+void *PDFSigningPKCS7PasswordCallback(void *arg, void * /*handle*/)
+{
+return arg;
+}
+
bool PDFWriterImpl::finalizeSignature()
{
@@ -6162,7 +6187,7 @@ bool PDFWriterImpl::finalizeSignature()
sal_uInt64 nOffset = ~0U;
CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, nOffset ) ) );
-sal_Int64 nLastByteRangeNo = nOffset - (m_nSignatureContentOffset +
MAX_SIGNATURE_CONTENT_LENGTH) - 1;
+sal_Int64 nLastByteRangeNo = nOffset - (m_nSignatureContentOffset +
MAX_SIGNATURE_CONTENT_LENGTH + 1);
// 2- overwrite the value to the m_nSignatureLastByteRangeNoOffset position
sal_uInt64 nWritten = 0;
@@ -6185,18 +6210,102 @@ bool PDFWriterImpl::finalizeSignature()
if (!derEncoded.hasElements())
return false;
-#if 0
-// FIXME TODO
sal_Int8* n_derArray = derEncoded.getArray();
sal_Int32 n_derLength = derEncoded.getLength();
-#endif
-// 4- overwrite the PKCS7 content to the m_nSignatureContentOffset
-CHECK_RETURN( (osl_File_E_None == osl_setFilePos( m_aFile,
osl_Pos_Absolut, m_nSignatureContentOffset ) ) );
-// osl_writeFile()
+NSS_NoDB_Init(.);
+
+/* An alternate method for certificate reconstruction
+SECItem certitem;
+certitem.data = reinterpret_castunsigned char *(n_derArray);
+certitem.len = n_derLength;
+certitem.type = siDERCertBuffer;
+CERTCertificate *cert = CERT_NewTempCertificate(CERT_GetDefaultCertDB(),
certitem, NULL, PR_FALSE, PR_TRUE);
+*/
+
+CERTCertificate *cert = CERT_DecodeCertFromPackage(reinterpret_castchar
*(n_derArray), n_derLength);
+
+if (!cert)
+{
+SAL_WARN(vcl.gdi, PDF Signing: Error occured, certificate cannot be
reconstructed.);
+return false;
+}
+
+SAL_WARN(vcl.gdi, PDF Signing:
[Libreoffice-commits] .: RepositoryExternal.mk extensions/Library_ldapbe2.mk
RepositoryExternal.mk | 35 +++ extensions/Library_ldapbe2.mk |4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) New commits: commit e0ee0d444e5107bc2bbc2ac9f3bda19150f4f82b Author: Michael Stahl mst...@redhat.com Date: Mon Jul 16 19:00:07 2012 +0200 RepositoryExternal.mk: add openldap Change-Id: I5f673db405449d28951eff4d6d30ad0b9ec5d77f diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8f542d7..9394c85 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1328,6 +1328,41 @@ endef endif # SYSTEM_HSQLDB +ifdef ($(SYSTEM_OPENLDAP),YES) + +define gb_LinkTarget__use_openldap + +$(call gb_LinkTarget_add_libs,$(1),\ + -lldap \ + -llber \ +) + +endef + +else # !SYSTEM_OPENLDAP + +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + ldap \ + lber \ +)) + +define gb_LinkTarget__use_openldap + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/openldap \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + ldap \ + lber \ +) + +endef + +endif # SYSTEM_OPENLDAP + + ifeq ($(SYSTEM_POSTGRESQL),YES) define gb_LinkTarget__use_postgresql diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 9fd8073..d503cf6 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -58,9 +58,9 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ wldap32 \ )) else # 0S!=WNT +$(eval $(call gb_Library_use_externals,ldapbe2,openldap)) + $(eval $(call gb_Library_add_libs,ldapbe2,\ - -lldap \ - -llber \ -lssl3 \ -lsmime3 \ -lnss3 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e13cda114264670413fe9f799491266b99601df3 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jul 16 21:50:59 2012 +0200 fix --with-system-openldap Change-Id: Ifb70bf8277659b942ef05f55f483e1407814958f diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9394c85..5bbe84e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1328,7 +1328,7 @@ endef endif # SYSTEM_HSQLDB -ifdef ($(SYSTEM_OPENLDAP),YES) +ifeq ($(SYSTEM_OPENLDAP),YES) define gb_LinkTarget__use_openldap ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 16468bd2ea7bdefd859b68c978fdb3397d53a4d4 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Jun 14 08:59:28 2012 -0500 Fix pyuno migration on Mac Change-Id: I75322a9ada9c84faa6c54ade7d44e5493abb418a diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1ce7c59..3b321ee 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1645,7 +1645,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ --F $(OUTDIR)/lib -framework OOoPython \ +-F$(OUTDIR)/lib -framework OOoPython \ ) else $(call gb_LinkTarget_use_libraries,$(1),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d45c4112b1cac10a46b35e10a8fcfa891840a846 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Jun 5 10:05:20 2012 +0200 oh yes, we need some date_time implementation Change-Id: I7f88382a8244799c293f23555243d381ea793685 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 67d5be6..eafe5ed 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -272,8 +272,8 @@ endif # SYSTEM_HUNSPELL ifeq ($(SYSTEM_BOOST),YES) -# No need of libboostdatetime at all define gb_LinkTarget__use_boostdatetime +$(call gb_LinkTarget_add_libs,$(1),-lboost_date_time) endef else # !SYSTEM_BOOST ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ba256eac5fbeaa5fa5d69abff51be353aa2b3d0 Author: David Tardon dtar...@redhat.com Date: Wed May 30 10:20:46 2012 +0200 fix ldap library name Change-Id: Id1294ab2232821eaa9ca5fb37b0f504c828b6f48 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 731bad7..84e368a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1290,7 +1290,7 @@ $(call gb_LinkTarget_use_external,$(1),openssl) $(call gb_LinkTarget_use_libraries,$(1),\ secur32 \ ws2_32 \ - $(if $(filter YES,$(WITH_LDAP)),ldap) \ + $(if $(filter YES,$(WITH_LDAP)),ldap50) \ ) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 071e5ae9bee16415b27c85c2e170b7bc10e75a10 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon May 7 01:09:01 2012 +0200 libs were renamed, but dylib_file hint for older XCode was missed. diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bb5b16f..8e620bf 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -417,7 +417,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal.1 libraptor.1,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) +$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.1 libraptor-lo.1,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cd7aa59a8bc918f637a68df8002c4b58e9469f4 Author: Michael Stahl mst...@redhat.com Date: Thu Apr 19 16:16:07 2012 +0200 gb_LinkTarget_add_static_libs never existed diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 10dc633..d618b63 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -453,7 +453,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ) ifneq ($(OS),WNT) ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_add_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ pixman-1 \ ) else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit a34f98bdacac4bffe8cfdcd6e6459617d204cfd2 Author: Michael Stahl mst...@redhat.com Date: Thu Apr 19 16:51:40 2012 +0200 this pixman-1 thing wasn't even registered diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d618b63..26de781 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -437,9 +437,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cairo \ )) ifneq ($(OS),WNT) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + pixman-1 \ +)) +else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pixman-1 \ )) +endif # MACOSX endif # WNT define gb_LinkTarget__use_cairo ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 5c3c72929c948abbef78205a49fa0713e7191b06 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sun Apr 8 18:24:26 2012 +0200 np_sdk is used even with system mozilla headers See np_sdk/Package_inc.mk . diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cb8c669..10dc633 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1024,6 +1024,7 @@ endif # SYSTEM_CURL ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) define gb_LinkTarget__use_mozilla_headers +$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc)) $(eval $(call gb_LinkTarget_set_include,$(1),\ $(MOZILLA_HEADERS_CFLAGS) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 2d3c700725736a5e59e60b80018582480674074d Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sat Mar 24 03:54:52 2012 +0100 help XCode 2.5 resolve @loader_path/libfoo.dylib diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1a054c7..c6a033c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -407,6 +407,12 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ rdf \ ) +ifeq ($(OS),MACOSX) + +$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal.1 libraptor.1,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) + +endif + endef endif # SYSTEM_REDLAND ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6b951e82748eb25aeb3976043c530b8f5debc0a3 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jan 12 08:23:06 2012 +0100 trying to fix windows build: include proper npapi.h diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 514a5b7..f37cc10 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -909,8 +909,8 @@ ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) define gb_LinkTarget__use_mozilla_headers $(eval $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ $(MOZILLA_HEADERS_CFLAGS) + $$(INCLUDE) \ )) endef @@ -918,8 +918,8 @@ else #!SYSTEM_MOZILLA_HEADERS define gb_LinkTarget__use_mozilla_headers $(eval $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ -I$(OUTDIR)/inc/npsdk \ + $$(INCLUDE) \ )) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 66458f367ac045c5e263271b58ed4b0068644ac9 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jan 12 08:53:20 2012 +0100 typo: missing \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f37cc10..c2efb60 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -909,9 +909,10 @@ ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) define gb_LinkTarget__use_mozilla_headers $(eval $(call gb_LinkTarget_set_include,$(1),\ - $(MOZILLA_HEADERS_CFLAGS) + $(MOZILLA_HEADERS_CFLAGS) \ $$(INCLUDE) \ )) + endef else #!SYSTEM_MOZILLA_HEADERS @@ -921,6 +922,7 @@ $(eval $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/npsdk \ $$(INCLUDE) \ )) + endef endif #SYSTEM_MOZILLA_HEADERS ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 472a7db1ef118147d949b13c66bb86411dbc7a75 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Dec 27 00:16:36 2011 +0100 register hunspell as static library diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6b9ebc0..ac2a95b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -192,6 +192,10 @@ endef else # !SYSTEM_HUNSPELL +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \ +)) + define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ -DHUNSPELL_STATIC \ @@ -200,8 +204,8 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/hunspell \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(if $(filter WNT,$(OS)),libhunspell.lib,-lhunspell-1.3) \ +$(call gb_LinkTarget_add_linked_static_libs,$(1),\ + $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \ ) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk RepositoryFixes.mk
RepositoryExternal.mk |4 ++-- RepositoryFixes.mk|2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 4258f0260d6e99edf5db44720b85db9f1d78ca91 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Dec 23 13:26:56 2011 +0100 Repository: fix Windows name for internal libexttextcat diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 11896cd..6b9ebc0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -224,7 +224,7 @@ else # !SYSTEM_LIBEXTTEXTCAT ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - exttextcat \ + libexttextcat \ )) else $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ @@ -235,7 +235,7 @@ endif define gb_LinkTarget__use_libexttextcat ifeq ($(OS),WNT) $(call gb_LinkTarget_add_linked_libs,$(1),\ - exttextcat \ + libexttextcat \ ) else $(call gb_LinkTarget_add_linked_static_libs,$(1),\ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index ff1eb34..cb80f45 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -56,7 +56,6 @@ gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$ gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) -gb_Library_FILENAMES := $(patsubst exttextcat:libexttextcat%,exttextcat:libilibexttextcat%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) @@ -68,6 +67,7 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 75f77e63189607142d0a90047ac04cd415072174 Author: Tomas Chvatal tchva...@suse.cz Date: Wed Nov 2 21:16:53 2011 +0100 One more SYSTEM_MOZILLA to SYSTEM_NSS diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8891d6b..d7ff86f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -828,16 +828,16 @@ $(call gb_LinkTarget_add_libs,$(1), \ endef -ifeq ($(SYSTEM_MOZILLA),YES) +ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -$(MOZ_NSS_CFLAGS) \ +$(NSS_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),\ -$(MOZ_NSS_LIBS) \ +$(NSS_LIBS) \ ) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
