diff options
Diffstat (limited to 'x11-toolkits/gtk30/files')
4 files changed, 11 insertions, 48 deletions
diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak index 27156d238e58..f8dda5cbffaf 100644 --- a/x11-toolkits/gtk30/files/patch-ak +++ b/x11-toolkits/gtk30/files/patch-ak @@ -1,6 +1,6 @@ $FreeBSD$ - $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $ + $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.21 2007/04/26 17:22:32 marcus Exp $ --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c index c33fc40e8264..e0fd02d4fbac 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c @@ -5,7 +5,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) - xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "/usr/local/share/"; ptr = xdg_data_dirs; diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h index 266d74c22365..b64106809ef6 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h +++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h @@ -1,25 +1,12 @@ ---- gtk/xdgmime/xdgmimecache.h.orig Mon May 29 20:04:24 2006 -+++ gtk/xdgmime/xdgmimecache.h Mon May 29 20:11:42 2006 -@@ -32,9 +32,19 @@ - typedef struct _XdgMimeCache XdgMimeCache; +--- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400 ++++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400 +@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) + #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) + #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) ++#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) - #ifdef XDG_PREFIX --#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) --#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) --#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) -+#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) -+#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) -+#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) -+#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data) -+#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file) -+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) -+#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) -+#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) -+#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents) #endif - extern XdgMimeCache **_caches; diff --git a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c deleted file mode 100644 index 612f57b60af0..000000000000 --- a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c +++ /dev/null @@ -1,24 +0,0 @@ ---- modules/printbackends/cups/gtkcupsutils.c.orig 2007-07-16 15:45:18.000000000 -0400 -+++ modules/printbackends/cups/gtkcupsutils.c 2007-10-01 14:27:17.000000000 -0400 -@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request) - httpClearFields(request->http); - httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length); - httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp"); --#ifdef HAVE_HTTP_AUTHSTRING -- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring); --#endif -+ httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http)); - - if (httpPost(request->http, request->resource)) - { -@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request) - } - - httpClearFields(request->http); --#ifdef HAVE_HTTP_AUTHSTRING -- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring); --#endif -+ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http)); - - if (httpGet(request->http, request->resource)) - { |