Accepting request 583616 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/583616
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=356
This commit is contained in:
Dominique Leuenberger 2018-03-09 10:10:43 +00:00 committed by Git OBS Bridge
parent ef9393b9a5
commit 0c6d04a059
7 changed files with 251 additions and 289 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8
size 7836536

3
glib-2.55.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a26bfa83bb412d181504a0773101093c9e538c3d0e09d30f5178885d78e72f6
size 7968728

View File

@ -1,34 +1,31 @@
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -56,12 +56,12 @@ class CodeGenerator:
Index: glib-2.55.2/gio/gdbus-2.0/codegen/codegen.py
===================================================================
--- glib-2.55.2.orig/gio/gdbus-2.0/codegen/codegen.py
+++ glib-2.55.2/gio/gdbus-2.0/codegen/codegen.py
@@ -29,7 +29,7 @@ from . import dbustypes
from .utils import print_error
def generate_intro(self):
self.c.write('/*\n'
- ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
+ ' * Generated by gdbus-codegen. DO NOT EDIT.\n'
' *\n'
' * The license of this code is the same as for the source it was derived from.\n'
' */\n'
'\n'
- %(config.VERSION))
+ )
self.c.write('#ifdef HAVE_CONFIG_H\n'
'# include "config.h"\n'
'#endif\n'
@@ -220,14 +220,14 @@ class CodeGenerator:
'\n')
LICENSE_STR = '''/*
- * Generated by gdbus-codegen {!s}. DO NOT EDIT.
+ * Generated by gdbus-codegen. DO NOT EDIT.
*
* The license of this code is the same as for the D-Bus interface description
* it was derived from.
@@ -65,7 +65,7 @@ class HeaderCodeGenerator:
# ----------------------------------------------------------------------------------------------------
self.h.write('/*\n'
- ' * Generated by gdbus-codegen %s. DO NOT EDIT.\n'
+ ' * Generated by gdbus-codegen. DO NOT EDIT.\n'
' *\n'
' * The license of this code is the same as for the source it was derived from.\n'
' */\n'
'\n'
'#ifndef __%s__\n'
'#define __%s__\n'
- '\n'%(config.VERSION, self.header_guard, self.header_guard))
+ '\n'%(self.header_guard, self.header_guard))
self.h.write('#include <gio/gio.h>\n'
'\n'
'G_BEGIN_DECLS\n'
def generate_header_preamble(self):
- self.outfile.write(LICENSE_STR.format(config.VERSION))
+ self.outfile.write(LICENSE_STR)
self.outfile.write('\n')
if self.use_pragma:
@@ -623,7 +623,7 @@ class CodeGenerator:
# ----------------------------------------------------------------------------------------------------
def generate_body_preamble(self):
- self.outfile.write(LICENSE_STR.format(config.VERSION))
+ self.outfile.write(LICENSE_STR)
self.outfile.write('\n')
self.outfile.write('#ifdef HAVE_CONFIG_H\n'
'# include "config.h"\n'

View File

@ -1,106 +0,0 @@
From 94b38beff1347ec4a733199f7a7abdacaa958678 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 17 Jan 2018 11:38:50 +0000
Subject: gmain: Partial revert of recent wakeup changes to gmain.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts the following commits (but keeps the other recent changes
to gmain.c):
• e4ee3079c Do not wake up main loop if change is from same thread
• 208702404 main: Create a helper function for "owner wakeup" optimization
• 0c0469b56 gmain: Signal wakeups if context has never been acquired as well
• 9ba95e25b gmain: only signal GWakeup right before or during a blocking poll
Some combination of them is causing problems with LibreOffice and/or
WebKit, and the safest thing to do at the moment is revert them all
until we work out whats going on. The previous revert (4976e8109) was
not sufficient (it fixed WebKit, but re-broken LibreOffice).
By reverting, we gain some spurious wakeups, but avoid dropping
necessary wakeups, which is presumably whats causing problems in the
other modules.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
https://bugzilla.gnome.org/show_bug.cgi?id=761102
---
glib/gmain.c | 33 +++++----------------------------
1 file changed, 5 insertions(+), 28 deletions(-)
diff --git a/glib/gmain.c b/glib/gmain.c
index 8ca54de..67102cd 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1118,29 +1118,6 @@ source_remove_from_context (GSource *source,
}
}
-/* See https://bugzilla.gnome.org/show_bug.cgi?id=761102 for
- * the introduction of this.
- *
- * The main optimization is to avoid waking up the main
- * context if a change is made by the current owner.
- */
-static void
-conditional_wakeup (GMainContext *context)
-{
- /* We want to signal wakeups in two cases:
- * 1 When the context is owned by another thread
- * 2 When the context owner is NULL (two subcases)
- * 2a Possible if the context has never been acquired
- * 2b Or if the context has no current owner
- *
- * At least case 2a) is necessary to ensure backwards compatibility with
- * qemu's use of GMainContext.
- * https://bugzilla.gnome.org/show_bug.cgi?id=761102#c14
- */
- if (context->owner != G_THREAD_SELF)
- g_wakeup_signal (context->wakeup);
-}
-
static guint
g_source_attach_unlocked (GSource *source,
GMainContext *context,
@@ -1187,8 +1164,8 @@ g_source_attach_unlocked (GSource *source,
/* If another thread has acquired the context, wake it up since it
* might be in poll() right now.
*/
- if (do_wakeup)
- conditional_wakeup (context);
+ if (do_wakeup && context->owner && context->owner != G_THREAD_SELF)
+ g_wakeup_signal (context->wakeup);
return source->source_id;
}
@@ -1878,7 +1855,7 @@ g_source_set_ready_time (GSource *source,
{
/* Quite likely that we need to change the timeout on the poll */
if (!SOURCE_BLOCKED (source))
- conditional_wakeup (context);
+ g_wakeup_signal (context->wakeup);
UNLOCK_CONTEXT (context);
}
}
@@ -4318,7 +4295,7 @@ g_main_context_add_poll_unlocked (GMainContext *context,
context->poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
- conditional_wakeup (context);
+ g_wakeup_signal (context->wakeup);
}
/**
@@ -4378,7 +4355,7 @@ g_main_context_remove_poll_unlocked (GMainContext *context,
context->poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
- conditional_wakeup (context);
+ g_wakeup_signal (context->wakeup);
}
/**
--
cgit v0.12

View File

@ -1,2 +1,10 @@
addFilter(".*shlib-fixed-dependency.*glib2")
# Adding gio-branding for the following filter
addFilter(".*shlib-fixed-dependency.*[glib2|gio\-branding].*")
# Filter for non-conffile-in-etc warning for the following files
# under /etc/profile.d/ and /etc/rpm/ directories, respectively:
# zzz-glib2.csh and zzz-glib2.sh, and macros.glib2
addFilter("glib2.*non-conffile-in-etc.*[zzz\-glib2.*|macros\.glib2]")
# Filter for env-script-intepreter for the following files under
# /usr/bin directory: gdbus-codegen, glib-genmarshal and glib-mkenums
addFilter(".*env-script-interpreter.*/usr/bin/[gdbus\-codegen|glib\-.*].*")

View File

@ -1,3 +1,98 @@
-------------------------------------------------------------------
Wed Feb 28 16:26:40 UTC 2018 - dimstar@opensuse.org
- Modernize spec-file by calling spec-cleaner
-------------------------------------------------------------------
Wed Feb 7 09:50:06 UTC 2018 - dimstar@opensuse.org
- Update to version 2.55.2:
+ GFile now has API to get the path without copying.
+ A network monitor implementation for Windows has been added.
+ Bugs fixed: bgo#520116, bgo#584284, bgo#605700, bgo#658713,
bgo#685442, bgo#723003, bgo#749583, bgo#757284, bgo#760324,
bgo#761102, bgo#767976, bgo#770335, bgo#772989, bgo#790698,
bgo#791015, bgo#791622, bgo#792050, bgo#792217, bgo#792338,
bgo#792351, bgo#792364, bgo#792370, bgo#792410, bgo#792432,
bgo#792455, bgo#792499, bgo#792516, bgo#792777, bgo#792780,
bgo#792856, bgo#792862, bgo#792903, bgo#793006, bgo#793026,
bgo#793074.
+ Updated translations.
-------------------------------------------------------------------
Mon Feb 5 02:55:01 UTC 2018 - dimstar@opensuse.org
- Update to version 2.55.1:
+ Build:
- The --enable-rebuilds configure option has been removed.
- The --with-charsetalias-dir configure option has been added.
+ GList and GSList now have autoptr support.
+ The gsettings list-schemas command has gained a --print-paths
option.
+ Bugs fixed: bgo#346816, bgo#508976, bgo#562334, bgo#662802,
bgo#684282, bgo#692034, bgo#694723, bgo#697715, bgo#701156,
bgo#720380, bgo#724383, bgo#724412, bgo#724794, bgo#732003,
bgo#734479, bgo#737677, bgo#741167, bgo#748534, bgo#749527,
bgo#749652, bgo#754634, bgo#756011, bgo#761102, bgo#773980,
bgo#776147, bgo#776195, bgo#777075, bgo#779413, bgo#780309,
bgo#780893, bgo#782057, bgo#784995, bgo#786796, bgo#788806,
bgo#788936, bgo#790416, bgo#790588, bgo#790697, bgo#790785,
bgo#790829, bgo#790830, bgo#790837, bgo#790839, bgo#790877,
bgo#790894, bgo#790896, bgo#790914, bgo#790934, bgo#790948,
bgo#791036, bgo#791128, bgo#791221, bgo#791235, bgo#791267,
bgo#791296, bgo#791318, bgo#791325, bgo#791334, bgo#791337,
bgo#791342, bgo#791460, bgo#791532, bgo#791622, bgo#791720,
bgo#791744, bgo#791745, bgo#791906, bgo#792064, bgo#792098,
bgo#792099, bgo#792129, bgo#792322, bgo#792324.
+ Updated translations.
- Rebase glib2-gdbus-codegen-version.patch.
- Drop glib2-gtester-report-py3.patch: fixed upstream.
- Drop glib2-gmain-partial-revert.patch: fixed upstream.
-------------------------------------------------------------------
Mon Feb 5 02:55:00 UTC 2018 - luc14n0@linuxmail.org
- Update to version 2.55.0:
+ New API:
- g_clear_handle_id, to simplify removing sources from the
default mainloop.
- g_file_load_bytes, to make it more convenient to load files
into GBytes.
+ Bugs fixed: bgo#330458, bgo#483341, bgo#569375, bgo#573251,
bgo#629347, bgo#630983, bgo#632953, bgo#636210, bgo#656502,
bgo#661442, bgo#668035, bgo#670139, bgo#677233, bgo#679347,
bgo#679467, bgo#689323, bgo#691436, bgo#695681, bgo#705331,
bgo#706667, bgo#711809, bgo#722256, bgo#723655, bgo#723743,
bgo#725014, bgo#727346, bgo#730296, bgo#731625, bgo#731705,
bgo#737278, bgo#738176, bgo#740223, bgo#740791, bgo#740826,
bgo#742548, bgo#742997, bgo#745723, bgo#749371, bgo#751738,
bgo#752239, bgo#752240, bgo#753459, bgo#753521, bgo#754026,
bgo#756009, bgo#756103, bgo#756128, bgo#756430, bgo#756470,
bgo#756588, bgo#760022, bgo#760109, bgo#760716, bgo#765063,
bgo#765552, bgo#767215, bgo#767239, bgo#769674, bgo#769846,
bgo#770459, bgo#773355, bgo#774083, bgo#776562, bgo#777308,
bgo#777310, bgo#777956, bgo#779182, bgo#779501, bgo#780202,
bgo#780296, bgo#781598, bgo#781867, bgo#783210, bgo#783270,
bgo#783825, bgo#786737, bgo#786785, bgo#787271, bgo#787485,
bgo#787551, bgo#787581, bgo#787671, bgo#787731, bgo#788138,
bgo#788270, bgo#788368, bgo#788384, bgo#788385, bgo#788401,
bgo#788467, bgo#788488, bgo#788489, bgo#788561, bgo#788594,
bgo#788705, bgo#788766, bgo#788772, bgo#788863, bgo#788880,
bgo#788927, bgo#788936, bgo#788948, bgo#788975, 7889bgo#78,
bgo#788989, bgo#788990, bgo#789087, bgo#789170, bgo#789245,
bgo#789444, bgo#789637, bgo#789681, bgo#789723, bgo#789755,
bgo#789820, bgo#790015, bgo#790030, bgo#790093, bgo#790126,
bgo#790147, bgo#790157, bgo#790272, bgo#790275, bgo#790310.
+ Updated translations.
- Switch libmount-devel by its pkgconfig counterpart as configure
only looks for this module.
- Add libgio-2_0-0 for the rpmlintrc shlib-fixed-dependency warning
filter. And add 2 extra filters:
+ non-conffile-in-etc warning for zzz-gilb2.csh, zzz-glib2.sh and
macros.glib2 files.
+ env-script-interpreter warning for gdbus-codegen,
glib-genmarshal nad glib-mkenums files.
-------------------------------------------------------------------
Wed Jan 31 21:34:18 UTC 2018 - bjorn.lie@gmail.com
@ -635,7 +730,7 @@ Sat Dec 19 03:42:41 UTC 2015 - damjanovic.ivo@gmail.com
bgo#728099, bgo#757372, bgo#756475, bgo#749092, bgo#759408,
bgo#759134, bgo#757374, bgo#758641.
+ Updated translations.
-------------------------------------------------------------------
Fri Nov 27 12:41:09 UTC 2015 - zaitor@opensuse.org
@ -1472,12 +1567,6 @@ Wed Jan 8 13:53:33 UTC 2014 - adrian@suse.de
-------------------------------------------------------------------
Sun Nov 17 20:02:45 UTC 2013 - dimstar@opensuse.org
- Add glib2-dbus-socket-path.patch: Have gio look for the system
dbus socket in /run instead of /var/run (bnc#845287).
-------------------------------------------------------------------
Sun Nov 17 20:02:45 UTC 2013 - dimstar@opensuse.org
- Add glib2-dbus-socket-path.patch: Have gio look for the system
dbus socket in /run instead of /var/run (bnc#845287).
@ -1814,7 +1903,7 @@ Wed Dec 26 18:01:49 UTC 2012 - zaitor@opensuse.org
to include the relevant OS-dependent networking headers. This
does not really abstract away unix-vs-windows however; error
codes, in particular, are incompatible.
+ Bugs fixed: bgo#686895, bgo#688704, bgo#602715, bgo#688377,
+ Bugs fixed: bgo#686895, bgo#688704, bgo#602715, bgo#688377,
bgo#688180, bgo#688497, bgo#688319, bgo#688886,bgo#681685,
bgo#689037, bgo#688931, bgo#688681, bgo#652650, bgo#664627,
bgo#688419, bgo#684145, bgo#675516, bgo#689538, bgo#679683,
@ -1848,7 +1937,7 @@ Tue Nov 27 09:49:31 UTC 2012 - dimstar@opensuse.org
+ The ->constructed vfunc is now called after all properties are
set
+ g_type_init() is no longer necessary and has been deprecated
+ GTask (the new GAsyncResult implementation) has landed
+ GTask (the new GAsyncResult implementation) has landed
+ GLib version macros updated
+ Update to Unicode 6.2
+ Thread safety fixes for GFileMonitor in non-default main
@ -3543,7 +3632,7 @@ Fri Jul 30 10:44:08 CEST 2010 - dimstar@opensuse.org
- bgo#624484 GDBusSubtreeDispatchFunc clarification
- bgo#624754 gdbusaddress.c missing sys/wait.h
- bgo#624968 div by zero in g_malloc_n family
- bgo#624991 GSettings mapping for G_TYPE_STRV
- bgo#624991 GSettings mapping for G_TYPE_STRV
- bgo#625383 Add missing GI annotations
+ Updated translations.
@ -3972,10 +4061,10 @@ Mon Sep 7 14:25:06 CEST 2009 - lmedinas@opensuse.org
- Update to version 2.21.6:
+ Minor API additions:
- g_mkstemp_full is a variant of g_mkstemp that allows to
- g_mkstemp_full is a variant of g_mkstemp that allows to
specify flags and permissions
+ Bugs fixed:
- bgo#593232 g_rand_new: read no more than requested from
- bgo#593232 g_rand_new: read no more than requested from
/dev/urandom
- bgo#591995 use saved errno
- bgo#589491 g_time_val_from_iso8601 doesn't handle some cases
@ -4250,7 +4339,7 @@ Tue Feb 3 11:17:27 EST 2009 - mboman@suse.de
- Update to version 2.19.6:
+ New format macro to print goffset data: G_OFFSET_FORMAT
+ GIO:
+ GIO:
* Add a GFilter{Input,Output}Stream::close-base-stream
properties which determine whether the base stream will be
closed when the filter stream is finalized.
@ -4349,7 +4438,7 @@ Wed Dec 10 12:34:56 CET 2008 - olh@suse.de
-------------------------------------------------------------------
Tue Dec 9 06:30:50 EST 2008 - mboman@suse.de
- Update to version 2.19.2:
+ GIO:
+ GIO:
- GIcon serialization support
- new file attribute for preview images
- new function to get the full commandline
@ -4394,7 +4483,7 @@ Mon Nov 24 12:34:56 CET 2008 - olh@suse.de
-------------------------------------------------------------------
Tue Nov 11 16:54:09 CET 2008 - ro@suse.de
- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
-------------------------------------------------------------------
Thu Nov 6 13:42:27 CST 2008 - federico@novell.com
@ -4424,7 +4513,7 @@ Mon Oct 6 16:36:52 CEST 2008 - sbrabec@suse.cz
-------------------------------------------------------------------
Mon Sep 29 00:25:40 CEST 2008 - ro@suse.de
- add gcc-c++ to buildreqires to work around libtool problem
- add gcc-c++ to buildreqires to work around libtool problem
-------------------------------------------------------------------
Fri Sep 19 10:09:52 CDT 2008 - maw@suse.de
@ -4511,12 +4600,12 @@ Thu Jul 31 17:19:22 CDT 2008 - maw@suse.de
* New API to handle content types: g_mount_guess_content_type,
g_content_type_guess_for_tree
* Export the eject-button signal on the volume monitor class
* New API to enable out-of-process volume monitors:
* New API to enable out-of-process volume monitors:
g_volume_get_activation_root
+ GObject:
* New API to handle signals without slots in the class
structure: g_signal_new_class_handler and
g_signal_override_class_handler
g_signal_override_class_handler
+ Internationalization:
+ Add an NC_ macro that is a no-op equivalent of C_
+ GMarkup:
@ -4546,7 +4635,7 @@ Fri Jul 25 14:04:56 CEST 2008 - sbrabec@suse.cz
-------------------------------------------------------------------
Sun Jul 20 02:45:18 CEST 2008 - crrodriguez@suse.de
- fix build
- fix build
- incidentally, this also fixes a problem on PPC caused by an
endianness bug; the GTK2 build failed causing a chain of errors
resulting in misleading libglitz.la related build failures.
@ -4576,7 +4665,7 @@ Wed Jun 18 22:13:18 CEST 2008 - maw@suse.de
+ New functions: g_dgettext() and g_dngettext(), wrappers
for corresponding gettext functions with added functionaliy
+ Support the latest version of the shared-mime spec, including
icons for mime types
icons for mime types
+ New function: g_themed_icon_prepend_name()
+ Bugs fixed: bgo#35418, bgo#28715, bgo#28714, bgo#37260,
bgo#30527, bgo#30526, bgo#28719, bgo#28172, bgo#28717,
@ -4601,7 +4690,7 @@ Fri Jun 6 19:45:59 CEST 2008 - maw@suse.de
+ Fix library version of GIO; GLib 2.16 shipped with
libgio-2.0.so.0.0.0
+ Use the GIO_EXTRA_MODULES environment variable to find
additional GIO modules
additional GIO modules
+ G_GNUC_ALLOC_SIZE: New macro that wraps the gcc alloc_size
function attribute
+ g_checksum_reset: New function to reset the state of a
@ -4619,7 +4708,7 @@ Fri Jun 6 19:45:59 CEST 2008 - maw@suse.de
bgo#501651, bgo#519026, bgo#534319, bgo#534137, bgo#517419,
bgo#526796, bgo#530196, bgo#532965, bgo#525553, bgo#526572,
bgo#528648, bgo#535021, bgo#521513, bgo#528433, bgo#533369,
bgo#521045, bgo#521672, bgo#521946, bgo#522335, bgo#523015,
bgo#521045, bgo#521672, bgo#521946, bgo#522335, bgo#523015,
bgo#523019, bgo#523338, bgo#524350, bgo#524579, bgo#524742,
bgo#524950, bgo#525866, bgo#526320, bgo#527132, bgo#532852,
bgo#534759, bgo#534764, bgo#521851, bgo#524344, bgo#525060,
@ -4674,7 +4763,7 @@ Thu May 1 12:52:01 CEST 2008 - vuntz@suse.de
-------------------------------------------------------------------
Tue Apr 29 17:32:20 CEST 2008 - cthiel@suse.de
- obsolete glib2-<arch> via baselibs.conf
- obsolete glib2-<arch> via baselibs.conf
-------------------------------------------------------------------
Tue Apr 22 03:55:09 CEST 2008 - hpj@suse.de
@ -4731,7 +4820,7 @@ Fri Apr 4 16:18:40 CEST 2008 - maw@suse.de
- Merge the BETA and STABLE branches
- Remove, pending further discussion, libgio-2_0-0's
recommendation of gvfs.
recommendation of gvfs.
-------------------------------------------------------------------
Tue Apr 1 19:16:57 CEST 2008 - maw@suse.de
@ -4791,7 +4880,7 @@ Thu Mar 13 13:01:50 CET 2008 - rodrigo@suse.de
- Update to version 2.16.1:
* Fix a crash in g_themed_icon_new
* Update the included PCRE to 7.6
- Tag patches
- Tag patches
-------------------------------------------------------------------
Fri Feb 29 02:48:06 CET 2008 - jpr@suse.de
@ -4806,8 +4895,8 @@ Fri Feb 29 02:48:06 CET 2008 - jpr@suse.de
* Only show mounts in /media and ~
* g_file_contains_file has been renamed to g_file_has_prefix
+ Win32:
* g_win32_get_package_installation_directory_of_module: new
function which supersedes
* g_win32_get_package_installation_directory_of_module: new
function which supersedes
g_win32_get_package_installation_directory
* Use alertable wait functions so that I/O completion routines or
user-mode Asynchronous Procedure Calls can be run
@ -4867,7 +4956,7 @@ Thu Jan 24 07:51:55 CST 2008 - maw@suse.de
- Update to version 2.15.3:
+ GChecksum:
* g_checksum_update can accept nul-terminated strings
* The MD5 implementation works correctly on buffers
* The MD5 implementation works correctly on buffers
that are longer than 64 bytes
+ GIO:
* Don't include a copy of the inotify headers, rely on
@ -5014,8 +5103,8 @@ Thu Jul 19 17:34:48 CEST 2007 - maw@suse.de
in this scenario.
* New functions g_once_init_enter() and g_once_init_leave() make
it easier to write threadsafe one-time initialization functions
it easier to write threadsafe one-time initialization functions
* Bugs fixed: [against bugzilla.gnome.org]
454473 Simple XML Subset Parser terminates on invalid XML
445813 g_module_open error, add file name
@ -5047,14 +5136,14 @@ Thu Jul 5 18:51:39 CEST 2007 - maw@suse.de
* Add GRegex, an implementation of Perl regular expressions,
based on PCRE.
* Use Posix monotonic clocks instead of gettimeofday()
for GTimer when available.
* Support static initialization of GQeues with G_QUEUE_INIT,
g_queue_init() and g_queue_clear().
* Add g_string_chunk_clear() for clearing a
* Add g_string_chunk_clear() for clearing a
GStringChunk.
* Add g_unichar_get_script() to obtain Unicode
@ -5063,7 +5152,7 @@ Thu Jul 5 18:51:39 CEST 2007 - maw@suse.de
* Add g_unichar_iszerowidth() to obtain information
about zero-width characters.
* Add G_GNUC_MAY_ALIAS which wraps the gcc may_alias
* Add G_GNUC_MAY_ALIAS which wraps the gcc may_alias
type attribute.
* G_GNUC_INTERNAL has a working definition for the
@ -5102,7 +5191,7 @@ Wed Mar 21 12:38:24 CST 2007 - maw@suse.de
-------------------------------------------------------------------
Mon Mar 5 18:06:21 CET 2007 - jhargadon@suse.de
- removed obsolete patch glib2-unexpanded-variables.patch (#249204)
- removed obsolete patch glib2-unexpanded-variables.patch (#249204)
-------------------------------------------------------------------
Thu Feb 22 15:31:17 CET 2007 - sbrabec@suse.cz
@ -5143,13 +5232,13 @@ Fri Feb 16 10:15:33 CST 2007 - maw@suse.de
316434 glib-2.6.6 fails to compile on AIX 5.1 due to assembler errors
172406 gconvert.c, function open_converter
327800 Hang during self-test of threads
343825 Double expansion in m4macros/glib-gettext.m4 will fail with
343825 Double expansion in m4macros/glib-gettext.m4 will fail with
newer autoconf
380801 build on Solaris does not work out of the box
386252 HEAD broken with last commit
138153 g_utf8_next_char problem with gcc -Wcast-qual
161288 glib doesn't configure well on Mac OS < 10.3
321977 GIOChannel ref_count private variable should be gint instead
321977 GIOChannel ref_count private variable should be gint instead
of guint
343191 GKeyFile silently loses values
346373 test failures in glib-2.10.3 on NetBSD
@ -5166,7 +5255,7 @@ Fri Feb 16 10:15:33 CST 2007 - maw@suse.de
362543 Compilation fail when configured with --disable-visibility
362918 monotonic clock test uses AC_TRY_RUN
369908 g_key_file_get_string not stripping final space
373864 sanity_check is a bash script
373864 sanity_check is a bash script
(These bugs are viewable on bugzilla.gnome.org)
- Make GKeyFile accept keys that are commonly used
- GKeyFile:
@ -5197,7 +5286,7 @@ Thu Dec 7 17:13:36 CET 2006 - sbrabec@suse.cz
Thu Nov 2 23:02:26 CET 2006 - jhargadon@suse.de
- added a patch to m4macros/glib-gettext.m4 so that the build
variables expand properly.
variables expand properly.
-------------------------------------------------------------------
Mon Oct 2 19:30:09 CEST 2006 - jhargadon@suse.de
@ -5210,7 +5299,7 @@ Mon Oct 2 19:30:09 CEST 2006 - jhargadon@suse.de
353580 va_copy detection breaks if user sets
CFLAGS=-Werror-implicit-function-declaration
354522 Small problem with PLT hiding 6 symbols
358421 typos in gmain.c
358421 typos in gmain.c
- New and updated translations
-------------------------------------------------------------------
@ -5225,7 +5314,7 @@ Tue Sep 12 20:11:02 CEST 2006 - jhargadon@suse.de
- 336114 desktop locks immediately after changing the system clock
- 351853 GKeyFile creates non-UTF-8 error messages
- Translation updates (fr,hu,ja,ku,lt,lv,ml,or,
pt,ru,sv,vi,zh_CN)
pt,ru,sv,vi,zh_CN)
-------------------------------------------------------------------
Wed Aug 30 01:42:05 CEST 2006 - jhargadon@suse.de
@ -5233,7 +5322,7 @@ Wed Aug 30 01:42:05 CEST 2006 - jhargadon@suse.de
- update to version 2.12.2
- Normalization is following Unicode TR #29
- 348491 g_utf8_strup() and g_utf8_strdown() returns
string with NUL bytes
string with NUL bytes
- 349825 GKeyFile always inserts a newline before a group
- 347842 g_unichar_isxdigit() is too general about what
it considers a digit
@ -5267,7 +5356,7 @@ Tue Jul 18 23:39:54 CEST 2006 - rml@suse.de
- Update to glib 2.12:
- Lots of bug fixes
- GSlice!
- Drop upstream patches
- Drop upstream patches
-------------------------------------------------------------------
Tue Jun 6 20:36:15 CEST 2006 - sbrabec@suse.cz
@ -5297,7 +5386,7 @@ Wed Jan 18 04:25:00 CET 2006 - gekker@suse.de
Tue Jan 17 04:49:13 CET 2006 - zsu@suse.de
- Fixed implicit cast issue introduced by bugfix #316221
http://bugzilla.gnome.org/show_bug.cgi?id=327022
http://bugzilla.gnome.org/show_bug.cgi?id=327022
-------------------------------------------------------------------
Fri Jan 13 12:54:23 CET 2006 - sbrabec@suse.cz
@ -5339,7 +5428,7 @@ Wed Sep 28 17:26:36 CEST 2005 - gekker@suse.de
-------------------------------------------------------------------
Tue Aug 23 18:56:26 CEST 2005 - gekker@suse.de
- Update to version 2.8.1
- Update to version 2.8.1
-------------------------------------------------------------------
Mon Aug 15 13:11:08 CEST 2005 - rodrigo@suse.de
@ -5349,17 +5438,17 @@ Mon Aug 15 13:11:08 CEST 2005 - rodrigo@suse.de
-------------------------------------------------------------------
Wed Aug 10 23:20:12 CEST 2005 - gekker@suse.de
- Update to version 2.7.7
- Update to version 2.7.7
-------------------------------------------------------------------
Mon Aug 1 19:07:15 CEST 2005 - gekker@suse.de
- Update to version 2.7.4
- Update to version 2.7.4
-------------------------------------------------------------------
Thu Jul 21 17:56:56 CEST 2005 - gekker@suse.de
- Update to version 2.7.2
- Update to version 2.7.2
-------------------------------------------------------------------
Thu Jun 23 17:44:20 CEST 2005 - sbrabec@suse.cz
@ -5370,12 +5459,12 @@ Thu Jun 23 17:44:20 CEST 2005 - sbrabec@suse.cz
Fri Jun 17 00:05:40 CEST 2005 - gekker@suse.de
- Update to version 2.7.0.
- Fix SENTINEL patch to work with upstream version.
- Fix SENTINEL patch to work with upstream version.
-------------------------------------------------------------------
Tue Jun 7 19:20:24 CEST 2005 - gekker@suse.de
- Update to version 2.6.4.
- Update to version 2.6.4.
-------------------------------------------------------------------
Tue May 31 17:13:52 CEST 2005 - schwab@suse.de
@ -5422,18 +5511,18 @@ Sun Jan 16 07:00:07 CET 2005 - clahey@suse.de
-------------------------------------------------------------------
Mon Jan 3 20:46:08 CET 2005 - gekker@suse.de
- Update to version 2.6.0
- Update to version 2.6.0
-------------------------------------------------------------------
Wed Dec 22 17:00:30 CET 2004 - ro@suse.de
- remove no translation (obsolete with nb present)
- remove no translation (obsolete with nb present)
-------------------------------------------------------------------
Wed Dec 15 00:31:10 CET 2004 - gekker@suse.de
- Update version to 2.5.7.
- Remove the no-no patch, as it is upstreamed.
- Remove the no-no patch, as it is upstreamed.
-------------------------------------------------------------------
Tue Nov 16 15:15:34 CET 2004 - clahey@suse.de
@ -5469,7 +5558,7 @@ Wed Aug 25 11:46:29 CEST 2004 - kukuk@suse.de
-------------------------------------------------------------------
Tue Jul 6 13:42:20 CEST 2004 - coolo@suse.de
- glib2-devel requires the very same version of glib2
- glib2-devel requires the very same version of glib2
-------------------------------------------------------------------
Tue Jun 22 14:46:29 CEST 2004 - sbrabec@suse.cz
@ -5547,12 +5636,12 @@ Wed Sep 24 12:33:24 CEST 2003 - sbrabec@suse.cz
-------------------------------------------------------------------
Mon Sep 15 15:10:21 CEST 2003 - sf@suse.de
- remove debug flags, add -O2 again
- remove debug flags, add -O2 again
-------------------------------------------------------------------
Thu Sep 11 11:07:14 CEST 2003 - sf@suse.de
- fix segfault in eog on AMD64 [bug 30483]
- fix segfault in eog on AMD64 [bug 30483]
-------------------------------------------------------------------
Thu Aug 28 15:40:17 CEST 2003 - sbrabec@suse.cz
@ -5581,12 +5670,12 @@ Tue Mar 11 13:10:40 CET 2003 - olh@suse.de
Mon Feb 3 08:51:24 CET 2003 - hhetter@suse.de
- updated to version 2.2.1, from changes:
* Win32
* Win32
- Improve handling of stderr/stdout
- Install .def files
- Fix quoting for GSpawn
- Fix quoting for GSpawn
- Miscellaneous bug fixes
* configure fixes
* configure fixes
* New and updated translations
-------------------------------------------------------------------
@ -5604,54 +5693,54 @@ Thu Jan 09 15:29:54 CET 2003 - sbrabec@suse.cz
Tue Nov 5 10:20:12 CET 2002 - hhetter@suse.de
- updated to version 2.0.7, bugfix release:
* Fix C++ warnings in gtype.h
* Fix g_type_fundamental_next()
* Fix various missing includes of config.h
* Handle main loop initialization before g_thread_init
* Fix C++ warnings in gtype.h
* Fix g_type_fundamental_next()
* Fix various missing includes of config.h
* Handle main loop initialization before g_thread_init
* Various 64-bit fixes
* Fix GPoll on Win32
* Fix bug with buffering on UTF-8 IOChannels
* Misc bug and build fixes
* Fix GPoll on Win32
* Fix bug with buffering on UTF-8 IOChannels
* Misc bug and build fixes
* Updated and new translations (be,cs,de,fa,it,lv,pt_BR,tr)
-------------------------------------------------------------------
Tue Aug 13 13:34:18 CEST 2002 - hhetter@suse.de
- gtk-doc usage conditional
- gtk-doc usage conditional
-------------------------------------------------------------------
Tue Aug 13 08:53:02 CEST 2002 - hhetter@suse.de
- correct URL and Source tag in specfile (#17638)
- correct URL and Source tag in specfile (#17638)
-------------------------------------------------------------------
Thu Aug 8 09:15:07 CEST 2002 - hhetter@suse.de
- devel package requires glib2
- devel package requires glib2
-------------------------------------------------------------------
Mon Aug 5 09:45:53 CEST 2002 - hhetter@suse.de
- updated to version 2.0.6, fron changes:
* Fix problem with interface prerequisites
* Clean up debug spew from GObject
* Compiler warning fixes
* Fix some problems with g_build_path()
* Fixes for --disable-debug
* Threading fixes
* Documentation fixes
* Misc bug fixes
* Fix problem with interface prerequisites
* Clean up debug spew from GObject
* Compiler warning fixes
* Fix some problems with g_build_path()
* Fixes for --disable-debug
* Threading fixes
* Documentation fixes
* Misc bug fixes
* Updated translations (bg,ko,vi)
-------------------------------------------------------------------
Mon Jun 17 18:32:00 CEST 2002 - jordi@suse.de
- Updated to version 2.0.4
* Fix some 64-bit problems
* Add note about Tru64 iconv to INSTALL
* Fix problem with timouts > MAXINT
* Updated translations
* Fix some 64-bit problems
* Add note about Tru64 iconv to INSTALL
* Fix problem with timouts > MAXINT
* Updated translations
-------------------------------------------------------------------
Fri Jun 14 12:23:44 CEST 2002 - ro@suse.de
@ -5662,7 +5751,7 @@ Fri Jun 14 12:23:44 CEST 2002 - ro@suse.de
-------------------------------------------------------------------
Tue Jun 4 08:56:39 CEST 2002 - hhetter@suse.de
- updated to version 2.0.3
- updated to version 2.0.3
-------------------------------------------------------------------
Thu Apr 25 16:50:03 CEST 2002 - meissner@suse.de
@ -5677,53 +5766,53 @@ Tue Apr 9 09:57:41 CEST 2002 - schwab@suse.de
-------------------------------------------------------------------
Mon Apr 8 10:18:54 CEST 2002 - hhetter@suse.de
- updated to version 2.0.1
- updated to version 2.0.1
-------------------------------------------------------------------
Thu Jan 31 13:41:13 CET 2002 - hhetter@suse.de
- updated to version 1.3.13 [GNOME desktop alpha2]
- updated to version 1.3.13 [GNOME desktop alpha2]
-------------------------------------------------------------------
Fri Jan 11 10:43:56 CET 2002 - hhetter@suse.de
- updated to version 1.3.12
- updated to version 1.3.12
-------------------------------------------------------------------
Tue Dec 11 14:11:28 CET 2001 - ro@suse.de
- export LIBRARY_PATH for broken libtool
- export LIBRARY_PATH for broken libtool
-------------------------------------------------------------------
Tue Nov 27 11:42:06 CET 2001 - hhetter@suse.de
- updated to version 1.3.11, changes include:
* Win32 fixes
* Documentation improvements
* Portable directory handling API
* Threading fixes
* Fix excess relocations in Unicode tables
* Fix gpattern for UTF-8
* Support overriding class closures
* Win32 fixes
* Documentation improvements
* Portable directory handling API
* Threading fixes
* Fix excess relocations in Unicode tables
* Fix gpattern for UTF-8
* Support overriding class closures
* Support for derivation from G_TYPE_POINTER
* Hide pointers to type information inside GType to reduce locking
* Adds check for direct inclusion of gobject/*.h
* GObject API cleanups
* Adds check for direct inclusion of gobject/*.h
* GObject API cleanups
-------------------------------------------------------------------
Tue Nov 20 16:06:51 CET 2001 - ro@suse.de
- really build libgmodule, libgobject and libgthread
- really build libgmodule, libgobject and libgthread
-------------------------------------------------------------------
Thu Nov 15 09:50:31 CET 2001 - hhetter@suse.de
- fixed build to provide libgmodule and libgobject
- fixed build to provide libgmodule and libgobject
-------------------------------------------------------------------
Tue Nov 13 11:09:57 CET 2001 - hhetter@suse.de
- updated to version 1.3.10
- updated to version 1.3.10
-------------------------------------------------------------------
Mon Oct 1 14:25:44 CEST 2001 - hhetter@suse.de

View File

@ -19,14 +19,14 @@
%define with_systemtap 0
%define _name glib
Name: glib2
Version: 2.54.3
Version: 2.55.2
Release: 0
# FIXME: find out if tapsets should really be in devel package or in main package
Summary: General-Purpose Utility Library
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Url: http://www.gtk.org/
Source: http://download.gnome.org/sources/glib/2.54/%{_name}-%{version}.tar.xz
URL: http://www.gtk.org/
Source: http://download.gnome.org/sources/glib/2.55/%{_name}-%{version}.tar.xz
Source1: glib2.sh
Source2: glib2.csh
# Not upstream file. Only proposes upstream packages:
@ -53,14 +53,11 @@ Patch14: glib2-dbus-socket-path.patch
Patch16: glib2-gdbus-codegen-version.patch
# PATCH-FIX-UPSTREAM glib2-gsettings-overrides-per-session.patch bgo#746592 bsc#1070090 xwang@suse.com -- gsettings default value can be overridden depending on session
Patch18: glib2-gsettings-overrides-per-session.patch
# PATCH-FIX-UPSTREAM glib2-gmain-partial-revert.patch bgo#761102 bjorn.lie@gmail.com -- gmain: Partial revert of recent wakeup changes to gmain.c
Patch19: glib2-gmain-partial-revert.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gamin-devel
BuildRequires: gcc-c++
BuildRequires: libmount-devel
BuildRequires: libselinux-devel
# glib/Makefile.am calls config.status, and thus triggers a bootstrap
BuildRequires: libtool
@ -71,9 +68,11 @@ BuildRequires: python3-xml
BuildRequires: xsltproc
# Needed for gresource
BuildRequires: pkgconfig(libelf) >= 0.8.12
BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libffi) >= 3.0.0
BuildRequires: pkgconfig(libpcre) >= 8.13
BuildRequires: pkgconfig(mount) >= 2.28
BuildRequires: pkgconfig(zlib)
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: /bin/sed
# For temporary %%posttrans script only.
PreReq: coreutils
@ -107,7 +106,7 @@ Summary: Upstream definitions of default settings and applications
Group: System/Libraries
Requires: libgio-2_0-0 = %{version}
Supplements: packageand(libgio-2_0-0:branding-upstream)
Conflicts: otherproviders(gio-branding)
Conflicts: gio-branding
Provides: %{name}-branding-upstream = %{version}
Obsoletes: %{name}-branding-upstream < %{version}
Provides: gio-branding = %{version}
@ -143,10 +142,6 @@ Requires: pkgconfig
Requires: python3-xml
Provides: glib2-doc = 2.19.6
Obsoletes: glib2-doc < 2.19.6
# bug437293
%ifarch ppc64
Obsoletes: glib2-devel-64bit
%endif
#
%description devel
@ -174,10 +169,6 @@ Group: System/Libraries
Recommends: %{name}-lang
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
# bug437293
%ifarch ppc64
Obsoletes: glib2-64bit
%endif
#
%description -n libglib-2_0-0
@ -270,12 +261,14 @@ translation-update-upstream
%patch14 -p1
%patch16 -p1
%patch18 -p1
%patch19 -p1
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
cp -a %{SOURCE4} gnome_defaults.conf
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
cp -a %{SOURCE7} m4macros/
fi
# replace /usr/bin/env shebangs
# /usr/bin/env @PYTHON@ -> @PYTHON@ (will be replaced by correct py interpreter by configure
grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|@PYTHON@|g"
%build
# glib/Makefile.am always calls config.status, which requires aclocal
@ -291,8 +284,7 @@ autoreconf -fi
--enable-systemtap \
%endif
--with-pcre=system
make %{?_smp_mflags} V=1
%make_build
%check
# make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969
@ -322,7 +314,7 @@ touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
# gsettings magic
touch %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
# remove files we don't care about
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
find %{buildroot} -type f -name "*.la" -delete -print
rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
@ -353,11 +345,8 @@ fi
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas
%post -n libglib-2_0-0 -p /sbin/ldconfig
%post -n libgobject-2_0-0 -p /sbin/ldconfig
%post -n libgthread-2_0-0 -p /sbin/ldconfig
%post -n libgio-2_0-0
/sbin/ldconfig
for ENV in gnome xfce lxde ; do
@ -370,7 +359,6 @@ fi
done
%post -n libgmodule-2_0-0 -p /sbin/ldconfig
%post -n libgio-fam
%if 0
###############################################################################
@ -384,15 +372,10 @@ done
%endif
%postun -n libglib-2_0-0 -p /sbin/ldconfig
%postun -n libgobject-2_0-0 -p /sbin/ldconfig
%postun -n libgthread-2_0-0 -p /sbin/ldconfig
%postun -n libgio-2_0-0 -p /sbin/ldconfig
%postun -n libgmodule-2_0-0 -p /sbin/ldconfig
%postun -n libgio-fam
%if 0
###############################################################################
@ -406,7 +389,6 @@ done
%endif
%files tools
%defattr(-,root,root)
%{_bindir}/gapplication
%{_bindir}/gdbus
%{_bindir}/gio
@ -436,29 +418,24 @@ done
%{_sysconfdir}/profile.d/zzz-glib2.*
%files -n gio-branding-upstream
%defattr(-,root,root)
%doc README.Gsettings-overrides
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
%files -n libglib-2_0-0
%defattr(-, root, root)
%doc AUTHORS COPYING README NEWS
%license COPYING
%doc AUTHORS README NEWS
%{_libdir}/libglib*.so.*
%files -n libgmodule-2_0-0
%defattr(-, root, root)
%{_libdir}/libgmodule*.so.*
%files -n libgobject-2_0-0
%defattr(-, root, root)
%{_libdir}/libgobject*.so.*
%files -n libgthread-2_0-0
%defattr(-, root, root)
%{_libdir}/libgthread*.so.*
%files -n libgio-2_0-0
%defattr(-, root, root)
%{_libdir}/libgio*.so.*
%dir %{_libdir}/gio
%dir %{_libdir}/gio/modules
@ -473,13 +450,11 @@ done
%ghost %{_localstatedir}/cache/gio-2.0/lxde-mimeapps.list
%files -n libgio-fam
%defattr(-,root,root)
%{_libdir}/gio/modules/libgiofam.so
%files lang -f %{_name}20.lang
%files devel
%defattr(-,root,root)
%doc ChangeLog
%{_bindir}/gdbus-codegen
%{_bindir}/glib-compile-resources
@ -489,14 +464,14 @@ done
%{_bindir}/gobject-query
%{_bindir}/gtester
%{_bindir}/gtester-report
%{_mandir}/man?/gdbus-codegen.*
%{_mandir}/man?/glib-compile-resources.*
%{_mandir}/man?/glib-genmarshal.*
%{_mandir}/man?/glib-gettextize.*
%{_mandir}/man?/glib-mkenums.*
%{_mandir}/man?/gobject-query.*
%{_mandir}/man?/gtester.*
%{_mandir}/man?/gtester-report.*
%{_mandir}/man?/gdbus-codegen*%{ext_man}
%{_mandir}/man?/glib-compile-resources*%{ext_man}
%{_mandir}/man?/glib-genmarshal*%{ext_man}
%{_mandir}/man?/glib-gettextize*%{ext_man}
%{_mandir}/man?/glib-mkenums*%{ext_man}
%{_mandir}/man?/gobject-query*%{ext_man}
%{_mandir}/man?/gtester*%{ext_man}
%{_mandir}/man?/gtester-report*%{ext_man}
%dir %{_datadir}/aclocal
%{_datadir}/aclocal/glib-2.0.m4
%{_datadir}/aclocal/glib-gettext.m4
@ -533,7 +508,6 @@ done
%dir %{_datadir}/gdb/auto-load%{_libdir}
%files devel-static
%defattr(-,root,root)
%{_libdir}/lib*.a
%changelog