aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/gsmartcontrol/04_glib2.31.patch42
-rw-r--r--system/gsmartcontrol/gsmartcontrol.SlackBuild2
2 files changed, 1 insertions, 43 deletions
diff --git a/system/gsmartcontrol/04_glib2.31.patch b/system/gsmartcontrol/04_glib2.31.patch
deleted file mode 100644
index 9f5073c1927a4..0000000000000
--- a/system/gsmartcontrol/04_glib2.31.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 --git a/system/gsmartcontrol/gsmartcontrol.SlackBuild b/system/gsmartcontrol/gsmartcontrol.SlackBuild
index f2973f5b9ea72..d25a0871c8181 100644
--- a/system/gsmartcontrol/gsmartcontrol.SlackBuild
+++ b/system/gsmartcontrol/gsmartcontrol.SlackBuild
@@ -67,7 +67,7 @@ find -L . \
sed -i "s/\tdestroy/\tthis->destroy/" src/gsc_text_window.h
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \