[Libreoffice-commits] .: 2 commits - bin/lo-pack-sources vcl/inc

[Petr Mladek]

 bin/lo-pack-sources          |   27 ++++++++++++++-------------
 vcl/inc/unx/gtk/gtkframe.hxx |    3 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 4b32624c1890dd8ff146b00b0c1699d75f4a0513
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 27 17:08:35 2011 +0200

    lo-pack-sources: update for the current list of repositories

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 1a24baf..6a68e71 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -210,7 +210,7 @@ sub generate_version_file($$$)
     # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
     open (VERFILE, ">$dir/$piece.ver") || die "Can't open $dir/lo-$piece.ver: $!\n";
 
-    print VERFILE "lo_bootstrap_ver=$release_version\n";
+    print VERFILE "lo_core_ver=$release_version\n";
 
     close VERFILE;
 }
@@ -375,8 +375,8 @@ sub prepare_lo_piece_tarball($$$$$)
 
     my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece, $piece_tarball_name);
     generate_lo_piece_changelog($piece_dir, "$temp_dir/$piece_tarball_name", $piece);
-    run_autoreconf("$temp_dir/$piece_tarball_name", $piece) if ($piece eq 'bootstrap');
-    generate_version_file("$temp_dir/$piece_tarball_name", $piece, $release_version) if ($piece eq 'bootstrap');
+    run_autoreconf("$temp_dir/$piece_tarball_name", $piece) if ($piece eq 'core');
+    generate_version_file("$temp_dir/$piece_tarball_name", $piece, $release_version) if ($piece eq 'core');
     release_lo_piece($temp_dir, $piece_tarball_name);
     generate_md5($temp_dir, $piece_tarball_name, ".tar.bz2") if (defined $md5);
 
@@ -403,7 +403,7 @@ sub generate_tarballs($$$$$$$$$)
     my ($source_dir, $releases_archive_dir, $release_version, $md5, $lo_build_tarball_name, $p_piece_tarball_name, $pack_lo_build, $pack_lo_pieces, $is_lo_build_dir) = @_;
 
     if ($pack_lo_build) {
-        my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, $md5, "bootstrap", $lo_build_tarball_name);
+        my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, $md5, "core", $lo_build_tarball_name);
         move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$lo_build_tarball_name.tar.bz2");
     }
 
@@ -466,10 +466,7 @@ my $lo_build_tempdir;
 my $force;
 my $verbose=1;
 my $is_lo_build_dir=0;
-my @pieces=("artwork", "base", "calc", "components",
-            "extensions", "extras", "filters", "help", "impress",
-            "libs-core", "libs-extern", "libs-extern-sys", "libs-gui",
-            "postprocess", "sdk", "testing", "translations", "ure", "writer");
+my @pieces=("binfilter", "dictionaries", "help", "translations");
 my %piece_tarball_name;
 
 ###################
@@ -523,12 +520,12 @@ unless ( -d "$source_dir" ) {
     die "Error: is not a directory: $source_dir\n";
 }
 
-# check if it is a valid libreoffice-bootstrap directory
+# check if it is a valid libreoffice-core directory
 $is_lo_build_dir=1 if (-f "$source_dir/autogen.sh" && -f "$source_dir/set_soenv.in");
 
-# all tarballs are generated from the libreoffice-bootstrap directory
+# all tarballs are generated from the libreoffice-core directory
 if (@pieces > 1 && $is_lo_build_dir == 0 ) {
-    die "Error: \"$source_dir\" is not a valid libreoffice-bootstrap directory\n";
+    die "Error: \"$source_dir\" is not a valid libreoffice-core directory\n";
 }
 
 # just a single piece tarball can be generated from piece directory; version must be explicitely set in this case
@@ -567,9 +564,13 @@ if ($is_lo_build_dir) {
 }
 
 # define tarball names
-$lo_build_tarball_name = "libreoffice-bootstrap-$release_version";
+$lo_build_tarball_name = "libreoffice-core-$release_version";
 foreach my $piece (@pieces) {
-    $piece_tarball_name{$piece} = "libreoffice-$piece-$release_version";
+    if (-d "$source_dir/clone/$piece") {
+        $piece_tarball_name{$piece} = "libreoffice-$piece-$release_version";
+    } else {
+        print "Warning: $piece sources are not available -> skipping\n";
+    }
 }
 
 print "Default version   : $config_version\n" if ($verbose && defined $config_version);
commit a608d0664371c21c854e1f91aee2210a17641220
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Oct 26 17:16:40 2011 +0200

    renderArea is implemented only with GTK-3
    
    fixes build on SLED10 with gtk-2.8 and cairo-1.0.2

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index edd904e..e4cf0be 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -325,8 +325,9 @@ public:
     // only for gtk3 ...
     void pushIgnoreDamage();
     void popIgnoreDamage();
+#if GTK_CHECK_VERSION(3,0,0)
     void renderArea( cairo_t *cr, cairo_rectangle_t *src );
-
+#endif
     virtual ~GtkSalFrame();
 
     // SalGraphics or NULL, but two Graphics for all SalFrames