ooo-build r14462 - in trunk: . bin bin/piece distro-configs doc patches/dev300

From: pmladek svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14462 - in trunk: . bin bin/piece distro-configs doc patches/dev300
Date: Wed, 5 Nov 2008 18:14:40 +0000 (UTC)
Author: pmladek
Date: Wed Nov  5 18:14:40 2008
New Revision: 14462
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14462&view=rev

Log:
2008-11-05  Petr Mladek  <pmladek suse cz>

        * patches/dev300/jvmfwk-libjvm-path-ibm-java-1.6.0.diff:
        * patches/dev300/apply: prefer the "/lib/<arch>/classic/libjvm.so"
          over /jre/bin/classic/libjvm.so; the second causes problems with
          IBM Java 1.6.0 (bnc#440459, i#95838)

        * patches/dev300/solven-extensions-noarch-identifier.diff:
        * patches/dev300/sdext-noarch-identifier.diff:
        * patches/dev300/apply: omit the ugly <platform>-<arch> suffix in the
          extensions identifier

        * patches/dev300/apply: enable PostgreSQL for SUSE and SUSE-11.0 again
          (fate#304558)

        * patches/dev300/piece-services.diff, bin/piece/post-inst-postprocess:
          register also the services that are registered by regmerge; fixes
          KDE and GNOME integration (bnc#433076)

        * bin/piece/install-generic: fix permissions of libraries (to produce
          correct debuinfo package)

        * configure.in, bin/setup.in, bin/piece/sys-setup.in:
          new --with-arch-flags configure option to define ARCH_FLAGS for all
          pieces in bootstrap

        * bin/piece/save-registry:
        * bin/piece/install-registry:
        * bin/piece/file-list-libs_core:
        * bin/piece/file-list-impress:
        * bin/piece/file-list-writer:
        * bin/piece/file-list-calc:
        * bin/piece/file-list-base:
	  put the prebuilt registry files into the right optional subpackages

        * distro-configs/SUSE.conf.in: add --enable-gio and --disable-gnome-vfs



Added:
   trunk/bin/piece/install-registry
   trunk/bin/piece/save-registry
   trunk/patches/dev300/jvmfwk-libjvm-path-ibm-java-1.6.0.diff
   trunk/patches/dev300/sdext-noarch-identifier.diff
   trunk/patches/dev300/solven-extensions-noarch-identifier.diff
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/bin/piece/file-list-base
   trunk/bin/piece/file-list-calc
   trunk/bin/piece/file-list-impress
   trunk/bin/piece/file-list-libs_core
   trunk/bin/piece/file-list-writer
   trunk/bin/piece/install-generic
   trunk/bin/piece/post-inst-postprocess
   trunk/bin/piece/sys-setup.in
   trunk/bin/setup.in
   trunk/configure.in
   trunk/distro-configs/SUSE.conf.in
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-services.diff

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Nov  5 18:14:40 2008
@@ -1,3 +1,36 @@
+ooo-build-3.0.0.8:
+
+    + bug fixes:
+	+ various impress bugs (i#94193) [Thorsten]
+	+ incorrect scaling of axes (i#95714) [Kohei]
+	+ disabled problematic TOC import fix (bnc#438525, bnc#404254) [Petr]
+	+ wrong color order for canvas axial gradients (i#95341) [Thorsten]
+	+ delimiter for percent sign consistence (i#80784) [Andras]
+	+ mailmerge speedup stuff fixes [Michel]
+	+ gnome vfs crasher (i#95689, bnc#440363, bnc#440816) [Michael]
+	+ allow to localize "Pixel" (i#61043) [Andras]
+	+ Hungarian translation fixes (i#88218) [Andras]
+	+ work with IBM Java 1.6.0 (bnc#440459, i#95838) [Petr]
+	+ work with groupwise (i#95873) [Petr]
+	+ gtk-2.8 warnings (bnc#440514) [Petr]
+    + VBA bits:
+	+  crash when inserting module (bnc#439971) [Fong]
+	+ can't edit Userform with Organize Dialogs (bnc#439972) [Fong]
+    + Win32 bits:
+	+ various built bits (Tor)
+    + build bits:
+	+ updated scsolver to the snapshot 2008-10-30 [Kohei]
+	+ arch independent extensions identifiers [Petr]
+	
+	+ put kdefilepicker into the KDE subapackage (bnc#439322) [Petr]
+	+ GIO vs. GNOME VFS (i#95713) [Petr]
+	+ really apply ooo-build translations [Petr]
+    + updated FSFhu, Mandriva, Novell stuff [Andras, Rafael, Petr]
+    + experimental:
+	+ split build [Michael, Petr]
+	+ do not recalculate row-heights to get faster XSL import [Kohei]
+	+ PHONETIC function support (i#80764, i#80765, i#80766) [Kohei]
+
 ooo-build-3.0.0.7:
 
     +features:

Modified: trunk/bin/piece/file-list-base
==============================================================================
--- trunk/bin/piece/file-list-base	(original)
+++ trunk/bin/piece/file-list-base	Wed Nov  5 18:14:40 2008
@@ -7,3 +7,6 @@
 
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "$piece"
+
+# install the prebuilt registry files
+$OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"

Modified: trunk/bin/piece/file-list-calc
==============================================================================
--- trunk/bin/piece/file-list-calc	(original)
+++ trunk/bin/piece/file-list-calc	Wed Nov  5 18:14:40 2008
@@ -7,3 +7,6 @@
 
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "$piece"
+
+# install the prebuilt registry files
+$OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"

Modified: trunk/bin/piece/file-list-impress
==============================================================================
--- trunk/bin/piece/file-list-impress	(original)
+++ trunk/bin/piece/file-list-impress	Wed Nov  5 18:14:40 2008
@@ -11,3 +11,7 @@
 
 # draw subpackage (heh, only desktop stuff)
 $OO_TOOLSDIR/piece/desktop-support-app "draw" "$ooo_build_tag" "draw"
+
+# install the prebuilt registry files
+$OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
+$OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "draw"

Modified: trunk/bin/piece/file-list-libs_core
==============================================================================
--- trunk/bin/piece/file-list-libs_core	(original)
+++ trunk/bin/piece/file-list-libs_core	Wed Nov  5 18:14:40 2008
@@ -5,6 +5,11 @@
 
 source $OO_TOOLSDIR/piece/sys-setup
 
+# hack to move the registry files to the right optional packages
+if test -n "$DESTDIR" ; then
+    $OO_TOOLSDIR/piece/save-registry $piece $ooo_build_tag || exit 1;
+fi
+
 # gnome subpackage
 $OO_TOOLSDIR/piece/merge-file-lists "files-gnome.txt" $DESTDIR/gid_Module_Optional_Gnome
 

Modified: trunk/bin/piece/file-list-writer
==============================================================================
--- trunk/bin/piece/file-list-writer	(original)
+++ trunk/bin/piece/file-list-writer	Wed Nov  5 18:14:40 2008
@@ -13,3 +13,7 @@
 $OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
 $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "$piece"
 $OO_TOOLSDIR/piece/desktop-support-app "$piece" "$ooo_build_tag" "web"
+
+# install the prebuilt registry files
+$OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
+$OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "math"

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Wed Nov  5 18:14:40 2008
@@ -67,6 +67,17 @@
     fi
 fi
 
+# add executable rights to libraries
+echo "Fixing permissions of libraries..."
+for libdir in $OO_INSTDIR/ure/lib \
+	      $OO_INSTDIR/program \
+	      $OO_INSTDIR/basis3.0/program ; do
+    test -d $DESTDIR$libdir && \
+	find $DESTDIR$libdir -name '*.so*' -type f -exec chmod a+x {} \;
+done
+
+# clean up solver
+echo "Cleaning up solver..."
 find $DEST -depth -name "CVS" -type d -exec rm -rf {} \;
 find $DEST -name "*.orig" -exec rm -rf {} \;
 find $DEST -type f -exec chmod go-w {} \;

Added: trunk/bin/piece/install-registry
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-registry	Wed Nov  5 18:14:40 2008
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+pack=$3
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+# do we need to do anything?
+test "$src_root" = "$DESTDIR" && exit 0
+
+echo "Installing $pack registry to the final location..."
+
+registry_system=$OO_INSTDIR/basis3.0/share/registry
+registry_solver=$OO_SOLVERDIR/registry
+filelist_prebuilt=files-$pack-registry.txt
+filelist_final=files-$pack.txt
+
+if test ! -f $registry_solver/$filelist_prebuilt ; then
+    echo "Error: cannot find prebuilt registry for $pack"
+    exit 1;
+fi
+
+# we wants to create even empty directories
+for dir in `grep "^%dir" $registry_solver/$filelist_prebuilt | sed "s|^%dir[[:blank:]]*||" | sort -ru` ; do
+    mkdir -p "$DESTDIR$dir"
+done
+
+# install files
+for file in `grep -v "^%dir" $registry_solver/$filelist_prebuilt | sort -ru` ; do
+    file_prebuilt=`echo $file | sed "s|$registry_system|$registry_solver|"`
+    cp "$file_prebuilt" "$DESTDIR$file"
+done
+
+# update the final filelist
+cat $registry_solver/$filelist_prebuilt >>$filelist_final

Modified: trunk/bin/piece/post-inst-postprocess
==============================================================================
--- trunk/bin/piece/post-inst-postprocess	(original)
+++ trunk/bin/piece/post-inst-postprocess	Wed Nov  5 18:14:40 2008
@@ -26,7 +26,7 @@
 
 $OO_TOOLSDIR/piece/install-generic $piece $ooo_build_tag
 # urgh - unbelievably nasty:
-cp -a OpenOffice/gid_Starregistry_Services_Rdb_servicesrdb/*/services.rdb \
+cp -a OpenOffice/gid_Starregistry_Services_Rdb_rdb/*/services.rdb \
     $DESTDIR$OO_INSTDIR/basis3.0/program/services.rdb
 cp -a OpenOffice/gid_Starregistry_Services_Rdb_Ure_servicesrdb/*/services.rdb \
     $DESTDIR$OO_INSTDIR/ure/share/misc/services.rdb

Added: trunk/bin/piece/save-registry
==============================================================================
--- (empty file)
+++ trunk/bin/piece/save-registry	Wed Nov  5 18:14:40 2008
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+# this script saves the architecture independent files back into solver
+# they could be installed later in the noarch RPMs
+
+# the file lists are needed
+test -n "$DESTDIR" || exit 0;
+
+echo "Saving prebuilt registry files for optional packages back into solver ..."
+
+registry_system=$OO_INSTDIR/basis3.0/share/registry
+registry_solver=$OO_SOLVERDIR/registry
+
+mkdir -p $DESTDIR/$registry_solver
+
+for list in $DESTDIR/gid_Module_Prg_* ; do
+    echo "  $list"
+    # name of the target package
+    pack=`echo $list | \
+          sed -e "s|$DESTDIR/gid_Module_Prg_\([[:alpha:]]*\)_Bin|\1|" -e "s|Wrt|Writer|" | \
+	  tr [:upper:] [:lower:]`
+
+    filelist=files-$pack-registry.txt
+        
+    # generate file list
+    # the schema files are used during build. e.g. for reportbuilder => should be in the final location
+    grep "$registry_system" $list | grep -v "$registry_system/schema"  >$DESTDIR/$registry_solver/$filelist
+    grep -v "$registry_system" $list >$list.new
+    grep "$registry_system/schema" $list >>$list.new
+    mv $list.new $list
+
+    # move the registry to solver
+    for source in `grep -v "^%dir" $DESTDIR/$registry_solver/$filelist | sort -ru` ; do
+	target=`echo "$source" | sed "s|$registry_system|$registry_solver|"`
+	source_dir=`dirname $source`
+	target_dir=`dirname $target`
+	mkdir -p "$DESTDIR$target_dir"
+	mv "$DESTDIR$source" "$DESTDIR$target_dir"
+	rmdir --ignore-fail-on-non-empty "$DESTDIR$source_dir"
+    done
+
+done
+

Modified: trunk/bin/piece/sys-setup.in
==============================================================================
--- trunk/bin/piece/sys-setup.in	(original)
+++ trunk/bin/piece/sys-setup.in	Wed Nov  5 18:14:40 2008
@@ -7,6 +7,7 @@
 export OO_MANDIR= mandir@
 export OO_LANGS='@OOO_LANGS@'
 export OOO_BUILD_NOARCH='@OOO_BUILD_NOARCH@'
+export ARCH_FLAGS='@ARCH_FLAGS@'
 
 if test "z$OO_INSTDIR" == "z"; then
     echo "Error: missing oo instdir"

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Wed Nov  5 18:14:40 2008
@@ -20,6 +20,7 @@
 ENABLE_ICECREAM='@ENABLE_ICECREAM@'
 ICECREAM_BINDIR='@ICECREAM_BINDIR@'
 MAX_JOBS='@MAX_JOBS@'
+ARCH_FLAGS='@ARCH_FLAGS@'
 OOO_WIDGET_FLAGS='@OOO_WIDGET_FLAGS@'
 OOO_CUSTOM_IMAGES='@OOO_CUSTOM_IMAGES@'
 OOO_CRYSTAL_IMAGES='@OOO_CRYSTAL_IMAGES@'
@@ -273,7 +274,7 @@
 export CONFIGURE_OPTIONS
 export DISTRO BINSUFFIX ARCHITECTURE BUILD_MAGIC
 export BUILD_WIN32 
-export FORCE_GCC33
+export FORCE_GCC33 ARCH_FLAGS
 export OPENCLIPART_VER OPENCLIPART_DIR
 export OOO_SPLIT_PREFIX
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov  5 18:14:40 2008
@@ -293,6 +293,14 @@
                           Usage: --with-arch=(x86|ppc|sparc)],
 ,)
 
+AC_ARG_WITH(arch-flags,
+[
+  --with-arch-flags        Define extra flags that will be passed to the
+			   C and C++ compiler during bild
+
+                           Example: --with-arch-flags="-O2 -fmessage-length=0"],
+,)
+
 AC_ARG_WITH(mono-gac,
 [
   --with-mono-gac-root    Define the root of the mono GAC. It is especially
@@ -840,6 +848,12 @@
 fi
 AC_MSG_RESULT(ok)
 
+ARCH_FLAGS=
+if test "z$with_arch_flags" != "zyes" -a "z$with_arch_flags" != "zno" ; then
+    ARCH_FLAGS="$with_arch_flags"
+fi
+AC_SUBST(ARCH_FLAGS)
+
 MONO_GAC_ROOT=
 if test "z$with_mono_gac_root" != "z" -a "z$with_mono_gac_root" != "zno" ; then
     MONO_GAC_ROOT=$with_mono_gac_root

Modified: trunk/distro-configs/SUSE.conf.in
==============================================================================
--- trunk/distro-configs/SUSE.conf.in	(original)
+++ trunk/distro-configs/SUSE.conf.in	Wed Nov  5 18:14:40 2008
@@ -1,7 +1,9 @@
 --with-vendor=\"Novell, Inc.\"
 --disable-access
+--disable-gnome-vfs
 --disable-odk
 --disable-qadevooo
+--enable-gio
 --enable-libsn
 --enable-lockdown
 --enable-mono

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Nov  5 18:14:40 2008
@@ -409,3 +409,6 @@
 	+ export OOO_ALLOW_PROFILE=1 ...
 		+ add an --inhibit-profiles flag (?)
 		+ use it everywhere - except for the last stage ... (?)
+
+	+ accelerating patch application ...
+		+ patched_files +

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Nov  5 18:14:40 2008
@@ -55,7 +55,6 @@
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, Split, Shrink, \
 	     CustomUserConfig, CalcSolver
-#, PostgreSQL
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
@@ -63,8 +62,8 @@
 SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14, GTK28
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14
-SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
-SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize
+SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, PostgreSQL
+SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
@@ -414,6 +413,9 @@
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
 build-ant-1.6-swext.diff, i#90830, pmladek
+# omit the ugly <platform>-<arch> suffix in the extensions identifier
+solven-extensions-noarch-identifier.diff, pmladek
+sdext-noarch-identifier.diff, pmladek
 
 [ NovellOnly ]
 # allow build with ant-1.6
@@ -547,6 +549,10 @@
 # OOo and Java libraries
 shell-senddoc-library-path.diff, i#95873, pmladek
 
+# prefer the "/lib/<arch>/classic/libjvm.so" over /jre/bin/classic/libjvm.so
+# the second causes problems with IBM Java 1.6.0
+jvmfwk-libjvm-path-ibm-java-1.6.0.diff, n#440459, i#95838, pmladek
+
 [ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek

Added: trunk/patches/dev300/jvmfwk-libjvm-path-ibm-java-1.6.0.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/jvmfwk-libjvm-path-ibm-java-1.6.0.diff	Wed Nov  5 18:14:40 2008
@@ -0,0 +1,18 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx.old	2008-04-11 12:21:17.000000000 +0200
++++ jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx	2008-11-04 15:15:18.000000000 +0100
+@@ -74,12 +74,12 @@ char const* const* OtherInfo::getRuntime
+ #ifdef MACOSX
+         "/../../../JavaVM"
+ #else
+-	"/bin/classic/libjvm.so", // for IBM Java
+-        "/jre/bin/classic/libjvm.so", // for IBM Java
+         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
+         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
+         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
+-	"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" // for Java of BEA Systems
++        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems
++        "/bin/classic/libjvm.so", // fallback for older for IBM Java
++        "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java
+ #endif
+ #endif
+ 

Modified: trunk/patches/dev300/piece-services.diff
==============================================================================
--- trunk/patches/dev300/piece-services.diff	(original)
+++ trunk/patches/dev300/piece-services.diff	Wed Nov  5 18:14:40 2008
@@ -15,7 +15,7 @@
  if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
  if (defined $ENV{OO_SOLVERDIR}) {
      push @{$includepatharrayref}, "$ENV{OO_SOLVERDIR}/bin";
-@@ -858,6 +865,22 @@
+@@ -893,6 +893,14 @@
  		}
  	}
  
@@ -27,6 +27,15 @@
 +	# saving debug info at end
 +	    if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
 +
+ 	#####################################
+ 	# Calls of regmerge
+ 	#####################################
+@@ -907,7 +915,15 @@
+ 			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14b.log", $filesinproductlanguageresolvedarrayref); }
+ 		}
+ 	}
+-	
++
 +#######################################################
 +# Stopping time
 +#######################################################
@@ -34,10 +43,10 @@
 +installer::logger::stoptime();
 +	    exit 0;
 +	}
-+	    
- 	#####################################
- 	# Calls of regmerge
- 	#####################################
++
+ 	############################################
+ 	# Collecting directories for epm list file
+ 	############################################
 Only in solenv/bin: make_installer.pl~
 diff -u -r solenv.pristine/bin/modules/installer/archivefiles.pm solenv/bin/modules/installer/archivefiles.pm
 --- solenv.pristine/bin/modules/installer/archivefiles.pm	2008-08-13 14:01:56.000000000 +0100

Added: trunk/patches/dev300/sdext-noarch-identifier.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sdext-noarch-identifier.diff	Wed Nov  5 18:14:40 2008
@@ -0,0 +1,19 @@
+--- sdext/source/presenter/description.xml.old	2008-09-26 16:13:47.000000000 +0200
++++ sdext/source/presenter/description.xml	2008-09-26 17:23:09.000000000 +0200
+@@ -5,7 +5,7 @@
+   xmlns:dep="http://openoffice.org/extensions/description/2006";
+   xmlns:xlink="http://www.w3.org/1999/xlink";>
+ 
+-  <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
++  <identifier value="com.sun.PresenterScreen" />
+ 
+   <dependencies>
+     <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+--- sdext/source/pdfimport/pdfisettings.pmk.old	2008-08-14 19:00:43.000000000 +0200
++++ sdext/source/pdfimport/pdfisettings.pmk	2008-09-26 17:25:18.000000000 +0200
+@@ -29,4 +29,4 @@
+ #
+ #*************************************************************************
+ 
+-IMPLEMENTATION_IDENTIFIER="com.sun.star.PDFImport-$(PLATFORMID)"
++IMPLEMENTATION_IDENTIFIER="com.sun.star.PDFImport"

Added: trunk/patches/dev300/solven-extensions-noarch-identifier.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solven-extensions-noarch-identifier.diff	Wed Nov  5 18:14:40 2008
@@ -0,0 +1,11 @@
+--- solenv/inc/extension_post.mk.old	2008-09-26 16:11:11.000000000 +0200
++++ solenv/inc/extension_post.mk	2008-09-26 18:25:04.000000000 +0200
+@@ -101,7 +101,7 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(
+ .ENDIF 			# "$(OS)$(CPU)"=="WNTI"
+ .ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
+ 
+-IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
++IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)"
+ 
+ .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+ .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]