Date: Wednesday, October 14, 2015 @ 16:24:09
Author: heftig
Revision: 249325
2.46.1
Modified:
glib2/trunk/PKGBUILD
Deleted:
glib2/trunk/0001-Revert-list-store-Fix-a-parameter-check.patch
----------------------------------------------------+
0001-Revert-list-store-Fix-a-parameter-check.patch | 74 -------------------
PKGBUILD | 9 --
2 files changed, 3 insertions(+), 80 deletions(-)
Deleted: 0001-Revert-list-store-Fix-a-parameter-check.patch
===================================================================
--- 0001-Revert-list-store-Fix-a-parameter-check.patch 2015-10-14 09:10:51 UTC
(rev 249324)
+++ 0001-Revert-list-store-Fix-a-parameter-check.patch 2015-10-14 14:24:09 UTC
(rev 249325)
@@ -1,74 +0,0 @@
-From 19a560f9491c4964e7093e22cb3876fc53a442e6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
-Date: Wed, 23 Sep 2015 23:16:04 +0200
-Subject: [PATCH] Revert "list store: Fix a parameter check"
-
-This reverts commit d28639507db2029b8f184a5d93e9d8c28acc1955.
-
-Bogus commit changing the behavior of g_sequence_search in violation
-of the documentation. Breaks GStreamer test suite.
----
- glib/gsequence.c | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/glib/gsequence.c b/glib/gsequence.c
-index 75c1f76..76e24e7 100644
---- a/glib/gsequence.c
-+++ b/glib/gsequence.c
-@@ -139,8 +139,7 @@ static GSequenceNode *node_find_closest (GSequenceNode
*haystack,
- GSequenceNode *needle,
- GSequenceNode *end,
- GSequenceIterCompareFunc cmp,
-- gpointer user_data,
-- gboolean
return_match);
-+ gpointer
user_data);
- static gint node_get_length (GSequenceNode *node);
- static void node_free (GSequenceNode *node,
- GSequence *seq);
-@@ -1080,7 +1079,7 @@ g_sequence_search_iter (GSequence *seq,
- dummy = g_sequence_append (tmp_seq, data);
-
- node = node_find_closest (seq->end_node, dummy,
-- seq->end_node, iter_cmp, cmp_data, TRUE);
-+ seq->end_node, iter_cmp, cmp_data);
-
- g_sequence_free (tmp_seq);
-
-@@ -1734,8 +1733,7 @@ node_find_closest (GSequenceNode *haystack,
- GSequenceNode *needle,
- GSequenceNode *end,
- GSequenceIterCompareFunc iter_cmp,
-- gpointer cmp_data,
-- gboolean return_match)
-+ gpointer cmp_data)
- {
- GSequenceNode *best;
- gint c;
-@@ -1765,12 +1763,10 @@ node_find_closest (GSequenceNode *haystack,
- }
- while (haystack != NULL);
-
-- /* If the best node is smaller than the data, then move one step
-- * to the right to make sure the best one is strictly bigger than the data.
-- * We do return the last exact match or the node after it, depending on
-- * the return_match argument.
-+ /* If the best node is smaller or equal to the data, then move one step
-+ * to the right to make sure the best one is strictly bigger than the data
- */
-- if (best != end && (c < 0 || (c == 0 && !return_match)))
-+ if (best != end && c <= 0)
- best = node_get_next (best);
-
- return best;
-@@ -1992,7 +1988,7 @@ node_insert_sorted (GSequenceNode *node,
- {
- GSequenceNode *closest;
-
-- closest = node_find_closest (node, new, end, iter_cmp, cmp_data, FALSE);
-+ closest = node_find_closest (node, new, end, iter_cmp, cmp_data);
-
- node_unlink (new);
-
---
-2.5.3
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-14 09:10:51 UTC (rev 249324)
+++ PKGBUILD 2015-10-14 14:24:09 UTC (rev 249325)
@@ -3,22 +3,19 @@
pkgbase=glib2
pkgname=(glib2 glib2-docs)
-pkgver=2.46.0
-pkgrel=3
+pkgver=2.46.1
+pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/";
arch=(i686 x86_64)
makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi'
'libelf')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
- 0001-Revert-list-store-Fix-a-parameter-check.patch
revert-warn-glib-compile-schemas.patch)
-sha256sums=('b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4'
- '261ae2d2c7b94460f33ab569540313e21c9a50af38a7ebe8412e49f5b309af35'
+sha256sums=('5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
prepare() {
cd glib-$pkgver
- patch -Np1 -i ../0001-Revert-list-store-Fix-a-parameter-check.patch
patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
}
