rpms/emerald/devel DSO.patch, NONE, 1.1 gtk.patch, NONE, 1.1 emerald.spec, 1.24, 1.25

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/emerald/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12113

Modified Files:
	emerald.spec 
Added Files:
	DSO.patch gtk.patch 
Log Message:
* Thu Feb 18 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-3
- fix DSO link problem
- fix gtk deprecated error


DSO.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE DSO.patch ---
--- emerald-0.8.4.orig/src/Makefile.in	2010-02-18 20:01:14.000000000 +0000
+++ emerald-0.8.4/src/Makefile.in	2010-02-18 20:02:46.000000000 +0000
@@ -208,7 +208,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-emerald_LDADD = @EMERALD_LIBS@ $(top_builddir)/libengine/libemeraldengine.la
+emerald_LDADD = @EMERALD_LIBS@ $(top_builddir)/libengine/libemeraldengine.la -lm -ldl
 emerald_SOURCES = main.c \
 			   engine_loader.c
 

gtk.patch:
 themer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gtk.patch ---
--- emerald-0.8.4.orig/libengine/themer.c	2009-10-14 01:56:23.000000000 +0100
+++ emerald-0.8.4/libengine/themer.c	2010-02-18 20:27:56.000000000 +0000
@@ -461,7 +461,7 @@ gboolean get_bool(SettingItem * item)
 }
 gdouble get_float(SettingItem * item)
 {
-    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
     }
     else {
@@ -647,7 +647,7 @@ void set_bool(SettingItem * item, gboole
 }
 void set_float(SettingItem * item, gdouble f)
 {
-    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
     } 
     else {


Index: emerald.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/devel/emerald.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- emerald.spec	17 Jan 2010 13:02:35 -0000	1.24
+++ emerald.spec	18 Feb 2010 21:43:41 -0000	1.25
@@ -3,11 +3,13 @@ Url:            http://www.compiz-fusion
 License:        GPLv2
 Group:          User Interface/Desktops
 Version:        0.8.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
+Patch0:         DSO.patch
+Patch1:         gtk.patch
 
 # compiz-devel is not available on these arches
 ExcludeArch:    s390 s390x
@@ -43,6 +45,8 @@ for emerald, the themeable window decora
 
 %prep
 %setup -q
+%patch0 -p1 -b .DSO
+%patch1 -p1 -b .gtk
 
 %build
 %configure --enable-librsvg --disable-mime-update
@@ -101,6 +105,11 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Thu Feb 18 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.8.4-3
+- fix DSO link problem
+- fix gtk deprecated error
+
+
 * Sun Jan 17 2010 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.8.4-2
 - add build requires for gtk+