diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2011-06-16 08:44:01 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2011-06-16 08:44:01 +0000 |
| commit | 6f7c9b6b68911c5dffd5b0dc8311d74780c3595b (patch) | |
| tree | a172ec7beeabe95a14687e08241cf05490a4ac82 /editors/openoffice.org-3-RC/files/patch-vcl | |
| parent | - Fix build when CFLAGS is set in /etc/make.conf (diff) | |
Update to OOO340_m0. This is 3.4 beta.
cf.
http://development.openoffice.org/releases/3.4beta.html
http://openoffice.org/projects/www/lists/cws-announce/archive/2011-04/message/16
http://permalink.gmane.org/gmane.comp.openoffice.announce.cws/1886
Notes
Notes:
svn path=/head/; revision=275664
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-vcl | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl b/editors/openoffice.org-3-RC/files/patch-vcl new file mode 100644 index 000000000000..a0035611add9 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-vcl @@ -0,0 +1,100 @@ +--- 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 \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + )) + + $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ + + +--- 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 \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + $(gb_STDLIBS) \ + )) + +@@ -203,4 +199,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 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 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + $(gb_STDLIBS) \ + )) + +--- 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 \ + vos3 \ +- X11 \ +- Xext \ +- SM \ +- ICE \ + $(gb_STDLIBS) \ + )) + +--- 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 + |