pool/glib2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 629996 from home:iznogood:branches:GNOME:Factory

Browse Source 
- Update to version 2.56.2:
  + Support version 2 of the NetworkMonitor portal interface.
  + Bugs fixed: bgo#740791, bgo#755721, bgo#773435, bgo#793727,
    bgo#794380, bgo#794801, bgo#795138, bgo#795234, bgo#795406,
    bgo#795429, bgo#795711, bgo#795735, bgo#795802,
    glgo#GNOME/glib2#1240, glgo#GNOME/glib2#1401,
    glgo#GNOME/glib2#1452, glgo#GNOME/glib2#1458.
  + Updated translations.
- Drop glib2-codegen-headers.patch: Fixed upstream.
- Refresh patches with quilt.

OBS-URL: https://build.opensuse.org/request/show/629996
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=365
This commit is contained in:
Bjørn Lie 2018-08-18 16:19:14 +00:00 committed by Git OBS Bridge
parent 99da027da2
commit cd0b563a73
11 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.56.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
size 8028716

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

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

12
glib2-bgo569829-gettext-gkeyfile.patch
View File

@ -1,7 +1,7 @@
Index: glib-2.56.1/glib/gkeyfile.c
Index: glib-2.56.2/glib/gkeyfile.c
===================================================================
--- glib-2.56.1.orig/glib/gkeyfile.c 2018-03-12 17:23:37.000000000 +0100
+++ glib-2.56.1/glib/gkeyfile.c 2018-04-07 16:53:59.164856822 +0200
--- glib-2.56.2.orig/glib/gkeyfile.c 2018-03-12 17:23:37.000000000 +0100
+++ glib-2.56.2/glib/gkeyfile.c 2018-08-17 10:53:47.314889363 +0200
@@ -511,6 +511,7 @@ struct _GKeyFile
GKeyFileFlags flags;
@ -128,10 +128,10 @@ Index: glib-2.56.1/glib/gkeyfile.c
/* Fallback to untranslated key
*/
if (!translated_value)
Index: glib-2.56.1/glib/gkeyfile.h
Index: glib-2.56.2/glib/gkeyfile.h
===================================================================
--- glib-2.56.1.orig/glib/gkeyfile.h 2018-02-06 17:05:56.000000000 +0100
+++ glib-2.56.1/glib/gkeyfile.h 2018-04-07 16:53:59.164856822 +0200
--- glib-2.56.2.orig/glib/gkeyfile.h 2018-02-06 17:05:56.000000000 +0100
+++ glib-2.56.2/glib/gkeyfile.h 2018-08-17 10:53:47.314889363 +0200
@@ -320,6 +320,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"

14
glib2-codegen-headers.patch
View File

@ -1,14 +0,0 @@
diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
index 9d9099f..1cfe7c1 100755
--- a/gio/gdbus-2.0/codegen/codegen_main.py
+++ b/gio/gdbus-2.0/codegen/codegen_main.py
@@ -209,7 +209,7 @@ def codegen_main():
print_error('Using --body requires --output')
c_file = args.output
- header_name = os.path.splitext(c_file)[0] + '.h'
+ header_name = os.path.splitext(os.path.basename(c_file))[0] + '.h'
all_ifaces = []
for fname in args.files + args.xml_files:

8
glib2-dbus-socket-path.patch
View File

