diff options
author | marcus <marcus@FreeBSD.org> | 2002-05-06 04:56:12 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2002-05-06 04:56:12 +0800 |
commit | 9540385a219adbeef1779f49b411761cef111665 (patch) | |
tree | 8d1bef3d484a440d8d2c42aac46d5e3b294868df | |
parent | 64b19b3d62a35c8722040ae18e12886da21f5ca9 (diff) | |
download | freebsd-ports-gnome-9540385a219adbeef1779f49b411761cef111665.tar.gz freebsd-ports-gnome-9540385a219adbeef1779f49b411761cef111665.tar.zst freebsd-ports-gnome-9540385a219adbeef1779f49b411761cef111665.zip |
Fix a problem with MIME types and file type icon support.
Prompted by: Franz Klammer <klammer@webonaut.com>
16 files changed, 120 insertions, 4 deletions
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 298d9caf546a..582f92bc0867 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-vfs @@ -30,7 +30,8 @@ USE_X_PREFIX= yes USE_GNOMELIBS= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c new file mode 100644 index 000000000000..078542421129 --- /dev/null +++ b/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 16:42:00 2002 ++++ libgnomevfs/gnome-vfs-utils.c Sun May 5 16:42:15 2002 +@@ -771,7 +771,7 @@ + paths = g_strsplit (gnome_var, ":", 0); + + for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { +- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); ++ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); + if (hack_file_exists (full_filename)) { + g_strfreev (paths); + return full_filename; diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile index 298d9caf546a..582f92bc0867 100644 --- a/devel/gnomevfs/Makefile +++ b/devel/gnomevfs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-vfs @@ -30,7 +30,8 @@ USE_X_PREFIX= yes USE_GNOMELIBS= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} diff --git a/devel/gnomevfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs/files/patch-libgnomevfs_gnome-vfs-utils.c new file mode 100644 index 000000000000..078542421129 --- /dev/null +++ b/devel/gnomevfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 16:42:00 2002 ++++ libgnomevfs/gnome-vfs-utils.c Sun May 5 16:42:15 2002 +@@ -771,7 +771,7 @@ + paths = g_strsplit (gnome_var, ":", 0); + + for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { +- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); ++ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); + if (hack_file_exists (full_filename)) { + g_strfreev (paths); + return full_filename; diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 2437c4c92ffd..06b89691fae7 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomecontrolcenter PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center diff --git a/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c new file mode 100644 index 000000000000..5b48cd25cb94 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_file-types_file-types-icon-entry.c @@ -0,0 +1,11 @@ +--- capplets/file-types/file-types-icon-entry.c.orig Sun May 5 16:33:51 2002 ++++ capplets/file-types/file-types-icon-entry.c Sun May 5 16:34:02 2002 +@@ -424,7 +424,7 @@ + result = NULL; + filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry)); + if (filename != NULL) { +- path_parts = g_strsplit (filename, "/share/pixmaps/", 0); ++ path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0); + g_free (filename); + + if (path_parts[1] != NULL) { diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure new file mode 100644 index 000000000000..53566354e4ac --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun May 5 16:29:53 2002 ++++ configure Sun May 5 16:30:05 2002 +@@ -9161,7 +9161,7 @@ + + + cat >> confdefs.h <<EOF +-#define GNOME_ICONDIR "${prefix}/share/pixmaps" ++#define GNOME_ICONDIR "${datadir}/pixmaps" + EOF + + diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 2437c4c92ffd..06b89691fae7 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomecontrolcenter PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center diff --git a/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c new file mode 100644 index 000000000000..5b48cd25cb94 --- /dev/null +++ b/sysutils/gnome-control-center1/files/patch-capplets_file-types_file-types-icon-entry.c @@ -0,0 +1,11 @@ +--- capplets/file-types/file-types-icon-entry.c.orig Sun May 5 16:33:51 2002 ++++ capplets/file-types/file-types-icon-entry.c Sun May 5 16:34:02 2002 +@@ -424,7 +424,7 @@ + result = NULL; + filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry)); + if (filename != NULL) { +- path_parts = g_strsplit (filename, "/share/pixmaps/", 0); ++ path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0); + g_free (filename); + + if (path_parts[1] != NULL) { diff --git a/sysutils/gnome-control-center1/files/patch-configure b/sysutils/gnome-control-center1/files/patch-configure new file mode 100644 index 000000000000..53566354e4ac --- /dev/null +++ b/sysutils/gnome-control-center1/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun May 5 16:29:53 2002 ++++ configure Sun May 5 16:30:05 2002 +@@ -9161,7 +9161,7 @@ + + + cat >> confdefs.h <<EOF +-#define GNOME_ICONDIR "${prefix}/share/pixmaps" ++#define GNOME_ICONDIR "${datadir}/pixmaps" + EOF + + diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index 2437c4c92ffd..06b89691fae7 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomecontrolcenter PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center diff --git a/sysutils/gnomecontrolcenter/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnomecontrolcenter/files/patch-capplets_file-types_file-types-icon-entry.c new file mode 100644 index 000000000000..5b48cd25cb94 --- /dev/null +++ b/sysutils/gnomecontrolcenter/files/patch-capplets_file-types_file-types-icon-entry.c @@ -0,0 +1,11 @@ +--- capplets/file-types/file-types-icon-entry.c.orig Sun May 5 16:33:51 2002 ++++ capplets/file-types/file-types-icon-entry.c Sun May 5 16:34:02 2002 +@@ -424,7 +424,7 @@ + result = NULL; + filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry)); + if (filename != NULL) { +- path_parts = g_strsplit (filename, "/share/pixmaps/", 0); ++ path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0); + g_free (filename); + + if (path_parts[1] != NULL) { diff --git a/sysutils/gnomecontrolcenter/files/patch-configure b/sysutils/gnomecontrolcenter/files/patch-configure new file mode 100644 index 000000000000..53566354e4ac --- /dev/null +++ b/sysutils/gnomecontrolcenter/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun May 5 16:29:53 2002 ++++ configure Sun May 5 16:30:05 2002 +@@ -9161,7 +9161,7 @@ + + + cat >> confdefs.h <<EOF +-#define GNOME_ICONDIR "${prefix}/share/pixmaps" ++#define GNOME_ICONDIR "${datadir}/pixmaps" + EOF + + diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 2437c4c92ffd..06b89691fae7 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomecontrolcenter PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c new file mode 100644 index 000000000000..5b48cd25cb94 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_file-types_file-types-icon-entry.c @@ -0,0 +1,11 @@ +--- capplets/file-types/file-types-icon-entry.c.orig Sun May 5 16:33:51 2002 ++++ capplets/file-types/file-types-icon-entry.c Sun May 5 16:34:02 2002 +@@ -424,7 +424,7 @@ + result = NULL; + filename = nautilus_mime_type_icon_entry_get_full_filename (NAUTILUS_MIME_ICON_ENTRY (ientry)); + if (filename != NULL) { +- path_parts = g_strsplit (filename, "/share/pixmaps/", 0); ++ path_parts = g_strsplit (filename, "/share/gnome/pixmaps/", 0); + g_free (filename); + + if (path_parts[1] != NULL) { diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure new file mode 100644 index 000000000000..53566354e4ac --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun May 5 16:29:53 2002 ++++ configure Sun May 5 16:30:05 2002 +@@ -9161,7 +9161,7 @@ + + + cat >> confdefs.h <<EOF +-#define GNOME_ICONDIR "${prefix}/share/pixmaps" ++#define GNOME_ICONDIR "${datadir}/pixmaps" + EOF + + |