Patchwork [8/9] firefox: GNU gnash flash plugin needs gconf dependency

login
register
mail settings
Submitter Stefan Fröberg
Date Sept. 5, 2012, 2:29 p.m.
Message ID <1346855344-15081-9-git-send-email-stefan.froberg@petroprogram.com>
Download mbox | patch
Permalink /patch/181873/
State Deferred
Headers show

Comments

Stefan Fröberg - Sept. 5, 2012, 2:29 p.m.
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
---
 package/Config.in       |    1 +
 package/gconf/Config.in |   11 +++++++++++
 package/gconf/gconf.mk  |   26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 0 deletions(-)
 create mode 100644 package/gconf/Config.in
 create mode 100644 package/gconf/gconf.mk
Arnout Vandecappelle - Sept. 19, 2012, 6:16 a.m.
On 09/05/12 16:29, Stefan Fröberg wrote:
>
> Signed-off-by: Stefan Fröberg<stefan.froberg@petroprogram.com>
> ---
>   package/Config.in       |    1 +
>   package/gconf/Config.in |   11 +++++++++++
>   package/gconf/gconf.mk  |   26 ++++++++++++++++++++++++++
>   3 files changed, 38 insertions(+), 0 deletions(-)
>   create mode 100644 package/gconf/Config.in
>   create mode 100644 package/gconf/gconf.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 92c957e..fb4ec28 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -510,6 +510,7 @@ endmenu
>   menu "Miscellaneous"
>   source "package/collectd/Config.in"
>   source "package/empty/Config.in"
> +source "package/gconf/Config.in"
>   source "package/mobile-broadband-provider-info/Config.in"
>   source "package/shared-mime-info/Config.in"
>   source "package/sound-theme-borealis/Config.in"
> diff --git a/package/gconf/Config.in b/package/gconf/Config.in
> new file mode 100644
> index 0000000..770e707
> --- /dev/null
> +++ b/package/gconf/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_GCONF
> +	bool "gconf"
> +	select BR2_PACKAGE_INTLTOOL

  Unlikely. You probably want to depend on host-intltool.

> +	select BR2_PACKAGE_DBUS_GLIB

  This means you also need
	select BR2_PACKAGE_DBUS
	depends on BR2_TOOLCHAIN_HAS_THREADS

...
comment "gconf requires a toolchain with thread support"
	depends on !BR2_TOOLCHAIN_HAS_THREADS


> +	select BR2_PACKAGE_LIBXML2
> +	help
> +	  The GConf package contains a configuration database system used by many GNOME
> +	  applications.

  Word-wrap at 80 columns.

> +
> +	  http://ftp.gnome.org/pub/gnome/sources/GConf/3.2

  Is there no real website to refer to?

> +

  Spurious line at end of file.

> diff --git a/package/gconf/gconf.mk b/package/gconf/gconf.mk
> new file mode 100644
> index 0000000..8eefc05
> --- /dev/null
> +++ b/package/gconf/gconf.mk
> @@ -0,0 +1,26 @@
> +#############################################################
> +#
> +# GConf
> +#
> +#############################################################
> +
> +GCONF_VERSION = 3.2.0
> +GCONF_SOURCE = GConf-$(GCONF_VERSION).tar.xz
> +GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/

  For situations like this, we typically use
GCONF_VERSION_MAJOR = 3.2
GCONF_VERSION       = $(GCONF_VERSION_MAJOR).0
GCONF_SITE          = http://ftp.gnome.org/pub/gnome/sources/GConf/$(GCONF_VERSION_MAJOR)
GCONF_SOURCE        = GConf-$(GCONF_VERSION).tar.xz

  (As an aside: I personally prefer aligning the =, and I find
it more natural to put SOURCE after SITE. But those are not real
buildroot 'rules').

> +GCONF_DEPENDENCIES = dbus-glib intltool libxml2

  host-intltool, most likely.

> +GCONF_INSTALL_STAGING = YES
> +GCONF_CONF_OPT += --sysconfdir=/etc --libexecdir=/usr/lib/GConf --disable-orbit

  --sysconfdir=/etc is already in the standard configure
options.

  For --libexecdir, we usually use /usr/lib without subdirectory.

> +GCONF_LICENSE = GPLv2

  I haven't checked, but I would expect the gnome people to make
it GPLv2+.  Can you verify again?

> +GCONG_LICENSE_FILE = COPYING
> +
> +define GCONF_INSTALL_TARGET_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
> +
> +	(cd $(@D); \

  cd is unneeded here.

> +	install -v -m755 -d $(TARGET_DIR)/etc/gconf/gconf.xml.system)

  mkdir -p is better. Though I don't see why you need to create an
empty directory...

  Also, it's better to put this in POST_INSTALL_TARGET_HOOKS,
then you don't have to re-insert the default install commands.

> +
> +endef
> +
> +$(eval $(autotools-package))
> +
> +

  Spurious newlines at end of file.


  Regards,
  Arnout

Patch

diff --git a/package/Config.in b/package/Config.in
index 92c957e..fb4ec28 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -510,6 +510,7 @@  endmenu
 menu "Miscellaneous"
 source "package/collectd/Config.in"
 source "package/empty/Config.in"
+source "package/gconf/Config.in"
 source "package/mobile-broadband-provider-info/Config.in"
 source "package/shared-mime-info/Config.in"
 source "package/sound-theme-borealis/Config.in"
diff --git a/package/gconf/Config.in b/package/gconf/Config.in
new file mode 100644
index 0000000..770e707
--- /dev/null
+++ b/package/gconf/Config.in
@@ -0,0 +1,11 @@ 
+config BR2_PACKAGE_GCONF
+	bool "gconf"
+	select BR2_PACKAGE_INTLTOOL
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBXML2
+	help
+	  The GConf package contains a configuration database system used by many GNOME
+	  applications.
+
+	  http://ftp.gnome.org/pub/gnome/sources/GConf/3.2
+
diff --git a/package/gconf/gconf.mk b/package/gconf/gconf.mk
new file mode 100644
index 0000000..8eefc05
--- /dev/null
+++ b/package/gconf/gconf.mk
@@ -0,0 +1,26 @@ 
+#############################################################
+#
+# GConf
+#
+#############################################################
+
+GCONF_VERSION = 3.2.0
+GCONF_SOURCE = GConf-$(GCONF_VERSION).tar.xz
+GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/
+GCONF_DEPENDENCIES = dbus-glib intltool libxml2
+GCONF_INSTALL_STAGING = YES
+GCONF_CONF_OPT += --sysconfdir=/etc --libexecdir=/usr/lib/GConf --disable-orbit
+GCONF_LICENSE = GPLv2
+GCONG_LICENSE_FILE = COPYING
+
+define GCONF_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+
+	(cd $(@D); \
+	install -v -m755 -d $(TARGET_DIR)/etc/gconf/gconf.xml.system)
+
+endef
+
+$(eval $(autotools-package))
+
+