Portage of oregano to gtk 3.0 & goocanvas-2.0.1

ChangeLog

@@ -1,3 +1,7 @@
+Sat, 10 Mar 2012 Marc Lorber <Lorber.Marc@wanadoo.fr>
+	* TAF 0.80
+	* Portage of oregano under gtk-3.0 & goocanvas
+
 Fri, 18 Jun 2010 Marc Lorber <Lorber.Marc@wanadoo.fr>
 	* TAG 0.73
 	* Add option-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
@@ -13,6 +17,8 @@ Sun, 9 May 2010 Marc Lorber  <Lorber.Marc@wanadoo.fr>
 
 	* Removal of libglade and replacement by gtk_builder
 
+	* Update the files header
+
 	* Prepare switch to gnome 3.0
 
 Sun, 17 Jan 2010 Marc Lorber <Lorber.Marc@wanadoo.fr>

INSTALL

@@ -38,9 +38,10 @@ be considered for the next release.  If you are using the cache, and at
 some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-The file `configure.in' is used to create `configure' by a program called 
-`autoconf'.  You need `configure.in' if you want to change it or regenerate 
-`configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 

Makefile.am

@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = po src data help
 
 oreganodocdir = $(datadir)/doc/oregano

README

@@ -8,10 +8,9 @@ Spice, or GNUcap or the new generation ngspice.
 oregano is licensed under the terms of the GNU GPL included in the
 file COPYING.
 
-You need libgnome2, libglade2, libgnomeui2, libgtksourceview2.0
-and libxml2 to run oregano. 
-They can be found at ftp.gnome.org or mirrors. 
-To have an executable running you may do 'sh autogen.sh && ./configure && make && make install'
+You need libgtksourceview2.0, goocanvas-2.0 and libxml2 to run oregano. 
+They can be found at ftp.gnome.org or mirrors.
+To have an executable running you may do 'sh autogen.sh && ./configure && make && make install' 
 
 oregano still lacks many features. If you want to help out, please
 send an email to the project.

config.h.in

@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS

configure.in → configure.ac

@@ -1,5 +1,5 @@
-AC_INIT(oregano-0.73, 0.73)
-AM_INIT_AUTOMAKE(oregano, 0.73)
+AC_INIT(AUTHORS)
+AM_INIT_AUTOMAKE(oregano, 0.80)
 
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
@@ -13,6 +13,8 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
 	[GetText version number])
 
+
+
 AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
@@ -47,13 +49,12 @@ fi
 
 # 
 PKG_CHECK_MODULES(OREGANO,
-	glib-2.0 >= 2.20.0 \
-	gtk+-2.0 >= 2.16.0 \
-	gconf-2.0 >=  2.28.0 \
+	gtk+-3.0 >= 3.0 \
 	libxml-2.0 >= 2.6.0 \
-	libgnomecanvas-2.0 >= 2.12.0 \
-	gtksourceview-2.0 >= 2.8 \
-	cairo >= 1.2.0)
+	goocanvas-2.0 >= 2.0 \
+	gtksourceview-3.0 >= 3.0)
+#cairo >= 1.8.0)
+#gconf-2.0 >=  2.28.0 \
 
 
 # Taken from Screem HTML editor configure.in

data/Makefile.am

@@ -3,10 +3,12 @@ SUBDIRS = libraries models mime xml
 desktopdir = $(datadir)/applications
 desktop_in_files = oregano.desktop.in
 desktop_DATA = oregano.desktop
+prefs_keyfile = apps.oregano.gschema.xml
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
-	$(desktop_in_files)
+	$(desktop_in_files)\
+	$(prefs_keyfile)
 
 CLEANFILES = \
 	$(desktop_DATA)

data/settings/README

@@ -0,0 +1,3 @@
+This direcxtory has been added to manage the new gnome settings.
+Therefore the file "apps.oregano.gschema.xml" has been created.
+It is installed into /usr/share/glib-2.0/schemas

data/settings/apps.oregano.gschema.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+	<schema path="/apps/oregano/" id="apps.oregano" gettext-domain="oregano">
+		<key type="i" name="engine">
+			<default>1</default>
+			<summary>The spice engine ngspice or gnucap.</summary>
+		</key>
+		<key type="b" name="compress-files">
+			<default>false</default>
+			<summary>oregano files are compressed or not.</summary>
+		</key>
+		<key type="b" name="show-log">
+			<default>false</default>
+			<summary>oregano provides a log window by default.</summary>
+		</key>
+		<key type="b" name="show-splash">
+			<default>false</default>
+			<summary>oregano starts providing a splash window at startup.</summary>
+		</key>
+	</schema>
+</schemalist>