gEDA-cvs: pcb.git: branch: master updated (be3aec15d207ca92ee23553c93cce957751343eb)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  be3aec15d207ca92ee23553c93cce957751343eb (commit)
       via  732e10a394d7d3210f7b70dcfafc08b6c40c5210 (commit)
      from  cb95aa44bfde8231ab80ae3642a2f380636b4f8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 doc/Makefile.am           |    2 +-
 src/hid/gtk/gtkhid-main.c |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)


=================
 Commit Messages
=================

commit be3aec15d207ca92ee23553c93cce957751343eb
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    [windows] set GDK_PIXBUF_MODULE_FILE
    
    If we're using a local gdk-pixbuf installation, we need to set this env
    variable to point to it.

:100644 100644 1957be6... 79987ff... M	src/hid/gtk/gtkhid-main.c

commit 732e10a394d7d3210f7b70dcfafc08b6c40c5210
Author: Bdale Garbee <bdale@xxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Invoke eps2png in $(srcdir), no .

:100644 100644 55f8fed... e6e7593... M	doc/Makefile.am

=========
 Changes
=========

commit be3aec15d207ca92ee23553c93cce957751343eb
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    [windows] set GDK_PIXBUF_MODULE_FILE
    
    If we're using a local gdk-pixbuf installation, we need to set this env
    variable to point to it.

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 1957be6..79987ff 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -2101,15 +2101,31 @@ hid_gtk_init ()
 #ifdef WIN32
   char * tmps;
   char * share_dir;
+  char *loader_cache;
+  FILE *loader_file;
 #endif
 
 #ifdef WIN32
   tmps = g_win32_get_package_installation_directory (PACKAGE "-" VERSION, NULL);
 #define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PACKAGE
+#define REST_OF_CACHE G_DIR_SEPARATOR_S "loaders.cache"
   share_dir = (char *) malloc(strlen(tmps) + 
 			  strlen(REST_OF_PATH) +
 			  1);
   sprintf (share_dir, "%s%s", tmps, REST_OF_PATH);
+
+  /* Point to our gdk-pixbuf loader cache.  */
+  loader_cache = (char *) malloc (strlen (bindir) +
+				  strlen (REST_OF_CACHE) +
+				  1);
+  sprintf (loader_cache, "%s%s", bindir, REST_OF_CACHE);
+  loader_file = fopen (loader_cache, "r");
+  if (loader_file)
+    {
+      fclose (loader_file);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", loader_cache, TRUE);
+    }
+
   free (tmps);
 #undef REST_OF_PATH
   printf ("\"Share\" installation path is \"%s\"\n", share_dir);

commit 732e10a394d7d3210f7b70dcfafc08b6c40c5210
Author: Bdale Garbee <bdale@xxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Invoke eps2png in $(srcdir), no .

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55f8fed..e6e7593 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -171,4 +171,4 @@ else
 endif
 
 .eps.png:
-	${PERL} eps2png --png $< > $@
+	${PERL} $(srcdir)/eps2png --png $< > $@




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs