File no-gconf.patch of Package aeskulap

Overview Repositories Revisions Requests Users Attributes Meta

File no-gconf.patch of Package aeskulap

--- a/configuration/Makefile.am	2022-04-06 10:46:12.387863232 +0200
+++ b/configuration/Makefile.am	2022-04-06 10:53:43.202872457 +0200
@@ -7,11 +7,7 @@
 if USE_MINGW
 extra_SOURCES=aconfiguration-win32.cpp
 else
-if USE_GSETTINGS
   extra_SOURCES=aconfiguration-gsettings.cpp
-else
-  extra_SOURCES=aconfiguration-gconf.cpp
-endif
 endif
 
 libconfiguration_la_SOURCES = \
--- a/configure.ac	2022-04-06 10:46:12.387863232 +0200
+++ b/configure.ac	2022-04-06 10:52:14.658281393 +0200
@@ -40,8 +40,6 @@
 AC_SUBST(GMSGFMT)
 fi
 
-AM_GCONF_SOURCE_2
-
 dnl
 dnl gettext package
 dnl
@@ -87,39 +85,12 @@
 
 if test x"$MINGW32" = xno ; then
 
-AC_ARG_WITH(gsettings, [AS_HELP_STRING([--with-gsettings],
-            [Build with the gsettings configuration backend])],
-            [],
-            [with_gsettings=yes])
- echo "with_gsettings='$with_gsettings'"
-
-if test "x$with_gsettings" = "xyes"; then
-
-  echo "Using GSettings"
-
   GLIB_GSETTINGS
   HAVE_GSETTINGS=1
 
   AC_SUBST(HAVE_GSETTINGS)
   AC_DEFINE(HAVE_GSETTINGS, 1, [use gsettings configuration backend])
-  AM_CONDITIONAL(USE_GSETTINGS, test "x$with_gsettings" = "xyes")
-
-else
-   echo "falling back to old gconf backend"
-
-   PKG_CHECK_MODULES(GCONFMM, gconfmm-2.6 >= 2.10.0)
-   AC_SUBST(GCONFMM_CFLAGS)
-   AC_SUBST(GCONFMM_LIBS)
-   AC_DEFINE(HAVE_GCONFMM, 1, [Have gconfmm settings backend])
-
-  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-  if test x"$GCONFTOOL" = xno ; then
-     AC_MSG_ERROR([gconftool2 executable not found in your path - should be
-  installed with GConf])
-  fi
-fi
 
-dnl not WIN32
 fi
 
 
--- a/src/Makefile.am	2022-04-06 10:46:12.395863285 +0200
+++ b/src/Makefile.am	2022-04-06 10:52:36.882429744 +0200
@@ -48,25 +48,12 @@
 
 if BUILD_NOT_MINGW32
 
-if  USE_GSETTINGS
 # gsettings_SCHEMAS is a list of all the schemas you want to install
 gsettings_SCHEMAS = org.gnu.aeskulap.gschema.xml
 
 # include the appropriate makefile rules for schema handling
 @GSETTINGS_RULES@
 
-else 
-
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = aeskulap.schemas
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-endif
-endif 
 endif
 
 AM_CPPFLAGS = \

Places

File no-gconf.patch of Package aeskulap

Places