[solang] Dropped some more dependencies
- From: Debarshi Ray <debarshir src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [solang] Dropped some more dependencies
- Date: Wed, 13 Jan 2010 17:09:43 +0000 (UTC)
commit aa458adb3423843e4e07d9166ddcdbf02d23cf58
Author: Debarshi Ray <rishi gnu org>
Date: Thu Jan 7 01:38:16 2010 +0200
Dropped some more dependencies
No point in depending on flickcurl, libgphoto2, libsoup and
webkit-2.0 because we are not building the importers any more.
README | 8 +-------
configure.ac | 4 ----
src/application/Makefile.am | 6 ------
src/application/main.cpp | 11 +----------
src/attribute/Makefile.am | 3 +--
src/common/Makefile.am | 3 ---
6 files changed, 3 insertions(+), 32 deletions(-)
---
diff --git a/README b/README
index 8be1c03..941784e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
All rights reserved.
@@ -36,8 +36,6 @@ Features:
---------
- Browser, editor, enlarged and slideshow renderer for viewing the entire
collection, editing, a single photo and slideshows respectively.
-- Camera, Flickr and folder importer to import photos from cameras in PTP mode
- Flickr and folders respectively.
- Folder exporter to export selected photos to a folder.
- Date view for showing photo dates.
- Basic editing like brightness, contrast, flipping, rotation, saturation and
@@ -53,15 +51,11 @@ Dependencies:
-------------
- babl
- dbus-glib-1
- - flickcurl
- gdl-1.0
- gegl
- - libgphoto2
- gtkimageview
- gtkmm-2.4 >= 2.8
- - libsoup-2.4
- tracker-client-0.7
- - webkit-1.0
Packages are available for Debian, Fedora and Ubuntu.
diff --git a/configure.ac b/configure.ac
index 2fc2851..1af1947 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,11 @@ fi
PKG_CHECK_MODULES(BABL, [babl])
PKG_CHECK_MODULES(DBUS, [dbus-glib-1])
-PKG_CHECK_MODULES(FLICKCURL, [flickcurl libxml-2.0])
PKG_CHECK_MODULES(GDL, [gdl-1.0])
PKG_CHECK_MODULES(GEGL, [gegl])
-PKG_CHECK_MODULES(GPHOTO2, [libgphoto2])
PKG_CHECK_MODULES(GTKIMAGEVIEW, [gtkimageview])
PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 2.8])
-PKG_CHECK_MODULES(SOUP, [libsoup-2.4])
PKG_CHECK_MODULES(TRACKER, [tracker-client-0.7])
-PKG_CHECK_MODULES(WEBKIT, [webkit-1.0])
AC_OUTPUT([
diff --git a/src/application/Makefile.am b/src/application/Makefile.am
index 22b2d06..56c5fc9 100644
--- a/src/application/Makefile.am
+++ b/src/application/Makefile.am
@@ -23,12 +23,8 @@ solang_LDADD = \
$(top_builddir)/src/edit-engine/libeditengine.la \
$(top_builddir)/src/common/libcommon.la \
$(DBUS_LIBS) \
- $(FLICKCURL_LIBS) \
- $(GPHOTO2_LIBS) \
$(GTKIMAGEVIEW_LIBS) \
- $(WEBKIT_LIBS) \
$(GTKMM_LIBS) \
- $(SOUP_LIBS) \
$(GDL_LIBS) \
$(BABL_LIBS) \
$(GEGL_LIBS) \
@@ -49,8 +45,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/renderer \
$(SOLANG_CFLAGS) \
$(DBUS_CFLAGS) \
- $(FLICKCURL_CFLAGS) \
- $(GPHOTO2_CFLAGS) \
$(GTKIMAGEVIEW_CFLAGS) \
$(GTKMM_CFLAGS) \
$(GDL_CFLAGS) \
diff --git a/src/application/main.cpp b/src/application/main.cpp
index 3190aa7..912ee60 100644
--- a/src/application/main.cpp
+++ b/src/application/main.cpp
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
* Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
*
* Solang is free software: you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
#include <cstdlib>
-#include <flickcurl.h>
#include <gegl.h>
#include <giomm.h>
#include <glibmm.h>
@@ -47,12 +46,6 @@ main(int argc, char *argv[])
Gio::init();
gegl_init( &argc, &argv );
- if (0 != flickcurl_init())
- {
- g_warning ("Failed to initialize FlickCurl");
- return EXIT_FAILURE;
- }
-
Glib::set_prgname(PACKAGE_TARNAME);
Glib::set_application_name(_(PACKAGE_NAME));
@@ -89,7 +82,5 @@ main(int argc, char *argv[])
application.run();
application.final();
- flickcurl_finish();
-
return EXIT_SUCCESS;
}
diff --git a/src/attribute/Makefile.am b/src/attribute/Makefile.am
index 4106346..9c8be7d 100644
--- a/src/attribute/Makefile.am
+++ b/src/attribute/Makefile.am
@@ -55,8 +55,7 @@ AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GTKMM_CFLAGS) \
$(GDL_CFLAGS) \
- $(TRACKER_CFLAGS) \
- $(LIBXML_CFLAGS)
+ $(TRACKER_CFLAGS)
AM_CXXFLAGS = \
-Wall
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 8d7e75f..2567dd4 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -30,8 +30,6 @@ libcommon_la_SOURCES = \
exif-data.h \
export-queue-operations.cpp \
export-queue-operations.h \
- flickr-context.cpp \
- flickr-context.h \
histogram-viewer.cpp \
histogram-viewer.h \
histogram.cpp \
@@ -100,7 +98,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/storage \
$(SOLANG_CFLAGS) \
$(DBUS_CFLAGS) \
- $(FLICKCURL_CFLAGS) \
$(GTKMM_CFLAGS) \
$(GDL_CFLAGS) \
$(GEGL_CFLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]