build: Drop EggListBox
https://bugzilla.gnome.org/show_bug.cgi?id=702164
This commit is contained in:
committed by
Thomas Wood
parent
a14e52b9ed
commit
620bc4bb1f
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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."
|
||||
|
||||
15
configure.ac
15
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)
|
||||
|
||||
Submodule egg-list-box deleted from d189c2a323
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user