diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2011-06-14 20:56:18 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2011-06-14 20:56:18 +0000 |
| commit | b5b159af24b95a86c7e40b1392293e2b2ff471a3 (patch) | |
| tree | 7f56743db4fbaec29483ea8144e12dae36bacab7 /editors/openoffice-3-devel/files/patch-vcl | |
| parent | - Update IcedTea-Web to 1.0.3. (diff) | |
Update to DEV300_m105.
Notes
Notes:
svn path=/head/; revision=275590
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-vcl | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/files/patch-vcl b/editors/openoffice-3-devel/files/patch-vcl new file mode 100644 index 000000000000..a1725e63b396 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-vcl @@ -0,0 +1,105 @@ +--- 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 +@@ -65,10 +65,6 @@ + cppu \ + sal \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + )) + + $(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 +@@ -56,10 +56,6 @@ + cppu \ + sal \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + )) + + $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ +@@ -202,4 +198,14 @@ + pthread \ + )) + endif ++ ++ifeq ($(OS),FREEBSD) ++$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ ++ $$(SOLARLIB) \ ++ -lX11 \ ++ -lXext \ ++ -lSM \ ++ -lICE \ ++)) ++endif + # 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 @@ + cppu \ + sal \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + )) + + $(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 +@@ -62,10 +62,6 @@ + cppu \ + sal \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + )) + + $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ + + + |