package/pkgconf: bump to version 1.6.1
PATCH v2 1/2 package/pkgconf: bump to version 1.6.1
From: Adam Duskett <[email protected]>
Other changes:
- Add a hash for the license file.
Tested against:
- libsoup
- X11r7
- dbus-glib
- atk
---
v1 -> v2:
- Clean up commit message (Thomas)
- Use the original URL as the https certificate is now fixed.
- Remove AUTORECONF = YES because the https certificate is now fixed.
package/pkgconf/pkgconf.hash | 3 ++- package/pkgconf/pkgconf.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
package/pkgconf/pkgconf.hash +2 -1
@@ -1,2 +1,3 @@ # Locally calculated -sha256 d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715 pkgconf-1.5.3.tar.xz +sha256 22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c pkgconf-1.6.1.tar.xz +sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING
package/pkgconf/pkgconf.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -PKGCONF_VERSION = 1.5.3 +PKGCONF_VERSION = 1.6.1 PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license
Signature · 1 line
2.20.1
PATCH v2 2/2 package/libglib2: bump to version 2.60.0
From: Adam Duskett <[email protected]>
Changes include:
- Moving to the meson build system, as autoconf is no longer supported.
- Add 0002-Only-build-tests-if-certain-conditions-are-met.patch
- Add 0003-remove-cpp-requirement.patch because c++ is not needed.
- Add 0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch to prevent a false error when compiling against older gcc versions.
(https://gitlab.gnome.org/GNOME/glib/issues/1744)
- Remove 0004-Do-not-hardcode-python-path-into-various-tools.patch as the switch to meson makes this obsolete.
- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk
- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk
All tests pass:
./utils/test-pkg -c ./defconfig
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: OK
sourcery-arm [6/6]: OK---
v1 -> v2:
- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk
- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk
- Remove -Dtests=false from libglib2.mk in favor of the updated 0002-Only-build-tests-if-certain-conditions-are-met.patch.
- Instead of making cpp optional, remove cpp requirement completely as the c++ requirement is for testing purposes only.
- Add a link to https://gitlab.gnome.org/GNOME/glib/issues/1748 as to why patch 0003 is buildroot specific.
- Update url in 0001-fix-compile-time-atomic-detection.patch
- Remove 0004-Do-not-hardcode-python-path-into-various-tools.patch (Arnout)
...01-fix-compile-time-atomic-detection.patch | 2 +- ...-tests-if-certain-conditions-are-met.patch | 88 ++++++++++++++ package/libglib2/0002-disable-tests.patch | 60 ---------- .../0003-remove-cpp-requirement.patch | 96 +++++++++++++++ ...mat-nonliteral-to-compiler-arguments.patch | 28 +++++ ...dcode-python-path-into-various-tools.patch | 48 -------- package/libglib2/libglib2.hash | 2 +- package/libglib2/libglib2.mk | 110 +++--------------- 8 files changed, 230 insertions(+), 204 deletions(-) create mode 100644 package/libglib2/0002-Only-build-tests-if-certain-conditions-are-met.patch delete mode 100644 package/libglib2/0002-disable-tests.patch create mode 100644 package/libglib2/0003-remove-cpp-requirement.patch create mode 100644 package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch delete mode 100644 package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch
package/libglib2/0001-fix-compile-time-atomic-detection.patch +1 -1
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix compile time atomic detection Improved compile-time detection of atomic support in the compiler. Upstream-Status: submitted -See : https://bugzilla.gnome.org/show_bug.cgi?id=752731 +See : https://gitlab.gnome.org/GNOME/glib/issues/1063 Signed-off-by: Brendan Heading <[email protected]> Signed-off-by: Adam Duskett <[email protected]>
package/libglib2/0002-Only-build-tests-if-certain-conditions-are-met.patch new file +88 -0
88 lines not on this page · raw message
package/libglib2/0002-disable-tests.patch deleted +0 -60
60 lines not on this page · raw message
package/libglib2/0003-remove-cpp-requirement.patch new file +96 -0
96 lines not on this page · raw message
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Tue, 9 Apr 2019 13:03:51 -0400 +Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments. + +This warning is a false positive on older versions of gcc. +See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details. + +Signed-off-by: Adam Duskett <[email protected]> +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 3c615b7..7cae4e8 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,6 +357,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Wno-cast-function-type', + # Due to function casts through (void*) we cannot support -Wpedantic: + # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. ++ '-Wno-format-nonliteral', + '-Wno-pedantic', + '-Werror=declaration-after-statement', + '-Werror=format=2', +-- +2.20.1 +
package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch deleted +0 -48
48 lines not on this page · raw message
package/libglib2/libglib2.hash +1 -1
@@ -1,4 +1,4 @@ # https://download.gnome.org/sources/glib/2.56/glib-2.56.4.sha256sum -sha256 27f703d125efb07f8a743666b580df0b4095c59fc8750e8890132c91d437504c glib-2.56.4.tar.xz +sha256 20865d8b96840d89d9340fc485b4b1131c1bb24d16a258a22d642c3bb1b44353 glib-2.60.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
package/libglib2/libglib2.mk +16 -94
154 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 2/2 package/libglib2: bump to version 2.60.0
Quoted 18 lines · aduskett at gmail.com
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch new file +12
-0@@ -0,0 +1,28 @@ +From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Tue, 9 Apr 2019 13:03:51 -0400 +Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments. + +This warning is a false positive on older versions of gcc. +See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details. + +Signed-off-by: Adam Duskett <[email protected]> +--- + meson.build | 1 + + 1 file changed, 1 insertion(+)
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch line 22
Quoted 10 lines
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch new file +10
-0+ +diff --git a/meson.build b/meson.build +index 3c615b7..7cae4e8 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,6 +357,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' + '-Wno-cast-function-type', + # Due to function casts through (void*) we cannot support -Wpedantic: + # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. ++ '-Wno-format-nonliteral',
Didn't I say in a previous iteration that this should go before the comment?
The comment is about the no-pedantic so you shouldn't put something in-between.
Regards,
Arnout
Quoted 3 lines
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch new file +3
-0+ '-Wno-pedantic', + '-Werror=declaration-after-statement', + '-Werror=format=2',
Arnout Vandecappelle
AppliedPATCH v2 1/2 package/pkgconf: bump to version 1.6.1
In reply to aduskett at gmail.comQuoted 5 lines · aduskett at gmail.com
From: Adam Duskett <[email protected]>
Other changes:
- Add a hash for the license file.
Quoted 7 lines
Tested against:
- libsoup
- X11r7
- dbus-glib
- atkSigned-off-by Adam Duskett <[email protected]>
Applied to master, thanks.
Could you monitor the autobuilders for fallout from this bump?
Regards,
Arnout
Quoted 33 lines
---
v1 -> v2:
- Clean up commit message (Thomas)
- Use the original URL as the https certificate is now fixed.
- Remove AUTORECONF = YES because the https certificate is now fixed.package/pkgconf/pkgconf.hash | 3 ++- package/pkgconf/pkgconf.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)package/pkgconf/pkgconf.hash +2
-1@@ -1,2 +1,3 @@ # Locally calculated -sha256 d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715 pkgconf-1.5.3.tar.xz +sha256 22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c pkgconf-1.6.1.tar.xz +sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYINGpackage/pkgconf/pkgconf.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -PKGCONF_VERSION = 1.5.3 +PKGCONF_VERSION = 1.6.1 PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license