rpms
/
GConf2
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try again

Browse Source
epel9
Matthias Clasen 17 years ago
parent eb4c79c4bc
commit c98f8b7b9f
1 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File

83
gconf-defaults.patch
Unescape View File

@ -1,7 +1,7 @@
diff -u -r GConf-2.22.0/configure.in hacked/configure.in
--- GConf-2.22.0/configure.in 2008-03-10 10:52:28.000000000 -0400
+++ hacked/configure.in 2008-05-02 00:05:01.000000000 -0400
@@ -166,6 +166,7 @@
diff -up GConf-2.22.0/configure.in.defaults GConf-2.22.0/configure.in
--- GConf-2.22.0/configure.in.defaults 2008-03-10 10:52:28.000000000 -0400
+++ GConf-2.22.0/configure.in 2008-05-04 18:15:22.000000000 -0400
@@ -166,6 +166,7 @@ AC_SUBST(DEPENDENT_WITH_GTK_CFLAGS)
AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_LIBS)
AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_CFLAGS)
@ -9,7 +9,7 @@ diff -u -r GConf-2.22.0/configure.in hacked/configure.in
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
AC_SUBST(ORBIT_IDL)
@@ -261,6 +262,7 @@
@@ -261,6 +262,7 @@ doc/Makefile
doc/gconf/Makefile
examples/Makefile
tests/Makefile
@ -17,9 +17,9 @@ diff -u -r GConf-2.22.0/configure.in hacked/configure.in
gconf-2.0.pc
])
diff -u -r GConf-2.22.0/defaults/gconf-defaults.c hacked/defaults/gconf-defaults.c
--- GConf-2.22.0/defaults/gconf-defaults.c 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/gconf-defaults.c 2008-05-02 22:12:17.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.c
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/gconf-defaults.c 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,704 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -725,9 +725,9 @@ diff -u -r GConf-2.22.0/defaults/gconf-defaults.c hacked/defaults/gconf-defaults
+out:
+ start_killtimer();
+}
diff -u -r GConf-2.22.0/defaults/gconf-defaults.h hacked/defaults/gconf-defaults.h
--- GConf-2.22.0/defaults/gconf-defaults.h 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/gconf-defaults.h 2008-05-02 14:08:18.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.h
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/gconf-defaults.h 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -813,9 +813,9 @@ diff -u -r GConf-2.22.0/defaults/gconf-defaults.h hacked/defaults/gconf-defaults
+G_END_DECLS
+
+#endif /* GCONF_DEFAULTS_H */
diff -u -r GConf-2.22.0/defaults/gconf-defaults-main.c hacked/defaults/gconf-defaults-main.c
--- GConf-2.22.0/defaults/gconf-defaults-main.c 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/gconf-defaults-main.c 2008-05-01 14:41:50.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults-main.c
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/gconf-defaults-main.c 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,174 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@ -991,9 +991,9 @@ diff -u -r GConf-2.22.0/defaults/gconf-defaults-main.c hacked/defaults/gconf-def
+out:
+ return ret;
+}
diff -u -r GConf-2.22.0/defaults/gconf-defaults.xml hacked/defaults/gconf-defaults.xml
--- GConf-2.22.0/defaults/gconf-defaults.xml 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/gconf-defaults.xml 2008-05-02 22:45:08.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/gconf-defaults.xml
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/gconf-defaults.xml 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,61 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/">
@ -1056,10 +1056,10 @@ diff -u -r GConf-2.22.0/defaults/gconf-defaults.xml hacked/defaults/gconf-defaul
+
+ </interface>
+</node>
diff -u -r GConf-2.22.0/defaults/Makefile.am hacked/defaults/Makefile.am
--- GConf-2.22.0/defaults/Makefile.am 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/Makefile.am 2008-04-30 23:35:38.000000000 -0400
@@ -0,0 +1,51 @@
diff -up /dev/null GConf-2.22.0/defaults/Makefile.am
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/Makefile.am 2008-05-04 18:18:04.000000000 -0400
@@ -0,0 +1,56 @@
+libexec_PROGRAMS = gconf-defaults-mechanism
+
+gconf-defaults-glue.h: $(srcdir)/gconf-defaults.xml
@ -1074,9 +1074,14 @@ diff -u -r GConf-2.22.0/defaults/Makefile.am hacked/defaults/Makefile.am
+ gconf-defaults-glue.h \
+ gconf-defaults-main.c
+
+INCLUDES = $(DEFAULTS_CFLAGS)
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(DEFAULTS_CFLAGS)
+
+gconf_defaults_mechanism_LDADD = $(DEFAULTS_LIBS)
+gconf_defaults_mechanism_LDADD = \
+ $(top_builddir}/gconf/libgconf-2.la \
+ $(DEFAULTS_LIBS)
+
+BUILT_SOURCES = gconf-defaults-glue.h
+
@ -1111,9 +1116,9 @@ diff -u -r GConf-2.22.0/defaults/Makefile.am hacked/defaults/Makefile.am
+ $(polkit_DATA) \
+ $(dbus_services_DATA)
+
diff -u -r GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf hacked/defaults/org.gnome.GConf.Defaults.conf
--- GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/org.gnome.GConf.Defaults.conf 2008-05-02 14:09:10.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
@ -1138,9 +1143,9 @@ diff -u -r GConf-2.22.0/defaults/org.gnome.GConf.Defaults.conf hacked/defaults/o
+ </policy>
+
+</busconfig>
diff -u -r GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in hacked/defaults/org.gnome.gconf.defaults.policy.in
--- GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/org.gnome.gconf.defaults.policy.in 2008-05-02 14:09:28.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
@ -1170,17 +1175,17 @@ diff -u -r GConf-2.22.0/defaults/org.gnome.gconf.defaults.policy.in hacked/defau
+ </action>
+
+</policyconfig>
diff -u -r GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in hacked/defaults/org.gnome.GConf.Defaults.service.in
--- GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in 2008-05-02 23:07:19.000000000 -0400
+++ hacked/defaults/org.gnome.GConf.Defaults.service.in 2008-05-01 14:39:59.000000000 -0400
diff -up /dev/null GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in
--- /dev/null 2008-05-04 08:09:30.807030239 -0400
+++ GConf-2.22.0/defaults/org.gnome.GConf.Defaults.service.in 2008-05-04 18:15:22.000000000 -0400
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.GConf.Defaults
+Exec=@LIBEXECDIR@/gconf-defaults-mechanism
+User=root
diff -u -r GConf-2.22.0/Makefile.am hacked/Makefile.am
--- GConf-2.22.0/Makefile.am 2007-06-25 07:11:31.000000000 -0400
+++ hacked/Makefile.am 2008-04-30 23:32:45.000000000 -0400
diff -up GConf-2.22.0/Makefile.am.defaults GConf-2.22.0/Makefile.am
--- GConf-2.22.0/Makefile.am.defaults 2007-06-25 07:11:31.000000000 -0400
+++ GConf-2.22.0/Makefile.am 2008-05-04 18:15:22.000000000 -0400
@@ -1,5 +1,5 @@
-SUBDIRS = gconf backends po doc examples
@ -1188,10 +1193,10 @@ diff -u -r GConf-2.22.0/Makefile.am hacked/Makefile.am
DIST_SUBDIRS=tests $(SUBDIRS)
EXTRA_DIST = \
diff -u -r GConf-2.22.0/po/POTFILES.in hacked/po/POTFILES.in
--- GConf-2.22.0/po/POTFILES.in 2007-06-25 07:11:31.000000000 -0400
+++ hacked/po/POTFILES.in 2008-05-01 22:14:31.000000000 -0400
@@ -9,6 +9,7 @@
diff -up GConf-2.22.0/po/POTFILES.in.defaults GConf-2.22.0/po/POTFILES.in
--- GConf-2.22.0/po/POTFILES.in.defaults 2007-06-25 07:11:31.000000000 -0400
+++ GConf-2.22.0/po/POTFILES.in 2008-05-04 18:15:22.000000000 -0400
@@ -9,6 +9,7 @@ backends/xml-backend.c
backends/xml-cache.c
backends/xml-dir.c
backends/xml-entry.c

Write Preview
Loading…
Cancel
Save