configure.ac | 5 +++++ solenv/bin/modules/par2script/work.pm | 5 +++++ 2 files changed, 10 insertions(+)
New commits: commit 76d2d78ac48c0ec7fcdc27c841d0777cab732464 Author: David Tardon <dtar...@redhat.com> Date: Sat Nov 1 10:14:16 2014 +0100 fdo#85633 filter out empty file records Change-Id: I9f96cf3e059d444c52ce81b37cf5f69157c2888d diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm index 9c03078..8003785 100644 --- a/solenv/bin/modules/par2script/work.pm +++ b/solenv/bin/modules/par2script/work.pm @@ -187,6 +187,11 @@ sub collect_definitions if ( $oneitem eq "Directory" ) { if ( $itemkey =~ "DosName" ) { $itemkey =~ s/DosName/HostName/; } } if (( $oneitem eq "Directory" ) || ( $oneitem eq "File" ) || ( $oneitem eq "Unixlink" )) { if ( $itemvalue eq "PD_PROGDIR" ) { $itemvalue = "PREDEFINED_PROGDIR"; }} if (( $itemkey eq "Styles" ) && ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ )) { $itemvalue = "($1)$2"; } + elsif ( $itemkey eq "Files" ) # filter out empty file records, as they mess up assignment to modules + { + $itemvalue =~ /^\(([^)]*)\)$/; + $itemvalue = '(' . join( ',', grep( !/^$/, split( ',', $1 ) ) ) . ')'; + } $oneitemhash{$itemkey} = $itemvalue; } commit 7f5672bb14956d589fd257067b9eebef3c28e421 Author: David Tardon <dtar...@redhat.com> Date: Thu Oct 30 09:58:46 2014 +0100 system libgltf conflicts with dbgutil too Change-Id: I326d62077b556501d0a98794bca4b00f4bcfc369 diff --git a/configure.ac b/configure.ac index e39ce6b..84505ba 100644 --- a/configure.ac +++ b/configure.ac @@ -3753,6 +3753,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then else with_system_libcmis=no fi + if test "$with_system_libgltf" = "yes"; then + AC_MSG_ERROR([--with-system-libgltf conflicts with --enable-dbgutil]) + else + with_system_libgltf=no + fi if test "$enable_win_mozab_driver" = "yes"; then AC_MSG_ERROR([--enable-win-mozab-driver conflicts with --enable-dbgutil]) fi _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits