Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=d86fc61d19abab86155b88fe06eaec1281522827
commit d86fc61d19abab86155b88fe06eaec1281522827 Author: James Buren <[email protected]> Date: Wed May 9 05:20:40 2012 -0500 gsmartcontrol-0.8.6-2-x86_64 * rebuild with pcre 8.30 diff --git a/source/xapps-extra/gsmartcontrol/FrugalBuild b/source/xapps-extra/gsmartcontrol/FrugalBuild index de56aad..cf17509 100644 --- a/source/xapps-extra/gsmartcontrol/FrugalBuild +++ b/source/xapps-extra/gsmartcontrol/FrugalBuild @@ -3,18 +3,20 @@ pkgname=gsmartcontrol pkgver=0.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." -depends=('smartmontools' 'gtkmm2' 'libxau>=1.0.4-1' 'libxdmcp' 'freetype2' 'pcre' 'libxext' 'libxdamage' 'libxml2') +depends=('smartmontools' 'gtkmm2' 'libxau>=1.0.4-1' 'libxdmcp' 'freetype2' 'pcre>=8.30' 'libxext' 'libxdamage' 'libxml2') options=('scriptlet') _F_berlios_ext=".tar.bz2" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude berlios gnome-scriptlet -source=($source gcc4.diff) +source=($source gcc4.diff glib2.31.patch gcc-4.7.patch) groups=('xapps-extra') archs=('i686' 'x86_64') sha1sums=('e05dda2815921aa0d2aa18850e2e715c1a5e00e0' \ - '211b524043ca357a31f6f2650b9cad96865ed6d0') + '211b524043ca357a31f6f2650b9cad96865ed6d0' \ + '9417084b99091c43a26ab2dcdd2125af37dcb238' \ + '7b20a251ed96d9be24315fa7a8c395134a241061') # optimization OK diff --git a/source/xapps-extra/gsmartcontrol/gcc-4.7.patch b/source/xapps-extra/gsmartcontrol/gcc-4.7.patch new file mode 100644 index 0000000..8a92e12 --- /dev/null +++ b/source/xapps-extra/gsmartcontrol/gcc-4.7.patch @@ -0,0 +1,24 @@ +Description: fix FTBFS with gcc 4.7 +Author: Paul Tagliamonte <[email protected]> +Bug-Debian: http://bugs.debian.org/667194 + +--- a/src/gsc_text_window.h 2012-04-18 22:03:41.340661672 -0400 ++++ b/src/gsc_text_window.h 2012-04-18 22:03:46.264661939 -0400 +@@ -126,7 +126,7 @@ class GscTextWindow : public AppUIResWid + // 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 AppUIResWid + + void on_close_window_button_clicked() + { +- destroy(this); ++ this->destroy(this); + } + + diff --git a/source/xapps-extra/gsmartcontrol/glib2.31.patch b/source/xapps-extra/gsmartcontrol/glib2.31.patch new file mode 100644 index 0000000..9f5073c --- /dev/null +++ b/source/xapps-extra/gsmartcontrol/glib2.31.patch @@ -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)) + + + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
