[gyachi] fix libv4l1 compile, gtk issues, support notify 0.7, cleanup desktop file

Tue May 17 15:23:43 UTC 2011

commit 1872a9befa24d9c22051ab2ce4a444d4fab4d480
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue May 17 11:23:31 2011 -0400

    fix libv4l1 compile, gtk issues, support notify 0.7, cleanup desktop file

 gyachi-1.2.10-desktop-fix.patch        |   18 ++++++++++++++
 gyachi-1.2.10-gtk-and-notify-fix.patch |   39 ++++++++++++++++++++++++++++++++
 gyachi-1.2.10-libv4l1.patch            |   13 ++++++++++
 gyachi.spec                            |   16 ++++++++++++-
 4 files changed, 85 insertions(+), 1 deletions(-)
---

diff --git a/gyachi-1.2.10-desktop-fix.patch b/gyachi-1.2.10-desktop-fix.patch
new file mode 100644
index 0000000..eb781a9
--- /dev/null
+++ b/gyachi-1.2.10-desktop-fix.patch
@@ -0,0 +1,18 @@
+diff -up gyachi-1.2.10/gyachi.desktop.fix gyachi-1.2.10/gyachi.desktop
+--- gyachi-1.2.10/gyachi.desktop.fix	2011-05-17 11:06:34.890734047 -0400
++++ gyachi-1.2.10/gyachi.desktop	2011-05-17 11:07:06.113908461 -0400
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=GYachE Improved
+ Name[sr]=Усавршени GYachE
+ Comment[de]=Yahoo! Klient
+ Comment[sr]=Програм за Yahoo!
+ Comment=Yahoo! Client
+ Exec=gyachi
+-Icon=gyachi.png
++Icon=gyachi
+ Terminal=false
+ Type=Application
+-Categories=Application;Network;
++Categories=GTK;Network;InstantMessaging;
diff --git a/gyachi-1.2.10-gtk-and-notify-fix.patch b/gyachi-1.2.10-gtk-and-notify-fix.patch
new file mode 100644
index 0000000..8620966
--- /dev/null
+++ b/gyachi-1.2.10-gtk-and-notify-fix.patch
@@ -0,0 +1,39 @@
+diff -up gyachi-1.2.10/client/trayicon.h.gtkfix gyachi-1.2.10/client/trayicon.h
+--- gyachi-1.2.10/client/trayicon.h.gtkfix	2011-05-17 10:58:19.905672512 -0400
++++ gyachi-1.2.10/client/trayicon.h	2011-05-17 10:58:34.098768393 -0400
+@@ -33,6 +33,8 @@
+ #define TRAY_ICON_IDLE 3
+ #define TRAY_ICON_BUSY 4
+ 
++#include <gtk/gtk.h>
++
+ extern void trayicon_create (void);
+ extern void trayicon_destroy (void);
+ extern void trayicon_mail_alert();
+diff -up gyachi-1.2.10/lib/theme_support.h.gtkfix gyachi-1.2.10/lib/theme_support.h
+--- gyachi-1.2.10/lib/theme_support.h.gtkfix	2011-05-17 10:57:48.533458808 -0400
++++ gyachi-1.2.10/lib/theme_support.h	2011-05-17 10:57:56.719514804 -0400
+@@ -23,6 +23,8 @@
+ #ifndef _THEME_SUPPORT_H
+ #define _THEME_SUPPORT_H
+ 
++#include <gtk/gtk.h>
++
+ #define GYACHI_BOLD			"gyachi-bold"
+ #define GYACHI_BUDDY_AWAY		"gyachi-buddy_away"
+ #define GYACHI_BUDDY_IDLE		"gyachi-buddy_idle"
+diff -up gyachi-1.2.10/plugins/libnotify/gyachi-libnotify.c.gtkfix gyachi-1.2.10/plugins/libnotify/gyachi-libnotify.c
+--- gyachi-1.2.10/plugins/libnotify/gyachi-libnotify.c.gtkfix	2011-05-17 10:59:44.870239117 -0400
++++ gyachi-1.2.10/plugins/libnotify/gyachi-libnotify.c	2011-05-17 11:02:04.139130210 -0400
+@@ -72,7 +72,11 @@ void gyachi_libnotify(char *mytitle, cha
+ 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+         gtk_widget_realize(win);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	my_popup=notify_notification_new(mytitle, mymsg, NULL);
++#else
+ 	my_popup=notify_notification_new_with_status_icon(mytitle, mymsg, NULL, popup_attach_systray?systray_get_status_icon():NULL);
++#endif
+ 	if (stock_id) {
+ 		icon_pixbuf = gtk_widget_render_icon(win, stock_id, (strcmp(stock_id, GYACHI_MAIL) == 0) ? GYACHI_ICON_SIZE_MAIL: GTK_ICON_SIZE_LARGE_TOOLBAR, "gvwindow");
+ 		if (icon_pixbuf) {
diff --git a/gyachi-1.2.10-libv4l1.patch b/gyachi-1.2.10-libv4l1.patch
new file mode 100644
index 0000000..98947ce
--- /dev/null
+++ b/gyachi-1.2.10-libv4l1.patch
@@ -0,0 +1,13 @@
+diff -up gyachi-1.2.10/webcam/gyacheupload-v4l.c.libv4l1 gyachi-1.2.10/webcam/gyacheupload-v4l.c
+--- gyachi-1.2.10/webcam/gyacheupload-v4l.c.libv4l1	2011-05-17 10:50:46.813232393 -0400
++++ gyachi-1.2.10/webcam/gyacheupload-v4l.c	2011-05-17 10:51:11.372330954 -0400
+@@ -112,7 +112,7 @@
+ #endif
+ 
+ /* V4L1 */
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ /*  V4L2 */
+ #include <linux/videodev2.h>
+diff -up gyachi-1.2.10/webcam/Makefile.am.libv4l1 gyachi-1.2.10/webcam/Makefile.am
diff --git a/gyachi.spec b/gyachi.spec
index f0c24c6..b23e323 100644
--- a/gyachi.spec
+++ b/gyachi.spec
@@ -30,7 +30,7 @@
 
 Name:		gyachi
 Version:	1.2.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -39,6 +39,11 @@ URL:		http://gyachi.sourceforge.net
 #Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
 #Patch0:	configure.patch
+Patch1:		gyachi-1.2.10-libv4l1.patch
+# Fixes gtk and notify issues
+Patch2:		gyachi-1.2.10-gtk-and-notify-fix.patch
+# Clean up desktop file
+Patch3:		gyachi-1.2.10-desktop-fix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -242,6 +247,9 @@ This theme uses the pidgin icons, and is copyrighted by it's respective authors.
 %prep
 %setup -q
 #%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -375,6 +383,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 17 2011 Tom Callaway <spot at fedoraproject.org> - 1.2.10-5
+- use libv4l1 header instead of obsolete kernel header
+- fix gtk compile issues
+- support notify 0.7
+- cleanup desktop file (bz 616122)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
