[gnome-control-center] build: Drop EggListBox
- From: Thomas Wood <thos src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] build: Drop EggListBox
- Date: Tue, 2 Jul 2013 15:29:44 +0000 (UTC)
commit 620bc4bb1f9092448abf3570ecc498f41dec2a77
Author: Kalev Lember <kalevlember gmail com>
Date: Fri Jun 21 20:18:49 2013 +0200
build: Drop EggListBox
https://bugzilla.gnome.org/show_bug.cgi?id=702164
.gitmodules | 4 ----
Makefile.am | 4 ++--
autogen.sh | 4 ----
configure.ac | 15 ++-------------
egg-list-box | 1 -
po/POTFILES.skip | 1 -
6 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 5287565..f096bd7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "egg-list-box"]
- path = egg-list-box
- url = git://git.gnome.org/egg-list-box
-
[submodule "panels/sound/gvc"]
path = panels/sound/gvc
url = git://git.gnome.org/libgnome-volume-control
diff --git a/Makefile.am b/Makefile.am
index 0398c32..b2a4254 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-SUBDIRS = libgd po egg-list-box panels shell search-provider
+SUBDIRS = libgd po panels shell search-provider
if BUILD_DOCUMENTATION
SUBDIRS += man
endif
-DIST_SUBDIRS = libgd egg-list-box po panels shell man search-provider
+DIST_SUBDIRS = libgd po panels shell man search-provider
MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \
diff --git a/autogen.sh b/autogen.sh
index 64b6861..4179f77 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,10 +23,6 @@ rm -f .using-gnome-libs-package
echo "+ Setting up submodules"
git submodule update --init --recursive
-cd egg-list-box
-sh autogen.sh --no-configure
-cd ..
-
if ! which gnome-autogen.sh ; then
echo "You need to install the gnome-common module and make"
echo "sure the gnome-autogen.sh script is in your \$PATH."
diff --git a/configure.ac b/configure.ac
index f474449..b9d3490 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,15 +79,6 @@ else
IBUS_MODULE=
fi
-# EggListBox submodule
-prev_top_build_prefix=$ac_top_build_prefix
-prev_ac_configure_args=$ac_configure_args
-AX_CONFIG_DIR([egg-list-box])
-ac_top_build_prefix=$prev_top_build_prefix
-ac_configure_args=$prev_ac_configure_args
-
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"egg-list-box
-
dnl ==============================================
dnl Check that we meet the dependencies
dnl ==============================================
@@ -124,9 +115,7 @@ LIBGD_INIT([_view-common notification main-toolbar header-bar stack static])
PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
-# egg-list-box is a static library, so it must be shared among all panels
-# or it breaks GType registration
-PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 egg-list-box polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
@@ -173,7 +162,7 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
pwquality >= $PWQAULITY_REQUIRED_VERSION
accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION)
-PKG_CHECK_MODULES(SHARING_PANEL, $COMMON_MODULES egg-list-box)
+PKG_CHECK_MODULES(SHARING_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(REMOTE_LOGIN_HELPER, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0)
PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib)
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d08b96c..b898e0c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
-egg-list-box/egg-flow-box.c
libgd/libgd/gd-header-bar.c
panels/background/gnome-background-panel.desktop.in
panels/bluetooth/gnome-bluetooth-panel.desktop.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]