File gnome-builder-buildfixes.patch of Package gnome-builder

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-builder-buildfixes.patch of Package gnome-builder (Revision aad074e1e851520770d841d9f239300a)

Currently displaying revision aad074e1e851520770d841d9f239300a , Show latest

commit bfa98f7997f2526a127c77d9099b18378a08c58b
Author: Christian Hergert <christian@hergert.me>
Date:   Tue Mar 24 02:44:59 2015 -0700

clang: add debugging for tracing cflags

diff --git a/libide/clang/ide-clang-service.c b/libide/clang/ide-clang-service.c
index e291d86..f840169 100644
--- a/libide/clang/ide-clang-service.c
+++ b/libide/clang/ide-clang-service.c
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define G_LOG_DOMAIN "gb-clang-service"
+
 #include <clang-c/Index.h>
 #include <glib/gi18n.h>
 
@@ -23,6 +25,7 @@
 #include "ide-clang-private.h"
 #include "ide-clang-service.h"
 #include "ide-context.h"
+#include "ide-debug.h"
 #include "ide-file.h"
 #include "ide-unsaved-file.h"
 #include "ide-unsaved-files.h"
@@ -194,6 +197,16 @@ ide_clang_service__get_build_flags_cb (GObject      *object,
 
   request->command_line_args = argv;
 
+#ifndef IDE_DISABLE_TRACE
+  {
+    gchar *cflags;
+
+    cflags = g_strjoinv (" ", argv);
+    IDE_TRACE_MSG ("CFLAGS = %s", cflags);
+    g_free (cflags);
+  }
+#endif
+
   g_task_run_in_thread (task, ide_clang_service_parse_worker);
 }

commit 6f6af4c61e52732e1e6aa0af3422db8af1e9ddea
Author: Garrett Regier <garrettregier@gmail.com>
Date:   Tue Mar 24 02:13:01 2015 -0700

build: fix more build warnings

diff --git a/libide/ide-context.c b/libide/ide-context.c
index 2709b6a..56e18a2 100644
--- a/libide/ide-context.c
+++ b/libide/ide-context.c
@@ -707,10 +707,10 @@ ide_context_class_init (IdeContextClass *klass)
 static void
 ide_context_init (IdeContext *self)
 {
-  IDE_ENTRY;
-
   g_autofree gchar *scriptsdir = NULL;
 
+  IDE_ENTRY;
+
   self->root_build_dir = g_build_filename (g_get_user_cache_dir (),
                                            ide_get_program_name (),
                                            "builds",
diff --git a/libide/ide-ref-ptr.c b/libide/ide-ref-ptr.c
index 8633060..099e7b2 100644
--- a/libide/ide-ref-ptr.c
+++ b/libide/ide-ref-ptr.c
@@ -55,8 +55,8 @@ ide_ref_ptr_ref (IdeRefPtr *self)
 void
 ide_ref_ptr_unref (IdeRefPtr *self)
 {
-  g_return_val_if_fail (self, NULL);
-  g_return_val_if_fail (self->ref_count > 0, NULL);
+  g_return_if_fail (self);
+  g_return_if_fail (self->ref_count > 0);
 
   if (g_atomic_int_dec_and_test (&self->ref_count))
     {
diff --git a/libide/modelines/modeline-parser.c b/libide/modelines/modeline-parser.c
index ef7f098..ab2ad92 100644
--- a/libide/modelines/modeline-parser.c
+++ b/libide/modelines/modeline-parser.c
@@ -676,6 +676,7 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 	GtkTextIter iter, liter;
 	gint line_count;
 	GSettings *settings;
+	ModelineOptions *previous;
 
 	options.language_id = NULL;
 	options.set = MODELINE_SET_NONE;
@@ -771,8 +772,8 @@ modeline_parser_apply_modeline (GtkSourceView *view)
 		}
 	}
 
-	ModelineOptions *previous = g_object_get_data (G_OBJECT (buffer),
-	                                               MODELINE_OPTIONS_DATA_KEY);
+	previous = g_object_get_data (G_OBJECT (buffer),
+	                              MODELINE_OPTIONS_DATA_KEY);
 
 	settings = g_settings_new ("org.gnome.gedit.preferences.editor");

commit dd924fab954cddcfa8403c36833554e5b41721c2
Author: Christian Hergert <christian@hergert.me>
Date:   Tue Mar 24 02:06:50 2015 -0700

build: fix some build warnings

diff --git a/libide/devhelp/ide-devhelp-search-provider.c b/libide/devhelp/ide-devhelp-search-provider.c
index 3a0b466..b11cea1 100644
--- a/libide/devhelp/ide-devhelp-search-provider.c
+++ b/libide/devhelp/ide-devhelp-search-provider.c
@@ -53,7 +53,7 @@ ide_devhelp_search_provider_populate (IdeSearchProvider *provider,
   IdeContext *idecontext;
   GtkTreeIter iter;
   gboolean valid;
-  gint count = 0;;
+  gint count = 0;
   gint total;
 
   g_assert (IDE_IS_DEVHELP_SEARCH_PROVIDER (self));
diff --git a/libide/ide-buffer-manager.c b/libide/ide-buffer-manager.c
index ba67832..baa9679 100644
--- a/libide/ide-buffer-manager.c
+++ b/libide/ide-buffer-manager.c
@@ -1453,7 +1453,7 @@ ide_buffer_manager_create_buffer (IdeBufferManager *self)
   GFile *workdir;
   guint doc_seq;
 
-  g_return_if_fail (IDE_IS_BUFFER_MANAGER (self));
+  g_return_val_if_fail (IDE_IS_BUFFER_MANAGER (self), NULL);
 
   context = ide_object_get_context (IDE_OBJECT (self));
   vcs = ide_context_get_vcs (context);

Places

File gnome-builder-buildfixes.patch of Package gnome-builder (Revision aad074e1e851520770d841d9f239300a)

Places