[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_tde.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk       |    1 +
 vcl/Library_vclplug_gtk3.mk |   15 ++++++---------
 vcl/Library_vclplug_tde.mk  |   13 +++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 398ce44c54b26b31eb826c150926fd49e59b4f52
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 28 21:47:29 2012 +0200

    RepositoryExternal: internal libpng requires zlib as well
    
    Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1196385..78e82b6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1371,6 +1371,7 @@ define gb_LinkTarget__use_png
 $(call gb_LinkTarget_use_static_libraries,$(1),\
 	png \
 )
+$(call gb_LinkTarget__use_zlib,$(1))
 
 endef
 
commit bce530e89cd32d40f7a54f80906c321c5b1b944b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 28 21:37:26 2012 +0200

    vcl: fix gtk3 build breakage due to forgotten use_libraries
    
    Change-Id: I53faf1a5c88b6ffd954fd98814cdf27b77f1c3db

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 2c34e1d..a044723 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -50,8 +50,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
 $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3))
 
 $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
-    $$(GTK3_LIBS) \
-    $$(GTHREAD_LIBS) \
+	$(GTK3_LIBS) \
+	$(GTHREAD_LIBS) \
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
 ))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
@@ -75,13 +79,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
 	dbus \
 ))
 
-$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
-	-lX11 \
-	-lXext \
-	-lSM \
-	-lICE \
-))
-
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
     vcl/unx/gtk3/a11y/gtk3atkaction \
     vcl/unx/gtk3/a11y/gtk3atkbridge \
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 9431131..600f00a 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -45,7 +45,11 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\
 $(eval $(call gb_Library_use_sdk_api,vclplug_tde))
 
 $(eval $(call gb_Library_add_libs,vclplug_tde,\
-    $$(TDE_LIBS) \
+	$(TDE_LIBS) \
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
 ))
 
 $(eval $(call gb_Library_use_libraries,vclplug_tde,\
@@ -70,13 +74,6 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\
 	icuuc \
 ))
 
-$(eval $(call gb_Library_add_libs,vclplug_tde,\
-	-lX11 \
-	-lXext \
-	-lSM \
-	-lICE \
-))
-
 $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\
     vcl/unx/kde/kdedata \
     vcl/unx/kde/salnativewidgets-kde \