IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining gconf code bits

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23264 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens
2013-10-07 14:28:44 +00:00
parent 889f73afce
commit b74194151f
28 changed files with 9 additions and 4212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packaging/win32/crossbuild_webkit.sh
View File

@@ -191,8 +191,7 @@ function inst_libxslt_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists libxslt &&
if quiet ${PKG_CONFIG} --exists libxslt &&
[ -f $_GNOME_UDIR/lib/pkgconfig/libxslt.pc ] &&
quiet intltoolize --version
then
@@ -245,8 +244,7 @@ function check_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 gtk+-2.0 cairo libxml-2.0 &&
if quiet ${PKG_CONFIG} --exists gtk+-2.0 cairo libxml-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed."
@@ -282,8 +280,7 @@ function inst_enchant () {
else
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists enchant &&
if quiet ${PKG_CONFIG} --exists enchant &&
[ -f $_GNOME_UDIR/lib/pkgconfig/enchant.pc ] &&
quiet intltoolize --version
then
@@ -307,8 +304,7 @@ function inst_libsoup () {
else
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists libsoup-2.4 &&
if quiet ${PKG_CONFIG} --exists libsoup-2.4 &&
[ -f $_GNOME_UDIR/lib/pkgconfig/libsoup-2.4.pc ] &&
quiet intltoolize --version
then
@@ -357,8 +353,7 @@ function inst_webkit() {
else
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists webkit-1.0 &&
if quiet ${PKG_CONFIG} --exists webkit-1.0 &&
[ -f $_GNOME_UDIR/lib/pkgconfig/webkit-1.0.pc ] &&
quiet intltoolize --version
then

3
packaging/win32/defaults.sh
View File

@@ -236,9 +236,6 @@ set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win3
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
GCONF_VERSION="2.22.0"
set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
GDK_PIXBUF_VERSION=2.24.0
set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf_${GDK_PIXBUF_VERSION}-1_win32.zip"
set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf-dev_${GDK_PIXBUF_VERSION}-1_win32.zip"

18
packaging/win32/dist-impl.sh
View File

@@ -52,7 +52,6 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
_PID=$$
@@ -87,7 +86,6 @@ function dist_gnome() {
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GCONF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
@@ -118,7 +116,6 @@ function dist_gnome() {
cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
if [ -d $DIST_UDIR/lib/locale ] ; then
# Huh, is this removed in newer gtk?
cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
@@ -233,8 +230,6 @@ function dist_gnucash() {
mkdir -p $DIST_UDIR/bin
cp $_MINGW_UDIR/bin/pthreadGC2.dll $DIST_UDIR/bin
cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/etc/gnucash/* $DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
@@ -263,19 +258,6 @@ function dist_gnucash() {
}
function dist_finish() {
for file in $DIST_UDIR/etc/gconf/schemas/*.schemas; do
echo -n "Installing $file ... "
gconftool-2 \
--config-source=xml:merged:${DIST_WFSDIR}/etc/gconf/gconf.xml.defaults \
--install-schema-file $file >/dev/null
echo "done"
done
gconftool-2 --shutdown
mv $DIST_UDIR/libexec/gconfd-2.exe $DIST_UDIR/bin
exetype $DIST_UDIR/bin/gconfd-2.exe windows
cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
assert_one_dir ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards
_qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`

26
packaging/win32/install-impl.sh
View File

@@ -502,9 +502,7 @@ function inst_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
if quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
@@ -524,8 +522,6 @@ function inst_gnome() {
wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GDK_PIXBUF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -574,10 +570,6 @@ function inst_gnome() {
qpushd $_GNOME_UDIR
assert_one_dir $TMP_UDIR/gtk-doc-*
mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
if [ ! -f libexec/gconfd-2.console.exe ]; then
cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
fi
exetype libexec/gconfd-2.exe windows
for file in bin/intltool-*; do
sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
mv tmp $file
@@ -620,8 +612,6 @@ EOF
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
quiet gconftool-2 --version || die "gnome not installed correctly"
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 || die "gnome not installed correctly: no gconf-2.0 with atleast-version=${GCONF_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"
@@ -1458,7 +1448,7 @@ function inst_gnucash() {
# This function will be called by make_install.sh as well,
# so do not regard variables from inst_* functions as set
# Parameters allowed: skip_scripts, skip_schemas
# Parameters allowed: skip_scripts
function make_install() {
_BUILD_UDIR=`unix_path $BUILD_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
@@ -1483,7 +1473,6 @@ function make_install() {
for param in "$@"; do
[ "$param" = "skip_scripts" ] && _skip_scripts=1
[ "$param" = "skip_schemas" ] && _skip_schemas=1
done
make install
@@ -1511,17 +1500,6 @@ function make_install() {
done
qpopd
if [ -z $_skip_schemas ]; then
qpushd $_INSTALL_UDIR/etc/gconf/schemas
for file in *.schemas; do
gconftool-2 \
--config-source=xml:merged:${_INSTALL_WFSDIR}/etc/gconf/gconf.xml.defaults \
--install-schema-file $file >/dev/null
done
gconftool-2 --shutdown
qpopd
fi
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
# If you make any changes here, you should probably also change