[GtkAda] Patched to adapt to Glib changes.
Björn Persson
rombobeorn at fedoraproject.org
Thu Jan 5 07:56:35 UTC 2012
commit 111ba63067189b010d058711010af13929a3ada7
Author: Björn Persson <bjorn at rombobjörn.se>
Date: Thu Jan 5 08:41:51 2012 +0100
Patched to adapt to Glib changes.
GtkAda-2.18.0-no_include_gmain.patch | 10 ++++++++++
GtkAda.spec | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/GtkAda-2.18.0-no_include_gmain.patch b/GtkAda-2.18.0-no_include_gmain.patch
new file mode 100644
index 0000000..ffb4334
--- /dev/null
+++ b/GtkAda-2.18.0-no_include_gmain.patch
@@ -0,0 +1,10 @@
+--- src/misc.c~ 2012-01-05 07:01:22.000000000 +0100
++++ src/misc.c 2012-01-05 07:01:22.000000000 +0100
+@@ -36,7 +36,6 @@
+
+ #include <glib.h>
+ #include <glib-object.h>
+-#include <glib/gmain.h>
+
+ #include <pango/pango.h>
+
diff --git a/GtkAda.spec b/GtkAda.spec
index 0d9ac10..8251170 100644
--- a/GtkAda.spec
+++ b/GtkAda.spec
@@ -1,6 +1,6 @@
Name: GtkAda
Version: 2.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Ada binding to GTK+
Summary(sv): Adabinding till GTK+
Group: System Environment/Libraries
@@ -37,6 +37,8 @@ Patch9: GtkAda-2.18.0-lgnomeada.patch
Patch10: GtkAda-2.18.0-ldflags.patch
# Hack to avoid conflicts where two project files claim the same source files:
Patch11: GtkAda-2.18.0-source_dirs.patch
+# "Only <glib.h> can be included directly.":
+Patch12: GtkAda-2.18.0-no_include_gmain.patch
BuildRequires: gcc-gnat
BuildRequires: gtk2-devel >= 2.21
BuildRequires: libgnome-devel
@@ -159,6 +161,7 @@ Paketet %{name}-doc innehåller dokumentationen till %{name}.
%patch9
%patch10
%patch11
+%patch12
find -name .cvsignore | xargs rm -fr
%build
@@ -238,6 +241,9 @@ cp features known-problems COPYING $RPM_BUILD_ROOT%{_docdir}/gtkada
%changelog
+* Thu Jan 05 2012 Björn Persson <bjorn at rombobjörn.se> - 2.18.0-2
+- Patched to adapt to Glib changes.
+
* Sun Aug 14 2011 Björn Persson <bjorn at rombobjörn.se> - 2.18.0-1
- Upgraded to 2.18.0.
- Moved the documentation to a directory that can remain constant across
More information about the scm-commits
mailing list