diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2011-06-16 06:02:52 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2011-06-16 06:02:52 +0000 |
| commit | 9349965a709ae0bddde796d3a6d71a35062c23e8 (patch) | |
| tree | 65747a0e62a1a296ab5e0b35849de10797eba9b3 /editors/openoffice.org-3-devel/files | |
| parent | 003d8db5570d84a0d83a5761abc16583ea93264e (diff) | |
Notes
Diffstat (limited to 'editors/openoffice.org-3-devel/files')
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-vcl | 89 |
1 files changed, 42 insertions, 47 deletions
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl b/editors/openoffice.org-3-devel/files/patch-vcl index a1725e63b396..a0035611add9 100644 --- a/editors/openoffice.org-3-devel/files/patch-vcl +++ b/editors/openoffice.org-3-devel/files/patch-vcl @@ -1,5 +1,5 @@ ---- vcl/Library_desktop_detector.mk 2011-04-15 19:59:29.000000000 +0900 -+++ vcl/Library_desktop_detector.mk 2011-06-13 17:21:06.000000000 +0900 +--- vcl/Library_desktop_detector.mk 2011-04-15 21:51:38.000000000 +0900 ++++ vcl/Library_desktop_detector.mk 2011-06-15 06:04:43.000000000 +0900 @@ -65,10 +65,6 @@ cppu \ sal \ @@ -12,38 +12,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ ---- vcl/Library_vcl.mk 2011-04-15 19:59:29.000000000 +0900 -+++ vcl/Library_vcl.mk 2011-06-14 15:35:47.000000000 +0900 -@@ -45,13 +45,8 @@ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/stl \ - -I$(OUTDIR)/inc \ -+ $$(FREETYPE_CFLAGS) \ - )) --ifeq ($(GUIBASE),unx) --$(eval $(call gb_Library_set_cxxflags,vcl,\ -- $$(CXXFLAGS) \ -- $$(FREETYPE_CFLAGS) \ --)) --endif - - $(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ -@@ -88,8 +83,9 @@ - endif - endif - ifeq ($(GUIBASE),unx) --$(eval $(call gb_Library_add_linked_libs,vcl,\ -- freetype \ -+$(eval $(call gb_Library_set_ldflags,vcl,\ -+ $$(LDFLAGS) \ -+ $(FREETYPE_LIBS) \ - )) - endif - ---- vcl/Library_vclplug_gen.mk 2011-04-15 19:59:29.000000000 +0900 -+++ vcl/Library_vclplug_gen.mk 2011-06-14 15:51:10.000000000 +0900 +--- vcl/Library_vclplug_gen.mk 2011-04-15 21:51:38.000000000 +0900 ++++ vcl/Library_vclplug_gen.mk 2011-06-15 06:27:38.000000000 +0900 @@ -56,10 +56,6 @@ cppu \ sal \ @@ -52,10 +23,10 @@ - Xext \ - SM \ - ICE \ + $(gb_STDLIBS) \ )) - $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ -@@ -202,4 +198,14 @@ +@@ -203,4 +199,14 @@ pthread \ )) endif @@ -72,9 +43,9 @@ # vim: set noet sw=4 ts=4: ---- vcl/Library_vclplug_gtk.mk 2011-04-15 19:59:29.000000000 +0900 -+++ vcl/Library_vclplug_gtk.mk 2011-06-13 17:21:25.000000000 +0900 -@@ -84,10 +84,6 @@ +--- vcl/Library_vclplug_gtk.mk 2011-04-15 21:51:38.000000000 +0900 ++++ vcl/Library_vclplug_gtk.mk 2011-06-15 06:28:07.000000000 +0900 +@@ -85,10 +85,6 @@ cppu \ sal \ vos3 \ @@ -82,13 +53,11 @@ - Xext \ - SM \ - ICE \ + $(gb_STDLIBS) \ )) - $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ - - ---- vcl/Library_vclplug_svp.mk 2011-04-15 19:59:29.000000000 +0900 -+++ vcl/Library_vclplug_svp.mk 2011-06-13 17:20:54.000000000 +0900 +--- vcl/Library_vclplug_svp.mk 2011-04-15 21:51:38.000000000 +0900 ++++ vcl/Library_vclplug_svp.mk 2011-06-15 06:28:20.000000000 +0900 @@ -62,10 +62,6 @@ cppu \ sal \ @@ -97,9 +66,35 @@ - Xext \ - SM \ - ICE \ + $(gb_STDLIBS) \ )) - $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ - - - +--- vcl/Library_vcl.mk 2011-04-15 21:51:38.000000000 +0900 ++++ vcl/Library_vcl.mk 2011-06-16 12:18:00.000000000 +0900 +@@ -45,13 +45,8 @@ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ ++ $$(FREETYPE_CFLAGS) \ + )) +-ifeq ($(GUIBASE),unx) +-$(eval $(call gb_Library_set_cxxflags,vcl,\ +- $$(CXXFLAGS) \ +- $$(FREETYPE_CFLAGS) \ +-)) +-endif + + $(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ +@@ -89,8 +84,9 @@ + endif + endif + ifeq ($(GUIBASE),unx) +-$(eval $(call gb_Library_add_linked_libs,vcl,\ +- freetype \ ++$(eval $(call gb_Library_set_ldflags,vcl,\ ++ $$(LDFLAGS) \ ++ $(FREETYPE_LIBS) \ + )) + endif + |