Merge pull request #53 from mgreter/release-3.6.4

mgreter · web-flow · commit a1d5dce58373 · 2021-05-21T03:37:32.000+02:00
Update libsass to version 3.6.5
diff --git a/Changes b/Changes
@@ -1,3 +1,12 @@
+CSS::Sass (3.6.4)
+
+  Maintenance release including a MacOSx build fix.
+
+  * Bumped libsass version to virtual 3.6.5
+  * Fix MacOS linker not understanding z-origin
+
+-- Marcel Greter <perl-libsass@ocbnet.ch>  Mon, 21 May 2020 03:33:30 +0100
+
 CSS::Sass (3.6.3)
 
   Maintenance release including some build fixes.
diff --git a/META.json b/META.json
@@ -68,5 +68,5 @@
          "url" : "https://github.com/sass/perl-libsass"
       }
    },
-   "version" : "v3.6.3"
+   "version" : "v3.6.4"
 }
diff --git a/META.yml b/META.yml
@@ -39,4 +39,4 @@ resources:
   homepage: https://metacpan.org/release/CSS-Sass
   license: http://opensource.org/licenses/MIT
   repository: https://github.com/sass/perl-libsass
-version: v3.6.3
+version: v3.6.4
diff --git a/Makefile.PL b/Makefile.PL
@@ -651,7 +651,7 @@ sub compile_lib {
 	# this may not be supported on all operating systems!
 	unless ($^O eq 'MSWin32' && $Config{cc} =~ /^cl/) {
 		# the `-z origin` seems needed for some BSD derivates!
-		push @args, '-Wl,-z,origin' if $isPlugin && $^O ne 'MSWin32';
+		push @args, '-Wl,-z,origin' if $isPlugin && $^O ne 'MSWin32' && $^O ne 'darwin';
 		push @args, '-Wl,-rpath,\\$$ORIGIN/../..' if $isPlugin;
 	}
 	# add explicit library name on OSX
diff --git a/lib/CSS/Sass.pm b/lib/CSS/Sass.pm
@@ -69,7 +69,7 @@ our @EXPORT = qw(
 	SASS2SCSS_CONVERT_COMMENT
 );
 
-our $VERSION = "3.6.3";
+our $VERSION = "3.6.4";
 
 require XSLoader;
 XSLoader::load('CSS::Sass', $VERSION);
diff --git a/lib/CSS/Sass/Plugins.pm b/lib/CSS/Sass/Plugins.pm
@@ -24,7 +24,7 @@ use warnings;
 
 ################################################################################
 package CSS::Sass::Plugins;
-our $VERSION = "3.6.3";
+our $VERSION = "3.6.4";
 ################################################################################
 # collect plugins
 our %plugins;
diff --git a/lib/CSS/Sass/Value.pm b/lib/CSS/Sass/Value.pm
@@ -39,7 +39,7 @@ use CSS::Sass;
 
 ################################################################################
 package CSS::Sass::Value;
-our $VERSION = "3.6.3";
+our $VERSION = "3.6.4";
 ################################################################################
 use CSS::Sass qw(import_sv);
 use CSS::Sass qw(sass_operation);
diff --git a/lib/CSS/Sass/Watchdog.pm b/lib/CSS/Sass/Watchdog.pm
@@ -25,7 +25,7 @@ use CSS::Sass;
 
 ################################################################################
 package CSS::Sass::Watchdog;
-our $VERSION = "3.6.3";
+our $VERSION = "3.6.4";
 ################################################################################
 
 use Exporter 'import'; # gives you Exporter's import() method directly
diff --git a/libsass b/libsass
@@ -1 +1 @@
-Subproject commit c3c1c0e01af458b262b954ed49557a415e2bd977
+Subproject commit f6afdbb9288d20d1257122e71d88e53348a53af3
diff --git a/plugins/digest b/plugins/digest
@@ -1 +1 @@
-Subproject commit ccd17a55747b8c4a9de2a9cb6e126a84e2fe766f
+Subproject commit 12c5c5cf99a8c4022d80d8b4bf8c633ea69b1343
diff --git a/plugins/sassc b/plugins/sassc
@@ -1 +1 @@
-Subproject commit 46748216ba0b60545e814c07846ca10c9fefc5b6
+Subproject commit 66f0ef37e7f0ad3a65d2f481eff09d09408f42d0
diff --git a/t/99_sass_specs.t b/t/99_sass_specs.t
@@ -549,24 +549,15 @@ END {
 # 	$_->query('start') <= 3.4
 # } @tests);
 
-use Test::More tests => 3 * scalar @specs;
+use Test::More tests => 2 * scalar @specs;
 use Test::Differences;
 
 # run tests after filtering
 foreach my $spec (@specs)
 {
+	my $expected = $spec->expect;
 	# compare the result with expected data
-	eq_or_diff ($spec->css, $spec->expect, "CSS: " . $spec->file);
-	# skip some faulty error specs (perl is picky)
-	if ($spec->{file} =~ m/\Wissue_(?:2446)\W/) {
-		ok('Invalid UTF8 sequence in output');
-	} else {
-		eq_or_diff ($spec->err, $spec->stderr, "Errors: " . $spec->file);
-	}
-	# skip some faulty warning specs (perl is picky)
-	if ($spec->{file} =~ m/\Wissue_(?:308|1578)\W/) {
-		ok('Warning message not marked as todo in spec')
-	} else {
-		eq_or_diff ($spec->msg, $spec->stdmsg, "Warnings: " . $spec->file);
-	}
+	if ($expected) { eq_or_diff ($spec->css, $expected, "CSS: " . $spec->file); }
+	else { eq_or_diff ($spec->err, $spec->stderr, "Errors: " . $spec->file); }
+	eq_or_diff ($spec->msg, $spec->stdmsg, "Warnings: " . $spec->file);
 }
diff --git a/t/sass-spec b/t/sass-spec
@@ -1 +1 @@
-Subproject commit 52946f0ff979be50793f1d8cc389653d9a63e340
+Subproject commit 1a6ec35c6a3bb26b71af4575b233b30920b39953

Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,5 @@`
`68`	`68`	`"url" : "https://github.com/sass/perl-libsass"`
`69`	`69`	`}`
`70`	`70`	`},`
`71`		`- "version" : "v3.6.3"`
	`71`	`+ "version" : "v3.6.4"`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ sub compile_lib {`
`651`	`651`	`# this may not be supported on all operating systems!`
`652`	`652`	`unless ($^O eq 'MSWin32' && $Config{cc} =~ /^cl/) {`
`653`	`653`	# the `-z origin` seems needed for some BSD derivates!
`654`		`- push @args, '-Wl,-z,origin' if $isPlugin && $^O ne 'MSWin32';`
	`654`	`+ push @args, '-Wl,-z,origin' if $isPlugin && $^O ne 'MSWin32' && $^O ne 'darwin';`
`655`	`655`	`push @args, '-Wl,-rpath,\\$$ORIGIN/../..' if $isPlugin;`
`656`	`656`	`}`
`657`	`657`	`# add explicit library name on OSX`