[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.114.ooo51718.rpath.patch, NONE, 1.1 workspace.fpicandrpath.patch, NONE, 1.1 openoffice.org.spec, 1.283, 1.284 openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch, 1.1, NONE openoffice.org-1.9.114.oooXXXXX.rpath.patch, 1.1, NONE



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10812

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.114.ooo51718.rpath.patch 
	workspace.fpicandrpath.patch 
Removed Files:
	openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch 
	openoffice.org-1.9.114.oooXXXXX.rpath.patch 
Log Message:
still not exported

openoffice.org-1.9.114.ooo51718.rpath.patch:
 berkeleydb/makefile.mk          |    7 +++++++
 portaudio/portaudio_v18_1.patch |    5 +++--
 sndfile/makefile.mk             |   13 ++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.114.ooo51718.rpath.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/berkeleydb/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/berkeleydb/makefile.mk	11 Apr 2005 09:32:45 -0000	1.21
+++ openoffice.org/berkeleydb/makefile.mk	4 Jul 2005 15:14:53 -0000
@@ -93,6 +93,13 @@ ADDITIONAL_FILES=    \
 PATCH_FILE_NAME=db-4.2.52.patch
 
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+.EXPORT: LDFLAGS
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=..$/dist$/configure
Index: portaudio_v18_1.patch
===================================================================
RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
retrieving revision 1.2
diff -u -p -r1.2 portaudio_v18_1.patch
--- openoffice.org.orig/portaudio/portaudio_v18_1.patch	31 May 2005 16:34:54 -0000	1.2
+++ openoffice.org/portaudio/portaudio_v18_1.patch	4 Jul 2005 21:54:37 -0000
@@ -1,5 +1,5 @@
-*** misc/portaudio_v18_1/configure	2003-02-11 23:24:56.000000000 -0500
---- misc/build/portaudio_v18_1/configure	2004-06-02 17:23:18.000000000 -0400
+*** misc/portaudio_v18_1/configure	2005-07-04 16:28:16.000000000 +0100
+--- misc/build/portaudio_v18_1/configure	2005-07-04 16:30:12.000000000 +0100
 ***************
 *** 1883,1892 ****
   case "${host_os}" in
@@ -28,7 +28,7 @@
 ! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
 ! 	LIBS="-lm -lpthread";
 ! 	PADLL="libportaudio.so";
-! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
+! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0 -Wl,-rpath,'\$\$ORIGIN'";
 ! 	CFLAGS="-O2 -fPIC"
 ! 	;;
 ! 
Index: makefile.mk
===================================================================
RCS file: /cvs/external/sndfile/makefile.mk,v
retrieving revision 1.6
diff -u -p -r1.6 makefile.mk
--- openoffice.org.orig/sndfile/makefile.mk	31 May 2005 16:31:45 -0000	1.6
+++ openoffice.org/sndfile/makefile.mk	4 Jul 2005 16:28:16 -0000
@@ -80,11 +80,18 @@ PATCH_FILE_NAME=libsndfile-1.0.9.patch
 
 CONFIGURE_DIR=
 
-CONFIGURE_ACTION=./configure --with-pic
-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
-CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+.IF "$(GUI)"=="UNX"
+.IF "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-noinhibit-exec
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+.EXPORT: LDFLAGS
 .ENDIF
 
+CONFIGURE_ACTION=./configure --with-pic
+
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
 

workspace.fpicandrpath.patch:
 binfilter/bf_sd/source/ui/app/makefile.mk  |    7 ++++++-
 binfilter/bf_sd/util/makefile.mk           |    4 ++--
 binfilter/bf_sw/source/ui/app/makefile.mk  |    4 ++++
 binfilter/bf_sw/source/ui/app/sw_swlib.cxx |    4 ++--
 binfilter/bf_sw/util/makefile.mk           |   10 +++++++---
 pyuno/source/module/makefile.mk            |   14 +++++++++-----
 sw/source/filter/basflt/makefile.mk        |    2 --
 sw/util/makefile.mk                        |    3 ++-
 8 files changed, 32 insertions(+), 16 deletions(-)

--- NEW FILE workspace.fpicandrpath.patch ---
Index: bf_sd/source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sd/source/ui/app/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -p -r1.3 -r1.3.140.1
--- openoffice.org.orig/binfilter/bf_sd/source/ui/app/makefile.mk	18 Nov 2003 19:23:05 -0000	1.3
+++ openoffice.org/binfilter/bf_sd/source/ui/app/makefile.mk	17 Jun 2005 19:37:20 -0000	1.3.140.1
@@ -107,7 +107,7 @@ SRC1FILES =	\
 
 OBJFILES = \
 		$(OBJ)$/sd_sdlib.obj	\
-		$(OBJ)$/sd_sdresid.obj	\
+		$(OBJ)$/sd_sdresid.obj
 
 SLOFILES =	\
         $(SLO)$/sd_sdmod.obj		\
@@ -126,6 +126,11 @@ EXCEPTIONSFILES= \
 		$(SLO)$/sd_sdxfer.obj		\
 		$(SLO)$/sd_sdmod1.obj		
 
+LIB3TARGET=$(SLB)$/bf_ysdlib.lib
+LIB3OBJFILES=\
+		$(SLO)$/sd_sdlib.obj \
+	     	$(SLO)$/sd_sdresid.obj
+
 .IF "$(GUI)" == "WNT"
 
 NOOPTFILES=\
Index: bf_sd/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sd/util/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -p -r1.3 -r1.3.140.1
--- openoffice.org.orig/binfilter/bf_sd/util/makefile.mk	11 Nov 2003 15:30:14 -0000	1.3
+++ openoffice.org/binfilter/bf_sd/util/makefile.mk	17 Jun 2005 19:37:21 -0000	1.3.140.1
@@ -200,8 +200,8 @@ LIB3FILES=      \
 LIB4TARGET=$(LB)$/bf_sdlib.lib
 LIB4ARCHIV=$(LB)$/libbf_sdlib.a
 .IF "$(GUI)"=="UNX"
-LIB4OBJFILES=$(OBJ)$/sd_sdlib.obj \
-		  $(OBJ)$/sd_sdresid.obj
+LIB4OBJFILES=$(SLO)$/sd_sdlib.obj \
+		  $(SLO)$/sd_sdresid.obj
 .ELSE
 .IF "$(GUI)"=="MAC"
 LIB4OBJFILES=$(OBJ)$/sd_sdlib.obj \
Index: bf_sw/source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/source/ui/app/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -p -r1.3 -r1.3.140.1
--- openoffice.org.orig/binfilter/bf_sw/source/ui/app/makefile.mk	18 Nov 2003 19:24:44 -0000	1.3
+++ openoffice.org/binfilter/bf_sw/source/ui/app/makefile.mk	17 Jun 2005 19:37:21 -0000	1.3.140.1
@@ -147,6 +147,10 @@ LIB1OBJFILES= \
 		$(SLO)$/sw_version.obj	 \
 		$(SLO)$/sw_swwait.obj
 
+LIB3TARGET=$(SLB)$/bf_yswlib.lib
+LIB3OBJFILES=\
+	$(SLO)$/sw_swlib.obj \
+	$(SLO)$/sw_swcomlib.obj
 
 # --- Targets ------------------------------------------------------
 
Index: bf_sw/source/ui/app/sw_swlib.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/source/ui/app/sw_swlib.cxx,v
retrieving revision 1.3
retrieving revision 1.3.110.1
diff -u -p -r1.3 -r1.3.110.1
--- openoffice.org.orig/binfilter/bf_sw/source/ui/app/sw_swlib.cxx	3 Aug 2004 18:32:27 -0000	1.3
+++ openoffice.org/binfilter/bf_sw/source/ui/app/sw_swlib.cxx	17 Jun 2005 19:37:21 -0000	1.3.110.1
@@ -111,9 +111,9 @@
 #include <web.hrc>
 #include <globdoc.hrc>
 
-#ifndef _IODETECT_HXX
+#undef _DLL_
 #include <iodetect.hxx>
-#endif
+
 namespace binfilter {
 
 #define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
Index: bf_sw/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/util/makefile.mk,v
retrieving revision 1.5
retrieving revision 1.5.122.1
diff -u -p -r1.5 -r1.5.122.1
--- openoffice.org.orig/binfilter/bf_sw/util/makefile.mk	13 Jul 2004 16:26:41 -0000	1.5
+++ openoffice.org/binfilter/bf_sw/util/makefile.mk	17 Jun 2005 19:37:22 -0000	1.5.122.1
@@ -173,13 +173,17 @@ RESLIB1SRSFILES= \
 
 LIB1TARGET=$(LB)$/bf_swlib.lib
 LIB1ARCHIV=$(LB)$/libbf_swlib.a
+.IF "$(GUI)"=="UNX"
+LIB1OBJFILES= \
+		$(SLO)$/sw_swlib.obj \
+		$(SLO)$/sw_swcomlib.obj \
+		$(SLO)$/sw_w4wflt.obj
+.ELSE
 LIB1OBJFILES= \
 		$(OUT)$/obj$/sw_swlib.obj \
 		$(OUT)$/obj$/sw_swcomlib.obj \
 		$(OUT)$/obj$/sw_w4wflt.obj
-
-
-
+.ENDIF
 
 SHL2TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
 SHL2VERSIONMAP= $(TARGET).map
Index: source/module/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/source/module/makefile.mk,v
retrieving revision 1.9
retrieving revision 1.9.8.1
diff -u -p -r1.9 -r1.9.8.1
--- openoffice.org.orig/pyuno/source/module/makefile.mk	16 Feb 2005 16:45:24 -0000	1.9
+++ openoffice.org/pyuno/source/module/makefile.mk	16 Jun 2005 11:19:43 -0000	1.9.8.1
@@ -145,16 +145,20 @@ $(DLLDEST)$/%.py: %.py
 .IF "$(GUI)" == "UNX"
 $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
 .IF "$(OS)" == "LINUX"
-	$(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "SOLARIS"
-	ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "FREEBSD"
-	ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "NETBSD"
-	$(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "MACOSX"
-	$(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+.ELSE
+	@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ENDIF
+	cat $(MISC)$/$(@:b).cmd
+	@source $(MISC)$/$(@:b).cmd
 .ENDIF
 
 
Index: source/filter/basflt/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/filter/basflt/makefile.mk,v
retrieving revision 1.7
retrieving revision 1.7.472.1
diff -u -p -r1.7 -r1.7.472.1
--- openoffice.org.orig/sw/source/filter/basflt/makefile.mk	4 Oct 2004 19:15:35 -0000	1.7
+++ openoffice.org/sw/source/filter/basflt/makefile.mk	16 Jun 2005 09:51:55 -0000	1.7.472.1
@@ -86,8 +86,6 @@ SLOFILES =  \
 EXCEPTIONSFILES = \
                 $(SLO)$/fltini.obj
 
-OBJFILES = $(OBJ)$/w4wflt.obj
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
retrieving revision 1.48
retrieving revision 1.48.140.1
diff -u -p -r1.48 -r1.48.140.1
--- openoffice.org.orig/sw/util/makefile.mk	15 Mar 2005 10:07:25 -0000	1.48
+++ openoffice.org/sw/util/makefile.mk	16 Jun 2005 09:51:56 -0000	1.48.140.1
@@ -185,6 +185,7 @@ SHL2STDLIBS= \
             $(SOTLIB) \
             $(TOOLSLIB) \
 	    $(UCBHELPERLIB) \
+	    $(UNOTOOLSLIB) \
             $(COMPHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
@@ -193,7 +194,7 @@ SHL2STDLIBS= \
 SHL2OBJS=   $(SLO)$/swdetect.obj \
         $(SLO)$/swdet2.obj \
         $(SLO)$/detreg.obj  \
-            $(OUT)$/obj$/w4wflt.obj
+            $(SLO)$/w4wflt.obj
 
 .IF "$(product)"==""
 SHL2OBJS+=  \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- openoffice.org.spec	8 Jul 2005 07:06:20 -0000	1.283
+++ openoffice.org.spec	8 Jul 2005 08:57:30 -0000	1.284
@@ -98,17 +98,17 @@
 Patch35: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
 Patch36: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
 Patch37: workspace.gslpatches2.patch
-Patch38: openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch
+Patch38: workspace.fpicandrpath.patch
 Patch39: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch40: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
 Patch41: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
-#Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
+Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
 Patch43: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
 #Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
 Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
 Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
-Patch48: openoffice.org-1.9.114.oooXXXXX.rpath.patch
+Patch48: openoffice.org-1.9.114.ooo51718.rpath.patch
 Patch49: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 Patch50: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
 Patch51: openoffice.org-1.9.114.ooo51638.mailmerge.patch
@@ -732,17 +732,17 @@
 %patch35 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
 %patch36 -p1 -b .ooo47323.binfilter.stupiddetect.patch
 %patch37 -p1 -b .workspace.gslpatches2.patch
-%patch38 -p1 -b .oooXXXXX.pyuno.pushrpath.patch
+%patch38 -p1 -b .workspace.fpicandrpath.patch
 %patch39 -p1 -b .NONE.gcc3gcj4.patch
 %patch40 -p1 -b .ooo9290.goodies.epstoepdf.patch
 %patch41 -p1 -b .oooXXXXX.psprintfriend.patch
-#%patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
+%patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
 %patch43 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
 #%patch44 -p1 -b .oooXXXXX.testtools.patch
 %patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
 %patch47 -p1 -b .ooo51385.bridges.stack.patch
-%patch48 -p1 -b .oooXXXXX.rpath.patch
+%patch48 -p1 -b .ooo51718.rpath.patch
 %patch49 -p1 -b .rh161886.rpath.desktop.patch
 %patch50 -p1 -b .ooo51637.solenv.pyuno.patch
 %patch51 -p1 -b .ooo51638.mailmerge.patch


--- openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch DELETED ---


--- openoffice.org-1.9.114.oooXXXXX.rpath.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]