[lordsawar] g_thread_init is no longer needed
Bruno Wolff III
bruno at fedoraproject.org
Sat Nov 5 21:56:40 UTC 2011
commit 5f7796b6351329ec916b374694ba5e7ab4ca9d26
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Nov 5 16:54:41 2011 -0500
g_thread_init is no longer needed
Since gobject-2.0.pc no longer requires gthread-2.0.pc we either needed
to stop calling g_thread_init or use gthread-2.0.pc explicitly.
Dropping it seemed to be the better way to go.
lordsawar-noginit.patch | 10 ++++++++++
lordsawar.spec | 3 +++
2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/lordsawar-noginit.patch b/lordsawar-noginit.patch
new file mode 100644
index 0000000..8bb97b6
--- /dev/null
+++ b/lordsawar-noginit.patch
@@ -0,0 +1,10 @@
+--- src/gui/main.cpp.orig 2011-11-05 16:51:47.456285385 -0500
++++ src/gui/main.cpp 2011-11-05 16:52:31.514885005 -0500
+@@ -61,7 +61,6 @@
+ random_number_seed = 0;
+ port = 0;
+
+- Glib::thread_init();
+ try
+ {
+ impl->gtk_main = new Gtk::Main(argc, argv);
diff --git a/lordsawar.spec b/lordsawar.spec
index e322597..4985150 100644
--- a/lordsawar.spec
+++ b/lordsawar.spec
@@ -13,6 +13,7 @@ License: GPLv2+ and GFDL
URL: http://savannah.nongnu.org/projects/%{name}
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{rel_version}.tar.gz
Patch1: lordsawar-local-manual.patch
+Patch2: lordsawar-noginit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libglademm24-devel gtkmm24-devel gettext desktop-file-utils
@@ -30,6 +31,7 @@ LordsAWar! is a turn-based strategy game set in a fantasy setting.
%prep
%setup -qn %{name}-%{rel_version}
%patch1
+%patch2
sed -i.orig -e "s/Comment=Play a clone of Warlords II/Comment=Play a turn-based strategy game/" dat/lordsawar.desktop.in.in
@@ -83,6 +85,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sat Nov 05 2011 Bruno Wolff III <bruno at wolff.to> 0.2.0-4
- Rebuild for libpng 1.5
+- g_thread_init is no longer needed
* Sat Mar 19 2011 Bruno Wolff III <bruno at wolff.to> 0.2.0-3
- All GDFL license versions share the same tag
More information about the scm-commits
mailing list