From bee96c85712303c5b83a70263668abb69a8e11c9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 19 Jan 2014 23:28:01 +0100
Subject: fix detecting if basesystem is installed (mga#10722)

thus fixing "basesystem package not selected"

real cause might be some package flags not having been updated
---
 perl-install/install/NEWS        | 3 +++
 perl-install/install/install2.pm | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 35199b2cb..415c90218 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- fix detecting if basesystem is installed (mga#10722)
+  thus fixing "basesystem package not selected"
+
 Version 16.25 - 19 January 2014
 
 - add Mageia 4 desktop images
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 661f3d4a8..13661efb1 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -200,7 +200,8 @@ sub choosePackages {
     log::l("rpmsrate_flags_chosen's: ", join(' ', sort @flags));
 
     #- check pre-condition that basesystem package must be selected.
-    install::pkgs::packageByName($o->{packages}, 'basesystem')->flag_available or die "basesystem package not selected";
+    my $base_pkg = install::pkgs::packageByName($o->{packages}, 'basesystem');
+    $base_pkg->flag_available or $base_pkg->flag_installed or die "basesystem package not selected";
 
     #- check if there are packages that need installation.
     $o->{steps}{installPackages}{done} = 0 if $o->{steps}{installPackages}{done} && install::pkgs::packagesToInstall($o->{packages}) > 0;
-- 
cgit v1.2.1


From 5a10bf42289cdb03e40819db2903041ffc83111d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:26:20 +0100
Subject: kill very old comment (introduced when migrated from gtk1 to gtk2)

---
 perl-install/mygtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index f9c614198..3f75d4cc6 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -1337,7 +1337,7 @@ sub _create_Window {
 
 	    # ignore bogus sizing events:
 	    return if $w_size[2] < 5;
-	    return if $w_size[2] == $wi && $w_size[3] == $he; #BUG
+	    return if $w_size[2] == $wi && $w_size[3] == $he;
 	    (undef, undef, $wi, $he) = @w_size;
 
             $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), 
-- 
cgit v1.2.1


From f9104f228828d8871548a917461cbd01285b1fb4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:35:32 +0100
Subject: fix sizing partition widgets

ratio would be negative when allocated width was reported as 1 in some
cases since commit 807df2a2b558461a2890f9bec0050f0bd974c92e
---
 perl-install/NEWS                | 3 +++
 perl-install/diskdrake/hd_gtk.pm | 6 +++++-
 perl-install/install/NEWS        | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1e213a6c9..828264796 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o fix sizing partition widgets
+
 Version 16.23 - 16 January 2014
 
 - dont remove pulseaudio-module-bluetooth (mga#12323)
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index e01f65b2b..266e86cd7 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -327,7 +327,11 @@ sub create_automatic_notebooks {
 sub create_buttons4partitions {
     my ($kind, $totalsectors, @parts) = @_;
 
-    $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 60 if $w->{window}->get_window;
+    if ($w->{window}->get_window) {
+	my $windowwidth = $w->{window}->get_allocated_width;
+	$windowwidth = $::real_windowwidth if $windowwidth <= 1;
+	$width = $windowwidth - first(get_action_box_size()) - 60;
+    }
 
     my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1;
     my $i = 1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 415c90218..f99e6d6bc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
 - fix detecting if basesystem is installed (mga#10722)
   thus fixing "basesystem package not selected"
+- partitioning:
+  o fix sizing partition widgets
 
 Version 16.25 - 19 January 2014
 
-- 
cgit v1.2.1


From 63b96a79bf9ea443f056df91035d92ae8d720078 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:38:26 +0100
Subject: fix inverted dimensions

bug introduced in commit fadc8b97ed98977bf264d87d62c33e779f299716
important to fix before next commit
---
 perl-install/mygtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index 3f75d4cc6..ff27ecbe1 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -1333,7 +1333,7 @@ sub _create_Window {
 	my ($wi, $he);
 	$w->signal_connect(size_allocate => sub {
 	    my (undef, $event) = @_;
-	    my @w_size = @$event{qw(height width)};
+	    my @w_size = @$event{qw(width height)};
 
 	    # ignore bogus sizing events:
 	    return if $w_size[2] < 5;
-- 
cgit v1.2.1


From 7ddb042efd511f14bca865e0cca684367d7d6344 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:34:46 +0100
Subject: fix not moving window (mga#11790, mga#11988, mga#11977)

regression introduced in commit fadc8b97ed98977bf264d87d62c33e779f299716

sadly flickering may happen
---
 perl-install/install/NEWS | 1 +
 perl-install/mygtk3.pm    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f99e6d6bc..6f7ffda26 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
   thus fixing "basesystem package not selected"
 - partitioning:
   o fix sizing partition widgets
+  o fix not moving window (mga#11790, mga#11988, mga#11977)
 
 Version 16.25 - 19 January 2014
 
diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index ff27ecbe1..c9e987a1d 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -1336,9 +1336,9 @@ sub _create_Window {
 	    my @w_size = @$event{qw(width height)};
 
 	    # ignore bogus sizing events:
-	    return if $w_size[2] < 5;
-	    return if $w_size[2] == $wi && $w_size[3] == $he;
-	    (undef, undef, $wi, $he) = @w_size;
+	    return if $w_size[0] < 5;
+	    return if $w_size[0] == $wi && $w_size[1] == $he;
+	    ($wi, $he) = @w_size;
 
             $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), 
 		     max(0, ($::o->{windowheight} - $he) / 2));
-- 
cgit v1.2.1


From 9397164cdc835a5dc38809616f492ab763831541 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:44:04 +0100
Subject: revert minimum partition width to its pre-gtk3 value

reverting commit 6861dc0526938a22da627308591d652b05b8fbf6
---
 perl-install/NEWS                | 1 +
 perl-install/diskdrake/hd_gtk.pm | 2 +-
 perl-install/install/NEWS        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 828264796..c4eda7d7b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - diskdrake:
   o fix sizing partition widgets
+  o revert minimum partition width to its pre-gtk3 value
 
 Version 16.23 - 16 January 2014
 
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 266e86cd7..0b36d229d 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -16,7 +16,7 @@ use log;
 use fsedit;
 use feature qw(state);
 
-my ($width, $height, $minwidth) = (400, 50, 16);
+my ($width, $height, $minwidth) = (400, 50, 5);
 my ($all_hds, $in, $do_force_reload, $current_kind, $current_entry, $update_all);
 my ($w, @notebook, $done_button);
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6f7ffda26..b04a7f5ed 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,7 @@
 - partitioning:
   o fix sizing partition widgets
   o fix not moving window (mga#11790, mga#11988, mga#11977)
+  o revert minimum partition width to its pre-gtk3 value
 
 Version 16.25 - 19 January 2014
 
-- 
cgit v1.2.1


From 8e28b7b164be215dcdbebbb6dfdae689998f5874 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:52:28 +0100
Subject: show labels on partition buttons

reverting commit 54dd9e586b59fdacb54bcd2f78d29870d00b1f3e
---
 perl-install/diskdrake/hd_gtk.pm | 10 ++--------
 perl-install/install/NEWS        |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 0b36d229d..98738738f 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -356,14 +356,8 @@ sub create_buttons4partitions {
 	}
 	my $info = $entry->{mntpoint} || $entry->{device_LABEL} || '';
 	$info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info;
-	my $w;
-	if ($::isInstall) {
-	    $w = Gtk3::ToggleButton->new();
-	}else {
-	    $w = Gtk3::ToggleButton->new_with_label($info);
-	    $w->get_child->set_ellipsize('end');
-	}
-	$w or internal_error('new_with_label');
+	my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label');
+	$w->get_child->set_ellipsize('end');
 	$w->set_tooltip_text($info);
 	$w->signal_connect(clicked => sub { 
 	    $current_button != $w or return;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b04a7f5ed..9412c459b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,7 @@
   o fix sizing partition widgets
   o fix not moving window (mga#11790, mga#11988, mga#11977)
   o revert minimum partition width to its pre-gtk3 value
+  o show labels on partition buttons
 
 Version 16.25 - 19 January 2014
 
-- 
cgit v1.2.1


From 81f5869e1e9afaf2349ffd0c34f1c149589b3897 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 01:56:55 +0100
Subject: 16.26

---
 perl-install/Makefile.config | 2 +-
 perl-install/NEWS            | 2 ++
 perl-install/install/NEWS    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 693c40398..c1ac5fc03 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=16.25
+VERSION:=16.26
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c4eda7d7b..15fc3eff8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+Version 16.26 - 20 January 2014
+
 - diskdrake:
   o fix sizing partition widgets
   o revert minimum partition width to its pre-gtk3 value
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9412c459b..da7cc5382 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+Version 16.26 - 20 January 2014
+
 - fix detecting if basesystem is installed (mga#10722)
   thus fixing "basesystem package not selected"
 - partitioning:
-- 
cgit v1.2.1


From 7d57777b5036e0a57553cf51ad11c5b5a7dedee7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 07:21:54 +0100
Subject: increase back minimum partition width for Oxygen (mga#11977)

reverting commit 6861dc0526938a22da627308591d652b05b8fbf6
this should results in better sizing if there's a lot a small partitions
as oxygen's ToggleButtons minimum width is bigger
---
 perl-install/NEWS                | 3 +++
 perl-install/diskdrake/hd_gtk.pm | 2 +-
 perl-install/install/NEWS        | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 15fc3eff8..86a825abb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o increase back minimum partition width for Oxygen (mga#11977)
+
 Version 16.26 - 20 January 2014
 
 - diskdrake:
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 98738738f..653320697 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -16,7 +16,7 @@ use log;
 use fsedit;
 use feature qw(state);
 
-my ($width, $height, $minwidth) = (400, 50, 5);
+my ($width, $height, $minwidth) = (400, 50, 16);
 my ($all_hds, $in, $do_force_reload, $current_kind, $current_entry, $update_all);
 my ($w, @notebook, $done_button);
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index da7cc5382..5fe39b8ad 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partitioning:
+  o increase back minimum partition width for Oxygen (mga#11977)
+
 Version 16.26 - 20 January 2014
 
 - fix detecting if basesystem is installed (mga#10722)
-- 
cgit v1.2.1


From 4f2d23e7ff6a659d0ddc760dce2c0135481d029a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 20 Jan 2014 07:23:12 +0100
Subject: 16.26.1

---
 perl-install/Makefile.config | 2 +-
 perl-install/NEWS            | 2 ++
 perl-install/install/NEWS    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index c1ac5fc03..7d7164de7 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=16.26
+VERSION:=16.26.1
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 86a825abb..41c705dae 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+Version 16.26.1 - 20 January 2014
+
 - diskdrake:
   o increase back minimum partition width for Oxygen (mga#11977)
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5fe39b8ad..acb489b38 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+Version 16.26.1 - 20 January 2014
+
 - partitioning:
   o increase back minimum partition width for Oxygen (mga#11977)
 
-- 
cgit v1.2.1