rpms/anjuta/F-11 anjuta-2.26.2.2-class-gen-templates.patch, NONE, 1.1 anjuta-2.26.2.2-reduce-wakeups.patch, NONE, 1.1 anjuta-2.26.2.2-wxwidgets-project.patch, NONE, 1.1 anjuta.spec, 1.75, 1.76

Debarshi Ray rishi at fedoraproject.org
Tue Jul 14 06:45:38 UTC 2009


Author: rishi

Update of /cvs/pkgs/rpms/anjuta/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29349

Modified Files:
	anjuta.spec 
Added Files:
	anjuta-2.26.2.2-class-gen-templates.patch 
	anjuta-2.26.2.2-reduce-wakeups.patch 
	anjuta-2.26.2.2-wxwidgets-project.patch 
Log Message:
* Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.2.2-4
- Backported fix to prevent wxWidget projects from depending on libglade and
  Gtk+. (GNOME Bugzilla #581074)
- Backported fix to use g_timeout_add_seconds to reduce wakeups. (GNOME
  Bugzilla #582710)


anjuta-2.26.2.2-class-gen-templates.patch:

--- NEW FILE anjuta-2.26.2.2-class-gen-templates.patch ---
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "plugin.c" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "plugin.c" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "plugin.c"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #include <config.h>
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "plugin.h" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "plugin.h" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "plugin.h"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #ifndef _[+NameCUpper+]_H_
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin-vala/src/config.vapi anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin-vala/src/config.vapi
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin-vala/src/config.vapi	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin-vala/src/config.vapi	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "plugin.h" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "plugin.h" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "plugin.h"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin-vala/src/plugin.vala anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin-vala/src/plugin.vala
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/anjuta-plugin-vala/src/plugin.vala	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/anjuta-plugin-vala/src/plugin.vala	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "plugin.c" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "plugin.c" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "plugin.c"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 using GLib;
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/cpp/src/main.cc anjuta-2.26.2.2/plugins/project-wizard/templates/cpp/src/main.cc
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/cpp/src/main.cc	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/cpp/src/main.cc	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.cc" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "main.cc" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "main.cc"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #include <iostream>
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gnome-applet/src/main.c anjuta-2.26.2.2/plugins/project-wizard/templates/gnome-applet/src/main.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gnome-applet/src/main.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/gnome-applet/src/main.c	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.c" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "main.c" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "main.c"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #ifdef HAVE_CONFIG_H
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtk/src/callbacks.c anjuta-2.26.2.2/plugins/project-wizard/templates/gtk/src/callbacks.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtk/src/callbacks.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/gtk/src/callbacks.c	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "callbacks.c" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "callbacks.c" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "callbacks.c"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #ifdef HAVE_CONFIG_H
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtk/src/callbacks.h anjuta-2.26.2.2/plugins/project-wizard/templates/gtk/src/callbacks.h
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtk/src/callbacks.h	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/gtk/src/callbacks.h	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "callbacks.h" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "callbacks.h" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "callbacks.h"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #include <gtk/gtk.h>
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtk/src/main.c anjuta-2.26.2.2/plugins/project-wizard/templates/gtk/src/main.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtk/src/main.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/gtk/src/main.c	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.c" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "main.c" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "main.c"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #include <sys/types.h>
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtkmm/src/main.cc anjuta-2.26.2.2/plugins/project-wizard/templates/gtkmm/src/main.cc
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/gtkmm/src/main.cc	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/gtkmm/src/main.cc	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.cc" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "main.cc" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "main.cc"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #include <libglademm/xml.h>
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/java/src/main.java anjuta-2.26.2.2/plugins/project-wizard/templates/java/src/main.java
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/java/src/main.java	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/java/src/main.java	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.java" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "main.java" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "main.java"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 class [+MainClass+] {
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/python/src/main.py anjuta-2.26.2.2/plugins/project-wizard/templates/python/src/main.py
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/python/src/main.py	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/python/src/main.py	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
 # Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
 # 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.py" (get "Author") "# ")+]
-[+ == "LGPL" +][+(lgpl "main.py" (get "Author") "# ")+]
-[+ == "GPL"  +][+(gpl  "main.py"                "# ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") "# ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "# ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                "# ")+]
 [+ESAC+]
 
 print "Hello World!"
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/sdl/src/main.c anjuta-2.26.2.2/plugins/project-wizard/templates/sdl/src/main.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/sdl/src/main.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/sdl/src/main.c	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  *
 [+CASE (get "License") +]
-[+ == "BSD" +][+(bsd "main.c" (get "Author") "\t")+]
-[+ == "LGPL" +][+(lgpl "main.c" (get "Author") "\t")+]
-[+ == "GPL" +][+(gpl "main.c"  "\t")+]
+[+ == "BSD" +][+(bsd (get "Name") (get "Author") "\t")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "\t")+]
+[+ == "GPL" +][+(gpl (get "Name")  "\t")+]
 [+ESAC+] */
 
 /*Program closes with a mouse click or keypress */
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/terminal/src/main.c anjuta-2.26.2.2/plugins/project-wizard/templates/terminal/src/main.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/terminal/src/main.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/terminal/src/main.c	2009-07-14 10:45:51.000000000 +0530
@@ -5,9 +5,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  "main.c" (get "Author") " * ")+]
-[+ == "LGPL" +][+(lgpl "main.c" (get "Author") " * ")+]
-[+ == "GPL"  +][+(gpl  "main.c"                " * ")+]
+[+ == "BSD"  +][+(bsd  (get "Name") (get "Author") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "Name")                " * ")+]
 [+ESAC+] */
 
 #include <stdio.h>
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/wxwin/src/main.cc anjuta-2.26.2.2/plugins/project-wizard/templates/wxwin/src/main.cc
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/wxwin/src/main.cc	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/wxwin/src/main.cc	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  *
 [+CASE (get "License") +]
