rev 13343 - in branches/kde4.2/packages/pkg-kde-tools/trunk: debian symbolshelper/Debian/PkgKde/SymHelper symbolshelper/Debian/PkgKde/SymHelper/Handler

Modestas Vainius modax-guest at alioth.debian.org
Wed Jan 14 12:17:43 UTC 2009


Author: modax-guest
Date: 2009-01-14 12:17:43 +0000 (Wed, 14 Jan 2009)
New Revision: 13343

Modified:
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
   branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handler/SimpleTypeDiff.pm
   branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
Log:
add support for int64_t/uint64_t differences on 64bit/32bit arches.

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-14 11:53:14 UTC (rev 13342)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-14 12:17:43 UTC (rev 13343)
@@ -1,4 +1,4 @@
-pkg-kde-tools (0.3.1~pre3) UNRELEASED; urgency=low
+pkg-kde-tools (0.3.1~pre4) UNRELEASED; urgency=low
 
   * pkgkde-symbolshelper/patch: improve processing of patches which patch
     multiple files. Use the first patch portion that applies properly.
@@ -8,8 +8,9 @@
     into one file.
   * debian/rules: disable .svn check. It is wrong and useless since does not
     check the tarball itself but the directory the tarball gets built from.
+  * add support for int64_t/uint64_t differences on 64bit/32bit arches.
 
- -- Modestas Vainius <modestas at vainius.eu>  Sat, 13 Dec 2008 01:58:28 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 14 Jan 2009 13:51:03 +0200
 
 pkg-kde-tools (0.3) experimental; urgency=low
 

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handler/SimpleTypeDiff.pm
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handler/SimpleTypeDiff.pm	2009-01-14 11:53:14 UTC (rev 13342)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handler/SimpleTypeDiff.pm	2009-01-14 12:17:43 UTC (rev 13343)
@@ -60,7 +60,6 @@
     }
 }
 
-1;
 package Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::size_t;
 our @ISA = qw( Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff );
 
@@ -70,7 +69,7 @@
 sub new {
     my $self = Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::new(@_);
     $self->{substvar} = "{size_t}";
-    $self->{main_type} = "j"; # unsigned int
+    $self->{main_type} = "m"; # unsigned long (amd64)
     $self->{type_re} = "[jm]";
     return $self;
 }
@@ -78,7 +77,6 @@
 sub get_predef_arch_params {
     my ($self, $arch) = @_;
 
-    # Mult should be 1 on 32bit arches and 2 on 64bit arches and so on
     my $params = { type => "j" }; # unsigned int
     $params->{type} = "m" if ($arch =~ /amd64|ia64|alpha|s390/); # unsigned long
     return $params;
@@ -93,7 +91,7 @@
 sub new {
     my $self = Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::new(@_);
     $self->{substvar} = "{ssize_t}";
-    $self->{main_type} = "i"; # unsigned int
+    $self->{main_type} = "l"; # long (amd64)
     $self->{type_re} = "[il]";
     return $self;
 }
@@ -101,13 +99,55 @@
 sub get_predef_arch_params {
     my ($self, $arch) = @_;
 
-    # Mult should be 1 on 32bit arches and 2 on 64bit arches and so on
     my $params = { type => "i" }; # int
     $params->{type} = "l" if ($arch =~ /amd64|ia64|alpha|s390/); # unsigned long
     return $params;
 }
 
-1;
+package Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::int64_t;
+our @ISA = qw( Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff );
+
+use strict;
+use warnings;
+
+sub new {
+    my $self = Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::new(@_);
+    $self->{substvar} = "{int64_t}";
+    $self->{main_type} = "l"; # long (amd64)
+    $self->{type_re} = "[xl]";
+    return $self;
+}
+
+sub get_predef_arch_params {
+    my ($self, $arch) = @_;
+
+    my $params = { type => "x" }; # long long, __int64
+    $params->{type} = "l" if ($arch =~ /amd64|ia64|alpha/); # long
+    return $params;
+}
+
+package Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::uint64_t;
+our @ISA = qw( Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff );
+
+use strict;
+use warnings;
+
+sub new {
+    my $self = Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::new(@_);
+    $self->{substvar} = "{uint64_t}";
+    $self->{main_type} = "m"; # unsigned long (64bit)
+    $self->{type_re} = "[ym]";
+    return $self;
+}
+
+sub get_predef_arch_params {
+    my ($self, $arch) = @_;
+
+    my $params = { type => "y" }; # unsigned long long, __uint64
+    $params->{type} = "m" if ($arch =~ /amd64|ia64|alpha/); # unsigned long
+    return $params;
+}
+
 package Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::qreal;
 our @ISA = qw( Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff );
 
@@ -117,7 +157,7 @@
 sub new {
     my $self = Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::new(@_);
     $self->{substvar} = "{qreal}";
-    $self->{main_type} = "d"; # unsigned int
+    $self->{main_type} = "d"; # double (not arm)
     $self->{type_re} = "[fd]";
     return $self;
 }
@@ -125,7 +165,6 @@
 sub get_predef_arch_params {
     my ($self, $arch) = @_;
 
-    # Mult should be 1 on 32bit arches and 2 on 64bit arches and so on
     my $params = { type => "d" }; # int
     $params->{type} = "f" if ($arch =~ /arm/); # unsigned long
     return $params;

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm	2009-01-14 11:53:14 UTC (rev 13342)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm	2009-01-14 12:17:43 UTC (rev 13343)
@@ -17,6 +17,8 @@
     my @multiple_substitution = (
         new Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::size_t,
         new Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::ssize_t,
+        new Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::int64_t,
+        new Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::uint64_t,
         new Debian::PkgKde::SymHelper::Handler::SimpleTypeDiff::qreal,
     );
     my @substitution = (




More information about the pkg-kde-commits mailing list