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 | |
parent | - Update IcedTea-Web to 1.0.3. (diff) |
Update to DEV300_m105.
Notes
Notes:
svn path=/head/; revision=275590
Diffstat (limited to 'editors/openoffice-3-devel/files')
-rw-r--r-- | editors/openoffice-3-devel/files/patch-i65514 | 8 | ||||
-rw-r--r-- | editors/openoffice-3-devel/files/patch-i91861 | 14 | ||||
-rw-r--r-- | editors/openoffice-3-devel/files/patch-icu | 26 | ||||
-rw-r--r-- | editors/openoffice-3-devel/files/patch-vcl | 105 |
4 files changed, 135 insertions, 18 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i65514 b/editors/openoffice-3-devel/files/patch-i65514 index f12266b5fede..1db72be7b5bd 100644 --- a/editors/openoffice-3-devel/files/patch-i65514 +++ b/editors/openoffice-3-devel/files/patch-i65514 @@ -1,9 +1,9 @@ ---- berkeleydb/makefile.mk 2009-09-26 08:52:35.000000000 +0900 -+++ berkeleydb/makefile.mk 2009-09-26 08:54:31.000000000 +0900 -@@ -102,6 +102,9 @@ +--- berkeleydb/makefile.mk 2011-06-13 13:30:42.000000000 +0900 ++++ berkeleydb/makefile.mk 2011-06-13 13:33:39.000000000 +0900 +@@ -97,6 +97,9 @@ CONFIGURE_ACTION= \ ..$/dist$/configure - CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 + CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)' +.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX" +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly +.ENDIF diff --git a/editors/openoffice-3-devel/files/patch-i91861 b/editors/openoffice-3-devel/files/patch-i91861 deleted file mode 100644 index 85dfde19f963..000000000000 --- a/editors/openoffice-3-devel/files/patch-i91861 +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/source/glyphs/makefile.mk~ 2009-11-18 13:58:31.000000000 +0900 -+++ vcl/source/glyphs/makefile.mk 2009-11-29 20:13:21.000000000 +0900 -@@ -41,7 +41,11 @@ - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/util$/makefile2.pmk - -+.IF "$(OS)" != "FREEBSD" - CFLAGS+= $(FREETYPE_CFLAGS) -+.ELSE -+ADDCDEFS+= $(FREETYPE_CFLAGS) -+.ENDIF - - # --- Files -------------------------------------------------------- - diff --git a/editors/openoffice-3-devel/files/patch-icu b/editors/openoffice-3-devel/files/patch-icu new file mode 100644 index 000000000000..b04a701dd71a --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-icu @@ -0,0 +1,26 @@ +--- icu/icu4c-4_0_1-src.patch 2011-04-15 19:58:10.000000000 +0900 ++++ icu/icu4c-4_0_1-src.patch 2011-06-14 17:12:52.000000000 +0900 +@@ -1,3 +1,23 @@ ++--- misc/icu/source/config/mh-bsd-gcc 2009-01-15 16:46:10.000000000 +0900 +++++ misc/build/icu/source/config/mh-bsd-gcc 2011-06-14 17:12:14.000000000 +0900 ++@@ -18,7 +18,15 @@ ++ ++ ## Compiler switch to embed a runtime search path ++ LD_RPATH= ++-LD_RPATH_PRE= -Wl,-rpath, +++LD_RPATH_PRE= -Wl,-z,origin -Wl,-rpath, +++ +++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH +++## (incl. the C++ runtime libs potentially found in the URE lib dir): +++ENABLE_RPATH=YES +++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' +++ +++#SH# ENABLE_RPATH=YES +++#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" ++ ++ ## Compiler switch to embed a library name ++ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++ + --- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 + +++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 + @@ -52,7 +52,7 @@ 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,\ + + + |