summarylogtreecommitdiffstats
path: root/no_gconf.patch
blob: ee6c714cf7f8b643821eb93f6129d1675ab3b8ae (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
diff -rudp swfdec-gnome-2.30.1.orig/aclocal.m4 swfdec-gnome-2.30.1/aclocal.m4
--- swfdec-gnome-2.30.1.orig/aclocal.m4	2023-01-22 16:56:30.000000000 -0500
+++ swfdec-gnome-2.30.1/aclocal.m4	2023-01-22 17:02:50.000000000 -0500
@@ -1214,52 +1214,6 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
diff -rudp swfdec-gnome-2.30.1.orig/configure.ac swfdec-gnome-2.30.1/configure.ac
--- swfdec-gnome-2.30.1.orig/configure.ac	2023-01-22 16:56:30.000000000 -0500
+++ swfdec-gnome-2.30.1/configure.ac	2023-01-22 17:02:20.000000000 -0500
@@ -54,13 +54,6 @@ dnl Check dependencies
 PKG_CHECK_MODULES(THUMBNAILER, swfdec-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRED)
 PKG_CHECK_MODULES(PLAYER, gmodule-export-2.0 swfdec-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRED swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRED gtk+-2.0 >= $GTK_REQUIRED)
 
-AM_GCONF_SOURCE_2
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
-if test "x$GCONFTOOL" = "xno"; then
-	AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-fi
-
-
 dnl Finish up
 
 AC_SUBST(GLOBAL_CFLAGS)
diff -rudp swfdec-gnome-2.30.1.orig/Makefile.am swfdec-gnome-2.30.1/Makefile.am
--- swfdec-gnome-2.30.1.orig/Makefile.am	2023-01-22 16:56:30.000000000 -0500
+++ swfdec-gnome-2.30.1/Makefile.am	2023-01-22 17:01:57.000000000 -0500
@@ -1,4 +1,4 @@
-SUBDIRS = player thumbnailer po data
+SUBDIRS = player po data
 
 EXTRA_DIST =			\
 	MAINTAINERS		\
diff -rudp swfdec-gnome-2.30.1.orig/Makefile.in swfdec-gnome-2.30.1/Makefile.in
--- swfdec-gnome-2.30.1.orig/Makefile.in	2023-01-22 16:56:30.000000000 -0500
+++ swfdec-gnome-2.30.1/Makefile.in	2023-01-22 17:01:40.000000000 -0500
@@ -225,7 +225,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = player thumbnailer po data
+SUBDIRS = player po data
 EXTRA_DIST = \
 	MAINTAINERS		\
 	autogen.sh		\