rpms/f-spot/devel f-spot-0.7.0-build-fixes.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 f-spot.spec, 1.103, 1.104 sources, 1.26, 1.27 0001-remove-empty-default-tags-from-schemas-file.patch, 1.1, NONE 0003-use-system-Gnome.Keyring-if-available.patch, 1.2, NONE
chkr
chkr at fedoraproject.org
Wed Jun 23 21:45:07 UTC 2010
- Previous message: File f-spot-0.7.0.tar.bz2 uploaded to lookaside cache by chkr
- Next message: rpms/pekwm/devel pekwm-menu.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pekwm.spec, 1.6, 1.7 sources, 1.2, 1.3 pekwm-0.1.5-gcc43.patch, 1.2, NONE pekwm-xdg-menu.py, 1.1, NONE pekwm.desktop, 1.1, NONE pekwm_configure.patch, 1.1, NONE pekwm_menu.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: chkr
Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3034
Modified Files:
.cvsignore f-spot.spec sources
Added Files:
f-spot-0.7.0-build-fixes.patch
Removed Files:
0001-remove-empty-default-tags-from-schemas-file.patch
0003-use-system-Gnome.Keyring-if-available.patch
Log Message:
* Wed Jun 23 2010 Christian Krause <chkr at fedoraproject.org> - 0.7.0-1
- Update to 0.7.0
- Remove patches fixed upstream
- Add patch to support parallel builds
f-spot-0.7.0-build-fixes.patch:
b/acinclude.m4 | 6
b/build/build.rules.mk | 19 -
b/lib/GKeyFile/Makefile.am | 54 +-
lib/GKeyFile/generated/Error.cs | 20 -
lib/GKeyFile/generated/Flags.cs | 18
lib/GKeyFile/generated/GKeyFile.cs | 685 -------------------------------------
lib/GKeyFile/gkeyfile-api.raw | 343 ------------------
lib/GKeyFile/gkeyfile-api.xml | 344 ------------------
8 files changed, 25 insertions(+), 1464 deletions(-)
--- NEW FILE f-spot-0.7.0-build-fixes.patch ---
>From 32e7eeda57e7ce28f757851e440c6b3bb6bb9a8e Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sat, 19 Jun 2010 21:04:01 +0200
Subject: [PATCH 3/5] fix aclocal warning:
warning: underquoted definition of F_CHECK_BERKELEYDB
---
acinclude.m4 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 77ad68b..3bd3ff1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,7 +2,7 @@
###
### Check for the right version of the Berkeley DB library.
-AC_DEFUN(F_CHECK_BERKELEYDB, [
+AC_DEFUN([F_CHECK_BERKELEYDB], [
AC_ARG_WITH(db4, [ --with-db4=PREFIX Location of db4],
[with_db4_includes="$withval/include"
--
1.6.6.1
>From c081aa6cdd37f701fca0d2f8bfbf3eb3f771e9b6 Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sat, 19 Jun 2010 21:04:43 +0200
Subject: [PATCH 4/5] fix parallel build
- remove the explicit all: rule in buil/build.rules.mk
- this rule would apply in parallel to the 2nd implicit all rule
generated by auto* framework which would cause that the SUBDIRS
are built in parallel to the main target of a directory (most times
the main target requires the SUBDIRS built first)
- remove unnecessary ThemIcon rules
---
build/build.rules.mk | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/build/build.rules.mk b/build/build.rules.mk
index c1c6c1f..dd3e143 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -21,8 +21,6 @@ RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
-THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
-THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
@@ -48,8 +46,6 @@ OUTPUT_FILES = \
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
-all: $(ASSEMBLY_FILE) theme-icons
-
run:
@pushd $(top_builddir); \
make run; \
@@ -88,16 +84,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
fi;
-theme-icons: $(THEME_ICONS_SOURCE)
- @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
-
-install-data-local: $(THEME_ICONS_SOURCE)
- @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
-
-uninstall-local: $(THEME_ICONS_SOURCE)
- @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
-
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED)
CLEANFILES = $(OUTPUT_FILES) $(ASSEMBLY_FILE).config
DISTCLEANFILES = *.pidb
--
1.6.6.1
>From 0a2cd9999af1aaa27fc357997f8a600a29d805e2 Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sat, 19 Jun 2010 21:08:23 +0200
Subject: [PATCH 5/5] fix GKeyFile's Makefile.am
- does not generate automake warnings anymore
- adjust Makefile.am to the coding style of the other Makefile.am
- remove auto-generated files
---
lib/GKeyFile/Makefile.am | 54 ++--
lib/GKeyFile/generated/Error.cs | 20 -
lib/GKeyFile/generated/Flags.cs | 18 -
lib/GKeyFile/generated/GKeyFile.cs | 685 ------------------------------------
lib/GKeyFile/gkeyfile-api.raw | 343 ------------------
lib/GKeyFile/gkeyfile-api.xml | 343 ------------------
6 files changed, 23 insertions(+), 1440 deletions(-)
delete mode 100644 lib/GKeyFile/generated/Error.cs
delete mode 100644 lib/GKeyFile/generated/Flags.cs
delete mode 100644 lib/GKeyFile/generated/GKeyFile.cs
delete mode 100644 lib/GKeyFile/gkeyfile-api.raw
delete mode 100644 lib/GKeyFile/gkeyfile-api.xml
diff --git a/lib/GKeyFile/Makefile.am b/lib/GKeyFile/Makefile.am
index 958b432..c58d1cf 100644
--- a/lib/GKeyFile/Makefile.am
+++ b/lib/GKeyFile/Makefile.am
@@ -1,53 +1,45 @@
include $(top_srcdir)/Makefile.include
-ASSEMBLY_NAME = gkeyfile-sharp
-
-ASSEMBLY_SOURCES =
-
-ASSEMBLY_CUSTOMS = \
+CUSTOMS = \
$(srcdir)/GKeyFile.custom
-GENERATED = \
- $(srcdir)/generated/Error.cs \
- $(srcdir)/generated/Flags.cs \
- $(srcdir)/generated/GKeyFile.cs
-
-REFS =
-
-PKGS = \
+ASSEMBLIES = \
-pkg:glib-sharp-2.0
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
+all: gkeyfile-sharp.dll
gkeyfile-api.raw: gkeyfile-sharp-sources.xml
$(GAPI2PARSER) gkeyfile-sharp-sources.xml
gkeyfile-api.xml: gkeyfile-api.raw GKeyFile.metadata
+ @echo -e "\n*** Massaging the raw api into $@"
cp gkeyfile-api.raw gkeyfile-api.xml
+ chmod +w gkeyfile-api.xml
$(GAPI2FIXUP) --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
-.generated_timestamp: gkeyfile-api.xml $(CUSTOMS)
+generated/GKeyFile.cs: gkeyfile-api.xml $(CUSTOMS) $(GAPI2CODEGEN)
+ @echo -e "\n*** Generating C# code"
$(GAPI2CODEGEN) --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
- touch $@
-$(ASSEMBLY): .generated_timestamp $(ASSEMBLY_SOURCES) $(ASSEMBLY_CUSTOMS)
- $(CSC_LIB) -unsafe -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(srcdir)/generated/*.cs
+
+gkeyfile-sharp.dll: generated/GKeyFile.cs $(CUSTOMS)
+ $(CSC_LIB) -unsafe -out:$@ $(PKGS) $(ASSEMBLIES) $(srcdir)/generated/*.cs
assemblydir = $(pkglibdir)
-assembly_DATA = \
- $(ASSEMBLY)
+assembly_DATA = \
+ gkeyfile-sharp.dll
+
+CLEANFILES = \
+ gkeyfile-sharp.dll \
+ gkeyfile-sharp.mdb \
+ gkeyfile-api.raw \
+ gkeyfile-api.xml
+
+DISTCLEANFILES = \
+ generated/*.cs
EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
- $(ASSEMBLY_CUSTOMS) \
- $(ASSEMBLY_NAME)-sources.xml \
+ $(CUSTOMS) \
gkeyfile-api.raw \
GKeyFile.metadata \
gkeyfile-api.xml \
- .generated_timestamp \
- $(GENERATED)
-
-CLEANFILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY).mdb
+ gkeyfile-sharp-sources.xml
diff --git a/lib/GKeyFile/generated/Error.cs b/lib/GKeyFile/generated/Error.cs
deleted file mode 100644
index 3222788..0000000
--- a/lib/GKeyFile/generated/Error.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file was generated by the Gtk# code generator.
-// Any changes made will be lost if regenerated.
-
-namespace KeyFile {
-
- using System;
- using System.Runtime.InteropServices;
-
-#region Autogenerated code
- public enum Error {
-
- UnknownEncoding,
- Parse,
- NotFound,
- KeyNotFound,
- GroupNotFound,
- InvalidValue,
- }
-#endregion
-}
diff --git a/lib/GKeyFile/generated/Flags.cs b/lib/GKeyFile/generated/Flags.cs
deleted file mode 100644
index d0532ce..0000000
--- a/lib/GKeyFile/generated/Flags.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// This file was generated by the Gtk# code generator.
-// Any changes made will be lost if regenerated.
-
-namespace KeyFile {
-
- using System;
- using System.Runtime.InteropServices;
-
-#region Autogenerated code
- [Flags]
- public enum Flags {
-
- None,
- KeepComments = 1 << 0,
- KeepTranslations = 1 << 1,
- }
-#endregion
-}
diff --git a/lib/GKeyFile/generated/GKeyFile.cs b/lib/GKeyFile/generated/GKeyFile.cs
deleted file mode 100644
index f5b80ab..0000000
--- a/lib/GKeyFile/generated/GKeyFile.cs
+++ /dev/null
@@ -1,685 +0,0 @@
-// This file was generated by the Gtk# code generator.
-// Any changes made will be lost if regenerated.
-
-namespace KeyFile {
-
- using System;
- using System.Collections;
- using System.Runtime.InteropServices;
-
-#region Autogenerated code
- public class GKeyFile : GLib.Opaque {
-
- [DllImport("libglib-2.0.dll")]
- static extern IntPtr g_key_file_get_groups(IntPtr raw, out UIntPtr length);
-
- private string[] GetGroups(out ulong length) {
- UIntPtr native_length;
- IntPtr raw_ret = g_key_file_get_groups(Handle, out native_length);
- string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, false);
- length = (ulong) native_length;
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_boolean(IntPtr raw, IntPtr group_name, IntPtr key, bool value);
-
- public void SetBoolean(string group_name, string key, bool value) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- g_key_file_set_boolean(Handle, native_group_name, native_key, value);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_locale_string(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr locale, out IntPtr error);
-
- public unsafe string GetLocaleString(string group_name, string key, string locale) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_locale = GLib.Marshaller.StringToPtrGStrdup (locale);
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_locale_string(Handle, native_group_name, native_key, native_locale, out error);
- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_locale);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_remove_key(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe bool RemoveKey(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_remove_key(Handle, native_group_name, native_key, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_value(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr value);
-
- public void SetValue(string group_name, string key, string value) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value);
- g_key_file_set_value(Handle, native_group_name, native_key, native_value);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_value);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_remove_group(IntPtr raw, IntPtr group_name, out IntPtr error);
-
- public unsafe bool RemoveGroup(string group_name) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_remove_group(Handle, native_group_name, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_remove_comment(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe bool RemoveComment(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_remove_comment(Handle, native_group_name, native_key, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_list_separator(IntPtr raw, IntPtr separator);
-
- public string ListSeparator {
- set {
- g_key_file_set_list_separator(Handle, GLib.Marshaller.StringToPtrGStrdup(value));
- }
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern bool g_key_file_has_group(IntPtr raw, IntPtr group_name);
-
- public bool HasGroup(string group_name) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- bool raw_ret = g_key_file_has_group(Handle, native_group_name);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_set_comment(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr comment, out IntPtr error);
-
- public unsafe bool SetComment(string group_name, string key, string comment) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_comment = GLib.Marshaller.StringToPtrGStrdup (comment);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_set_comment(Handle, native_group_name, native_key, native_comment, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_comment);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe int g_key_file_get_integer(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe int GetInteger(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- int raw_ret = g_key_file_get_integer(Handle, native_group_name, native_key, out error);
- int ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_double_list(IntPtr raw, IntPtr group_name, IntPtr key, double[] list, UIntPtr n_list);
-
- public void SetDoubleList(string group_name, string key, double[] list) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- g_key_file_set_double_list(Handle, native_group_name, native_key, list, new UIntPtr ((ulong) (list == null ? 0 : list.Length)));
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_locale_string_list(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr locale, out UIntPtr length, out IntPtr error);
-
- public unsafe string[] GetLocaleStringList(string group_name, string key, string locale, out ulong length) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_locale = GLib.Marshaller.StringToPtrGStrdup (locale);
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_locale_string_list(Handle, native_group_name, native_key, native_locale, out native_length, out error);
- string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, false);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_locale);
- length = (ulong) native_length;
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_keys(IntPtr raw, IntPtr group_name, out UIntPtr length, out IntPtr error);
-
- private unsafe string[] GetKeys(string group_name, out ulong length) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_keys(Handle, native_group_name, out native_length, out error);
- string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, false);
- GLib.Marshaller.Free (native_group_name);
- length = (ulong) native_length;
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_get_boolean(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe bool GetBoolean(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_get_boolean(Handle, native_group_name, native_key, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_locale_string_list(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr locale, IntPtr[] list, UIntPtr length);
-
- public void SetLocaleStringList(string group_name, string key, string locale, string[] list, ulong length) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_locale = GLib.Marshaller.StringToPtrGStrdup (locale);
- int cnt_list = list == null ? 0 : list.Length;
- IntPtr[] native_list = new IntPtr [cnt_list];
- for (int i = 0; i < cnt_list; i++)
- native_list [i] = GLib.Marshaller.StringToPtrGStrdup (list[i]);
- g_key_file_set_locale_string_list(Handle, native_group_name, native_key, native_locale, native_list, new UIntPtr (length));
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_locale);
- for (int i = 0; i < native_list.Length; i++) {
- list [i] = GLib.Marshaller.Utf8PtrToString (native_list[i]);
- GLib.Marshaller.Free (native_list[i]);
- }
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_string_list(IntPtr raw, IntPtr group_name, IntPtr key, out UIntPtr length, out IntPtr error);
-
- private unsafe string[] GetStringList(string group_name, string key, out ulong length) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_string_list(Handle, native_group_name, native_key, out native_length, out error);
- string[] ret = GLib.Marshaller.NullTermPtrToStringArray (raw_ret, false);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- length = (ulong) native_length;
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_boolean_list(IntPtr raw, IntPtr group_name, IntPtr key, bool[] list, UIntPtr n_list);
-
- public void SetBooleanList(string group_name, string key, bool[] list) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- g_key_file_set_boolean_list(Handle, native_group_name, native_key, list, new UIntPtr ((ulong) (list == null ? 0 : list.Length)));
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_load_from_data_dirs(IntPtr raw, IntPtr file, IntPtr full_path, int flags, out IntPtr error);
-
- public unsafe bool LoadFromDataDirs(string file, string full_path, KeyFile.Flags flags) {
- IntPtr native_file = GLib.Marshaller.StringToPtrGStrdup (file);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_load_from_data_dirs(Handle, native_file, GLib.Marshaller.StringToPtrGStrdup(full_path), (int) flags, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_file);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_locale_string(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr locale, IntPtr str1ng);
-
- public void SetLocaleString(string group_name, string key, string locale, string str1ng) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_locale = GLib.Marshaller.StringToPtrGStrdup (locale);
- IntPtr native_str1ng = GLib.Marshaller.StringToPtrGStrdup (str1ng);
- g_key_file_set_locale_string(Handle, native_group_name, native_key, native_locale, native_str1ng);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_locale);
- GLib.Marshaller.Free (native_str1ng);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_load_from_file(IntPtr raw, IntPtr file, int flags, out IntPtr error);
-
- public unsafe bool LoadFromFile(string file, KeyFile.Flags flags) {
- IntPtr native_file = GLib.Marshaller.StringToPtrGStrdup (file);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_load_from_file(Handle, native_file, (int) flags, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_file);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_integer_list(IntPtr raw, IntPtr group_name, IntPtr key, int[] list, UIntPtr n_list);
-
- public void SetIntegerList(string group_name, string key, int[] list) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- g_key_file_set_integer_list(Handle, native_group_name, native_key, list, new UIntPtr ((ulong) (list == null ? 0 : list.Length)));
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_to_data(IntPtr raw, out UIntPtr length, out IntPtr error);
-
- private unsafe string ToData(out ulong length) {
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_to_data(Handle, out native_length, out error);
- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
- length = (ulong) native_length;
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_string_list(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr[] list, UIntPtr n_list);
-
- public void SetStringList(string group_name, string key, string[] list) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- int cnt_list = list == null ? 0 : list.Length;
- IntPtr[] native_list = new IntPtr [cnt_list];
- for (int i = 0; i < cnt_list; i++)
- native_list [i] = GLib.Marshaller.StringToPtrGStrdup (list[i]);
- g_key_file_set_string_list(Handle, native_group_name, native_key, native_list, new UIntPtr ((ulong) (list == null ? 0 : list.Length)));
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- for (int i = 0; i < native_list.Length; i++) {
- list [i] = GLib.Marshaller.Utf8PtrToString (native_list[i]);
- GLib.Marshaller.Free (native_list[i]);
- }
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_load_from_data(IntPtr raw, IntPtr data, UIntPtr length, int flags, out IntPtr error);
-
- public unsafe bool LoadFromData(string data, KeyFile.Flags flags) {
- IntPtr native_data = GLib.Marshaller.StringToPtrGStrdup (data);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_load_from_data(Handle, native_data, new UIntPtr ((ulong) System.Text.Encoding.UTF8.GetByteCount (data)), (int) flags, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_data);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_string(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe string GetString(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_string(Handle, native_group_name, native_key, out error);
- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_double(IntPtr raw, IntPtr group_name, IntPtr key, double value);
-
- public void SetDouble(string group_name, string key, double value) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- g_key_file_set_double(Handle, native_group_name, native_key, value);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_comment(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe string GetComment(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_comment(Handle, native_group_name, native_key, out error);
- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern int g_key_file_error_quark();
-
- public static int ErrorQuark() {
- int raw_ret = g_key_file_error_quark();
- int ret = raw_ret;
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_has_key(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe bool HasKey(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_has_key(Handle, native_group_name, native_key, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe bool g_key_file_load_from_dirs(IntPtr raw, IntPtr file, IntPtr search_dirs, IntPtr full_path, int flags, out IntPtr error);
-
- public unsafe bool LoadFromDirs(string file, string search_dirs, string full_path, KeyFile.Flags flags) {
- IntPtr native_file = GLib.Marshaller.StringToPtrGStrdup (file);
- IntPtr native_search_dirs = GLib.Marshaller.StringToPtrGStrdup (search_dirs);
- IntPtr error = IntPtr.Zero;
- bool raw_ret = g_key_file_load_from_dirs(Handle, native_file, native_search_dirs, GLib.Marshaller.StringToPtrGStrdup(full_path), (int) flags, out error);
- bool ret = raw_ret;
- GLib.Marshaller.Free (native_file);
- GLib.Marshaller.Free (native_search_dirs);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_value(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe string GetValue(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_value(Handle, native_group_name, native_key, out error);
- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_string(IntPtr raw, IntPtr group_name, IntPtr key, IntPtr str1ng);
-
- public void SetString(string group_name, string key, string str1ng) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr native_str1ng = GLib.Marshaller.StringToPtrGStrdup (str1ng);
- g_key_file_set_string(Handle, native_group_name, native_key, native_str1ng);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- GLib.Marshaller.Free (native_str1ng);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern IntPtr g_key_file_get_start_group(IntPtr raw);
-
- public string StartGroup {
- get {
- IntPtr raw_ret = g_key_file_get_start_group(Handle);
- string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
- return ret;
- }
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_set_integer(IntPtr raw, IntPtr group_name, IntPtr key, int value);
-
- public void SetInteger(string group_name, string key, int value) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- g_key_file_set_integer(Handle, native_group_name, native_key, value);
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe double g_key_file_get_double(IntPtr raw, IntPtr group_name, IntPtr key, out IntPtr error);
-
- public unsafe double GetDouble(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- IntPtr error = IntPtr.Zero;
- double raw_ret = g_key_file_get_double(Handle, native_group_name, native_key, out error);
- double ret = raw_ret;
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- return ret;
- }
-
- public GKeyFile(IntPtr raw) : base(raw) {}
-
- [DllImport("libglib-2.0.dll")]
- static extern IntPtr g_key_file_new();
-
- public GKeyFile ()
- {
- Raw = g_key_file_new();
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern void g_key_file_free(IntPtr raw);
-
- protected override void Free (IntPtr raw)
- {
- g_key_file_free (raw);
- }
-
- class FinalizerInfo {
- IntPtr handle;
-
- public FinalizerInfo (IntPtr handle)
- {
- this.handle = handle;
- }
-
- public bool Handler ()
- {
- g_key_file_free (handle);
- return false;
- }
- }
-
- ~GKeyFile ()
- {
- if (!Owned)
- return;
- FinalizerInfo info = new FinalizerInfo (Handle);
- GLib.Timeout.Add (50, new GLib.TimeoutHandler (info.Handler));
- }
-
-#endregion
-#region Customized extensions
-#line 1 "GKeyFile.custom"
-/*
- * GKeyFile.custom
- *
- * Author(s):
- * Stephane Delcroix (stephane at delcroix.org)
- *
- * Copyright (c) 2008 Novell, Inc.
- *
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
- public GKeyFile (string file, KeyFile.Flags flags) : this ()
- {
- LoadFromFile (file, flags);
- }
-
- public GKeyFile (string file) : this (file, KeyFile.Flags.KeepComments)
- {
- }
-
- public string ToData ()
- {
- ulong length;
- return ToData (out length);
- }
-
- public void Save (string filename)
- {
- byte [] content = System.Text.Encoding.Default.GetBytes (ToData ());
- System.IO.FileStream stream = System.IO.File.Create (filename);
- stream.Write (content, 0, content.Length);
- stream.Close ();
- }
-
- public string [] GetKeys (string group_name) {
- ulong length;
- return GetKeys (group_name, out length);
- }
-
- public string [] GetGroups () {
- ulong length;
- return GetGroups (out length);
- }
-
- public string[] GetStringList(string group_name, string key) {
- ulong length;
- return GetStringList (group_name, key, out length);
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_boolean_list(IntPtr raw, IntPtr group_name, IntPtr key, out UIntPtr length, out IntPtr error);
-
- public unsafe bool[] GetBooleanList(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_boolean_list(Handle, native_group_name, native_key, out native_length, out error);
- ulong length = (ulong) native_length;
- bool[] ret = new bool [(int)length];
- int[] b_ret = new int [(int)length];
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- Marshal.Copy (raw_ret, b_ret, 0, (int)length);
- GLib.Marshaller.Free (raw_ret);
- for (int i=0; i < (int)length; i++)
- ret[i] = b_ret[i] != 0;
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_integer_list(IntPtr raw, IntPtr group_name, IntPtr key, out UIntPtr length, out IntPtr error);
-
- public unsafe int[] GetIntegerList(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_integer_list(Handle, native_group_name, native_key, out native_length, out error);
- ulong length = (ulong) native_length;
- int[] ret = new int[(int)length];
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- Marshal.Copy (raw_ret, ret, 0, (int)length);
- GLib.Marshaller.Free (raw_ret);
- return ret;
- }
-
- [DllImport("libglib-2.0.dll")]
- static extern unsafe IntPtr g_key_file_get_double_list(IntPtr raw, IntPtr group_name, IntPtr key, out UIntPtr length, out IntPtr error);
-
- public unsafe double[] GetDoubleList(string group_name, string key) {
- IntPtr native_group_name = GLib.Marshaller.StringToPtrGStrdup (group_name);
- IntPtr native_key = GLib.Marshaller.StringToPtrGStrdup (key);
- UIntPtr native_length;
- IntPtr error = IntPtr.Zero;
- IntPtr raw_ret = g_key_file_get_double_list(Handle, native_group_name, native_key, out native_length, out error);
- ulong length = (ulong)native_length;
- double[] ret = new double[(int)length];
- GLib.Marshaller.Free (native_group_name);
- GLib.Marshaller.Free (native_key);
- if (error != IntPtr.Zero) throw new GLib.GException (error);
- Marshal.Copy (raw_ret, ret, 0, (int)length);
- GLib.Marshaller.Free (raw_ret);
- return ret;
- }
-
-#endregion
- }
-}
diff --git a/lib/GKeyFile/gkeyfile-api.raw b/lib/GKeyFile/gkeyfile-api.raw
deleted file mode 100644
index 8032844..0000000
--- a/lib/GKeyFile/gkeyfile-api.raw
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0"?>
-<api>
- <!--
-
- This file was automatically generated.
- Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-
--->
- <namespace name="KeyFile" library="libglib-2.0.dll">
- <enum name="Error" cname="GKeyFileError" type="enum">
- <member cname="G_KEY_FILE_ERROR_UNKNOWN_ENCODING" name="UnknownEncoding" />
- <member cname="G_KEY_FILE_ERROR_PARSE" name="Parse" />
- <member cname="G_KEY_FILE_ERROR_NOT_FOUND" name="NotFound" />
- <member cname="G_KEY_FILE_ERROR_KEY_NOT_FOUND" name="KeyNotFound" />
- <member cname="G_KEY_FILE_ERROR_GROUP_NOT_FOUND" name="GroupNotFound" />
- <member cname="G_KEY_FILE_ERROR_INVALID_VALUE" name="InvalidValue" />
- </enum>
- <enum name="Flags" cname="GKeyFileFlags" type="flags">
- <member cname="G_KEY_FILE_NONE" name="None" />
- <member cname="G_KEY_FILE_KEEP_COMMENTS" name="KeepComments" value="1 << 0" />
- <member cname="G_KEY_FILE_KEEP_TRANSLATIONS" name="KeepTranslations" value="1 << 1" />
- </enum>
- <struct name="GKeyFile" cname="GKeyFile" opaque="true">
- <method name="ErrorQuark" cname="g_key_file_error_quark" shared="true">
- <return-type type="GQuark" />
- </method>
- <method name="Free" cname="g_key_file_free">
- <return-type type="void" />
- </method>
- <method name="GetBoolean" cname="g_key_file_get_boolean">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetBooleanList" cname="g_key_file_get_boolean_list">
- <return-type type="gboolean*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetComment" cname="g_key_file_get_comment">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetDouble" cname="g_key_file_get_double">
- <return-type type="gdouble" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetDoubleList" cname="g_key_file_get_double_list">
- <return-type type="gdouble*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetGroups" cname="g_key_file_get_groups">
- <return-type type="gchar**" />
- <parameters>
- <parameter type="gsize*" name="length" />
- </parameters>
- </method>
- <method name="GetInteger" cname="g_key_file_get_integer">
- <return-type type="gint" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetIntegerList" cname="g_key_file_get_integer_list">
- <return-type type="gint*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetKeys" cname="g_key_file_get_keys">
- <return-type type="gchar**" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetLocaleString" cname="g_key_file_get_locale_string">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetLocaleStringList" cname="g_key_file_get_locale_string_list">
- <return-type type="gchar**" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetStartGroup" cname="g_key_file_get_start_group">
- <return-type type="gchar*" />
- </method>
- <method name="GetString" cname="g_key_file_get_string">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetStringList" cname="g_key_file_get_string_list">
- <return-type type="gchar**" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetValue" cname="g_key_file_get_value">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="HasGroup" cname="g_key_file_has_group">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- </parameters>
- </method>
- <method name="HasKey" cname="g_key_file_has_key">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromData" cname="g_key_file_load_from_data">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="data" />
- <parameter type="gsize" name="length" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromDataDirs" cname="g_key_file_load_from_data_dirs">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="file" />
- <parameter type="gchar**" name="full_path" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromDirs" cname="g_key_file_load_from_dirs">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="file" />
- <parameter type="const-gchar**" name="search_dirs" />
- <parameter type="gchar**" name="full_path" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromFile" cname="g_key_file_load_from_file">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="file" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <constructor cname="g_key_file_new" />
- <method name="RemoveComment" cname="g_key_file_remove_comment">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="RemoveGroup" cname="g_key_file_remove_group">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="RemoveKey" cname="g_key_file_remove_key">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="SetBoolean" cname="g_key_file_set_boolean">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gboolean" name="value" />
- </parameters>
- </method>
- <method name="SetBooleanList" cname="g_key_file_set_boolean_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gboolean" array="true" name="list" />
- <parameter type="gsize" name="length" />
- </parameters>
- </method>
- <method name="SetComment" cname="g_key_file_set_comment">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="comment" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="SetDouble" cname="g_key_file_set_double">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gdouble" name="value" />
- </parameters>
- </method>
- <method name="SetDoubleList" cname="g_key_file_set_double_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gdouble" array="true" name="list" />
- <parameter type="gsize" name="length" />
- </parameters>
- </method>
- <method name="SetInteger" cname="g_key_file_set_integer">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gint" name="value" />
- </parameters>
- </method>
- <method name="SetIntegerList" cname="g_key_file_set_integer_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gint" array="true" name="list" />
- <parameter type="gsize" name="length" />
- </parameters>
- </method>
- <method name="SetListSeparator" cname="g_key_file_set_list_separator">
- <return-type type="void" />
- <parameters>
- <parameter type="gchar" name="separator" />
- </parameters>
- </method>
- <method name="SetLocaleString" cname="g_key_file_set_locale_string">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="const-gchar*" name="string" />
- </parameters>
- </method>
- <method name="SetLocaleStringList" cname="g_key_file_set_locale_string_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="const-gchar*" array="true" name="list" />
- <parameter type="gsize" name="length" />
- </parameters>
- </method>
- <method name="SetString" cname="g_key_file_set_string">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="string" />
- </parameters>
- </method>
- <method name="SetStringList" cname="g_key_file_set_string_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" array="true" name="list" />
- <parameter type="gsize" name="length" />
- </parameters>
- </method>
- <method name="SetValue" cname="g_key_file_set_value">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="value" />
- </parameters>
- </method>
- <method name="ToData" cname="g_key_file_to_data">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- </struct>
- </namespace>
-</api>
\ No newline at end of file
diff --git a/lib/GKeyFile/gkeyfile-api.xml b/lib/GKeyFile/gkeyfile-api.xml
deleted file mode 100644
index 65dae20..0000000
--- a/lib/GKeyFile/gkeyfile-api.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0"?>
-<api>
- <!--
-
- This file was automatically generated.
- Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-
--->
- <namespace name="KeyFile" library="libglib-2.0.dll">
- <enum name="Error" cname="GKeyFileError" type="enum">
- <member cname="G_KEY_FILE_ERROR_UNKNOWN_ENCODING" name="UnknownEncoding" />
- <member cname="G_KEY_FILE_ERROR_PARSE" name="Parse" />
- <member cname="G_KEY_FILE_ERROR_NOT_FOUND" name="NotFound" />
- <member cname="G_KEY_FILE_ERROR_KEY_NOT_FOUND" name="KeyNotFound" />
- <member cname="G_KEY_FILE_ERROR_GROUP_NOT_FOUND" name="GroupNotFound" />
- <member cname="G_KEY_FILE_ERROR_INVALID_VALUE" name="InvalidValue" />
- </enum>
- <enum name="Flags" cname="GKeyFileFlags" type="flags">
- <member cname="G_KEY_FILE_NONE" name="None" />
- <member cname="G_KEY_FILE_KEEP_COMMENTS" name="KeepComments" value="1 << 0" />
- <member cname="G_KEY_FILE_KEEP_TRANSLATIONS" name="KeepTranslations" value="1 << 1" />
- </enum>
- <struct name="GKeyFile" cname="GKeyFile" opaque="true">
- <method name="ErrorQuark" cname="g_key_file_error_quark" shared="true">
- <return-type type="GQuark" />
- </method>
- <method name="Free" cname="g_key_file_free">
- <return-type type="void" />
- </method>
- <method name="GetBoolean" cname="g_key_file_get_boolean">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetBooleanList" cname="g_key_file_get_boolean_list" hidden="1">
- <return-type type="gboolean*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetComment" cname="g_key_file_get_comment">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetDouble" cname="g_key_file_get_double">
- <return-type type="gdouble" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetDoubleList" cname="g_key_file_get_double_list" hidden="1">
- <return-type type="gdouble*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetGroups" cname="g_key_file_get_groups" accessibility="private">
- <return-type type="gchar**" null_term_array="1" />
- <parameters>
- <parameter type="gsize*" name="length" />
- </parameters>
- </method>
- <method name="GetInteger" cname="g_key_file_get_integer">
- <return-type type="gint" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetIntegerList" cname="g_key_file_get_integer_list" hidden="1">
- <return-type type="gint*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetKeys" cname="g_key_file_get_keys" accessibility="private">
- <return-type type="gchar**" null_term_array="1" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetLocaleString" cname="g_key_file_get_locale_string">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetLocaleStringList" cname="g_key_file_get_locale_string_list">
- <return-type type="gchar**" null_term_array="1" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetStartGroup" cname="g_key_file_get_start_group">
- <return-type type="gchar*" />
- </method>
- <method name="GetString" cname="g_key_file_get_string">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetStringList" cname="g_key_file_get_string_list" accessibility="private">
- <return-type type="gchar**" null_term_array="1" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="GetValue" cname="g_key_file_get_value">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="HasGroup" cname="g_key_file_has_group">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- </parameters>
- </method>
- <method name="HasKey" cname="g_key_file_has_key">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromData" cname="g_key_file_load_from_data">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="data" />
- <parameter type="gsize" name="length" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromDataDirs" cname="g_key_file_load_from_data_dirs">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="file" />
- <parameter type="gchar**" name="full_path" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromDirs" cname="g_key_file_load_from_dirs">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="file" />
- <parameter type="const-gchar**" name="search_dirs" />
- <parameter type="gchar**" name="full_path" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="LoadFromFile" cname="g_key_file_load_from_file">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="file" />
- <parameter type="GKeyFileFlags" name="flags" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <constructor cname="g_key_file_new" />
- <method name="RemoveComment" cname="g_key_file_remove_comment">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="RemoveGroup" cname="g_key_file_remove_group">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="RemoveKey" cname="g_key_file_remove_key">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="SetBoolean" cname="g_key_file_set_boolean">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gboolean" name="value" />
- </parameters>
- </method>
- <method name="SetBooleanList" cname="g_key_file_set_boolean_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gboolean" array="true" name="list" />
- <parameter type="gsize" name="n_list" />
- </parameters>
- </method>
- <method name="SetComment" cname="g_key_file_set_comment">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="comment" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- <method name="SetDouble" cname="g_key_file_set_double">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gdouble" name="value" />
- </parameters>
- </method>
- <method name="SetDoubleList" cname="g_key_file_set_double_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gdouble" array="true" name="list" />
- <parameter type="gsize" name="n_list" />
- </parameters>
- </method>
- <method name="SetInteger" cname="g_key_file_set_integer">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gint" name="value" />
- </parameters>
- </method>
- <method name="SetIntegerList" cname="g_key_file_set_integer_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="gint" array="true" name="list" />
- <parameter type="gsize" name="n_list" />
- </parameters>
- </method>
- <method name="SetListSeparator" cname="g_key_file_set_list_separator">
- <return-type type="void" />
- <parameters>
- <parameter type="gchar" name="separator" />
- </parameters>
- </method>
- <method name="SetLocaleString" cname="g_key_file_set_locale_string">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="const-gchar*" name="string" />
- </parameters>
- </method>
- <method name="SetLocaleStringList" cname="g_key_file_set_locale_string_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="locale" />
- <parameter type="const-gchar*" array="true" name="list" />
- <parameter type="gsize" name="length" />
- </parameters>
- </method>
- <method name="SetString" cname="g_key_file_set_string">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="string" />
- </parameters>
- </method>
- <method name="SetStringList" cname="g_key_file_set_string_list">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" array="true" name="list" />
- <parameter type="gsize" name="n_list" />
- </parameters>
- </method>
- <method name="SetValue" cname="g_key_file_set_value">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="group_name" />
- <parameter type="const-gchar*" name="key" />
- <parameter type="const-gchar*" name="value" />
- </parameters>
- </method>
- <method name="ToData" cname="g_key_file_to_data" accessibility="private">
- <return-type type="gchar*" />
- <parameters>
- <parameter type="gsize*" name="length" />
- <parameter type="GError**" name="error" />
- </parameters>
- </method>
- </struct>
- </namespace>
-</api>
\ No newline at end of file
--
1.6.6.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore 24 May 2010 18:40:31 -0000 1.26
+++ .cvsignore 23 Jun 2010 21:45:06 -0000 1.27
@@ -1 +1 @@
-f-spot-0.6.2.tar.bz2
+f-spot-0.7.0.tar.bz2
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- f-spot.spec 1 Jun 2010 20:09:17 -0000 1.103
+++ f-spot.spec 23 Jun 2010 21:45:07 -0000 1.104
@@ -1,18 +1,15 @@
Name: f-spot
-Version: 0.6.2
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2+ and CPL and MIT
URL: http://f-spot.org/
-Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# Fix schemas file: http://gitorious.org/f-spot/mainline/merge_requests/2161
-Patch1: 0001-remove-empty-default-tags-from-schemas-file.patch
+Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.7/f-spot-%{version}.tar.bz2
+Patch1: f-spot-0.7.0-build-fixes.patch
# unmount cameras before importing
Patch3: 0002-enhance-the-f-spot-import-script.patch
-# Use system gnome-keyring
-Patch4: 0003-use-system-Gnome.Keyring-if-available.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +28,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gnome-keyring-sharp-devel
BuildRequires: GConf2
BuildRequires: unique-devel
+BuildRequires: flickrnet-devel
Requires: sqlite >= 3.3.1
Requires: lcms-libs
Requires: dcraw
@@ -72,12 +70,17 @@ photo collection in a slideshow as a scr
%prep
%setup -q
-%patch1 -p1 -b .schemas-fix
+%patch1 -p1 -b .buildfix
%patch3 -p1 -b .gvfs-gphoto
-%patch4 -p1 -b .link-system-keyring
%build
-autoreconf -f -i -I build/m4/shamrock -I build/m4/shave
+intltoolize --force --copy
+libtoolize --force --copy --automake
+aclocal -I build/m4/f-spot -I build/m4/shamrock -I build/m4/shave
+autoconf
+autoheader
+test -f config.h.in && touch config.h.in
+automake --gnu --add-missing --force --copy -Wno-portability
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure --disable-scrollkeeper
make V=1 %{?_smp_mflags}
@@ -144,20 +147,24 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_libdir}/f-spot/*.mdb
%{_libdir}/f-spot/*.so
%{_libdir}/f-spot/*.so.*
-%exclude %{_libdir}/f-spot/extensions/ScreensaverConfig.dll
-%{_libdir}/f-spot/extensions/
+%exclude %{_libdir}/f-spot/Extensions/FSpot.Exporters.ScreensaverConfig.dll*
+%{_libdir}/f-spot/Extensions/
%{_bindir}/f-spot
%{_bindir}/f-spot-import
%{_bindir}/f-spot-sqlite-upgrade
-%{_datadir}/omf/f-spot/
%files screensaver
%defattr(-,root,root,-)
-%{_libdir}/f-spot/extensions/ScreensaverConfig.dll
+%{_libdir}/f-spot/Extensions/FSpot.Exporters.ScreensaverConfig.dll
%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
%changelog
+* Wed Jun 23 2010 Christian Krause <chkr at fedoraproject.org> - 0.7.0-1
+- Update to 0.7.0
+- Remove patches fixed upstream
+- Add patch to support parallel builds
+
* Tue Jun 01 2010 Christian Krause <chkr at fedoraproject.org> - 0.6.2-2
- Rebuilt against new mono-addins
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 24 May 2010 18:40:32 -0000 1.26
+++ sources 23 Jun 2010 21:45:07 -0000 1.27
@@ -1 +1 @@
-82d281eb6c5c6b10e75313a897250444 f-spot-0.6.2.tar.bz2
+9ef688be77fbfb8c697368d046a6cd6b f-spot-0.7.0.tar.bz2
--- 0001-remove-empty-default-tags-from-schemas-file.patch DELETED ---
--- 0003-use-system-Gnome.Keyring-if-available.patch DELETED ---
- Previous message: File f-spot-0.7.0.tar.bz2 uploaded to lookaside cache by chkr
- Next message: rpms/pekwm/devel pekwm-menu.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pekwm.spec, 1.6, 1.7 sources, 1.2, 1.3 pekwm-0.1.5-gcc43.patch, 1.2, NONE pekwm-xdg-menu.py, 1.1, NONE pekwm.desktop, 1.1, NONE pekwm_configure.patch, 1.1, NONE pekwm_menu.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list