[SCM] gwc/master: Add patch to fix pointer truncation issues. (Closes: #852082)

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Jan 24 19:01:20 UTC 2017


The following commit has been merged in the master branch:
commit ef72f48c926f64447a44bc1fd23729af1ebdff3e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jan 24 19:45:44 2017 +0100

    Add patch to fix pointer truncation issues. (Closes: #852082)

diff --git a/debian/patches/0004-pointer-truncation.patch b/debian/patches/0004-pointer-truncation.patch
new file mode 100644
index 0000000..9472f70
--- /dev/null
+++ b/debian/patches/0004-pointer-truncation.patch
@@ -0,0 +1,59 @@
+Description: Fix pointer truncation issues in 2 _get_type functions
+ On 64-bit architectures the pointers returned by these functions were being
+ truncated to 32-bits causing segfaults.
+Author: James Cowgill <jcowgill at debian.org>
+Bug-Debian: https://bugs.debian.org/852082
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/gtkgamma.c
++++ b/gtkgamma.c
+@@ -202,10 +202,10 @@ static char *xpm[][27] =
+     }
+   };
+ 
+-guint
++GtkType
+ gtk_gamma_curve_get_type (void)
+ {
+-  static guint gamma_curve_type = 0;
++  static GtkType gamma_curve_type = 0;
+ 
+   if (!gamma_curve_type)
+     {
+--- a/gtkgamma.h
++++ b/gtkgamma.h
+@@ -68,7 +68,7 @@ struct _GtkGammaCurveClass
+ };
+ 
+ 
+-guint      gtk_gamma_curve_get_type (void);
++GtkType    gtk_gamma_curve_get_type (void);
+ GtkWidget* gtk_gamma_curve_new      (void);
+ 
+ 
+--- a/gtkledbar.c
++++ b/gtkledbar.c
+@@ -28,10 +28,10 @@
+ static void     led_bar_class_init        (LedBarClass *klass);
+ static void     led_bar_init              (LedBar      *led_bar);
+ 
+-guint
++GtkType
+ led_bar_get_type ()
+ {
+-  static guint led_bar_type = 0;
++  static GtkType led_bar_type = 0;
+ 
+   if (!led_bar_type)
+     {
+--- a/gtkledbar.h
++++ b/gtkledbar.h
+@@ -57,7 +57,7 @@ struct _LedBarClass
+   GtkVBoxClass   parent_class;
+ };
+ 
+-guint         led_bar_get_type            (void);
++GtkType       led_bar_get_type            (void);
+ GtkWidget*    led_bar_new                 (gint       segments,
+ 					   gint       orientation);
+ gint          led_bar_get_num_segments    (GtkWidget  *bar);
diff --git a/debian/patches/series b/debian/patches/series
index d89c5a0..606964e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-buildsystem.patch
 0002-fix-function-declaration.patch
 0003-fix_typos.patch
+0004-pointer-truncation.patch

-- 
gwc packaging



More information about the pkg-multimedia-commits mailing list