-[+ == "BSD" +][+(bsd "main.cc" (get "Author") "\t")+]
-[+ == "LGPL" +][+(lgpl "main.cc" (get "Author") "\t")+]
-[+ == "GPL" +][+(gpl "main.cc"  "\t")+]
+[+ == "BSD" +][+(bsd (get "Name") (get "Author") "\t")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "\t")+]
+[+ == "GPL" +][+(gpl (get "Name")  "\t")+]
 [+ESAC+] */
 
 #ifdef HAVE_CONFIG_H
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib/src/main.c anjuta-2.26.2.2/plugins/project-wizard/templates/xlib/src/main.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib/src/main.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/xlib/src/main.c	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  *
 [+CASE (get "License") +]
-[+ == "BSD" +][+(bsd "main.c" (get "Author") "\t")+]
-[+ == "LGPL" +][+(lgpl "main.c" (get "Author") "\t")+]
-[+ == "GPL" +][+(gpl "main.c"  "\t")+]
+[+ == "BSD" +][+(bsd (get "Name") (get "Author") "\t")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "\t")+]
+[+ == "GPL" +][+(gpl (get "Name")  "\t")+]
 [+ESAC+] */
 
 /*Program closes with a mouse click or keypress */
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib-dock/src/main.c anjuta-2.26.2.2/plugins/project-wizard/templates/xlib-dock/src/main.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib-dock/src/main.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/xlib-dock/src/main.c	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  *
 [+CASE (get "License") +]
-[+ == "BSD" +][+(bsd "main.c" (get "Author") "\t")+]
-[+ == "LGPL" +][+(lgpl "main.c" (get "Author") "\t")+]
-[+ == "GPL" +][+(gpl "main.c"  "\t")+]
+[+ == "BSD" +][+(bsd (get "Name") (get "Author") "\t")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "\t")+]
+[+ == "GPL" +][+(gpl (get "Name")  "\t")+]
 [+ESAC+] */
 
 #ifdef HAVE_CONFIG_H
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c anjuta-2.26.2.2/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  *
 [+CASE (get "License") +]
-[+ == "BSD" +][+(bsd "wmgeneral.c" (get "Author") "\t")+]
-[+ == "LGPL" +][+(lgpl "wmgeneral.c" (get "Author") "\t")+]
-[+ == "GPL" +][+(gpl "wmgeneral.c"  "\t")+]
+[+ == "BSD" +][+(bsd (get "Name") (get "Author") "\t")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "\t")+]
+[+ == "GPL" +][+(gpl (get "Name")  "\t")+]
 [+ESAC+] */
 
 /*	wmgeneral was taken from wmppp.
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h anjuta-2.26.2.2/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h	2009-07-14 10:45:51.000000000 +0530
@@ -4,9 +4,9 @@
  * Copyright (C) [+Author+] [+(shell "date +%Y")+] <[+Email+]>
  *
 [+CASE (get "License") +]
-[+ == "BSD" +][+(bsd "wmgeneral.h" (get "Author") "\t")+]
-[+ == "LGPL" +][+(lgpl "wmgeneral.h" (get "Author") "\t")+]
-[+ == "GPL" +][+(gpl "wmgeneral.h"  "\t")+]
+[+ == "BSD" +][+(bsd (get "Name") (get "Author") "\t")+]
+[+ == "LGPL" +][+(lgpl (get "Name") (get "Author") "\t")+]
+[+ == "GPL" +][+(gpl (get "Name")  "\t")+]
 [+ESAC+] */
 
 #ifndef WMGENERAL_H_INCLUDED

anjuta-2.26.2.2-reduce-wakeups.patch:

--- NEW FILE anjuta-2.26.2.2-reduce-wakeups.patch ---
diff -urNp anjuta-2.26.2.2.orig/plugins/gbf-am/test.c anjuta-2.26.2.2/plugins/gbf-am/test.c
--- anjuta-2.26.2.2.orig/plugins/gbf-am/test.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/gbf-am/test.c	2009-07-14 11:21:01.000000000 +0530
@@ -209,7 +209,7 @@ main (int argc, char *argv[])
 		g_free (file);
 	}
 
