summaryrefslogtreecommitdiff
path: root/devel/libgnome/patches
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-02-14 20:11:49 +0000
committerjmmv <jmmv>2003-02-14 20:11:49 +0000
commitce245d947465116539be717d9afac9810b73d4e4 (patch)
tree0432d8a5702d568eafa1e618e7885605001a57fa /devel/libgnome/patches
parent7f94768345a4da18d3077744346c8ba794178821 (diff)
downloadpkgsrc-ce245d947465116539be717d9afac9810b73d4e4.tar.gz
Updated to 2.2.0.1. Changes since 2.0.6 include:
* libgnome/Makefile.am (libgnome_2_la_LDFLAGS): Correct version number error. * configure.in: Add EXTRAVERSION and set to .1. Add missing translations to ALL_LINGUAS. * configure.in: Added "mn" to ALL_LINGUAS. * configure.in: Fix libtool versioning. Up number to 2.2.0 * schemas/desktop_gnome_peripherals_mouse.schemas.in: add /desktop/gnome/peripherals/mouse/cursor_theme and /desktop/gnome/peripherals/mouse/cursor_size * monikers/bonobo-config-bag.c (bonobo_config_bag_new): Fix comment. * schemas/Makefile.am (schema_in_files) schemas/desktop_gnome_thumbnailers.schemas.in: Add schemas for thumbnailers. * schemas/desktop_gnome_accessibility_keyboard.schemas.in : set defaults to 0 to fix #96483 * help-converters/info/main.c output title, fixing bug #83905 Changes in the package: - Honor PKG_SYSCONFDIR. - Use GConf2's schemas.mk file to register schemas. - Depend on docbook, so the installed customization layer works.
Diffstat (limited to 'devel/libgnome/patches')
-rw-r--r--devel/libgnome/patches/patch-aa24
-rw-r--r--devel/libgnome/patches/patch-ab24
-rw-r--r--devel/libgnome/patches/patch-ac14
-rw-r--r--devel/libgnome/patches/patch-ad13
4 files changed, 42 insertions, 33 deletions
diff --git a/devel/libgnome/patches/patch-aa b/devel/libgnome/patches/patch-aa
index 0e112b05442..b43a6277961 100644
--- a/devel/libgnome/patches/patch-aa
+++ b/devel/libgnome/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 23:31:16 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/14 20:11:50 jmmv Exp $
---- doc/reference/Makefile.am.orig Thu Sep 5 23:37:18 2002
-+++ doc/reference/Makefile.am Thu Sep 5 23:37:33 2002
-@@ -155,8 +155,8 @@
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- done; \
-- echo '-- Installing $(srcdir)/html/index.sgml' ; \
-- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+ echo '-- Installing $(srcdir)/html/index.html' ; \
-+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- fi)
+--- gnome-data/Makefile.in.orig Thu Jan 23 15:08:16 2003
++++ gnome-data/Makefile.in
+@@ -132,7 +132,7 @@ YACC = @YACC@
+ Z_LIBS = @Z_LIBS@
+ gnomelocaledir = @gnomelocaledir@
- #
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/libgnome/sound/events
+
+ soundlist_in_files = \
+ gnome-2.soundlist.in \
diff --git a/devel/libgnome/patches/patch-ab b/devel/libgnome/patches/patch-ab
index 19bde4049b1..4ea71d97c43 100644
--- a/devel/libgnome/patches/patch-ab
+++ b/devel/libgnome/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/11 23:31:16 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/02/14 20:11:51 jmmv Exp $
---- doc/reference/Makefile.in.orig Thu Sep 5 23:37:21 2002
-+++ doc/reference/Makefile.in Thu Sep 5 23:37:41 2002
-@@ -379,8 +379,8 @@
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- done; \
-- echo '-- Installing $(srcdir)/html/index.sgml' ; \
-- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+ echo '-- Installing $(srcdir)/html/index.html' ; \
-+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- fi)
+--- help-converters/gnome-vfs-module/Makefile.in.orig Thu Jan 23 15:08:20 2003
++++ help-converters/gnome-vfs-module/Makefile.in
+@@ -150,7 +150,7 @@ libvfs_help_la_SOURCES = \
+ libvfs_help_la_LDFLAGS = $(module_flags)
+ libvfs_help_la_LIBADD = $(HELP_VFS_MODULE_LIBS)
- #
+-modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
++modulesconfdir = $(datadir)/examples/libgnome/gnome-vfs-2.0/modules
+ modulesconf_DATA = help-methods.conf
+
+ EXTRA_DIST = help-methods.conf
diff --git a/devel/libgnome/patches/patch-ac b/devel/libgnome/patches/patch-ac
index 484f4adddb9..6972b55521a 100644
--- a/devel/libgnome/patches/patch-ac
+++ b/devel/libgnome/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/11 23:31:16 rh Exp $
+$NetBSD: patch-ac,v 1.2 2003/02/14 20:11:51 jmmv Exp $
---- libgnome/gnome-init.h.orig Fri Sep 6 23:02:37 2002
-+++ libgnome/gnome-init.h Fri Sep 6 23:02:47 2002
-@@ -32,8 +32,8 @@
- G_BEGIN_DECLS
-
- /* This is where the user specific files are stored under $HOME */
+--- libgnome/gnome-init.h.orig Fri Nov 22 14:47:27 2002
++++ libgnome/gnome-init.h
+@@ -36,8 +36,8 @@ G_BEGIN_DECLS
+ * to override .gnome2 via environment variable and this is
+ * an important feature for environments that mix GNOME versions)
+ */
-#define GNOME_DOT_GNOME ".gnome2/"
-#define GNOME_DOT_GNOME_PRIVATE ".gnome2_private/"
+#define GNOME_DOT_GNOME ".gnome2"
diff --git a/devel/libgnome/patches/patch-ad b/devel/libgnome/patches/patch-ad
new file mode 100644
index 00000000000..a5318f750a9
--- /dev/null
+++ b/devel/libgnome/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/02/14 20:11:52 jmmv Exp $
+
+--- schemas/Makefile.in.orig Thu Jan 23 15:08:14 2003
++++ schemas/Makefile.in
+@@ -279,7 +279,7 @@ maintainer-clean
+
+ # don't do this if we are building in eg. rpm
+ install-data-local:
+- if test -z "$(DESTDIR)" ; then \
++ if false ; then \
+ for p in $(schema_DATA) ; do \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
+ done \