@ -1,8 +1,8 @@
Index: glib-2.56.1/gio/gdbusaddress.c
Index: glib-2.56.2/gio/gdbusaddress.c
===================================================================
--- glib-2.56.1.orig/gio/gdbusaddress.c 2018-02-06 16:44:20.000000000 +0100
+++ glib-2.56.1/gio/gdbusaddress.c 2018-04-07 16:53:59.200857044 +0200
@@ -1624,7 +1624,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp
--- glib-2.56.2.orig/gio/gdbusaddress.c 2018-08-16 22:53:19.000000000 +0200
+++ glib-2.56.2/gio/gdbusaddress.c 2018-08-17 10:46:31.564471587 +0200
@@ -1628,7 +1628,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp
ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
if (ret == NULL)
{

12
glib2-fate300461-gettext-gkeyfile-suse.patch
View File

@ -1,7 +1,7 @@
Index: glib-2.56.1/glib/gkeyfile.c
Index: glib-2.56.2/glib/gkeyfile.c
===================================================================
--- glib-2.56.1.orig/glib/gkeyfile.c 2018-04-07 16:53:59.164856822 +0200
+++ glib-2.56.1/glib/gkeyfile.c 2018-04-07 16:53:59.176856896 +0200
--- glib-2.56.2.orig/glib/gkeyfile.c 2018-08-17 10:53:47.314889363 +0200
+++ glib-2.56.2/glib/gkeyfile.c 2018-08-17 10:53:47.330889591 +0200
@@ -512,6 +512,7 @@ struct _GKeyFile
gchar **locales;
@ -156,10 +156,10 @@ Index: glib-2.56.1/glib/gkeyfile.c
g_free (orig_value);
Index: glib-2.56.1/glib/gkeyfile.h
Index: glib-2.56.2/glib/gkeyfile.h
===================================================================
--- glib-2.56.1.orig/glib/gkeyfile.h 2018-04-07 16:53:59.164856822 +0200
+++ glib-2.56.1/glib/gkeyfile.h 2018-04-07 16:53:59.176856896 +0200
--- glib-2.56.2.orig/glib/gkeyfile.h 2018-08-17 10:53:47.314889363 +0200
+++ glib-2.56.2/glib/gkeyfile.h 2018-08-17 10:53:47.330889591 +0200
@@ -320,7 +320,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"

6
glib2-gdbus-codegen-version.patch
View File

@ -1,7 +1,7 @@
Index: glib-2.55.2/gio/gdbus-2.0/codegen/codegen.py
Index: glib-2.56.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
--- glib-2.56.2.orig/gio/gdbus-2.0/codegen/codegen.py 2018-08-17 02:03:20.000000000 +0200
+++ glib-2.56.2/gio/gdbus-2.0/codegen/codegen.py 2018-08-17 10:46:31.576471772 +0200
@@ -29,7 +29,7 @@ from . import dbustypes
from .utils import print_error

24
glib2-gsettings-overrides-per-session.patch
View File

@ -1,7 +1,7 @@
Index: glib-2.56.1/gio/glib-compile-schemas.c
Index: glib-2.56.2/gio/glib-compile-schemas.c
===================================================================
--- glib-2.56.1.orig/gio/glib-compile-schemas.c 2018-04-07 16:53:59.188856969 +0200
+++ glib-2.56.1/gio/glib-compile-schemas.c 2018-04-07 16:53:59.228857214 +0200
--- glib-2.56.2.orig/gio/glib-compile-schemas.c 2018-08-17 10:46:31.552471402 +0200
+++ glib-2.56.2/gio/glib-compile-schemas.c 2018-08-17 10:46:31.584471894 +0200
@@ -179,6 +179,8 @@ typedef struct
GString *unparsed_default_value;
GVariant *default_value;
@ -164,10 +164,10 @@ Index: glib-2.56.1/gio/glib-compile-schemas.c
g_strfreev (keys);
}
Index: glib-2.56.1/gio/gsettings.c
Index: glib-2.56.2/gio/gsettings.c
===================================================================
--- glib-2.56.1.orig/gio/gsettings.c 2018-03-12 17:23:37.000000000 +0100
+++ glib-2.56.1/gio/gsettings.c 2018-04-07 16:53:59.232857239 +0200
--- glib-2.56.2.orig/gio/gsettings.c 2018-08-17 02:03:20.000000000 +0200
+++ glib-2.56.2/gio/gsettings.c 2018-08-17 10:46:31.584471894 +0200
@@ -1204,10 +1204,7 @@ g_settings_get_value (GSettings *setti
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
@ -251,10 +251,10 @@ Index: glib-2.56.1/gio/gsettings.c
}
if (variant == NULL)
Index: glib-2.56.1/gio/gsettingsschema-internal.h
Index: glib-2.56.2/gio/gsettingsschema-internal.h
===================================================================
--- glib-2.56.1.orig/gio/gsettingsschema-internal.h 2017-07-14 01:03:39.000000000 +0200
+++ glib-2.56.1/gio/gsettingsschema-internal.h 2018-04-07 16:53:59.232857239 +0200
--- glib-2.56.2.orig/gio/gsettingsschema-internal.h 2018-08-17 02:03:20.000000000 +0200
+++ glib-2.56.2/gio/gsettingsschema-internal.h 2018-08-17 10:46:31.584471894 +0200
@@ -37,6 +37,7 @@ struct _GSettingsSchemaKey
const GVariantType *type;
GVariant *minimum, *maximum;
@ -271,10 +271,10 @@ Index: glib-2.56.1/gio/gsettingsschema-internal.h
gint g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
GVariant *value);
Index: glib-2.56.1/gio/gsettingsschema.c
Index: glib-2.56.2/gio/gsettingsschema.c
===================================================================
--- glib-2.56.1.orig/gio/gsettingsschema.c 2018-01-22 21:28:02.000000000 +0100
+++ glib-2.56.1/gio/gsettingsschema.c 2018-04-07 16:53:59.232857239 +0200
--- glib-2.56.2.orig/gio/gsettingsschema.c 2018-08-17 02:03:20.000000000 +0200
+++ glib-2.56.2/gio/gsettingsschema.c 2018-08-17 10:46:31.584471894 +0200
@@ -27,6 +27,7 @@
#include <glibintl.h>
#include <locale.h>

