tags 665677 + pending
thanks

Dear maintainer,

I've prepared an NMU for gsmartcontrol (versioned as 0.8.6-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   
diff -Nru gsmartcontrol-0.8.6/debian/changelog gsmartcontrol-0.8.6/debian/changelog
--- gsmartcontrol-0.8.6/debian/changelog	2011-07-15 14:59:37.000000000 +0200
+++ gsmartcontrol-0.8.6/debian/changelog	2012-04-08 14:20:28.000000000 +0200
@@ -1,3 +1,11 @@
+gsmartcontrol (0.8.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with glib 2.32": add patch 04_glib2.31.patch from Alexander
+    Shaduri. (Closes: #665677, LP: #935155
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 08 Apr 2012 14:19:47 +0200
+
 gsmartcontrol (0.8.6-1) unstable; urgency=low
 
   * [dbb993d] Updated my email address and removed DM-Upload-Allowed
diff -Nru gsmartcontrol-0.8.6/debian/patches/04_glib2.31.patch gsmartcontrol-0.8.6/debian/patches/04_glib2.31.patch
--- gsmartcontrol-0.8.6/debian/patches/04_glib2.31.patch	1970-01-01 01:00:00.000000000 +0100
+++ gsmartcontrol-0.8.6/debian/patches/04_glib2.31.patch	2012-04-08 14:16:21.000000000 +0200
@@ -0,0 +1,42 @@
+Description: Fixed compilation under Glib 2.31.x.
+Origin: Upstream, http://svn.berlios.de/viewvc/gsmartcontrol/trunk/gsmartcontrol/src/hz/sync_policy_glib.h?r1=27&r2=72&view=patch
+Author: Alexander Shaduri
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935155
+Bug-Debian: http://bugs.debian.org/665677
+
+--- gsmartcontrol/src/hz/sync_policy_glib.h	2011/03/06 10:43:38	27
++++ gsmartcontrol/src/hz/sync_policy_glib.h	2011/11/02 16:00:39	72
+@@ -17,30 +17,14 @@
+ // Glib-based policy.
+ 
+ 
+-// Note: g_static_mutex_*lock() functions may give warnings about breaking strict-aliasing rules.
+-// The warnings are completely harmless and visible on some versions of glib only.
+-// However, due to their number, I decided to implement this workaround.
+-
+-#ifndef _WIN32
+-	// same as stock version, but an additional cast to (void*) is added.
+-	#define hz_glib_static_mutex_get_mutex(mutex) \
+-		( g_thread_use_default_impl ? ((GMutex*) ((void*)((mutex)->static_mutex.pad))) : \
+-		g_static_mutex_get_mutex_impl_shortcut(&((mutex)->runtime_mutex)) )
+-
+-#else
+-	// win32 has different definition of this macro, so default to stock version.
+-	#define hz_glib_static_mutex_get_mutex(mutex) g_static_mutex_get_mutex(mutex)
+-#endif
+-
+-
+ #define hz_glib_static_mutex_lock(mutex) \
+-	g_mutex_lock(hz_glib_static_mutex_get_mutex(mutex))
++	g_mutex_lock(g_static_mutex_get_mutex(mutex))
+ 
+ #define hz_glib_static_mutex_trylock(mutex) \
+-	g_mutex_trylock(hz_glib_static_mutex_get_mutex(mutex))
++	g_mutex_trylock(g_static_mutex_get_mutex(mutex))
+ 
+ #define hz_glib_static_mutex_unlock(mutex) \
+-	g_mutex_unlock(hz_glib_static_mutex_get_mutex(mutex))
++	g_mutex_unlock(g_static_mutex_get_mutex(mutex))
+ 
+ 
+ 
diff -Nru gsmartcontrol-0.8.6/debian/patches/series gsmartcontrol-0.8.6/debian/patches/series
--- gsmartcontrol-0.8.6/debian/patches/series	2011-07-15 14:59:37.000000000 +0200
+++ gsmartcontrol-0.8.6/debian/patches/series	2012-04-08 14:19:30.000000000 +0200
@@ -1,3 +1,4 @@
 01_use_su-to-root.patch
 02_fix_doc_install.patch
 03_gcc4.4.patch
+04_glib2.31.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to