[rhythmbox] remove libsexy
- From: Jonathan Matthew <jmatthew src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rhythmbox] remove libsexy
- Date: Wed, 10 Feb 2010 13:07:04 +0000 (UTC)
commit bac21d24b41f935f3ee2bbcaf9297a2f2180dac3
Author: Jonathan Matthew <jonathan d14n org>
Date: Wed Feb 10 22:59:51 2010 +1000
remove libsexy
GtkEntry in gtk+ 2.16 replaces SexyIconEntry, and that was the last
thing we were using.
configure.ac | 24 -
doc/reference/Makefile.am | 1 -
widgets/Makefile.am | 8 +-
widgets/libsexy/Makefile.am | 19 -
widgets/libsexy/sexy-icon-entry.c | 960 -------------------------------------
widgets/libsexy/sexy-icon-entry.h | 100 ----
6 files changed, 1 insertions(+), 1111 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a92637..82a573c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,22 +528,6 @@ AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_BUILDDIR,"`pwd`/data",[path to built source
AC_DEFINE_UNQUOTED(METADATA_UNINSTALLED_DIR,"`pwd`/metadata",[path to metadata build dir])
AC_SUBST(ROOT_UNINSTALLED_DIR)
-dnl libsexy is only required with gtk < 2.16
-PKG_CHECK_EXISTS(gtk+-2.0 >= 2.16, [need_libsexy=no], [need_libsexy=yes])
-
-AC_ARG_WITH(internal-libsexy,
- AC_HELP_STRING([--with-internal-libsexy],
- [Build using internal libsexy library]),,
- with_internal_libsexy=no)
-if test "x$need_libsexy" = "xyes" && test "x$with_internal_libsexy" = "xno"; then
- PKG_CHECK_MODULES(LIBSEXY, libsexy >= 0.1.5,
- with_internal_libsexy=no,
- with_internal_libsexy=yes)
-fi
-AC_SUBST(LIBSEXY_CFLAGS)
-AC_SUBST(LIBSEXY_LIBS)
-AM_CONDITIONAL(WITH_INTERNAL_LIBSEXY, test "x$with_internal_libsexy" = "xyes")
-
dnl warnings bits, copied from gnome-keyring configure.in
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
@@ -802,7 +786,6 @@ lib/libmediaplayerid/Makefile
metadata/Makefile
rhythmdb/Makefile
widgets/Makefile
-widgets/libsexy/Makefile
podcast/Makefile
shell/Makefile
data/Makefile
@@ -962,13 +945,6 @@ if test x"$use_gnome_keyring" = xyes; then
else
AC_MSG_NOTICE([ gnome-keyring support disabled])
fi
-if test x"$need_libsexy" = xyes; then
- if test x"$with_internal_libsexy" = xyes; then
- AC_MSG_NOTICE([ using internal libsexy])
- else
- AC_MSG_NOTICE([** using system-wide libsexy])
- fi
-fi
if test "x$enable_fm_radio" != xno; then
AC_MSG_NOTICE([** FM radio support enabled])
else
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 31601be..4cb8e23 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -36,7 +36,6 @@ IGNORE_HFILES= \
rb-cut-and-paste-code.h \
rb-marshal.h \
rhythmdb-private.h \
- sexy-icon-entry.h \
\
rb-shell-glue.h \
rb-shell-binding.h \
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index c32b33c..0da1225 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,10 +1,5 @@
noinst_LTLIBRARIES = librbwidgets.la
-if WITH_INTERNAL_LIBSEXY
-SUBDIRS = libsexy
-LIBSEXY_LIBS += $(top_builddir)/widgets/libsexy/libsexy.la
-endif
-
librbwidgets_la_SOURCES = \
rb-entry-view.c \
rb-entry-view.h \
@@ -56,11 +51,10 @@ INCLUDES = \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/backends \
$(NOTIFY_CFLAGS) \
- $(LIBSEXY_CFLAGS) \
$(RHYTHMBOX_CFLAGS)
librbwidgets_la_LDFLAGS = -export-dynamic
-librbwidgets_la_LIBADD = $(NOTIFY_LIBS) $(LIBSEXY_LIBS)
+librbwidgets_la_LIBADD = $(NOTIFY_LIBS)
noinst_PROGRAMS = test-rb-segmented-bar
test_rb_segmented_bar_SOURCES = test-rb-segmented-bar.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]