6
glib2-suppress-schema-deprecated-path-warning.patch
View File

@ -1,7 +1,7 @@
Index: glib-2.53.5/gio/glib-compile-schemas.c
Index: glib-2.56.2/gio/glib-compile-schemas.c
===================================================================
--- glib-2.53.5.orig/gio/glib-compile-schemas.c
+++ glib-2.53.5/gio/glib-compile-schemas.c
--- glib-2.56.2.orig/gio/glib-compile-schemas.c 2018-08-17 02:03:20.000000000 +0200
+++ glib-2.56.2/gio/glib-compile-schemas.c 2018-08-17 10:53:47.342889761 +0200
@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState *s
return;
}

14
glib2.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Aug 17 08:11:50 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.56.2:
+ Support version 2 of the NetworkMonitor portal interface.
+ Bugs fixed: bgo#740791, bgo#755721, bgo#773435, bgo#793727,
bgo#794380, bgo#794801, bgo#795138, bgo#795234, bgo#795406,
bgo#795429, bgo#795711, bgo#795735, bgo#795802,
glgo#GNOME/glib2#1240, glgo#GNOME/glib2#1401,
glgo#GNOME/glib2#1452, glgo#GNOME/glib2#1458.
+ Updated translations.
- Drop glib2-codegen-headers.patch: Fixed upstream.
- Refresh patches with quilt.
-------------------------------------------------------------------
Wed May 16 16:05:46 UTC 2018 - dimstar@opensuse.org

6
glib2.spec
View File

@ -19,7 +19,7 @@
%define with_systemtap 0
%define _name glib
Name: glib2
Version: 2.56.1
Version: 2.56.2
Release: 0
# FIXME: find out if tapsets should really be in devel package or in main package
Summary: General-Purpose Utility Library
@ -53,8 +53,7 @@ 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-codegen-headers.patch bgo#795802 dimstar@opensuse.org -- gdbus-codegen: Fix header include in the body file
Patch19: glib2-codegen-headers.patch
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -259,7 +258,6 @@ 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