From 15e2d0ff86b253fc2b69ce0cdabf811e3238ac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:22 +0100 Subject: strata/gtk2.morph: Use latest GTK+2 To support automake 1.14 --- strata/gtk2.morph | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 1265573c..8ac31eaa 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -8,6 +8,5 @@ chunks: - name: gtk+ morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ - ref: 52de99559e5b5bf09160e5a5a164d0ca5fede98c - unpetrify-ref: baserock/xfce-build + ref: fbf38d16bcc26630f0f721d266509f5bc292f606 build-depends: [] -- cgit v1.2.1 From dfc9aaa3880ef1f38a5716b2c2e5128692f7acc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:23 +0100 Subject: strata/core.morph: Upgrade to latest stable curl To support new versions of automake --- strata/core.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 857524e6..13250ab6 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -169,8 +169,8 @@ chunks: - name: curl morph: strata/core/curl.morph repo: upstream:curl - ref: 3c835adc9fe20f7b34df3f0abd4db6ff8b75bc3b - unpetrify-ref: baserock/morph + ref: 202aa9f7758636730299b86715d924f54468a908 + unpetrify-ref: curl-7_38_0 build-depends: - autoconf - automake -- cgit v1.2.1 From 224d6a41d5898eea189bf87a4faace1aa982dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:24 +0100 Subject: Bison depends on help2man Move help2man to core as bison depends on it; the attempt to create manpages without help2man turns from no-op to hard error since automake 1.13 --- strata/core.morph | 9 +++++++++ strata/core/help2man.morph | 9 +++++++++ strata/foundation.morph | 6 ------ strata/foundation/help2man.morph | 9 --------- 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 strata/core/help2man.morph delete mode 100644 strata/foundation/help2man.morph diff --git a/strata/core.morph b/strata/core.morph index 13250ab6..535f9d2c 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -206,6 +206,14 @@ chunks: - gettext - libexpat - openssl-new +- name: help2man + morph: strata/core/help2man.morph + repo: upstream:help2man + ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71 + unpetrify-ref: baserock/morph + build-depends: + - autoconf + - automake - name: bison morph: strata/core/bison.morph repo: upstream:bison @@ -218,6 +226,7 @@ chunks: - flex - gettext - git + - help2man - mini-utils - name: gperf morph: strata/core/gperf.morph diff --git a/strata/core/help2man.morph b/strata/core/help2man.morph new file mode 100644 index 00000000..e25a8d8e --- /dev/null +++ b/strata/core/help2man.morph @@ -0,0 +1,9 @@ +name: help2man +kind: chunk +configure-commands: +- autoreconf -i +- ./configure --prefix=/usr +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/foundation.morph b/strata/foundation.morph index 757b25d4..2af03865 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -111,12 +111,6 @@ chunks: build-depends: - glib - systemd -- name: help2man - morph: strata/foundation/help2man.morph - repo: upstream:help2man - ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71 - unpetrify-ref: baserock/morph - build-depends: [] - name: libxslt repo: upstream:libxslt ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e diff --git a/strata/foundation/help2man.morph b/strata/foundation/help2man.morph deleted file mode 100644 index e25a8d8e..00000000 --- a/strata/foundation/help2man.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: help2man -kind: chunk -configure-commands: -- autoreconf -i -- ./configure --prefix=/usr -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From 38149f6bdaa8b24b34491fa18c1c7bc10eaf34e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:25 +0100 Subject: strata/x-common.morph: Build latest xorg-util-macros To be able to build latest stable xcb-libxcb --- strata/x-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/x-common.morph b/strata/x-common.morph index a6791d48..5c8d77db 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -21,8 +21,8 @@ chunks: build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros - ref: c98b41de5596c675c603ef43ae9570133f1a9921 - unpetrify-ref: baserock/morph + ref: 9a54b858601bd305de2737b06e609084a2a114c2 + unpetrify-ref: util-macros-1.19.0 build-depends: [] - name: xorg-proto-bigreqsproto repo: upstream:xorg-proto-bigreqsproto -- cgit v1.2.1 From 9e0aa68a368366cc0d761f973520128bb4a1e970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:26 +0100 Subject: strata/x-common: Update xcb-libxcb to the latest stable version To avoid problem with newer automake --- strata/x-common.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/x-common.morph b/strata/x-common.morph index 5c8d77db..02548bb9 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -176,8 +176,8 @@ chunks: - xorg-util-macros - name: xcb-proto repo: upstream:xcb-proto - ref: ca30e6d5d7a0c7618d988f9051026d250f5e124e - unpetrify-ref: baserock/morph + ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 + unpetrify-ref: "1.11" build-depends: - xorg-util-macros - name: xorg-lib-libXau @@ -189,8 +189,8 @@ chunks: - xorg-util-macros - name: xcb-libxcb repo: upstream:xcb-libxcb - ref: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 - unpetrify-ref: baserock/morph + ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a + unpetrify-ref: "1.11" build-depends: - xcb-proto - xcb-pthread-stubs -- cgit v1.2.1 From 835eedb0425062a0ae818b6752b0e9f4ac6965d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:27 +0100 Subject: strata/x-common: Update xorg-lib-libX11 to the latest stable version To avoid problem with newer automake --- strata/x-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/x-common.morph b/strata/x-common.morph index 02548bb9..fe489832 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -204,8 +204,8 @@ chunks: - xorg-util-macros - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 - ref: f57fd760cba92ad846917f21e94e73e9c846185f - unpetrify-ref: baserock/morph + ref: cb107760df33ffc8630677e66e2e50aa37950a5c + unpetrify-ref: libX11-1.6.2 build-depends: - xcb-libxcb - xorg-lib-libXau -- cgit v1.2.1 From a97ab1a95090ccffe1eaf83808769f62f058b6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 14:15:28 +0100 Subject: strata/core.morph: Upgrade to automake 1.14 This is the current stable version. Also Its needed for some GNOME modules. --- strata/core.morph | 4 ++-- strata/core/automake.morph | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 535f9d2c..4c6a23bf 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -77,8 +77,8 @@ chunks: - name: automake morph: strata/core/automake.morph repo: upstream:automake - ref: 5ac84ae6760252fc60b144a7b4deb41694f95fe7 - unpetrify-ref: baserock/morph + ref: ba4b42faff673e3e5265416dff09e59affc688fb + unpetrify-ref: v1.14.1 build-depends: - autoconf - perl diff --git a/strata/core/automake.morph b/strata/core/automake.morph index 616eeddf..282535d6 100644 --- a/strata/core/automake.morph +++ b/strata/core/automake.morph @@ -2,7 +2,7 @@ name: automake kind: chunk build-system: autotools configure-commands: -- ./bootstrap +- ./bootstrap.sh - ./configure --prefix="$PREFIX" build-commands: - unset DESTDIR; make -- cgit v1.2.1