* [ptxdist] [PATCH 1/2] host-cairo: disable doc generation
@ 2022-10-04 14:47 Bastian Krause
2022-10-04 14:47 ` [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2 Bastian Krause
2022-10-14 7:46 ` [ptxdist] [APPLIED] host-cairo: disable doc generation Michael Olbrich
0 siblings, 2 replies; 5+ messages in thread
From: Bastian Krause @ 2022-10-04 14:47 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/host-cairo.make | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/host-cairo.make b/rules/host-cairo.make
index aa5c24cec..6936b9bc2 100644
--- a/rules/host-cairo.make
+++ b/rules/host-cairo.make
@@ -25,6 +25,7 @@ HOST_CAIRO_CONF_OPT := \
$(HOST_AUTOCONF) \
--enable-shared \
--disable-static \
+ --disable-gtk-doc \
--enable-atomic \
--disable-gcov \
--disable-valgrind \
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2
2022-10-04 14:47 [ptxdist] [PATCH 1/2] host-cairo: disable doc generation Bastian Krause
@ 2022-10-04 14:47 ` Bastian Krause
2022-10-04 15:48 ` Bastian Krause
2022-10-14 7:46 ` [ptxdist] [APPLIED] host-cairo: disable doc generation Michael Olbrich
1 sibling, 1 reply; 5+ messages in thread
From: Bastian Krause @ 2022-10-04 14:47 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/cairo.make | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/rules/cairo.make b/rules/cairo.make
index e9e395b26..416aa38cf 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
#
# Paths and names
#
-CAIRO_VERSION := 1.16.0
-CAIRO_MD5 := f19e0353828269c22bd72e271243a552
+CAIRO_VERSION := 1.17.2
+CAIRO_MD5 := 321a07adaeb125cb5513079256d465fb
CAIRO := cairo-$(CAIRO_VERSION)
CAIRO_SUFFIX := tar.xz
-CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
+CAIRO_URL := https://cairographics.org/snapshots/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
CAIRO_DIR := $(BUILDDIR)/$(CAIRO)
CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1
@@ -40,8 +40,6 @@ CAIRO_CONF_OPT := \
--enable-shared \
--disable-static \
--disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
$(GLOBAL_LARGE_FILE_OPTION) \
--enable-atomic \
--disable-gcov \
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2
2022-10-04 14:47 ` [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2 Bastian Krause
@ 2022-10-04 15:48 ` Bastian Krause
2022-10-06 15:38 ` Bastian Krause
0 siblings, 1 reply; 5+ messages in thread
From: Bastian Krause @ 2022-10-04 15:48 UTC (permalink / raw)
To: ptxdist
On 10/4/22 16:47, Bastian Krause wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
> rules/cairo.make | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
I missed the patches from 1.16.0. I'll have a look whether they're still
required and send a v2.
Regards,
Bastian
>
> diff --git a/rules/cairo.make b/rules/cairo.make
> index e9e395b26..416aa38cf 100644
> --- a/rules/cairo.make
> +++ b/rules/cairo.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
> #
> # Paths and names
> #
> -CAIRO_VERSION := 1.16.0
> -CAIRO_MD5 := f19e0353828269c22bd72e271243a552
> +CAIRO_VERSION := 1.17.2
> +CAIRO_MD5 := 321a07adaeb125cb5513079256d465fb
> CAIRO := cairo-$(CAIRO_VERSION)
> CAIRO_SUFFIX := tar.xz
> -CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
> +CAIRO_URL := https://cairographics.org/snapshots/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
> CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
> CAIRO_DIR := $(BUILDDIR)/$(CAIRO)
> CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1
> @@ -40,8 +40,6 @@ CAIRO_CONF_OPT := \
> --enable-shared \
> --disable-static \
> --disable-gtk-doc \
> - --disable-gtk-doc-html \
> - --disable-gtk-doc-pdf \
> $(GLOBAL_LARGE_FILE_OPTION) \
> --enable-atomic \
> --disable-gcov \
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2
2022-10-04 15:48 ` Bastian Krause
@ 2022-10-06 15:38 ` Bastian Krause
0 siblings, 0 replies; 5+ messages in thread
From: Bastian Krause @ 2022-10-06 15:38 UTC (permalink / raw)
To: ptxdist
On 10/4/22 17:48, Bastian Krause wrote:
> On 10/4/22 16:47, Bastian Krause wrote:
>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
>> ---
>> rules/cairo.make | 8 +++-----
>> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> I missed the patches from 1.16.0. I'll have a look whether they're still
> required and send a v2.
Please drop this patch, odd releases are development snapshots [1]. The
first patch of this series is still valid, though.
Regards,
Bastian
[1] https://gitlab.freedesktop.org/cairo/cairo/-/blob/1.17.6/RELEASING#L59
>
> Regards,
> Bastian
>
>>
>> diff --git a/rules/cairo.make b/rules/cairo.make
>> index e9e395b26..416aa38cf 100644
>> --- a/rules/cairo.make
>> +++ b/rules/cairo.make
>> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
>> #
>> # Paths and names
>> #
>> -CAIRO_VERSION := 1.16.0
>> -CAIRO_MD5 := f19e0353828269c22bd72e271243a552
>> +CAIRO_VERSION := 1.17.2
>> +CAIRO_MD5 := 321a07adaeb125cb5513079256d465fb
>> CAIRO := cairo-$(CAIRO_VERSION)
>> CAIRO_SUFFIX := tar.xz
>> -CAIRO_URL :=
>> http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
>> +CAIRO_URL :=
>> https://cairographics.org/snapshots/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
>> CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
>> CAIRO_DIR := $(BUILDDIR)/$(CAIRO)
>> CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1
>> @@ -40,8 +40,6 @@ CAIRO_CONF_OPT := \
>> --enable-shared \
>> --disable-static \
>> --disable-gtk-doc \
>> - --disable-gtk-doc-html \
>> - --disable-gtk-doc-pdf \
>> $(GLOBAL_LARGE_FILE_OPTION) \
>> --enable-atomic \
>> --disable-gcov \
>
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] host-cairo: disable doc generation
2022-10-04 14:47 [ptxdist] [PATCH 1/2] host-cairo: disable doc generation Bastian Krause
2022-10-04 14:47 ` [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2 Bastian Krause
@ 2022-10-14 7:46 ` Michael Olbrich
1 sibling, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2022-10-14 7:46 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as eb88cef2b0d8de0e38ec40194fddb2b8c5385b6c.
Michael
[sent from post-receive hook]
On Fri, 14 Oct 2022 09:46:36 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20221004144705.2277456-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-cairo.make b/rules/host-cairo.make
> index aa5c24cec8a0..6936b9bc2893 100644
> --- a/rules/host-cairo.make
> +++ b/rules/host-cairo.make
> @@ -25,6 +25,7 @@ HOST_CAIRO_CONF_OPT := \
> $(HOST_AUTOCONF) \
> --enable-shared \
> --disable-static \
> + --disable-gtk-doc \
> --enable-atomic \
> --disable-gcov \
> --disable-valgrind \
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-14 7:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04 14:47 [ptxdist] [PATCH 1/2] host-cairo: disable doc generation Bastian Krause
2022-10-04 14:47 ` [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2 Bastian Krause
2022-10-04 15:48 ` Bastian Krause
2022-10-06 15:38 ` Bastian Krause
2022-10-14 7:46 ` [ptxdist] [APPLIED] host-cairo: disable doc generation Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox