
This splits webkit2gtk into 3 packages: + webkit2gtk: GTK+3 and libsoup2 + libwebkit2gtk41: GTK+3 and libsoup3 + libwebkit2gtk50: GTK4 and libsoup3 This is necessary since libsoup2 and libsoup3 cannot be used at the same time. Ideally the other packages would eventually be no longer necessary.
82 lines
3.6 KiB
Diff
82 lines
3.6 KiB
Diff
commit 7366988f033d29f2b2e2e68fedb8827ba09a2cc1
|
|
Author: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Wed Jan 5 17:50:07 2022 +0100
|
|
|
|
reproducible build
|
|
|
|
diff --git a/Source/WebCore/bindings/scripts/CodeGenerator.pm b/Source/WebCore/bindings/scripts/CodeGenerator.pm
|
|
index a604bfd3..c267b402 100644
|
|
--- a/Source/WebCore/bindings/scripts/CodeGenerator.pm
|
|
+++ b/Source/WebCore/bindings/scripts/CodeGenerator.pm
|
|
@@ -324,7 +324,7 @@ sub MergeExtendedAttributesFromSupplemental
|
|
{
|
|
my ($object, $supplementalExtendedAttributes, $property, $context) = @_;
|
|
|
|
- foreach my $extendedAttributeName (keys %{$supplementalExtendedAttributes}) {
|
|
+ foreach my $extendedAttributeName (sort keys %{$supplementalExtendedAttributes}) {
|
|
my $isAllowed = 0;
|
|
for my $contextAllowed (@{$idlAttributes->{$extendedAttributeName}->{"contextsAllowed"}}) {
|
|
if ($contextAllowed eq $context) {
|
|
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
|
|
index be5a5d51..becb2b2f 100644
|
|
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
|
|
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
|
|
@@ -3217,7 +3217,7 @@ sub GenerateHeader
|
|
} else {
|
|
push(@headerContent, " static constexpr unsigned StructureFlags = Base::StructureFlags");
|
|
}
|
|
- foreach my $structureFlag (sort (keys %structureFlags)) {
|
|
+ foreach my $structureFlag (sort (sort keys %structureFlags)) {
|
|
push(@headerContent, " | " . $structureFlag);
|
|
}
|
|
push(@headerContent, ";\n");
|
|
@@ -7433,7 +7433,7 @@ sub WriteData
|
|
|
|
my @includes = ();
|
|
my %implIncludeConditions = ();
|
|
- foreach my $include (keys %implIncludes) {
|
|
+ foreach my $include (sort keys %implIncludes) {
|
|
next if $headerIncludes{$include};
|
|
next if $headerTrailingIncludes{$include};
|
|
|
|
@@ -7473,7 +7473,7 @@ sub WriteData
|
|
$contents = join "", @headerContentHeader;
|
|
|
|
@includes = ();
|
|
- foreach my $include (keys %headerIncludes) {
|
|
+ foreach my $include (sort keys %headerIncludes) {
|
|
$include = "\"$include\"" unless $include =~ /^["<]/; # "
|
|
$include = SubstituteHeader($include);
|
|
push @includes, $include;
|
|
@@ -7487,7 +7487,7 @@ sub WriteData
|
|
$contents .= join "", @headerContent;
|
|
|
|
@includes = ();
|
|
- foreach my $include (keys %headerTrailingIncludes) {
|
|
+ foreach my $include (sort keys %headerTrailingIncludes) {
|
|
$include = "\"$include\"" unless $include =~ /^["<]/; # "
|
|
push @includes, $include;
|
|
}
|
|
@@ -7560,7 +7560,7 @@ sub GeneratePrototypeDeclaration
|
|
if (%structureFlags) {
|
|
push(@$outputArray, "public:\n");
|
|
push(@$outputArray, " static constexpr unsigned StructureFlags = Base::StructureFlags");
|
|
- foreach my $structureFlag (sort (keys %structureFlags)) {
|
|
+ foreach my $structureFlag (sort (sort keys %structureFlags)) {
|
|
push(@$outputArray, " | " . $structureFlag);
|
|
}
|
|
push(@$outputArray, ";\n");
|
|
diff --git a/Source/cmake/tools/scripts/version-stamp.pl b/Source/cmake/tools/scripts/version-stamp.pl
|
|
index 888a4502..57ab9b16 100644
|
|
--- a/Source/cmake/tools/scripts/version-stamp.pl
|
|
+++ b/Source/cmake/tools/scripts/version-stamp.pl
|
|
@@ -75,7 +75,7 @@ my $VERSION_FILE = File::Spec->catfile(File::Spec->canonpath($intdir), 'include'
|
|
|
|
open(VERSION_INFO, '<', $VERSION_FILE) or die "Unable to open $VERSION_FILE: $!\n";
|
|
while (my $line = <VERSION_INFO>) {
|
|
- foreach my $componentKey (keys %components) {
|
|
+ foreach my $componentKey (sort keys %components) {
|
|
if ($line !~ m/$componentKey/) {
|
|
next;
|
|
}
|