Attachment 600268 Details for Bug 715732 – Patch to fix building

[patch] Patch to fix building

0001-Fixing-build-issues.patch (text/plain), 6.52 KB, created by Patrick Uiterwijk on 2012-07-25 10:58:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Uiterwijk

Created: 2012-07-25 10:58:53 UTC

Size: 6.52 KB

patch

obsolete

>From b18b98a9049fb82066f7f2fc18b32c13b5c0ebd1 Mon Sep 17 00:00:00 2001
>From: Patrick Uiterwijk <puiterwijk@gmail.com>
>Date: Wed, 25 Jul 2012 12:56:12 +0200
>Subject: [PATCH] Fixing build issues
>
>---
> pino-0.3-fixbuild.patch |  121 +++++++++++++++++++++++++++++++++++++++++++++++
> pino.spec               |   13 +++--
> 2 files changed, 130 insertions(+), 4 deletions(-)
> create mode 100644 pino-0.3-fixbuild.patch
>
>diff --git a/pino-0.3-fixbuild.patch b/pino-0.3-fixbuild.patch
>new file mode 100644
>index 0000000..330f8f1
>--- /dev/null
>+++ b/pino-0.3-fixbuild.patch
>@@ -0,0 +1,121 @@
>+diff -rupN pino/CMakeLists.txt pino.new/CMakeLists.txt
>+--- pino/CMakeLists.txt	2011-07-11 11:23:53.000000000 +0200
>++++ pino.new/CMakeLists.txt	2012-07-25 12:30:18.079367041 +0200
>+@@ -51,6 +51,7 @@ find_package(PkgConfig)
>+ pkg_check_modules(GLIB REQUIRED "glib-2.0 >= 2.14.0")
>+ pkg_check_modules(GOBJECT REQUIRED "gobject-2.0 >= 2.14.0")
>+ pkg_check_modules(GTK+ REQUIRED "gtk+-2.0 >= 2.10.0")
>++pkg_check_modules(GTHREAD REQUIRED "gthread-2.0 >= 2.0")
>+ pkg_check_modules(GEE REQUIRED "gee-1.0 >= 0.5.0")
>+ pkg_check_modules(GIO REQUIRED "gio-2.0 >= 2.0")
>+ pkg_check_modules(LIBNOTIFY REQUIRED "libnotify")
>+@@ -123,6 +124,7 @@ add_definitions(
>+   ${GTKSPELL_CFLAGS}
>+   ${LIBINDICATE_CFLAGS}
>+   ${REST_CFLAGS}
>++  ${GTHREAD_CFLAGS}
>+   #${RESTEXTRAS_CFLAGS}
>+ )
>+ 
>+@@ -140,6 +142,8 @@ link_libraries(
>+   ${GTKSPELL_LIBRARIES}
>+   ${LIBINDICATE_LIBRARIES}
>+   ${REST_LIBRARIES}
>++  ${GTHREAD_LIBRARIES}
>++  "-lm"
>+   #${RESTEXTRAS_LIBRARIES}
>+ )
>+ 
>+diff -rupN pino/src/account_abstract.vala pino.new/src/account_abstract.vala
>+--- pino/src/account_abstract.vala	2011-07-11 11:23:53.000000000 +0200
>++++ pino.new/src/account_abstract.vala	2012-07-25 12:47:33.453617677 +0200
>+@@ -121,14 +121,14 @@ public abstract class AAccount : GLib.Ob
>+ 	/** Add new stream */
>+ 	public void add_stream(StreamEnum stream_type, bool emit_signal = false,
>+ 		HashMap<string, string>? props = null) {
>+-		
>+-		Type? stype = null;
>+-		stype = avaliable_streams().get(stream_type);//streams_types.get_type_by_string(state.stream_type);
>+-			
>+-		if(stype == null) {
>++
>++		//Type? stype = null;
>++		Type stype = avaliable_streams().get(stream_type);//streams_types.get_type_by_string(state.stream_type);
>++
>++		/*if(stype == null) {
>+ 			warning("Stream type is not supported");
>+ 			return;
>+-		}
>++		}*/
>+ 
>+ 		AStream stream = (AStream) GLib.Object.new(stype);
>+ 		stream.account = this;
>+@@ -310,7 +310,7 @@ public abstract class AAccount : GLib.Ob
>+ 	
>+ 	/** Show status context menu */
>+ 	public virtual void context_menu(AStream stream, Status status) {
>+-		Menu menu = new Menu();
>++		Gtk.Menu menu = new Gtk.Menu();
>+ 		debug("creating context menu");
>+ 		
>+ 		foreach(StatusMenuItems item in status_popup_items) {
>+diff -rupN pino/src/accounts_widget.vala pino.new/src/accounts_widget.vala
>+--- pino/src/accounts_widget.vala	2011-07-11 11:23:53.000000000 +0200
>++++ pino.new/src/accounts_widget.vala	2012-07-25 11:43:56.758682370 +0200
>+@@ -35,7 +35,7 @@ public class StreamIcon : EventBox, Redr
>+ 	
>+ 	private bool checked {get; set; default = false;}
>+ 	
>+-	public static enum State {
>++	public enum State {
>+ 		ACTIVE,
>+ 		ACTIVE_HOVERED,
>+ 		INACTIVE,
>+@@ -163,7 +163,7 @@ public class StreamIcon : EventBox, Redr
>+ 	}
>+ 	
>+ 	private bool context_menu(Gdk.EventButton event) {
>+-		Menu menu = new Menu();
>++		Gtk.Menu menu = new Gtk.Menu();
>+ 		
>+ 		foreach(MenuItems item in stream.popup_items) {
>+ 			MenuItems sitem = item;
>+@@ -553,9 +553,9 @@ public class AccountWidget : EventBox, R
>+ 	}
>+     
>+ 	private bool context_menu(Gdk.EventButton event) {
>+-		Menu menu = new Menu();
>++		Gtk.Menu menu = new Gtk.Menu();
>+ 		
>+-		Menu streams_menu = new Menu(); //for streams
>++		Gtk.Menu streams_menu = new Gtk.Menu(); //for streams
>+ 		
>+ 		foreach(StreamEnum stream in account.avaliable_streams().keys) {
>+ 			string label = streams_types.get(stream).name;
>+@@ -572,13 +572,13 @@ public class AccountWidget : EventBox, R
>+ 			streams_menu.append(menu_item);
>+ 		}
>+ 		
>+-		MenuItem streams_item = new MenuItem.with_label("Add stream");
>++		Gtk.MenuItem streams_item = new Gtk.MenuItem.with_label("Add stream");
>+ 		streams_item.set_submenu(streams_menu);
>+ 		menu.append(streams_item);
>+ 		
>+ 		foreach(MenuItems item in account.popup_items) {
>+ 			MenuItems aitem = item;
>+-			MenuItem? menu_item = StreamIcon.item2menu(item); //static method
>++			Gtk.MenuItem? menu_item = StreamIcon.item2menu(item); //static method
>+ 			
>+ 			menu_item.activate.connect(() => {
>+ 				accounts.actions_tracker(account, aitem);
>+diff -rupN pino/src/menu_indicator.vala pino.new/src/menu_indicator.vala
>+--- pino/src/menu_indicator.vala	2011-07-11 11:23:53.000000000 +0200
>++++ pino.new/src/menu_indicator.vala	2012-07-25 11:42:24.166714332 +0200
>+@@ -1,6 +1,6 @@
>+ using Gtk;
>+ 
>+-public class MenuIndicator : MenuItem {
>++public class MenuIndicator : Gtk.MenuItem {
>+ 	
>+ 	private Label tlabel;
>+ 	private Spinner spin;
>diff --git a/pino.spec b/pino.spec
>index 19e5da4..ca305c1 100644
>--- a/pino.spec
>+++ b/pino.spec
>@@ -3,7 +3,7 @@
> 
> Name:		pino
> Version:	0.3
>-Release:	0.7.%{?hgdate}hg%{?dist}
>+Release:	0.8.%{?hgdate}hg%{?dist}
> Summary:	A fast, easy and free Twitter and identi.ca client
> Group:		Applications/Internet
> License:	LGPLv3+
>@@ -19,10 +19,12 @@ Patch0:		pino-0.3-ambiguous.patch
> Patch1:		pino-0.3-void.patch
> # mark output parameter: http://bitbucket.org/troorl/pino3/issue/6/mark-output-parameter-in-visual_stylevala
> Patch2:		pino-0.3-out.patch
>+# Fix building
>+Patch3:		pino-0.3-fixbuild.patch
> BuildRequires:	cmake vala gettext desktop-file-utils
>-BuildRequires:	libgee-devel libnotify-devel libsoup-devel libxml2-devel
>+BuildRequires:	libgee06-devel libnotify-devel libsoup-devel libxml2-devel
> BuildRequires:	webkitgtk-devel unique-devel gtkspell-devel rest-devel
>-Requires:	hicolor-icon-theme
>+Requires:	hicolor-icon-theme libgee
> 
> %description
> Pino is Twitter and identi.ca client for Linux desktop. It's simple and fast. 
>@@ -30,7 +32,7 @@ Pino is written in Vala language and compiled to the native binary code.
> 
> %prep
> %setup -q -n pino3-%{hghash}
>-
>+%patch3 -p1
> 
> grep -q 'StartupNotify' %{name}.desktop || \
> 	echo 'StartupNotify=true' >> %{name}.desktop
>@@ -78,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_datadir}/%{name}
> 
> %changelog
>+* Wed Jul 25 2012 Patrick Uiterwijk <puiterwijk@gmail.com> - 0.3-0.8.20110711hg
>+- Fixing build issues
>+
> * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-0.7.20110711hg
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 715732: 506833 | 506834 | 506835 | 506836 | 506837 | 506838 | 600268