diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-04-05 03:14:48 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-04-05 03:14:48 +0000 |
| commit | 034846f74614212cad0f1eb32fe34f717ec9a10e (patch) | |
| tree | ba1039d9eb2bc4ea39f7f30c164f50a661c183bf | |
| parent | Use intlhack to avoid adding a patch. (diff) | |
Add a patch forgotten by the merge script.
| -rw-r--r-- | misc/gnome-icon-theme/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c | 36 | ||||
| -rw-r--r-- | print/ggv2/files/patch-src_Makefile.in | 11 |
3 files changed, 58 insertions, 0 deletions
diff --git a/misc/gnome-icon-theme/files/patch-Makefile.in b/misc/gnome-icon-theme/files/patch-Makefile.in new file mode 100644 index 000000000000..0868017d98ba --- /dev/null +++ b/misc/gnome-icon-theme/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Jan 13 16:03:30 2004 ++++ Makefile.in Tue Jan 13 16:03:57 2004 +@@ -119,6 +119,8 @@ + hicolor_dirs = \ + $(datadir)/pixmaps \ + $(datadir)/icons \ ++ %%X11BASE%%/share/icons \ ++ %%X11BASE%%/share/pixmaps \ + /usr/share/icons \ + /usr/share/pixmaps + diff --git a/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c b/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c new file mode 100644 index 000000000000..e1acf76815b7 --- /dev/null +++ b/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c @@ -0,0 +1,36 @@ +2004-03-20 Joe Marcus Clarke <marcus@FreeBSD.org> + +* thumbnail/gst-thumbnail.c (*global*), (end_of_snap), + (gst_thumbnail_pngenc_get): + +Make sure the pipeline has completely finished before quitting the main +gst event loop. +--- thumbnail/gst-thumbnail.c.orig Sat Mar 20 19:49:01 2004 ++++ thumbnail/gst-thumbnail.c Sat Mar 20 19:49:04 2004 +@@ -23,11 +23,13 @@ + #define TIMEOUT 9999 /* how long before we give up, msec */ + + gboolean finished = FALSE; ++gboolean can_finish = FALSE; + + void end_of_snap (GstElement *pipeline) + { + g_print ("Snapped.\n"); +- gst_element_set_state (pipeline, GST_STATE_READY); ++ gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); ++ while (!can_finish) ; + gst_main_quit (); + finished = TRUE; + } +@@ -97,9 +99,9 @@ + /* commit suicide in due time if necessary */ + g_timeout_add (TIMEOUT, (GSourceFunc) timeout, pipeline); + g_idle_add ((GSourceFunc) iterator, pipeline); +- gst_main (); + +- gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); ++ can_finish = TRUE; ++ gst_main (); + } + int + main (int argc, char *argv[]) diff --git a/print/ggv2/files/patch-src_Makefile.in b/print/ggv2/files/patch-src_Makefile.in new file mode 100644 index 000000000000..9c223879875c --- /dev/null +++ b/print/ggv2/files/patch-src_Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Sat Mar 6 00:07:03 2004 ++++ src/Makefile.in Sat Mar 6 00:10:34 2004 +@@ -133,7 +133,7 @@ + + SUBDIRS = recent-files stock cursors + +-INCLUDES = -I$(top_srcdir)/recent-files -DG_LOG_DOMAIN=\"GGV\" -DGNOMELOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" -DGNOMEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" -DDATADIR=\""$(datadir)"\" $(GGV_CFLAGS) $(GGV_DEPRECATED_CFLAGS) -I$(includedir) ++INCLUDES = -I$(top_srcdir)/recent-files -DG_LOG_DOMAIN=\"GGV\" -DGNOMELOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" -DGNOMEICONDIR=\""${datadir}/pixmaps"\" -DDATADIR=\""$(datadir)"\" $(GGV_CFLAGS) $(GGV_DEPRECATED_CFLAGS) -I$(includedir) + + + bin_PROGRAMS = ggv |