[gnote] Add patches from Petr Machata to fix compilation
Bastien Nocera
hadess at fedoraproject.org
Sat Feb 5 00:05:47 UTC 2011
commit cdeed55600b7d5a0435591113ddfe5053da26be5
Author: Bastien Nocera <hadess at hadess.net>
Date: Sat Feb 5 00:05:41 2011 +0000
Add patches from Petr Machata to fix compilation
.gitignore | 1 -
gnote-0.7.3-boost-filesystem.patch | 14 ++++
gnote-0.7.3-signal.patch | 121 ++++++++++++++++++++++++++++++++++++
gnote.spec | 11 +++-
4 files changed, 143 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d564c88..5f4c802 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
gnote-0.7.2.tar.bz2
/gnote-0.7.3.tar.bz2
-/instance-save-addin-prefs.patch
diff --git a/gnote-0.7.3-boost-filesystem.patch b/gnote-0.7.3-boost-filesystem.patch
new file mode 100644
index 0000000..9d428f3
--- /dev/null
+++ b/gnote-0.7.3-boost-filesystem.patch
@@ -0,0 +1,14 @@
+diff -up gnote-0.7.3/configure\~ gnote-0.7.3/configure
+--- gnote-0.7.3/configure~ 2010-11-04 14:20:08.000000000 +0100
++++ gnote-0.7.3/configure 2011-02-04 23:54:01.000000000 +0100
+@@ -16394,7 +16394,7 @@ rm -f core conftest.err conftest_ipa8_co
+ LDFLAGS=$boost_save_LDFLAGS
+ LIBS=$boost_save_LIBS
+ if test x"$boost_cv_lib_system" = xyes; then
+- boost_cv_lib_system_LDFLAGS="-L$boost_ldpath -R$boost_ldpath"
++ boost_cv_lib_system_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
+ break 6
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+
+Diff finished. Fri Feb 4 23:54:06 2011
diff --git a/gnote-0.7.3-signal.patch b/gnote-0.7.3-signal.patch
new file mode 100644
index 0000000..6468e7f
--- /dev/null
+++ b/gnote-0.7.3-signal.patch
@@ -0,0 +1,121 @@
+diff -urp gnote-0.7.3/src/addinmanager.hpp gnote-0.7.3-pm/src/addinmanager.hpp
+--- gnote-0.7.3/src/addinmanager.hpp 2011-02-05 00:01:56.000000000 +0100
++++ gnote-0.7.3-pm/src/addinmanager.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <map>
+ #include <string>
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+
+ #include "sharp/modulemanager.hpp"
+diff -urp gnote-0.7.3/src/notebooks/notebookmanager.hpp gnote-0.7.3-pm/src/notebooks/notebookmanager.hpp
+--- gnote-0.7.3/src/notebooks/notebookmanager.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/notebooks/notebookmanager.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -23,6 +23,7 @@
+ #ifndef _NOTEBOOK_MANAGER_HPP__
+ #define _NOTEBOOK_MANAGER_HPP__
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+ #include <gtkmm/liststore.h>
+ #include <gtkmm/treemodel.h>
+diff -urp gnote-0.7.3/src/note.hpp gnote-0.7.3-pm/src/note.hpp
+--- gnote-0.7.3/src/note.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/note.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -30,6 +30,7 @@
+
+ #include <libxml/tree.h>
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+ #include <gtkmm/textbuffer.h>
+
+diff -urp gnote-0.7.3/src/notemanager.hpp gnote-0.7.3-pm/src/notemanager.hpp
+--- gnote-0.7.3/src/notemanager.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/notemanager.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -28,6 +28,7 @@
+
+ #include <gconf/gconf.h>
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+
+ #include "preferences.hpp"
+diff -urp gnote-0.7.3/src/notetag.hpp gnote-0.7.3-pm/src/notetag.hpp
+--- gnote-0.7.3/src/notetag.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/notetag.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -24,6 +24,7 @@
+
+ #include <string>
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+ #include <glibmm/refptr.h>
+ #include <gtkmm/textbuffer.h>
+diff -urp gnote-0.7.3/src/preferences.hpp gnote-0.7.3-pm/src/preferences.hpp
+--- gnote-0.7.3/src/preferences.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/preferences.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -25,6 +25,7 @@
+
+ #include <string>
+ #include <gconf/gconf-client.h>
++#include <cstddef>
+ #include <sigc++/signal.h>
+
+ #include "base/singleton.hpp"
+diff -urp gnote-0.7.3/src/prefskeybinder.hpp gnote-0.7.3-pm/src/prefskeybinder.hpp
+--- gnote-0.7.3/src/prefskeybinder.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/prefskeybinder.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -23,6 +23,7 @@
+ #define _PREFSKEYBINDER_HPP_
+
+ #include <string>
++#include <cstddef>
+ #include <sigc++/signal.h>
+ #include <sigc++/slot.h>
+
+diff -urp gnote-0.7.3/src/tagmanager.hpp gnote-0.7.3-pm/src/tagmanager.hpp
+--- gnote-0.7.3/src/tagmanager.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/tagmanager.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -24,6 +24,7 @@
+ #define __TAG_MANAGER_HPP_
+
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+
+ #include <glibmm/thread.h>
+diff -urp gnote-0.7.3/src/undo.hpp gnote-0.7.3-pm/src/undo.hpp
+--- gnote-0.7.3/src/undo.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/undo.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -28,6 +28,7 @@
+
+ #include <boost/noncopyable.hpp>
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+ #include <gtkmm/textbuffer.h>
+ #include <gtkmm/texttag.h>
+diff -urp gnote-0.7.3/src/utils.hpp gnote-0.7.3-pm/src/utils.hpp
+--- gnote-0.7.3/src/utils.hpp 2010-09-26 10:44:19.000000000 +0200
++++ gnote-0.7.3-pm/src/utils.hpp 2011-02-05 00:11:50.000000000 +0100
+@@ -22,6 +22,7 @@
+ #ifndef _GNOTE_UTILS_HPP__
+ #define _GNOTE_UTILS_HPP__
+
++#include <cstddef>
+ #include <sigc++/signal.h>
+
+ #include <gdkmm/pixbuf.h>
+diff -urp gnote-0.7.3/src/noteaddin.hpp gnote-0.7.3-pm/src/noteaddin.hpp
+--- gnote-0.7.3/src/noteaddin.hpp 2011-02-05 00:19:37.000000000 +0100
++++ gnote-0.7.3-pm/src/noteaddin.hpp 2011-02-05 00:18:37.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <list>
+ #include <map>
+
++#include <cstddef>
+ #include <sigc++/connection.h>
+
+ #include <gtkmm/menuitem.h>
diff --git a/gnote.spec b/gnote.spec
index c91ebec..de1dcc3 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -7,6 +7,9 @@ License: GPLv3+
URL: http://live.gnome.org/Gnote
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnote/0.7/%{name}-%{version}.tar.bz2
Patch0: instance-save-addin-prefs.patch
+# http://lists.fedoraproject.org/pipermail/devel/2011-February/148377.html
+Patch1: gnote-0.7.3-boost-filesystem.patch
+Patch2: gnote-0.7.3-signal.patch
BuildRequires: gtkmm24-devel libxml2-devel GConf2-devel intltool
BuildRequires: boost-devel libuuid-devel dbus-c++-devel
@@ -27,9 +30,12 @@ and consumes fewer resources.
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
+export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
%configure --disable-schemas-install --disable-static --with-gnu-ld --enable-dbus --disable-applet
V=1 make %{?_smp_mflags}
@@ -81,7 +87,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-,root,root,-)
%doc COPYING README TODO NEWS AUTHORS
%{_bindir}/gnote
-%{_prefix}/libexec/gnote-applet
%{_mandir}/man1/gnote.1.gz
%{_datadir}/applications/gnote.desktop
%{_datadir}/gnote/
@@ -91,13 +96,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gnome/help/gnote/
%{_datadir}/omf/gnote/
%{_prefix}/%{_lib}/gnote/
-%{_prefix}/%{_lib}/bonobo/servers/GNOME_GnoteApplet.server
%{_datadir}/dbus-1/services/org.gnome.Gnote.service
%changelog
* Thu Feb 03 2011 Bastien Nocera <bnocera at redhat.com> 0.7.3-5
- Disable panel applet
- Rebuild against newer GTK+
+- Add patch from Petr Machata <pmachata at redhat.com> to fix the build
* Fri Dec 17 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.7.3-4
- Add the patch
More information about the scm-commits
mailing list