From bdba13ae729cbf1e9d335dcd7a6bec4c58dba915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 21 Aug 2014 15:19:06 -0600 Subject: [PATCH 1/6] Add firefox package --- pkgs/firefox.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/firefox.yaml diff --git a/pkgs/firefox.yaml b/pkgs/firefox.yaml new file mode 100644 index 000000000..51166de60 --- /dev/null +++ b/pkgs/firefox.yaml @@ -0,0 +1,5 @@ +extends: [autotools_package] + +sources: +- key: tar.bz2:sxdyt4xrohcmppmdfgm2ek72srq2yr52 + url: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/source/firefox-31.0.source.tar.bz2 From 0656af9049947964768ed645e3cecfac6c1a66fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 21 Aug 2014 15:26:35 -0600 Subject: [PATCH 2/6] Use out of tree build --- pkgs/firefox.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/firefox.yaml b/pkgs/firefox.yaml index 51166de60..21e541d64 100644 --- a/pkgs/firefox.yaml +++ b/pkgs/firefox.yaml @@ -1,5 +1,20 @@ -extends: [autotools_package] +extends: [base_package] sources: - key: tar.bz2:sxdyt4xrohcmppmdfgm2ek72srq2yr52 url: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/source/firefox-31.0.source.tar.bz2 + +build_stages: +- name: make + handler: bash + bash: | + mkdir build2 # build exists + cd build2 + ../configure --prefix=$ARTIFACT + make -j ${HASHDIST_CPU_COUNT} + +- name: install + after: make + handler: bash + bash: | + make install From 58fbf9983dff3b52f352ff6e8f38d8e3aba23e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 21 Aug 2014 15:29:32 -0600 Subject: [PATCH 3/6] Depend on Python --- pkgs/firefox.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/firefox.yaml b/pkgs/firefox.yaml index 21e541d64..2c71a3168 100644 --- a/pkgs/firefox.yaml +++ b/pkgs/firefox.yaml @@ -1,4 +1,7 @@ -extends: [base_package] +extends: [base_package, libflags] + +dependencies: + build: [python] sources: - key: tar.bz2:sxdyt4xrohcmppmdfgm2ek72srq2yr52 From 03bea20c7a68d459dfc8b1c364aa08516573d877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 21 Aug 2014 15:36:43 -0600 Subject: [PATCH 4/6] Export SHELL --- pkgs/firefox.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/firefox.yaml b/pkgs/firefox.yaml index 2c71a3168..d5ca3de67 100644 --- a/pkgs/firefox.yaml +++ b/pkgs/firefox.yaml @@ -13,6 +13,7 @@ build_stages: bash: | mkdir build2 # build exists cd build2 + export SHELL=/bin/bash ../configure --prefix=$ARTIFACT make -j ${HASHDIST_CPU_COUNT} From c8fc3a4805f6ec7611f3b7dfb91da6db6c3e03cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 31 Oct 2014 15:29:06 -0600 Subject: [PATCH 5/6] Clarify a comment --- pkgs/firefox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/firefox.yaml b/pkgs/firefox.yaml index d5ca3de67..8a55253e6 100644 --- a/pkgs/firefox.yaml +++ b/pkgs/firefox.yaml @@ -11,7 +11,7 @@ build_stages: - name: make handler: bash bash: | - mkdir build2 # build exists + mkdir build2 # the 'build' directory already exists, so we name it 'build2' cd build2 export SHELL=/bin/bash ../configure --prefix=$ARTIFACT From 9db8faa480785c169ff79b67693214691fdad2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 31 Oct 2014 15:29:16 -0600 Subject: [PATCH 6/6] Add gtk2 as a dependency --- pkgs/firefox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/firefox.yaml b/pkgs/firefox.yaml index 8a55253e6..61486896b 100644 --- a/pkgs/firefox.yaml +++ b/pkgs/firefox.yaml @@ -1,7 +1,7 @@ extends: [base_package, libflags] dependencies: - build: [python] + build: [python, gtk2] sources: - key: tar.bz2:sxdyt4xrohcmppmdfgm2ek72srq2yr52