[f-spot] drop libeog



commit 67c80d172f027cd0522ed79cf5c4f5d7089b5ead
Author: Stephane Delcroix <stephane delcroix org>
Date:   Mon Jun 15 14:48:40 2009 +0200

    drop libeog

 Makefile.am                         |    2 -
 Makefile.include                    |    1 -
 configure.ac                        |    2 -
 libeog/.gitignore                   |   10 -
 libeog/Makefile.am                  |   59 -
 libeog/cursors.c                    |  104 --
 libeog/cursors.h                    |   35 -
 libeog/cursors/.gitignore           |    8 -
 libeog/cursors/Makefile.am          |    5 -
 libeog/cursors/hand-closed-data.xbm |    9 -
 libeog/cursors/hand-closed-mask.xbm |    9 -
 libeog/cursors/hand-open-data.xbm   |    9 -
 libeog/cursors/hand-open-mask.xbm   |    9 -
 libeog/eog-image.c                  |  859 -------------
 libeog/eog-image.h                  |   90 --
 libeog/eog-pixbuf-util.c            |  261 ----
 libeog/eog-pixbuf-util.h            |   11 -
 libeog/eog-scroll-view.c            | 1942 -----------------------------
 libeog/eog-scroll-view.h            |   61 -
 libeog/image-view.c                 | 2295 -----------------------------------
 libeog/image-view.h                 |  137 ---
 libeog/libeog-marshal.list          |    5 -
 libeog/ui-image.c                   |  318 -----
 libeog/ui-image.h                   |   68 -
 libeog/uta.c                        |  949 ---------------
 libeog/uta.h                        |   42 -
 libfspot/Makefile.am                |    5 +-
 libfspot/f-image-view.c             |  991 ---------------
 libfspot/f-image-view.h             |   81 --
 po/POTFILES.in                      |    2 -
 src/FSpot.Widgets.dll.config.in     |    1 -
 src/Widgets/NativeImageView.cs      |  340 ------
 src/f-spot.exe.config.in            |    1 -
 33 files changed, 1 insertions(+), 8720 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ad48ce0..71aee3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ SUBDIRS = 		\
 	glitz-sharp	\
 	gnome-keyring-sharp \
 	icons		\
-	libeog		\
 	libjpegtran	\
 	libfspot	\
 	libgphoto2-sharp \
@@ -32,7 +31,6 @@ DIST_SUBDIRS = 		\
 	glitz-sharp	\
 	gnome-keyring-sharp \
 	icons		\
-	libeog		\
 	libjpegtran	\
 	libfspot	\
 	libgphoto2-sharp \
diff --git a/Makefile.include b/Makefile.include
index 1db5cbc..5c7a0a2 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -13,7 +13,6 @@ DIR_GPHOTO2 = $(top_builddir)/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/libjpegtran
 DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
-DIR_LIBEOG = $(top_builddir)/libeog
 DIR_LIBFSPOT = $(top_builddir)/libfspot
 DIR_SEMWEB = $(top_builddir)/semweb
 DIR_SRC = $(top_builddir)/src
diff --git a/configure.ac b/configure.ac
index 40cda97..bc68d03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,8 +307,6 @@ dpap-sharp/DPAPBrowser/Makefile
 docs/Makefile
 gnome-keyring-sharp/Makefile
 icons/Makefile
-libeog/Makefile
-libeog/cursors/Makefile
 libjpegtran/Makefile
 libfspot/Makefile
 libgphoto2-sharp/Makefile
diff --git a/libfspot/Makefile.am b/libfspot/Makefile.am
index c19cee1..8d5c329 100644
--- a/libfspot/Makefile.am
+++ b/libfspot/Makefile.am
@@ -18,8 +18,6 @@ fspotlib_LTLIBRARIES = libfspot.la
 libfspot_la_SOURCES =				\
 	f-image-surface.c			\
 	f-image-surface.h			\
-	f-image-view.c				\
-	f-image-view.h				\
 	f-jpeg-utils.c				\
 	f-jpeg-utils.h				\
 	f-pixbuf-save.c				\
@@ -36,8 +34,7 @@ libfspot_la_LIBADD = 					\
 	$(LCMS_LIBS)					\
 	$(EXIF_LIBS)					\
 	$(GIO_LIBS)					\
-	$(top_builddir)/libjpegtran/libfspotjpegtran.la	\
-	$(top_builddir)/libeog/libfspoteog.la
+	$(top_builddir)/libjpegtran/libfspotjpegtran.la	
 
 
 # GLib marshalling cruft
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dc9b6ee..1f35529 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,8 +22,6 @@ mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
 f-spot-view.desktop.in.in
 f-spot-import.desktop.in.in
 f-spot.desktop.in.in
-libeog/eog-image.c
-libeog/image-view.c
 libfspot/f-jpeg-utils.c
 src/CameraFileSelectionDialog.cs
 src/CameraSelectionDialog.cs
diff --git a/src/FSpot.Widgets.dll.config.in b/src/FSpot.Widgets.dll.config.in
index 5e5b589..7d5a741 100644
--- a/src/FSpot.Widgets.dll.config.in
+++ b/src/FSpot.Widgets.dll.config.in
@@ -1,6 +1,5 @@
 <configuration>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
   <dllmap dll="libfspot" target="@expanded_libdir@/f-spot/libfspot.so.0"/>
-  <dllmap dll="libfspoteog" target="@expanded_libdir@/f-spot/libfspoteog.so.0"/>
   <dllmap dll="libfspotjpeg" target="@expanded_libdir@/f-spot/libfspotjpg.so.0"/>
 </configuration>
diff --git a/src/f-spot.exe.config.in b/src/f-spot.exe.config.in
index 11704ff..b392442 100644
--- a/src/f-spot.exe.config.in
+++ b/src/f-spot.exe.config.in
@@ -7,7 +7,6 @@
   <dllmap dll="libgnomevfs-2-0.dll" target="libgnomevfs-2.so.0"/>
   <dllmap dll="libgnomeui-2-0.dll" target="libgnomeui-2.so.0"/>
   <dllmap dll="libfspot" target="@expanded_libdir@/f-spot/libfspot.so.0"/>
-  <dllmap dll="libfspoteog" target="@expanded_libdir@/f-spot/libfspoteog.so.0"/>
   <dllmap dll="libfspotjpeg" target="@expanded_libdir@/f-spot/libfspotjpg.so.0"/>
   <dllmap dll="X11" target="libX11.so.6"/>
   <dllmap dll="GL" target="libGL.so.1"/>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]