Skip to contentSkip to conversation

libglib2: bump version to 2.52.2

PATCH Superseded Adam Duskett 2 participants 3 messages Jun 21, 2017 – Jun 24, 2017

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 1/1 libglib2: bump version to 2.52.2

Patches were updated to work with new version, and now pass check-package. 0003-gio-2.0.pc-include-libmount-in-Libs.private.patch was added to upstream as of commit:
https://git.gnome.org/browse/glib/commit/?id=ecdd3c29fc4bd28f01fe53d0528bfee888c9c62c.

Signed-off-by Adam Duskett <[email protected]>
---
 .../0001-fix-compile-time-atomic-detection.patch   | 12 +++--
 package/libglib2/0002-disable-tests.patch          | 57 ++++++++++++++--------
 ...o-2.0.pc-include-libmount-in-Libs.private.patch | 32 ------------
 package/libglib2/libglib2.hash                     |  4 +-
 package/libglib2/libglib2.mk                       |  4 +-
 5 files changed, 49 insertions(+), 60 deletions(-)
 delete mode 100644 package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch
package/libglib2/0001-fix-compile-time-atomic-detection.patch +8 -4
index f6d0c5d..708188b 100644
@@ -1,4 +1,7 @@
-[PATCH] Fix compilation issues on architectures with limited atomic support
+From d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001
+From: Brendan Heading <[email protected]>
+Date: Wed, 21 Jun 2017 16:36:15 -0400
+Subject: [PATCH] Fix compile time atomic detection
 
 Improved compile-time detection of atomic support in the compiler.
 

@@ -6,15 +9,16 @@ Upstream-Status: submitted
 See : https://bugzilla.gnome.org/show_bug.cgi?id=752731
 
 Signed-off-by: Brendan Heading <[email protected]>
+Signed-off-by: Adam Duskett <[email protected]>
 ---
  glib/gthread-posix.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
-index ae5d805..8db8557 100644
+index 71a6b7b..d09d029 100644
 --- a/glib/gthread-posix.c
 +++ b/glib/gthread-posix.c
-@@ -67,7 +67,7 @@
+@@ -65,7 +65,7 @@
  #endif
  
  /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */

@@ -24,5 +28,5 @@ index ae5d805..8db8557 100644
  #endif
  
 -- 
-2.4.3
+2.9.4
package/libglib2/0002-disable-tests.patch +37 -20

74 lines not on this page · raw message

package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch deleted +0 -32
deleted file mode 100644
index 364e179..0000000
@@ -1,32 +0,0 @@
-From ee32416dec8462ee27c3c254100cf980b0889ce0 Mon Sep 17 00:00:00 2001
-From: Rahul Bedarkar <[email protected]>
-Date: Tue, 18 Oct 2016 23:04:50 +0530
-Subject: [PATCH] gio-2.0.pc: include libmount in Libs.private
-
-This helps with static linking. When application statically links with
-libgio, it needs to link against libmount explicitly. When it is
-mentioned in Libs.private, build system can figure out with which extra
-libs to link against with help of pkg-config.
-
-This build failure is detected by Buildroot autobuilder:
-http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186
-
-Signed-off-by: Rahul Bedarkar <[email protected]>
----
- gio-2.0.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
-index 899af0c..7574eb7 100644
---- a/gio-2.0.pc.in
-+++ b/gio-2.0.pc.in
-@@ -14,5 +14,5 @@ Version: @VERSION@
- Requires: glib-2.0 gobject-2.0
- Requires.private: gmodule-no-export-2.0
- Libs: -L${libdir} -lgio-2.0
--Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
-+Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@
- Cflags:
--- 
-2.6.2
-
package/libglib2/libglib2.hash +2 -2
index b31c212..083b95d 100644
@@ -1,2 +1,2 @@
-# https://download.gnome.org/sources/glib/2.50/glib-2.50.3.sha256sum
-sha256  82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999  glib-2.50.3.tar.xz
+# https://download.gnome.org/sources/glib/2.50/glib-2.52.2.sha256sum
+sha256  f00e5d9e2a2948b1da25fcba734a6b7a40f556de8bc9f528a53f6569969ac5d0  glib-2.52.2.tar.xz
package/libglib2/libglib2.mk +2 -2
index 47d9f63..d6b18dd 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.50
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
+LIBGLIB2_VERSION_MAJOR = 2.52
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPL-2.0+
Signature · 1 line
2.9.4
author
#1 lore raw

PATCH v2 1/1 libglib2: bump version to 2.52.2

Patches were changed to git format, because libglib is a git project. 0003-gio-2.0.pc-include-libmount-in-Libs.private.patch was added to upstream as of commit:
https://git.gnome.org/browse/glib/commit/?id=ecdd3c29fc4bd28f01fe53d0528bfee888c9c62c.