-	g_timeout_add (3000, (GSourceFunc) gtk_main_quit, NULL);
+	g_timeout_add_seconds (3, (GSourceFunc) gtk_main_quit, NULL);
 	gtk_main ();
 	
   out:
diff -urNp anjuta-2.26.2.2.orig/plugins/gtodo/interface.c anjuta-2.26.2.2/plugins/gtodo/interface.c
--- anjuta-2.26.2.2.orig/plugins/gtodo/interface.c	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/gtodo/interface.c	2009-07-14 11:21:01.000000000 +0530
@@ -104,7 +104,7 @@ void gtodo_update_settings()
 	}
 	
 	gtodo_client_set_changed_callback(cl,(void *)backend_changed ,NULL);
-	g_timeout_add(300000, (GSourceFunc)check_for_notification_event, NULL);
+	g_timeout_add_seconds (300, (GSourceFunc)check_for_notification_event, NULL);
 
 	check_for_notification_event();
 }

anjuta-2.26.2.2-wxwidgets-project.patch:

--- NEW FILE anjuta-2.26.2.2-wxwidgets-project.patch ---
diff -urNp anjuta-2.26.2.2.orig/plugins/project-wizard/templates/wxwin.wiz anjuta-2.26.2.2/plugins/project-wizard/templates/wxwin.wiz
--- anjuta-2.26.2.2.orig/plugins/project-wizard/templates/wxwin.wiz	2009-07-14 09:43:06.000000000 +0530
+++ anjuta-2.26.2.2/plugins/project-wizard/templates/wxwin.wiz	2009-07-14 11:24:53.000000000 +0530
@@ -21,8 +21,6 @@
 	<property type="hidden" name="NameCUpper" default="[+(string->c-name! (string-substitute (string-upcase (get "Name")) " " "_"))+]"/>
 	<property type="hidden" name="NameCLower" default="[+(string->c-name! (string-substitute (string-downcase (get "Name")) " " "_"))+]"/>
 	<property type="hidden" name="NameHLower" default="[+(string-substitute (string->c-name! (string-downcase (get "Name"))) " " "-")+]"/>
-	<property type="hidden" name="HavePackage" default="1"/>
-	<property type="hidden" name="PackageModule1" default="gtk+-2.0 libglade-2.0"/>
 	<property type="directory" name="Destination" _label="Destination:" _description="" default="[+AnjutaProjectDirectory+]/[+(string-downcase (get "Name"))+]" mandatory="yes" exist="no" summary="yes"/>
 	<property type="list" name="License" _label="License" _description="Select code license" default="GPL" editable="no">
 		<item name="GPL" _label="General Public License (GPL)"/>


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-11/anjuta.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- anjuta.spec	14 Jul 2009 04:37:11 -0000	1.75
+++ anjuta.spec	14 Jul 2009 06:45:38 -0000	1.76
@@ -2,14 +2,20 @@ Summary:	A GNOME development IDE for C/C
 Name:		anjuta
 Epoch:		1
 Version:	2.26.2.2
-Release:	2%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/%{name}-%{version}.tar.gz
 
+# http://bugzilla.gnome.org/575147
+Patch0:		%{name}-%{version}-class-gen-templates.patch
+# http://bugzilla.gnome.org/581074
+Patch1:		%{name}-%{version}-wxwidgets-project.patch
+# http://bugzilla.gnome.org/582710
+Patch2:		%{name}-%{version}-reduce-wakeups.patch
 # http://bugzilla.gnome.org/588506
-Patch0:		%{name}-%{version}-docdir.patch
+Patch3:		%{name}-%{version}-docdir.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -94,6 +100,9 @@ Documentation for Anjuta DevStudio provi
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # Filter unwanted Provides.
 cat << \EOF > %{name}-prov
@@ -328,6 +337,16 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.2.2-4
+- Backported fix to prevent wxWidget projects from depending on libglade and
+  Gtk+. (GNOME Bugzilla #581074)
+- Backported fix to use g_timeout_add_seconds to reduce wakeups. (GNOME
+  Bugzilla #582710)
+
+* Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.2.2-3
+- Added patch against class generator plugin to fix wrong copyright and
+  license notices. (GNOME Bugzilla #575147)
+
 * Tue Jul 14 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.2.2-2
 - Fixed the value of PACKAGE_DOC_DIR. (GNOME Bugzilla #588506)
 
@@ -349,6 +368,9 @@ scrollkeeper-update -q || :
   * Tools plugin:
     + Handle patch files with whitespaces in their names. (GNOME Bugzilla
       #580013)
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.2.2.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.2.1.news
+  * http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.26/anjuta-2.26.2.0.news
 - Explicitly set docdir to /usr/share/doc/anjuta-2.26.2.2.
 
 * Wed Apr 15 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.26.1.0-1




More information about the fedora-extras-commits mailing list