summaryrefslogtreecommitdiffstats
path: root/x11/gnomecore/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnomecore/files')
-rw-r--r--x11/gnomecore/files/patch-ab85
-rw-r--r--x11/gnomecore/files/patch-ae22
-rw-r--r--x11/gnomecore/files/patch-ah51
-rw-r--r--x11/gnomecore/files/patch-am11
-rw-r--r--x11/gnomecore/files/patch-an11
-rw-r--r--x11/gnomecore/files/patch-ap20
-rw-r--r--x11/gnomecore/files/patch-applets::gen_util::Makefile.in14
-rw-r--r--x11/gnomecore/files/patch-ar18
-rw-r--r--x11/gnomecore/files/patch-config.h.in12
-rw-r--r--x11/gnomecore/files/patch-configure37
-rw-r--r--x11/gnomecore/files/patch-gnome-hint::gnome-hint.c14
-rw-r--r--x11/gnomecore/files/patch-idl::Makefile.in13
-rw-r--r--x11/gnomecore/files/patch-panel::config::Applet_Config41
-rw-r--r--x11/gnomecore/files/patch-panel::doc::Makefile.in14
-rw-r--r--x11/gnomecore/files/patch-panel::foobar-widget.c14
-rw-r--r--x11/gnomecore/files/patch-panel::launcher.c14
-rw-r--r--x11/gnomecore/files/patch-panel::main.c14
-rw-r--r--x11/gnomecore/files/patch-panel::menu-properties.c11
-rw-r--r--x11/gnomecore/files/patch-panel::menu.c31
-rw-r--r--x11/gnomecore/files/patch-panel_gnome-panel-screenshot.c12
-rw-r--r--x11/gnomecore/files/patch-po::Makefile.in.in14
-rw-r--r--x11/gnomecore/files/patch-sgmldocs.make14
22 files changed, 0 insertions, 487 deletions
diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab
deleted file mode 100644
index f756bd1..0000000
--- a/x11/gnomecore/files/patch-ab
+++ /dev/null
@@ -1,85 +0,0 @@
---- help-browser/gnome-help-browser.c.orig Sat May 13 12:16:14 2000
-+++ help-browser/gnome-help-browser.c Fri May 26 14:31:15 2000
-@@ -81,14 +81,10 @@
- void destroy_server(HelpWindow win);
-
- /* MANPATH should probably come from somewhere */
--#define DEFAULT_MANPATH GNOME_PREFIX "/man:/usr/man:/usr/share/man:/usr/local/man:/usr/X11R6/man"
--#define DEFAULT_INFOPATH GNOME_PREFIX "/info:/usr/info:/usr/share/info:/usr/local/info"
-+#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
-+#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info"
- /* GHELPPATH probably needs some automatic additions inside toc */
--#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \
-- "/opt/gnome/share/gnome/help:" \
-- "/usr/local/share/gnome/help:" \
-- "/usr/local/gnome/share/gnome/help:" \
-- "/usr/share/gnome/help"
-+#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help"
- #define DEFAULT_MEMCACHESIZE "1000000"
- #define DEFAULT_HISTORYLENGTH "1000"
- #define HELP_BROWSER_RC_DIR ".gnome-help-browser"
---- help-browser/toc.c.orig Thu May 4 06:54:33 2000
-+++ help-browser/toc.c Fri May 26 14:32:55 2000
-@@ -20,14 +20,13 @@
- static int hideTocInt(GtkWidget *window);
-
- struct _toc_config toc_config[] = {
-- { "/usr/man", TOC_MAN_TYPE },
-+ { "/usr/share/man", TOC_MAN_TYPE },
- { "/usr/local/man", TOC_MAN_TYPE },
- { "/usr/X11R6/man", TOC_MAN_TYPE },
-- { "/usr/info", TOC_INFO_TYPE },
-- { "/opt/gnome/share/gnome/help", TOC_GHELP_TYPE },
-- { "/usr/local/share/gnome/help", TOC_GHELP_TYPE },
-- { "/usr/local/gnome/share/gnome/help", TOC_GHELP_TYPE },
-- { "/usr/share/gnome/help", TOC_GHELP_TYPE },
-+ { "/usr/share/info", TOC_INFO_TYPE },
-+ { "/usr/local/info", TOC_INFO_TYPE },
-+ { "/usr/X11R6/info", TOC_INFO_TYPE },
-+ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE },
- { NULL, 0 }
- };
-
---- help-browser/Makefile.in.orig Tue May 23 04:25:07 2000
-+++ help-browser/Makefile.in Fri May 26 16:15:53 2000
-@@ -558,7 +558,7 @@
- help-caller.o gnome-help-browser.o: help-browser.h
-
- install-exec-local:
-- $(INSTALL_PROGRAM) $(top_srcdir)/help-browser/gnome-download \
-+ $(INSTALL_SCRIPT) $(top_srcdir)/help-browser/gnome-download \
- $(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
---- help-browser/misc.c.orig Thu Apr 20 01:02:35 2000
-+++ help-browser/misc.c Wed Aug 2 00:24:41 2000
-@@ -162,10 +162,10 @@
- switch (bz) {
- case 1:
- #ifdef HAVE_LIBBZ2
-- if ((bf=bzopen(file, "r"))==NULL)
-+ if ((bf=BZ2_bzopen(file, "r"))==NULL)
- return -1;
-
-- bytes=bzread(bf, buf, 8192);
-+ bytes=BZ2_bzread(bf, buf, 8192);
- break;
- #endif
- default:
-@@ -186,14 +186,14 @@
- len += bytes;
- #ifdef HAVE_LIBBZ2
- if (bz == 1)
-- bytes=bzread(bf, buf, 8192);
-+ bytes=BZ2_bzread(bf, buf, 8192);
- else
- #endif
- bytes=gzread(f, buf, 8192);
- }
- #ifdef HAVE_LIBBZ2
- if (bz == 1)
-- bzclose(bf);
-+ BZ2_bzclose(bf);
- else
- #endif
- gzclose(f);
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
deleted file mode 100644
index daf5653..0000000
--- a/x11/gnomecore/files/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
---- applets/gen_util/mailcheck.c.orig Thu May 18 03:16:03 2000
-+++ applets/gen_util/mailcheck.c Fri May 26 15:08:01 2000
-@@ -1296,7 +1296,7 @@
- if (!user)
- return NULL;
-
-- mc->mail_file = g_strdup_printf ("/var/spool/mail/%s",
-+ mc->mail_file = g_strdup_printf ("/var/mail/%s",
- user);
- } else
- mc->mail_file = g_strdup (mc->mail_file);
---- applets/fish/Makefile.in.orig Tue May 23 04:26:04 2000
-+++ applets/fish/Makefile.in Fri May 26 16:23:15 2000
-@@ -187,7 +187,7 @@
-
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libfish_applet_la_LDFLAGS =
-+libfish_applet_la_LDFLAGS = -version-info 5:0:0
- libfish_applet_la_LIBADD =
- libfish_applet_la_OBJECTS = fish.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah
deleted file mode 100644
index 9c12f14..0000000
--- a/x11/gnomecore/files/patch-ah
+++ /dev/null
@@ -1,51 +0,0 @@
-
-$FreeBSD$
-
---- panel/Makefile.in.orig Sun Jul 7 11:41:07 2002
-+++ panel/Makefile.in Wed Jul 10 18:02:24 2002
-@@ -217,7 +217,7 @@
- libpanel_appletincludedir = $(includedir)
- libpanel_statusincludedir = $(includedir)
-
--lib_LTLIBRARIES = libpanel_applet.la libpanel_status.la
-+lib_LTLIBRARIES = libpanel_status.la
-
- CORBA_SRCLIST = \
- gnome-panel-stubs.c \
-@@ -239,7 +239,7 @@
- gnome-panel.h
-
-
--libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
-+libpanel_applet_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
-
- libpanel_status_la_SOURCES = \
-@@ -251,7 +251,7 @@
- status-docklet.h
-
-
--libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libpanel_status_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
-
- bad_applet_SOURCES = bad-applet.c
-@@ -435,8 +435,8 @@
- $(man_MANS)
-
-
--confexecdir = $(libdir)
--confexec_DATA = appletsConf.sh dockletsConf.sh
-+confexecdir = $(sysconfdir)
-+confexec_DATA = dockletsConf.sh
-
- panelgnorbadir = $(sysconfdir)/CORBA/servers
- panelgnorba_DATA = panel.gnorba
-@@ -1278,7 +1278,6 @@
- install-data-am: install-man install-deskDATA install-gladeDATA \
- install-hintsDATA install-panelgnorbaDATA \
- install-soundlistDATA install-sysDATA \
-- install-libpanel_appletincludeHEADERS \
- install-libpanel_statusincludeHEADERS
- install-data: install-data-recursive
-
diff --git a/x11/gnomecore/files/patch-am b/x11/gnomecore/files/patch-am
deleted file mode 100644
index b9fc774..0000000
--- a/x11/gnomecore/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-terminal/gnome-terminal.c.orig Wed Feb 14 19:25:02 2001
-+++ gnome-terminal/gnome-terminal.c Mon Feb 26 20:01:55 2001
-@@ -513,3 +513,3 @@
-
-- cfg->keyboard_secured = FALSE;
-+ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0");
-
-@@ -1032,2 +1032,3 @@
-
-+ gnome_config_set_bool ("keyboard_secured", cfg->keyboard_secured);
- gnome_config_set_bool ("bell_silenced", cfg->bell);
diff --git a/x11/gnomecore/files/patch-an b/x11/gnomecore/files/patch-an
deleted file mode 100644
index 521114b..0000000
--- a/x11/gnomecore/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmenu/main.c.orig Wed May 10 01:36:16 2000
-+++ gmenu/main.c Fri May 26 15:09:49 2000
-@@ -276,7 +276,7 @@
- gnome_init ("GNOME menu editor", VERSION, argc, argv);
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-gmenu.png");
-
-- system_apps_dir = gnome_datadir_file("gnome/apps");
-+ system_apps_dir = gnome_datadir_file("apps");
- system_applets_dir = gnome_datadir_file("applets");
- system_pixmap_dir = gnome_datadir_file("pixmaps");
- if (!system_apps_dir || !system_pixmap_dir || !system_applets_dir)
diff --git a/x11/gnomecore/files/patch-ap b/x11/gnomecore/files/patch-ap
deleted file mode 100644
index 40f09cb..0000000
--- a/x11/gnomecore/files/patch-ap
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- gsm/Makefile.in.orig Tue Jan 22 16:13:49 2002
-+++ gsm/Makefile.in Tue Jan 22 16:24:53 2002
-@@ -175,12 +175,12 @@
-
- SUBDIRS = help
-
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
-
- INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
-- -DDEFAULTDIR="\"$(defaultdir)\"" @CANVAS_PIXBUF_CFLAGS@
-+ -DDEFAULTDIR="\"$(defaultdir)\"" @CANVAS_PIXBUF_CFLAGS@ -DX11BASE="\"$(X11BASE)\""
-
-
- LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
diff --git a/x11/gnomecore/files/patch-applets::gen_util::Makefile.in b/x11/gnomecore/files/patch-applets::gen_util::Makefile.in
deleted file mode 100644
index a21c7fb..0000000
--- a/x11/gnomecore/files/patch-applets::gen_util::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- applets/gen_util/Makefile.in.orig Tue Jan 22 16:13:51 2002
-+++ applets/gen_util/Makefile.in Tue Jan 22 16:25:24 2002
-@@ -242,7 +242,7 @@
-
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgen_util_applet_la_LDFLAGS =
-+libgen_util_applet_la_LDFLAGS = -version-info 5:0:0
- libgen_util_applet_la_LIBADD =
- libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \
- printer.lo clock.lo remote-helper.lo
diff --git a/x11/gnomecore/files/patch-ar b/x11/gnomecore/files/patch-ar
deleted file mode 100644
index d39b118..0000000
--- a/x11/gnomecore/files/patch-ar
+++ /dev/null
@@ -1,18 +0,0 @@
---- gsm/logout.c.orig Thu Mar 15 10:35:51 2001
-+++ gsm/logout.c Sun Mar 18 20:54:55 2001
-@@ -36,3 +36,7 @@
- {
-+#ifdef __FreeBSD__
-+ "/sbin/shutdown", "-h", "now", NULL
-+#else
- "/usr/bin/poweroff", NULL
-+#endif
- };
-@@ -41,3 +45,7 @@
- {
-+#ifdef __FreeBSD__
-+ "/sbin/shutdown", "-r", "now", NULL
-+#else
- "/usr/bin/reboot", NULL
-+#endif
- };
diff --git a/x11/gnomecore/files/patch-config.h.in b/x11/gnomecore/files/patch-config.h.in
deleted file mode 100644
index 5d11cde..0000000
--- a/x11/gnomecore/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig Sat Oct 5 13:48:12 2002
-+++ config.h.in Sat Oct 5 13:48:42 2002
-@@ -147,6 +147,9 @@
- /* Define if you have the <nl_types.h> header file. */
- #undef HAVE_NL_TYPES_H
-
-+/* Define if you have the <langinfo.h> header files. */
-+#undef HAVE_LANGINFO_H
-+
- /* Define if you have the <stdlib.h> header file. */
- #undef HAVE_STDLIB_H
-
diff --git a/x11/gnomecore/files/patch-configure b/x11/gnomecore/files/patch-configure
deleted file mode 100644
index 7d112da..0000000
--- a/x11/gnomecore/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig Mon Sep 9 14:09:25 2002
-+++ configure Sat Oct 5 13:43:32 2002
-@@ -5723,6 +5723,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7863,7 +7864,7 @@
-
-
- for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
--unistd.h sys/param.h
-+unistd.h sys/param.h langinfo.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -9299,7 +9300,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lXinerama $GTK_LIBS $LIBS"
-+LIBS="-lXinerama -lXext $GTK_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 9305 "configure"
- #include "confdefs.h"
-@@ -9332,7 +9333,7 @@
- #define HAVE_LIBXINERAMA 1
- EOF
-
-- XINERAMA_LIBS="-lXinerama"
-+ XINERAMA_LIBS="-lXinerama -lXext"
- XINERAMA_SUPPORT=yes
- else
- echo "$ac_t""no" 1>&6
diff --git a/x11/gnomecore/files/patch-gnome-hint::gnome-hint.c b/x11/gnomecore/files/patch-gnome-hint::gnome-hint.c
deleted file mode 100644
index 0603d6f..0000000
--- a/x11/gnomecore/files/patch-gnome-hint::gnome-hint.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gnome-hint/gnome-hint.c 2002/05/01 10:43:20 1.1
-+++ gnome-hint/gnome-hint.c 2002/05/01 10:43:49
-@@ -163,7 +163,7 @@
- hintnum++;
-
- /* see if we find the directory with the hints */
-- name = gnome_datadir_file ("gnome/hints");
-+ name = gnome_datadir_file ("hints");
- if (name == NULL)
- return;
- if (stat (name, &s) != 0 ||
diff --git a/x11/gnomecore/files/patch-idl::Makefile.in b/x11/gnomecore/files/patch-idl::Makefile.in
deleted file mode 100644
index 712f85a..0000000
--- a/x11/gnomecore/files/patch-idl::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- idl/Makefile.in 2002/07/10 14:57:23 1.1
-+++ idl/Makefile.in 2002/07/10 14:58:38
-@@ -180,7 +180,6 @@
- idldir = $(datadir)/idl
-
- idl_DATA = \
-- gnome-panel.idl \
- help-browser.idl \
- Terminal.idl
-
diff --git a/x11/gnomecore/files/patch-panel::config::Applet_Config b/x11/gnomecore/files/patch-panel::config::Applet_Config
deleted file mode 100644
index 28c0d0e..0000000
--- a/x11/gnomecore/files/patch-panel::config::Applet_Config
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- panel/config/Applet_Config 2002/01/22 14:18:42 1.1
-+++ panel/config/Applet_Config 2002/01/22 14:19:44
-@@ -15,7 +15,7 @@
- [Applet_2]
- Conditional=screen_width >= 640
- id=Launcher
--parameters=gnome/apps/gnome-help.desktop
-+parameters=apps/gnome-help.desktop
- position=12
- panel=0
- unique_panel_id=10000001
-@@ -24,7 +24,7 @@
- [Applet_3]
- Conditional=screen_width >= 640
- id=Launcher
--parameters=gnome/apps/System/gnome-terminal.desktop
-+parameters=apps/System/gnome-terminal.desktop
- position=13
- panel=0
- unique_panel_id=10000001
-@@ -33,7 +33,7 @@
- [Applet_4]
- Conditional=screen_width >= 640
- id=Launcher
--parameters=gnome/apps/Settings/gnomecc.desktop
-+parameters=apps/Settings/gnomecc.desktop
- position=14
- panel=0
- unique_panel_id=10000001
-@@ -42,7 +42,7 @@
- [Applet_5]
- Conditional=screen_width >= 640
- id=Launcher
--parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'gnome/apps/Internet/mozilla.desktop'}gnome/apps/Internet/mozilla.desktop{exists 'gnome/apps/Internet/Mozilla.desktop'}gnome/apps/Internet/Mozilla.desktop{true}gnome/apps/Internet/Netscape.desktop
-+parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'apps/Internet/mozilla.desktop'}apps/Internet/mozilla.desktop{exists 'apps/Internet/Mozilla.desktop'}apps/Internet/Mozilla.desktop{true}apps/Internet/Netscape.desktop
- position=15
- panel=0
- unique_panel_id=10000001
diff --git a/x11/gnomecore/files/patch-panel::doc::Makefile.in b/x11/gnomecore/files/patch-panel::doc::Makefile.in
deleted file mode 100644
index 5887c85..0000000
--- a/x11/gnomecore/files/patch-panel::doc::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- panel/doc/Makefile.in 2002/05/01 10:19:11 1.1
-+++ panel/doc/Makefile.in 2002/05/01 10:20:03
-@@ -188,7 +188,7 @@
- CFLAGS = "`gnome-config --cflags gnomeui applets docklets`"
- LDFLAGS = "`gnome-config --libs gnomeui applets docklets`"
-
--HTML_DIR = $(datadir)/html
-+HTML_DIR = $(prefix)/share/doc/panel
-
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-
diff --git a/x11/gnomecore/files/patch-panel::foobar-widget.c b/x11/gnomecore/files/patch-panel::foobar-widget.c
deleted file mode 100644
index f0ff594..0000000
--- a/x11/gnomecore/files/patch-panel::foobar-widget.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- panel/foobar-widget.c 2002/07/14 10:25:26 1.1
-+++ panel/foobar-widget.c 2002/07/14 10:25:41
-@@ -1068,7 +1068,7 @@
- FALSE, "apps");
- foo->settings =
- append_folder_menu(menu_bar, _("Settings"), NULL, TRUE,
-- "gnome/apps/Settings");
-+ "apps/Settings");
- append_desktop_menu (menu_bar);
-
- gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0);
diff --git a/x11/gnomecore/files/patch-panel::launcher.c b/x11/gnomecore/files/patch-panel::launcher.c
deleted file mode 100644
index 741b94b..0000000
--- a/x11/gnomecore/files/patch-panel::launcher.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- panel/launcher.c 2002/01/22 14:21:27 1.1
-+++ panel/launcher.c 2002/01/22 14:21:36
-@@ -324,7 +324,7 @@
- else
- extension = ".desktop";
-
-- apps_par = g_strconcat ("gnome/apps/", parameters,
-+ apps_par = g_strconcat ("apps/", parameters,
- extension, NULL);
- entry = gnome_datadir_file (apps_par);
- g_free (apps_par);
diff --git a/x11/gnomecore/files/patch-panel::main.c b/x11/gnomecore/files/patch-panel::main.c
deleted file mode 100644
index ed3cda1..0000000
--- a/x11/gnomecore/files/patch-panel::main.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- panel/main.c.orig Sat Jun 8 01:37:03 2002
-+++ panel/main.c Mon Jun 10 15:23:57 2002
-@@ -386,7 +386,7 @@
- {
- int len;
-
-- merge_main_dir = gnome_datadir_file("gnome/apps");
-+ merge_main_dir = gnome_datadir_file("apps");
- merge_main_dir_len = merge_main_dir != NULL ? strlen (merge_main_dir) : 0;
- merge_merge_dir = conditional_get_string ("/panel/Merge/Directory",
- "/etc/X11/applnk/",
diff --git a/x11/gnomecore/files/patch-panel::menu-properties.c b/x11/gnomecore/files/patch-panel::menu-properties.c
deleted file mode 100644
index 1a44cbf..0000000
--- a/x11/gnomecore/files/patch-panel::menu-properties.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- panel/menu-properties.c.orig Sat Jul 13 23:18:06 2002
-+++ panel/menu-properties.c Sat Jul 13 23:18:15 2002
-@@ -68,7 +68,7 @@
- arguments = ".";
-
- if(strcmp(arguments, ".") == 0)
-- this_menu = gnome_unconditional_datadir_file ("gnome/apps");
-+ this_menu = gnome_unconditional_datadir_file ("apps");
- else if (*arguments == '/')
- this_menu = g_strdup (arguments);
- else if (*arguments == '~')
diff --git a/x11/gnomecore/files/patch-panel::menu.c b/x11/gnomecore/files/patch-panel::menu.c
deleted file mode 100644
index 3d2ea1b..0000000
--- a/x11/gnomecore/files/patch-panel::menu.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- panel/menu.c.orig Sat Jul 13 23:17:04 2002
-+++ panel/menu.c Sat Jul 13 23:17:33 2002
-@@ -158,7 +158,7 @@
- /*just load the menus from disk, don't make the widgets
- this just reads the .desktops of the top most directory
- and a level down*/
-- menu = gnome_datadir_file ("gnome/apps");
-+ menu = gnome_datadir_file ("apps");
- if (menu != NULL)
- fr_read_dir (NULL, menu, NULL, NULL, 2);
- g_free (menu);
-@@ -3680,7 +3680,7 @@
- gboolean launcher_add,
- gboolean favourites_add)
- {
-- char *menudir = gnome_datadir_file ("gnome/apps");
-+ char *menudir = gnome_datadir_file ("apps");
-
- if (menudir &&
- g_file_test (menudir, G_FILE_TEST_ISDIR)) {
-@@ -4847,8 +4847,8 @@
- gtk_menu_append (GTK_MENU (submenu), submenuitem);
- gtk_signal_connect(GTK_OBJECT(submenuitem), "activate",
- GTK_SIGNAL_FUNC(add_menu_to_panel),
-- "gnome/apps");
-- setup_internal_applet_drag(submenuitem, "MENU:gnome/apps");
-+ "apps");
-+ setup_internal_applet_drag(submenuitem, "MENU:apps");
-
- submenuitem = gtk_menu_item_new ();
- gtk_widget_lock_accelerators (menuitem);
diff --git a/x11/gnomecore/files/patch-panel_gnome-panel-screenshot.c b/x11/gnomecore/files/patch-panel_gnome-panel-screenshot.c
deleted file mode 100644
index 7da6c82..0000000
--- a/x11/gnomecore/files/patch-panel_gnome-panel-screenshot.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- panel/gnome-panel-screenshot.c.orig Sat Oct 5 13:38:16 2002
-+++ panel/gnome-panel-screenshot.c Sat Oct 5 13:38:51 2002
-@@ -53,7 +53,9 @@
- #include <libart_lgpl/art_rgb_affine.h>
-
- #include <stdio.h>
-+#ifdef HAVE_LANGINFO_H
- #include <langinfo.h>
-+#endif
-
- /* How far down the window tree will we search when looking for top-level
- * windows? Some window managers doubly-reparent the client, so account
diff --git a/x11/gnomecore/files/patch-po::Makefile.in.in b/x11/gnomecore/files/patch-po::Makefile.in.in
deleted file mode 100644
index 6b65c22..0000000
--- a/x11/gnomecore/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in 2002/01/22 18:34:36 1.1
-+++ po/Makefile.in.in 2002/01/22 18:34:45
-@@ -106,7 +106,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
diff --git a/x11/gnomecore/files/patch-sgmldocs.make b/x11/gnomecore/files/patch-sgmldocs.make
deleted file mode 100644
index 2a94f8a..0000000
--- a/x11/gnomecore/files/patch-sgmldocs.make
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- sgmldocs.make 2002/01/22 14:14:55 1.1
-+++ sgmldocs.make 2002/01/22 14:15:31
-@@ -32,7 +32,7 @@
- # dist-hook: app-dist-hook
- #
-
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
-
- doc_DATA = index.html
-
OpenPOWER on IntegriCloud