Signed-off-by Adam Duskett <[email protected]>

---
Changes v1 -> v2:
- Updated commit message to include the url of the commit for patch 003.
- Added the correct authors to the remaining patches.

 .../0001-fix-compile-time-atomic-detection.patch   | 12 +++--
 package/libglib2/0002-disable-tests.patch          | 57 ++++++++++++++--------
 ...o-2.0.pc-include-libmount-in-Libs.private.patch | 32 ------------
 package/libglib2/libglib2.hash                     |  4 +-
 package/libglib2/libglib2.mk                       |  4 +-
 5 files changed, 49 insertions(+), 60 deletions(-)
 delete mode 100644 package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch
package/libglib2/0001-fix-compile-time-atomic-detection.patch +8 -4
index f6d0c5d..708188b 100644
@@ -1,4 +1,7 @@
-[PATCH] Fix compilation issues on architectures with limited atomic support
+From d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001
+From: Brendan Heading <[email protected]>
+Date: Wed, 21 Jun 2017 16:36:15 -0400
+Subject: [PATCH] Fix compile time atomic detection
 
 Improved compile-time detection of atomic support in the compiler.
 

@@ -6,15 +9,16 @@ Upstream-Status: submitted
 See : https://bugzilla.gnome.org/show_bug.cgi?id=752731
 
 Signed-off-by: Brendan Heading <[email protected]>
+Signed-off-by: Adam Duskett <[email protected]>
 ---
  glib/gthread-posix.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
-index ae5d805..8db8557 100644
+index 71a6b7b..d09d029 100644
 --- a/glib/gthread-posix.c
 +++ b/glib/gthread-posix.c
-@@ -67,7 +67,7 @@
+@@ -65,7 +65,7 @@
  #endif
  
  /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */

@@ -24,5 +28,5 @@ index ae5d805..8db8557 100644
  #endif
  
 -- 
-2.4.3
+2.9.4
package/libglib2/0002-disable-tests.patch +37 -20

74 lines not on this page · raw message

package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch deleted +0 -32
deleted file mode 100644
index 364e179..0000000
@@ -1,32 +0,0 @@
-From ee32416dec8462ee27c3c254100cf980b0889ce0 Mon Sep 17 00:00:00 2001
-From: Rahul Bedarkar <[email protected]>
-Date: Tue, 18 Oct 2016 23:04:50 +0530
-Subject: [PATCH] gio-2.0.pc: include libmount in Libs.private
-
-This helps with static linking. When application statically links with
-libgio, it needs to link against libmount explicitly. When it is
-mentioned in Libs.private, build system can figure out with which extra
-libs to link against with help of pkg-config.
-
-This build failure is detected by Buildroot autobuilder:
-http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186
-
-Signed-off-by: Rahul Bedarkar <[email protected]>
----
- gio-2.0.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
-index 899af0c..7574eb7 100644
---- a/gio-2.0.pc.in
-+++ b/gio-2.0.pc.in
-@@ -14,5 +14,5 @@ Version: @VERSION@
- Requires: glib-2.0 gobject-2.0
- Requires.private: gmodule-no-export-2.0
- Libs: -L${libdir} -lgio-2.0
--Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
-+Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@
- Cflags:
--- 
-2.6.2
-
package/libglib2/libglib2.hash +2 -2
index b31c212..083b95d 100644
@@ -1,2 +1,2 @@
-# https://download.gnome.org/sources/glib/2.50/glib-2.50.3.sha256sum
-sha256  82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999  glib-2.50.3.tar.xz
+# https://download.gnome.org/sources/glib/2.50/glib-2.52.2.sha256sum
+sha256  f00e5d9e2a2948b1da25fcba734a6b7a40f556de8bc9f528a53f6569969ac5d0  glib-2.52.2.tar.xz
package/libglib2/libglib2.mk +2 -2
index 47d9f63..d6b18dd 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.50
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
+LIBGLIB2_VERSION_MAJOR = 2.52
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPL-2.0+
Signature · 1 line
2.9.4
Applied
#2 lore raw

PATCH v2 1/1 libglib2: bump version to 2.52.2

Hello,

Quoted 10 lines · Adam Duskett

Patches were changed to git format, because libglib is a git project. 0003-gio-2.0.pc-include-libmount-in-Libs.private.patch was added to upstream as of commit:
https://git.gnome.org/browse/glib/commit/?id=ecdd3c29fc4bd28f01fe53d0528bfee888c9c62c.

Signed-off-by Adam Duskett <[email protected]>

---
Changes v1 -> v2:
- Updated commit message to include the url of the commit for patch 003.
- Added the correct authors to the remaining patches.

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com