summaryrefslogtreecommitdiff
path: root/x11/gnome-desktop/patches
diff options
context:
space:
mode:
authorrh <rh>2002-09-14 07:01:42 +0000
committerrh <rh>2002-09-14 07:01:42 +0000
commita9eee79da70e1e36aa558fac5c4d01d8478fdd72 (patch)
tree93b6207572b22f379c1cb044363257ae950f4aec /x11/gnome-desktop/patches
parentf989ab7b2231fe674c39e1e5f3756e3044a914a5 (diff)
downloadpkgsrc-a9eee79da70e1e36aa558fac5c4d01d8478fdd72.tar.gz
Initial import of gnome-desktop-2.0.8, the main desktop component of GNOME2
Based on Julio Merino's version in PR pkg/18209 with some modifications to allow co-existence with GNOME 1.
Diffstat (limited to 'x11/gnome-desktop/patches')
-rw-r--r--x11/gnome-desktop/patches/patch-aa13
-rw-r--r--x11/gnome-desktop/patches/patch-ab24
-rw-r--r--x11/gnome-desktop/patches/patch-ac22
-rw-r--r--x11/gnome-desktop/patches/patch-ad13
-rw-r--r--x11/gnome-desktop/patches/patch-ae13
5 files changed, 85 insertions, 0 deletions
diff --git a/x11/gnome-desktop/patches/patch-aa b/x11/gnome-desktop/patches/patch-aa
new file mode 100644
index 00000000000..b6729621b02
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+
+--- Makefile.in.orig Thu Sep 5 12:20:35 2002
++++ Makefile.in
+@@ -140,7 +140,7 @@ SUBDIRS = po libgnome-desktop gn
+ EXTRA_DIST = gnome-version.xml.in gnome-version.xml gnome-desktop.spec.in gnome-desktop.spec COPYING-DOCS HACKING sgmldocs.make xmldocs.make intltool-extract.in intltool-merge.in intltool-update.in
+
+
+-versiondir = $(datadir)/gnome-about
++versiondir = $(datadir)/gnome2-about
+ version_DATA = gnome-version.xml
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/gnome-desktop/patches/patch-ab b/x11/gnome-desktop/patches/patch-ab
new file mode 100644
index 00000000000..99779bc36ca
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+
+--- gnome-about/Makefile.in.orig Thu Sep 5 12:21:00 2002
++++ gnome-about/Makefile.in
+@@ -149,7 +149,7 @@ bin_PROGRAMS = gnome-about
+ gnome_about_SOURCES = gnome-about.c contributors.h
+
+
+-authorsdir = $(datadir)/gnome-about
++authorsdir = $(datadir)/gnome2-about
+ authors_DATA = contributors.dat
+
+ EXTRA_DIST = logo.xpm $(authors_DATA)
+@@ -207,8 +207,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/gnome/gnome2/' -e 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/gnome/gnome2/' -e 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ else :; fi; \
+ done
+
diff --git a/x11/gnome-desktop/patches/patch-ac b/x11/gnome-desktop/patches/patch-ac
new file mode 100644
index 00000000000..61bb3ab86da
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+
+--- gnome-about/gnome-about.c.orig Mon Aug 26 23:54:46 2002
++++ gnome-about/gnome-about.c
+@@ -299,7 +299,7 @@ cb_clicked (GtkWidget *widget, GdkEvent
+
+ filename = gnome_program_locate_file (
+ NULL, GNOME_FILE_DOMAIN_DATADIR,
+- "gnome-about/contributors.dat", TRUE, NULL);
++ "gnome2-about/contributors.dat", TRUE, NULL);
+ if (filename)
+ gnome_sound_play (filename);
+
+@@ -718,7 +718,7 @@ main (gint argc, gchar *argv[])
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+- gnome_program_init ("gnome-about","1.0", LIBGNOMEUI_MODULE, argc, argv, NULL);
++ gnome_program_init ("gnome2-about","1.0", LIBGNOMEUI_MODULE, argc, argv, NULL);
+ gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-logo-icon-transparent.png");
+ gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
+
diff --git a/x11/gnome-desktop/patches/patch-ad b/x11/gnome-desktop/patches/patch-ad
new file mode 100644
index 00000000000..55722d0080a
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+
+--- man/Makefile.in.orig Thu Sep 5 12:21:10 2002
++++ man/Makefile.in
+@@ -174,7 +174,7 @@ install-man1:
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++ inst=`echo $$inst | sed -e 's/gnome/gnome2/' -e '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ done
diff --git a/x11/gnome-desktop/patches/patch-ae b/x11/gnome-desktop/patches/patch-ae
new file mode 100644
index 00000000000..677395e957e
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+
+--- pixmaps/Makefile.in.orig Thu Sep 5 12:21:05 2002
++++ pixmaps/Makefile.in
+@@ -47,7 +47,7 @@ AUTOHEADER = @AUTOHEADER@
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
++INSTALL_DATA = echo "part of gnome-pixmaps, not installed: "
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ transform = @program_transform_name@
+