rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.11, 1.12 openoffice.org.spec, 1.2024, 1.2025
Caolan McNamara
caolanm at fedoraproject.org
Mon Oct 12 08:59:28 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046
Modified Files:
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
openoffice.org.spec
Log Message:
move prelink optimization into a proper patch
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
scripts/soffice.sh | 12 +++--------
util/makefile.mk | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 8 deletions(-)
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 10 Oct 2009 15:48:45 -0000 1.11
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 12 Oct 2009 08:59:27 -0000 1.12
@@ -1,5 +1,5 @@
---- SRC680_m123/desktop/scripts/soffice.sh.orig 2005-08-15 20:17:35.000000000 +0100
-+++ SRC680_m123/desktop/scripts/soffice.sh 2005-08-15 20:19:36.000000000 +0100
+--- desktop.orig/scripts/soffice.sh 2005-08-15 20:17:35.000000000 +0100
++++ desktop/scripts/soffice.sh 2005-08-15 20:19:36.000000000 +0100
@@ -73,30 +73,26 @@
esac
done
@@ -35,25 +35,67 @@
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-Index: osl/unx/signal.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/signal.c,v
-retrieving revision 1.28
-diff -u -p -u -r1.28 signal.c
---- openoffice.org.orig/sal/osl/unx/signal.c 8 Sep 2005 15:00:57 -0000 1.28
-+++ openoffice.org/sal/osl/unx/signal.c 3 Nov 2005 11:42:52 -0000
-@@ -185,6 +185,14 @@
- if (strProgName)
- {
- idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");
-+ if (idx == -1)
-+ idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "swriter");
-+ if (idx == -1)
-+ idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "simpress");
-+ if (idx == -1)
-+ idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "scalc");
-+ if (idx == -1)
-+ idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "sdraw");
- rtl_string_release (strProgName);
- }
- return (idx != -1);
+--- desktop.orig/util/makefile.mk 2009-10-12 08:41:17.000000000 +0100
++++ desktop/util/makefile.mk 2009-10-12 09:52:19.000000000 +0100
+@@ -189,6 +189,61 @@
+ APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
+ APP5DEF= $(MISCX)$/$(TARGET).def
+
++.IF "$(OS)" == "LINUX"
++PRELINKLIBS=$(APP5STDLIBS)
++PRELINKLIBS+= \
++ $(SVXLIB) \
++ $(SVXCORELIB) \
++ $(XMLOFFLIB) \
++ -lfwl$(DLLPOSTFIX) \
++ -lpackage2 \
++ -lucpfile1 \
++ -lucb1 \
++ $(STORELIB) \
++ $(REGLIB) \
++ -lvclplug_gtk$(DLLPOSTFIX) \
++ -lvclplug_gen$(DLLPOSTFIX) \
++ -ldtrans \
++ $(LNGLIB) \
++ $(ICUINLIB)
++
++APP6TARGET=swriter
++APP6NOSAL=TRUE
++APP6RPATH=BRAND
++APP6OBJS=$(APP5OBJS)
++APP6STDLIBS=$(PRELINKLIBS) \
++ $(ISWLIB)
++APP6DEPN=$(APP5DEPN)
++APP6DEF=$(MISCX)$/$(TARGET).def
++
++APP7TARGET=scalc
++APP7NOSAL=TRUE
++APP7RPATH=BRAND
++APP7OBJS=$(APP5OBJS)
++APP7STDLIBS=$(PRELINKLIBS) \
++ $(ISCLIB)
++APP7DEPN=$(APP5DEPN)
++APP7DEF=$(MISCX)$/$(TARGET).def
++
++APP8TARGET=sdraw
++APP8NOSAL=TRUE
++APP8RPATH=BRAND
++APP8OBJS=$(APP5OBJS)
++APP8STDLIBS=$(PRELINKLIBS) \
++ $(ISDLIB)
++APP8DEPN=$(APP5DEPN)
++APP8DEF=$(MISCX)$/$(TARGET).def
++
++APP9TARGET=simpress
++APP9NOSAL=TRUE
++APP9RPATH=BRAND
++APP9OBJS=$(APP5OBJS)
++APP9STDLIBS=$(PRELINKLIBS) \
++ $(ISDLIB)
++APP9DEPN=$(APP5DEPN)
++APP9DEF=$(MISCX)$/$(TARGET).def
++.ENDIF
++
+ .IF "$(GUI)" == "WNT"
+ APP5RES= $(RES)$/oodesktop.res
+ APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -p -r1.2024 -r1.2025
--- openoffice.org.spec 12 Oct 2009 07:39:12 -0000 1.2024
+++ openoffice.org.spec 12 Oct 2009 08:59:27 -0000 1.2025
@@ -1717,13 +1717,6 @@ cd ..
cd openoffice.org
./create_tree.sh
-#start of jakub based suggestion on prelink optimization
-cd ../../../../desktop/util
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-#end of jakub based suggestion on prelink optimization
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
%install
More information about the fedora-extras-commits
mailing list