[ooo-build-commit] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    2 +
 patches/dev300/import-export-dialogmodel.diff |   20 --------------
 patches/dev300/link-with-comphelper.diff      |   10 -------
 patches/dev300/win32-avoid-uac.diff           |   13 +++++++++
 patches/dev300/win32-mergemodule-pm.diff      |   36 --------------------------
 5 files changed, 15 insertions(+), 66 deletions(-)

New commits:
commit f54ec85c838627324f87c61ba43fd5b40481e565
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Apr 24 23:04:52 2010 +0300

    Drop orhpaned patches that are upstream
    
    * patches/dev300/import-export-dialogmodel.diff
    * patches/dev300/link-with-comphelper.diff
    * patches/dev300/win32-mergemodule-pm.diff: Delete.

diff --git a/patches/dev300/import-export-dialogmodel.diff b/patches/dev300/import-export-dialogmodel.diff
deleted file mode 100644
index b8cd09e..0000000
--- a/patches/dev300/import-export-dialogmodel.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- dbaccess/source/ext/macromigration/migrationengine.cxx
-+++ dbaccess/source/ext/macromigration/migrationengine.cxx
-@@ -1838,7 +1838,7 @@
-             Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
- 
-             Reference< XNameContainer > xDialogModel( m_aContext.createComponent( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW );
--            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext() );
-+            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
- 
-             // adjust the events of the dialog
-             impl_adjustDialogElementEvents_throw( xDialogModel );
-@@ -1853,7 +1853,7 @@
-             }
- 
-             // export dialog model
--            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext() );
-+            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
-             _inout_rDialogLibraryElement <<= xISP;
-         }
-         catch( const Exception& )
diff --git a/patches/dev300/link-with-comphelper.diff b/patches/dev300/link-with-comphelper.diff
deleted file mode 100644
index 131d475..0000000
--- a/patches/dev300/link-with-comphelper.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xmlscript/util/makefile.mk
-+++ xmlscript/util/makefile.mk
-@@ -58,6 +58,7 @@
-         $(LIB1TARGET)
- 
- SHL1STDLIBS= \
-+        $(COMPHELPERLIB)		\
-         $(CPPUHELPERLIB)		\
-         $(CPPULIB) 			\
-         $(SALLIB)
diff --git a/patches/dev300/win32-mergemodule-pm.diff b/patches/dev300/win32-mergemodule-pm.diff
deleted file mode 100644
index 7351180..0000000
--- a/patches/dev300/win32-mergemodule-pm.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- solenv/bin/modules/installer/windows/mergemodule.pm
-+++ solenv/bin/modules/installer/windows/mergemodule.pm
-@@ -1128,7 +1128,9 @@
- 						
- 		# changing directory
- 		my $from = cwd();
- 		my $to = $mergemodulehash->{'workdir'};
-+		$to = qx(cygpath -u "$to");
-+		chomp $to;
--		chdir($to);
-+		chdir($to) || die "Could not chdir to \"$to\"\n";
- 
- 		# Unpack the cab file, so that in can be included into the last office cabinet file.
-@@ -1138,7 +1138,10 @@
- 		$infoline = "Unpacking cabinet file: $mergemodulehash->{'cabinetfile'}\n";
- 		push( @installer::globals::logfileinfo, $infoline);
- 
--		my $expandfile = "expand.exe";	# Has to be in the path
-+		# Avoid the Cygwin expand command
-+		my $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
-+		chomp $expandfile;
-+
- 		my $cabfilename = "MergeModule.CABinet";
- 
- 		# exclude cabinet file
-@@ -1151,8 +1151,8 @@
- 
- 		my $systemcall = "";
- 		if ( $^O =~ /cygwin/i ) {
--			my $localunpackdir = qx{cygpath -w "$unpackdir"};
--			$localunpackdir =~ s/\\/\\\\/g;
-+			my $localunpackdir = qx(cygpath -m "$unpackdir");
-+			chomp $localunpackdir;
- 			$systemcall = $expandfile . " " . $cabfilename . " -F:\\\* " . $localunpackdir;
- 		}
- 		else
commit 1459869b82057fcd3477cf6f13338982c4fed41c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Apr 24 23:01:16 2010 +0300

    Add patch to avoid UAC prompts on Windows
    
    * patches/dev300/win32-avoid-uac.diff: New patch. Don't try to run
      temporary programs with "setup" or "patch" in their names.
    
    * patches/dev300/apply: Add it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2f7b783..fbee6d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3374,6 +3374,8 @@ win32-boost-crack.diff
 
 win32-pdfimport-use-temporary-file.diff, n#569319, fridrich
 
+win32-avoid-uac.diff, tml
+
 [ NovellOnly ]
 # remove Macro Recorder from UI since it is borked by design
 basctl-no-macro-recorder-in-ui.diff, fridrich
diff --git a/patches/dev300/win32-avoid-uac.diff b/patches/dev300/win32-avoid-uac.diff
new file mode 100644
index 0000000..8c8fbf3
--- /dev/null
+++ b/patches/dev300/win32-avoid-uac.diff
@@ -0,0 +1,13 @@
+--- solenv/bin/mhids.pl
++++ solenv/bin/mhids.pl
+@@ -151,7 +151,9 @@
+ $filebase =~ s/.*[\\\/]//;
+ $filebase =~ s/\..*?$//;
+ $workfile = "$tmpdir/${filebase}_".$$;
+-#$workfile =~ s/setup/set_up/;
++# Avoid UAC prompts on Windows
++$workfile =~ s/setup/set_up/;
++$workfile =~ s/patch/pat_ch/;
+ 
+ # now get $workfile ready for shell usage...
+ $shell_workfile = $workfile;