[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-166-gbb9b132)
The branch, master has been updated
via bb9b1321c59714e432c1c6a196a39baf56a437f9 (commit)
from a344ff9c33b9bbb7b1a622b70dcedf393e1de09a (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
=========
libgeda/configure.ac.in | 31 ++-----------------------------
libgeda/include/libgeda.h | 4 +---
libgeda/include/libgeda_priv.h | 2 +-
libgeda/libgeda.pc.in | 2 +-
libgeda/src/o_picture.c | 10 ----------
5 files changed, 5 insertions(+), 44 deletions(-)
=================
Commit Messages
=================
commit bb9b1321c59714e432c1c6a196a39baf56a437f9
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Jan 10 20:41:59 2009 +0000
libgeda: Don't depend upon GDK. We need gdk-pixbuf, which is separate.
We don't need to call gdk_init() in o_picture.c, since gdk-pixbuf is not
an internal part of GDK. Dropping the call to gdk_init() means it is now
possible to run gnetlist on a schametic with images, without an X server
available (for GDK build targetting X11).
We only explicitly require GdkPixbuf for libgeda's external APIs.
Move the #include <gdk-pixbuf/gdk-pixbuf.h> before we include our local
prototype.h and struct.h though, since gdk.h no longer pulls this in.
:100644 100644 3ed7668... e46f999... M libgeda/configure.ac.in
:100644 100644 0c68617... a7483ed... M libgeda/include/libgeda.h
:100644 100644 dbcd7ab... 565d20e... M libgeda/include/libgeda_priv.h
:100644 100644 4626651... a832b0d... M libgeda/libgeda.pc.in
:100644 100644 6c90a4b... ccd2407... M libgeda/src/o_picture.c
=========
Changes
=========
commit bb9b1321c59714e432c1c6a196a39baf56a437f9
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Jan 10 20:41:59 2009 +0000
libgeda: Don't depend upon GDK. We need gdk-pixbuf, which is separate.
We don't need to call gdk_init() in o_picture.c, since gdk-pixbuf is not
an internal part of GDK. Dropping the call to gdk_init() means it is now
possible to run gnetlist on a schametic with images, without an X server
available (for GDK build targetting X11).
We only explicitly require GdkPixbuf for libgeda's external APIs.
Move the #include <gdk-pixbuf/gdk-pixbuf.h> before we include our local
prototype.h and struct.h though, since gdk.h no longer pulls this in.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 3ed7668..e46f999 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -222,32 +222,6 @@ GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
############################################################################
############################################################################
-# Check for gdk 2.4 or later
-#
-
-PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.4.0, GDK="yes", no_GDK="yes")
-
-# This next bit of code figures out what gtk we need to use.
-if test "$GDK" = "yes"
-then
-
- AC_DEFINE(HAS_GDK, 1, [If gdk has been installed, define this])
- GDK_CFLAGS=$GDK_CFLAGS
- GDK_LIBS=$GDK_LIBS
- GDK_VERSION=`$PKG_CONFIG gdk-2.0 --modversion`
-
-fi
-
-if test "$GDK_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gdk, please make sure it is installed.])
-fi
-
-#
-# Check for gdk end
-############################################################################
-
-############################################################################
# Check for gdk-pixbuf
#
@@ -481,8 +455,8 @@ fi
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GLIB_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS $GDK_CFLAGS"
-LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS $GDK_LIBS"
+LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GLIB_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS"
+LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS"
LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION"
# Makefile.in variable substitution
@@ -523,7 +497,6 @@ AC_MSG_RESULT([
** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION
GLIB library version: $GLIB_VERSION
- GDK library version: $GDK_VERSION
GDK-PIXBUF (png output): $GDK_PIXBUF_VERSION
GUILE library version: $GUILE_VERSION
mingw build: $MINGW
diff --git a/libgeda/include/libgeda.h b/libgeda/include/libgeda.h
index 0c68617..a7483ed 100644
--- a/libgeda/include/libgeda.h
+++ b/libgeda/include/libgeda.h
@@ -20,11 +20,11 @@
#ifndef LIBGEDA_H
#define LIBGEDA_H
-#include <gdk/gdk.h>
#include <glib.h>
#include <stdio.h>
#include <libguile.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgeda/defines.h>
#include <libgeda/struct.h>
@@ -36,6 +36,4 @@
#include <libgeda/prototype.h>
#include <libgeda/geda_list.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
#endif
diff --git a/libgeda/include/libgeda_priv.h b/libgeda/include/libgeda_priv.h
index dbcd7ab..565d20e 100644
--- a/libgeda/include/libgeda_priv.h
+++ b/libgeda/include/libgeda_priv.h
@@ -1,8 +1,8 @@
/* System headers which libgeda headers rely on */
#include <glib.h>
#include <glib-object.h>
-#include <gdk/gdk.h>
#include <libguile.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "guile_compat_1.6.h"
/* Public libgeda headers */
diff --git a/libgeda/libgeda.pc.in b/libgeda/libgeda.pc.in
index 4626651..a832b0d 100644
--- a/libgeda/libgeda.pc.in
+++ b/libgeda/libgeda.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: libgeda
Description: gEDA/gaf's core library
-Requires:
+Requires: gdk-pixbuf-2.0
Version: @DATE_VERSION@
Libs: -L${libdir} -lgeda @LIBGEDA_LDFLAGS@
Cflags: -I${includedir} @LIBGEDA_CFLAGS@
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index 6c90a4b..ccd2407 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -35,10 +35,7 @@
#include <libgen.h>
#endif
-#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixdata.h>
-
#include "libgeda_priv.h"
@@ -75,13 +72,6 @@ OBJECT *o_picture_read (TOPLEVEL *toplevel,
gchar *file_content = NULL;
guint file_length = 0;
GError *err = NULL;
- static char gdk_initialized=0;
-
- /* Initialize GDK first in case this isn't a graphic app */
- if (gdk_initialized == 0) {
- gdk_init(NULL, NULL);
- gdk_initialized = 1;
- }
num_conv = sscanf(first_line, "%c %d %d %d %d %d %c %c\n",
&type, &x1, &y1, &width, &height, &angle, &mirrored, &embedded);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs