diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-06-02 14:04:12 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-06-02 14:04:12 +0200 |
commit | 4e5890ec52a6e48753123c19c5f50effbef02efd (patch) | |
tree | f68934ad1a0a7a59ea541ad1e548bc052b7ee46e /gnome-extra | |
parent | app-backup/rear: New ebuild for bug 404439 (diff) | |
download | sunrise-reviewed-4e5890ec52a6e48753123c19c5f50effbef02efd.tar.gz sunrise-reviewed-4e5890ec52a6e48753123c19c5f50effbef02efd.tar.bz2 sunrise-reviewed-4e5890ec52a6e48753123c19c5f50effbef02efd.zip |
gnome-extra/gsmartcontrol: Add fix for gcc-4.7 and changes in glib-2.31 for mutex
Diffstat (limited to 'gnome-extra')
-rw-r--r-- | gnome-extra/gsmartcontrol/ChangeLog | 4 | ||||
-rw-r--r-- | gnome-extra/gsmartcontrol/Manifest | 6 | ||||
-rw-r--r-- | gnome-extra/gsmartcontrol/files/0.8.6-gcc47.patch | 38 | ||||
-rw-r--r-- | gnome-extra/gsmartcontrol/files/0.8.6-glib-2.31-mutex.patch | 38 | ||||
-rw-r--r-- | gnome-extra/gsmartcontrol/gsmartcontrol-0.8.6.ebuild | 5 |
5 files changed, 88 insertions, 3 deletions
diff --git a/gnome-extra/gsmartcontrol/ChangeLog b/gnome-extra/gsmartcontrol/ChangeLog index 1acee93db..db7725af2 100644 --- a/gnome-extra/gsmartcontrol/ChangeLog +++ b/gnome-extra/gsmartcontrol/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Jun 2012; Justin Lecher <jlec@gentoo.org> +files/0.8.6-gcc47.patch, + gsmartcontrol-0.8.6.ebuild, +files/0.8.6-glib-2.31-mutex.patch: + Add fix for gcc-4.7 and changes in glib-2.31 for mutex + 05 May 2012; Mike Gilbert <floppym@gentoo.org> gsmartcontrol-0.8.6.ebuild: Use pkgconfig virtual. diff --git a/gnome-extra/gsmartcontrol/Manifest b/gnome-extra/gsmartcontrol/Manifest index 2fe87559b..d4d7f832e 100644 --- a/gnome-extra/gsmartcontrol/Manifest +++ b/gnome-extra/gsmartcontrol/Manifest @@ -1,5 +1,7 @@ AUX 0.8.6-fixdocs.patch 646 RMD160 7db3702214dc07f4b49aab3dfe1e92b4570dcf52 SHA1 9860610f17859eeca869e958ad1726ed5dd7cfad SHA256 8ab20b954a49fc7382e88ec5052b6d2ef0758d9a2322d5d3ea3034210668995d +AUX 0.8.6-gcc47.patch 1225 RMD160 811edff7ae1920d27ebca6b72869b2e8a5e58643 SHA1 af595a6cee63d55603fbb3bd8dc0951466e89651 SHA256 b813c2c854998ab6ec1088299c6ade15f9ae917232a5c45934ea032132820cff +AUX 0.8.6-glib-2.31-mutex.patch 1562 RMD160 ecd55c2b0d7540ffed65e3bbcffc22fa8458d187 SHA1 86250a3f7fc11c34aa6b39ca5b332714b469fa59 SHA256 5c3de060b91dbb14fbba0a5bea6ac54669f72d7f13a7e0df753270512d8359af DIST gsmartcontrol-0.8.6.tar.bz2 673712 RMD160 2387a3b078f6e94dcb7122c5f72b94f14d8da30f SHA1 e05dda2815921aa0d2aa18850e2e715c1a5e00e0 SHA256 b0806c0a6b2c3d33755e78b67bd8a2ce895b07aee2a5a75767132694e0f41eda -EBUILD gsmartcontrol-0.8.6.ebuild 606 RMD160 9fe286e05bae74bf44a1cef950bc4c0a1ca570a0 SHA1 6fa9d112dab9358842bf28ea48cf309232b5eedd SHA256 cc836fed903e72e1b853909733d302d8cdf438c39fe5da055d3a7a4c23d9e51a -MISC ChangeLog 1066 RMD160 95915e823efc1ef82b3a994b69c30ed456cca8d3 SHA1 b5bb4fdbfdc4298fab7c24d335098af77e2ade8a SHA256 24dffcbd3270820eec5534e0fed901b9f39220a9a586de7353c63d7e991f1991 +EBUILD gsmartcontrol-0.8.6.ebuild 692 RMD160 1a11eead1f3c7cf3e96dc0de3c73cd0586e43c40 SHA1 aebfd3e882f286630a8c16760661364ddf748e48 SHA256 dfba899b245e7af6d7d551963f1b348684c5cdd2478b4725dcb3133d64830095 +MISC ChangeLog 1263 RMD160 14cd4be8a627d4184a1f282f576ee2010a96d37f SHA1 d66653719650302d99a684dedeb937d88b6c4733 SHA256 ec6190d7eee80609b887076511ed6064f7dd483abae97f79a8916fb3a1ea7ddb MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8 diff --git a/gnome-extra/gsmartcontrol/files/0.8.6-gcc47.patch b/gnome-extra/gsmartcontrol/files/0.8.6-gcc47.patch new file mode 100644 index 000000000..6bf23112d --- /dev/null +++ b/gnome-extra/gsmartcontrol/files/0.8.6-gcc47.patch @@ -0,0 +1,38 @@ + src/gsc_text_window.h | 4 ++-- + src/libdebug/dstream.h | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/gsc_text_window.h b/src/gsc_text_window.h +index d36250d..6516888 100644 +--- a/src/gsc_text_window.h ++++ b/src/gsc_text_window.h +@@ -126,7 +126,7 @@ class GscTextWindow : public AppUIResWidget<GscTextWindow<InstanceSwitch>, Insta + // by default, delete_event calls hide(). + bool on_delete_event_before(GdkEventAny* e) + { +- destroy(this); // deletes this object and nullifies instance ++ this->destroy(this); // deletes this object and nullifies instance + return true; // event handled, don't call default virtual handler + } + +@@ -184,7 +184,7 @@ class GscTextWindow : public AppUIResWidget<GscTextWindow<InstanceSwitch>, Insta + + void on_close_window_button_clicked() + { +- destroy(this); ++ this->destroy(this); + } + + +diff --git a/src/libdebug/dstream.h b/src/libdebug/dstream.h +index bb2a428..87d49bc 100644 +--- a/src/libdebug/dstream.h ++++ b/src/libdebug/dstream.h +@@ -9,6 +9,7 @@ + + #include <ostream> // std::ostream definition + #include <streambuf> // std::streambuf definition ++#include <cstdio> + #include <string> + #include <sstream> + #include <vector> diff --git a/gnome-extra/gsmartcontrol/files/0.8.6-glib-2.31-mutex.patch b/gnome-extra/gsmartcontrol/files/0.8.6-glib-2.31-mutex.patch new file mode 100644 index 000000000..1de3a56f0 --- /dev/null +++ b/gnome-extra/gsmartcontrol/files/0.8.6-glib-2.31-mutex.patch @@ -0,0 +1,38 @@ +Taken from Fedora +diff -up gsmartcontrol-0.8.6/src/hz/sync_policy_glib.h.gstaticmutex gsmartcontrol-0.8.6/src/hz/sync_policy_glib.h +--- gsmartcontrol-0.8.6/src/hz/sync_policy_glib.h.gstaticmutex 2011-03-06 01:21:07.000000000 -0800 ++++ gsmartcontrol-0.8.6/src/hz/sync_policy_glib.h 2011-12-12 22:45:43.000000000 -0800 +@@ -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/gnome-extra/gsmartcontrol/gsmartcontrol-0.8.6.ebuild b/gnome-extra/gsmartcontrol/gsmartcontrol-0.8.6.ebuild index 66c5c3c2f..593e9022f 100644 --- a/gnome-extra/gsmartcontrol/gsmartcontrol-0.8.6.ebuild +++ b/gnome-extra/gsmartcontrol/gsmartcontrol-0.8.6.ebuild @@ -26,6 +26,9 @@ G2CONF="--docdir=/usr/share/doc/${P}" src_prepare() { gnome2_src_prepare - epatch "${FILESDIR}"/${PV}-fixdocs.patch + epatch \ + "${FILESDIR}"/${PV}-fixdocs.patch \ + "${FILESDIR}"/${PV}-gcc47.patch \ + "${FILESDIR}"/${PV}-glib-2.31-mutex.patch eautoreconf } |