aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-03-24 12:34:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-03-24 13:03:04 +0000
commitc749890cee25c59d44c799c76790acb5ef60c974 (patch)
treec240479520ce889382c8521d4e493404250919e8
parent647d4a9b28c11b6aed29c74133a2a7d7f0bdba64 (diff)
downloadaports-c749890cee25c59d44c799c76790acb5ef60c974.tar.gz
aports-c749890cee25c59d44c799c76790acb5ef60c974.tar.bz2
aports-c749890cee25c59d44c799c76790acb5ef60c974.tar.xz
main/glib: upgrade to 2.48.0
-rw-r--r--main/glib/0001-Revert-Move-quark-initialization-to-a-constructor.patch110
-rw-r--r--main/glib/APKBUILD14
2 files changed, 5 insertions, 119 deletions
diff --git a/main/glib/0001-Revert-Move-quark-initialization-to-a-constructor.patch b/main/glib/0001-Revert-Move-quark-initialization-to-a-constructor.patch
deleted file mode 100644
index 70ccc350bc..0000000000
--- a/main/glib/0001-Revert-Move-quark-initialization-to-a-constructor.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From ca32c60a815f91a28e63993e9b53a2cfa0764240 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 2 Oct 2015 08:11:53 +0200
-Subject: [PATCH] Revert "Move quark initialization to a constructor"
-
-musl's does not run ctors in the assumed order that glib-2.46 expects:
-
-- glib_init() should be called before gobject_init_ctor().
-
-This reverts commit 2fe992b099bfd3fb121a71b7af43e116b2142b5d.
----
- glib/glib-init.c | 1 -
- glib/glib-init.h | 2 --
- glib/gquark.c | 26 ++++++++++++--------------
- 3 files changed, 12 insertions(+), 17 deletions(-)
-
-diff --git a/glib/glib-init.c b/glib/glib-init.c
-index e7002e6..24efe9d 100644
---- a/glib/glib-init.c
-+++ b/glib/glib-init.c
-@@ -233,7 +233,6 @@ glib_init (void)
- {
- g_messages_prefixed_init ();
- g_debug_init ();
-- g_quark_init ();
- }
-
- #if defined (G_OS_WIN32)
-diff --git a/glib/glib-init.h b/glib/glib-init.h
-index b56f7e2..de6be78 100644
---- a/glib/glib-init.h
-+++ b/glib/glib-init.h
-@@ -25,8 +25,6 @@
- extern GLogLevelFlags g_log_always_fatal;
- extern GLogLevelFlags g_log_msg_prefix;
-
--void g_quark_init (void);
--
- #ifdef G_OS_WIN32
- #include <windows.h>
-
-diff --git a/glib/gquark.c b/glib/gquark.c
-index 9e51a92..d620533 100644
---- a/glib/gquark.c
-+++ b/glib/gquark.c
-@@ -40,7 +40,6 @@
- #include "gthread.h"
- #include "gtestutils.h"
- #include "glib_trace.h"
--#include "glib-init.h"
-
- #define QUARK_BLOCK_SIZE 2048
- #define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize))
-@@ -54,16 +53,6 @@ static gint quark_seq_id = 0;
- static gchar *quark_block = NULL;
- static gint quark_block_offset = 0;
-
--void
--g_quark_init (void)
--{
-- g_assert (quark_seq_id == 0);
-- quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
-- quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
-- quarks[0] = NULL;
-- quark_seq_id = 1;
--}
--
- /**
- * SECTION:quarks
- * @title: Quarks
-@@ -138,9 +127,10 @@ g_quark_try_string (const gchar *string)
- return 0;
-
- G_LOCK (quark_global);
-- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-+ if (quark_ht)
-+ quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
- G_UNLOCK (quark_global);
--
-+
- return quark;
- }
-
-@@ -179,7 +169,8 @@ quark_from_string (const gchar *string,
- {
- GQuark quark = 0;
-
-- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-+ if (quark_ht)
-+ quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
-
- if (!quark)
- {
-@@ -292,6 +283,13 @@ quark_new (gchar *string)
- */
- g_atomic_pointer_set (&quarks, quarks_new);
- }
-+ if (!quark_ht)
-+ {
-+ g_assert (quark_seq_id == 0);
-+ quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
-+ quarks[quark_seq_id] = NULL;
-+ g_atomic_int_inc (&quark_seq_id);
-+ }
-
- quark = quark_seq_id;
- g_atomic_pointer_set (&quarks[quark], string);
---
-2.6.0
-
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index f73ffe5c06..25fb0037dc 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glib
-pkgver=2.46.2
-pkgrel=1
+pkgver=2.48.0
+pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="http://www.gtk.org"
arch="all"
@@ -12,7 +12,6 @@ triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules"
depends_dev="perl python gettext-dev zlib-dev bzip2-dev libffi-dev"
makedepends="$depends_dev pcre-dev"
source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- 0001-Revert-Move-quark-initialization-to-a-constructor.patch
"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp"
@@ -74,9 +73,6 @@ bashcomp() {
[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
}
-md5sums="7f815d6e46df68e070cb421ed7f1139e glib-2.46.2.tar.xz
-1d9c4fbfadc2e358e3bb9fbec1646711 0001-Revert-Move-quark-initialization-to-a-constructor.patch"
-sha256sums="5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db glib-2.46.2.tar.xz
-c3dfaf69a627033d28552342e79ccbcfb7cae8dfbe8e3a2272ce2c25f76b9844 0001-Revert-Move-quark-initialization-to-a-constructor.patch"
-sha512sums="8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 glib-2.46.2.tar.xz
-c034c60e87b6fea82d1eddd6ccd849425dd9be10af552491d82398f04ec1691d6d386dc99333a917b1b5fa905526a4553cef37ab0967ff857864f95fe7a52edf 0001-Revert-Move-quark-initialization-to-a-constructor.patch"
+md5sums="093a586f37d2853bdb129231e1b350e0 glib-2.48.0.tar.xz"
+sha256sums="744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34 glib-2.48.0.tar.xz"
+sha512sums="684544bc594d9f6c905495d895daed40b074bcf5fa835aefb9a1034afc9564b2bd464e68d4c378c210e96918ef5d5202350da53a7104794420e990049ddbebf5 glib-2.48.0.tar.xz"