View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0003105 | DarkRadiant | Map Editing | public | 02.05.2012 01:11 | 27.08.2013 14:32 |
| Reporter | salamanderrake | Assigned To | greebo | ||
| Priority | normal | Severity | normal | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Platform | amd64 | OS | gentoo | OS Version | 10.0 |
| Product Version | 1.7.0 | ||||
| Target Version | 1.8.0 | Fixed in Version | 1.8.0 | ||
| Summary | 0003105: A patch for anyone building darkradiant on a system with glib-2.32 installed | ||||
| Description | glib complains that only glib.h is allowed to be included into project files. Aka. #include <glib.h> not #include <glib/*.h> | ||||
| Tags | No tags attached. | ||||
| Attached Files | darkradiant-glib_h-only.patch (3,180 bytes)
Index: plugins/vfspk3/Doom3FileSystem.cpp
===================================================================
--- plugins/vfspk3/Doom3FileSystem.cpp (revision 7108)
+++ plugins/vfspk3/Doom3FileSystem.cpp (working copy)
@@ -46,8 +46,12 @@
#include <stdio.h>
#include <stdlib.h>
+
+/*
#include <glib/gdir.h>
#include <glib/gstrfuncs.h>
+*/
+#include <glib.h>
#include "iradiant.h"
#include "idatastream.h"
Index: libs/os/dir.h
===================================================================
--- libs/os/dir.h (revision 7108)
+++ libs/os/dir.h (working copy)
@@ -25,7 +25,8 @@
/// \file
/// \brief OS directory-listing object.
-#include <glib/gdir.h>
+//#include <glib/gdir.h>
+#include <glib.h>
#include <string>
#include <stdexcept>
Index: libs/gtkutil/IConv.h
===================================================================
--- libs/gtkutil/IConv.h (revision 7108)
+++ libs/gtkutil/IConv.h (working copy)
@@ -1,11 +1,14 @@
#ifndef _GTKUTIL_ICONV_H
#define _GTKUTIL_ICONV_H
+/*
#include <glib/gconvert.h>
#include <glib/gmessages.h>
#include <glib/gunicode.h>
#include <glib/gmem.h>
#include <string>
+*/
+#include <glib.h>
#include <cassert>
Index: libs/gtkutil/DeferredMotionDelta.h
===================================================================
--- libs/gtkutil/DeferredMotionDelta.h (revision 7108)
+++ libs/gtkutil/DeferredMotionDelta.h (working copy)
@@ -1,7 +1,9 @@
#pragma once
#include <sigc++/connection.h>
-#include <glib/gmain.h>
+
+//#include <glib/gmain.h>
+#include <glib.h>
#include <gdk/gdkevents.h>
#include <boost/function.hpp>
Index: libs/gtkutil/event/SingleIdleCallback.h
===================================================================
--- libs/gtkutil/event/SingleIdleCallback.h (revision 7108)
+++ libs/gtkutil/event/SingleIdleCallback.h (working copy)
@@ -1,6 +1,7 @@
#pragma once
-#include <glib/gmain.h>
+//#include <glib/gmain.h>
+#include <glib.h>
#include <iostream>
Index: radiant/log/GtkLogRedirector.h
===================================================================
--- radiant/log/GtkLogRedirector.h (revision 7108)
+++ radiant/log/GtkLogRedirector.h (working copy)
@@ -4,8 +4,12 @@
#include "LogStream.h"
#include <boost/shared_ptr.hpp>
#include <map>
+
+/*
#include <glib/gtypes.h>
#include <glib/gmessages.h>
+*/
+#include <glib.h>
namespace applog {
Index: radiant/modulesystem/ApplicationContextImpl.cpp
===================================================================
--- radiant/modulesystem/ApplicationContextImpl.cpp (revision 7108)
+++ radiant/modulesystem/ApplicationContextImpl.cpp (working copy)
@@ -70,7 +70,8 @@
#include <pwd.h>
#include <unistd.h>
-#include <glib/gutils.h>
+//#include <glib/gutils.h>
+#include <glib.h>
const char* LINK_NAME =
#if defined (__linux__)
Index: radiant/patch/PatchBezier.h
===================================================================
--- radiant/patch/PatchBezier.h (revision 7108)
+++ radiant/patch/PatchBezier.h (working copy)
@@ -1,7 +1,9 @@
#pragma once
#include "math/Vector3.h"
-#include <glib/gslist.h>
+
+//#include <glib/gslist.h>
+#include <glib.h>
#include <limits>
#include <vector>
| ||||
 |
Fixed in git. |
 |
So the official repo is git and not svn? the website gave me the impression that svn was the only maintained repo. |
|
|
The repository has been very recently migrated from sourceforge's SVN to github. Although some parts will remain in SVN (the winbuild/w32deps/w64deps trees), git will be the primary source control system. There will be an announcement on the website soon I guess. |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 02.05.2012 01:11 | salamanderrake | New Issue | |
| 02.05.2012 01:11 | salamanderrake | File Added: darkradiant-glib_h-only.patch | |
| 03.05.2012 10:34 | greebo | Assigned To | => greebo |
| 03.05.2012 10:34 | greebo | Status | new => assigned |
| 03.05.2012 10:34 | greebo | Note Added: 0004519 | |
| 03.05.2012 10:34 | greebo | Status | assigned => resolved |
| 03.05.2012 10:34 | greebo | Fixed in Version | => 1.8.0 |
| 03.05.2012 10:34 | greebo | Resolution | open => fixed |
| 03.05.2012 10:34 | greebo | Product Version | => 1.7.0 |
| 03.05.2012 10:34 | greebo | Target Version | => 1.8.0 |
| 03.05.2012 17:05 | salamanderrake | Note Added: 0004520 | |
| 04.05.2012 05:05 | greebo | Note Added: 0004529 | |
| 27.08.2013 14:32 | greebo | Status | resolved => closed |
