Skip to contentSkip to conversation

package/libglib2: bump to version 2.60.3

PATCH New aduskett at gmail.com 2 participants 2 messages May 28, 2019 – Jun 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v7 1/1 package/libglib2: bump to version 2.60.3

From: Adam Duskett <[email protected]>

Changes include:
- Change the package type to meson, as autoconf is no longer supported.

- Add 0002-add-option-to-build-tests.patch
Upstream won't build tests when cross-compiling. However; this means still building the tests during a host build. Building the tests causes build failures on older distributions such as CentOS 6 and Debian 7 because of the command objcopy --add-symbol is used when building the test "test_resources2," which is not available with the older version of objcopy provided by the distributions.

- Add 0003-remove-cpp-requirement.patch:
C++ is not needed when just compiling. The inclusion of C++ in meson.build is to ensure libglib doesn't accidentally use C++ reserved keywords in public headers. Because tests aren't being compiled, there is no need for C++ as a requirement.
(https://gitlab.gnome.org/GNOME/glib/issues/1748)

- Add 0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch:
This prevents 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:
The switch to meson makes this obsolete.

- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk:
Now that libglib2 is a meson package, there is no need for AUTORECONF.

- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk:
Meson resolves these correctly.

- Add LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE in libglib2.mk:
Newer versions of libglib2 prefix glib-genmarshal, gobject-query, and glib-mkenums with ${bindir}. Unfortunately, this will resolve to the host systems /bin/ directory, which will cause compilation issues if the host does not have these programs. By removing the ${bindir}/ prefix, these programs are resolved in PATH instead.

---
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)

v2 -> v3:
- Moved -Wno-format-nonliteral above the comment. (Arnout)

v3 -> v4:
- Bump version from 2.60.0 to 2.60.1

v4 -> v5:
- Bump version from 2.60.1 to 2.60.2
- Replace 0002-Only-build-tests-if-certain-conditions-are-met.patch in favor of 0002-add-option-to-build-tests.patch. This allows tests to be disabled explicitly, and allows building on older distributions.

v5 -> v6:
- Bump version from 2.60.2 to 2.60.3
- Make a better commit log with more explination.
- Add LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE to fix finding glib-genmarshal. (Thanks to Arnout, Yann, and Thomas!)

v6 -> v7:
- Removed inappropriate depends on !BR2_nds32 in the Config.in file. This was used for some debugging and I missed it.

 ...01-fix-compile-time-atomic-detection.patch |   4 +-
 .../0002-add-option-to-build-tests.patch      | 103 +++++++++++++++
 package/libglib2/0002-disable-tests.patch     |  60 ---------
 ...03-gdbus-Avoid-printing-null-strings.patch |  73 -----------
 .../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                |   4 +-
 package/libglib2/libglib2.mk                  | 122 ++++--------------
 9 files changed, 259 insertions(+), 279 deletions(-)
 create mode 100644 package/libglib2/0002-add-option-to-build-tests.patch
 delete mode 100644 package/libglib2/0002-disable-tests.patch
 delete mode 100644 package/libglib2/0003-gdbus-Avoid-printing-null-strings.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 +2 -2
index 708188b2c1..527757d9c5 100644
@@ -5,8 +5,8 @@ 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
+Upstream-Status: Merged
+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-add-option-to-build-tests.patch new file +103 -0

103 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-gdbus-Avoid-printing-null-strings.patch deleted +0 -73

73 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
new file mode 100644
index 0000000000..e51bb6b2b1
@@ -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',
++    '-Wno-format-nonliteral',
+     # Due to function casts through (void*) we cannot support -Wpedantic:
+     # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions.
+     '-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 +2 -2
index faa01ef563..763c645b85 100644
@@ -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
+# https://download.gnome.org/sources/glib/2.60/glib-2.60.3.sha256sum
+sha256  04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9  glib-2.60.3.tar.xz
 # License files, locally calculated
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
package/libglib2/libglib2.mk +28 -94

172 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH v7 1/1 package/libglib2: bump to version 2.60.3

Hi Adam,

Quoted 33 lines · aduskett at gmail.com

From: Adam Duskett <[email protected]>

Changes include:
- Change the package type to meson, as autoconf is no longer supported.

- Add 0002-add-option-to-build-tests.patch
Upstream won't build tests when cross-compiling. However; this means still building the tests during a host build. Building the tests causes build failures on older distributions such as CentOS 6 and Debian 7 because of the command objcopy --add-symbol is used when building the test "test_resources2," which is not available with the older version of objcopy provided by the distributions.

- Add 0003-remove-cpp-requirement.patch:
C++ is not needed when just compiling. The inclusion of C++ in meson.build is to ensure libglib doesn't accidentally use C++ reserved keywords in public headers. Because tests aren't being compiled, there is no need for C++ as a requirement.
(https://gitlab.gnome.org/GNOME/glib/issues/1748)

- Add 0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch:
This prevents 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:
The switch to meson makes this obsolete.

- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk:
Now that libglib2 is a meson package, there is no need for AUTORECONF.

- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk:
Meson resolves these correctly.

Quoted 8 lines

- Add LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE in libglib2.mk:
Newer versions of libglib2 prefix glib-genmarshal, gobject-query, and glib-mkenums with ${bindir}. Unfortunately, this will resolve to the host systems /bin/ directory, which will cause compilation issues if the host does not have these programs. By removing the ${bindir}/ prefix, these programs are resolved in PATH instead.

Applied to master, thanks.

Thanks for keeping this going for four months!

Regards,
Arnout