commit
87c82d2671
@ -1,26 +0,0 @@
|
||||
From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Mon, 7 Aug 2017 12:57:43 -0400
|
||||
Subject: [PATCH] gnome-config.h: Fix invalid UTF-8 in header
|
||||
|
||||
This breaks the new Python `glib-mkenums`.
|
||||
---
|
||||
libgnome/gnome-config.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h
|
||||
index 0c3dfe64..b9d659d4 100644
|
||||
--- a/libgnome/gnome-config.h
|
||||
+++ b/libgnome/gnome-config.h
|
||||
@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv);
|
||||
#define gnome_config_private_clean_key(path) \
|
||||
(gnome_config_clean_key_((path),TRUE))
|
||||
|
||||
-/* returns the true filename of the config file */
|
||||
+/* returns the true filename of the config file */
|
||||
#define gnome_config_get_real_path(path) \
|
||||
(g_build_filename (gnome_user_dir_get(),(path),NULL))
|
||||
#define gnome_config_private_get_real_path(path) \
|
||||
--
|
||||
2.13.4
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
diff -up libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.default-background libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in
|
||||
--- libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in.default-background 2007-09-17 08:25:50.000000000 -0400
|
||||
+++ libgnome-2.20.0/schemas/desktop_gnome_background.schemas.in.in 2007-09-17 14:04:41.000000000 -0400
|
||||
@@ -16,7 +16,7 @@
|
||||
<applyto>/desktop/gnome/background/picture_options</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
- <default>zoom</default>
|
||||
+ <default>stretched</default>
|
||||
<locale name="C">
|
||||
<short>Picture Options</short>
|
||||
<long>Determines how the image set by wallpaper_filename is
|
||||
@@ -29,7 +29,7 @@
|
||||
<applyto>/desktop/gnome/background/picture_filename</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
- <default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
|
||||
+ <default>@datadir@/backgrounds/laughlin/default/laughlin.xml</default>
|
||||
<locale name="C">
|
||||
<short>Picture Filename</short>
|
||||
<long>File to use for the background image</long>
|
||||
@@ -51,7 +51,7 @@
|
||||
<applyto>/desktop/gnome/background/primary_color</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
- <default>#66ba00</default>
|
||||
+ <default>#224B68</default>
|
||||
<locale name="C">
|
||||
<short>Primary Color</short>
|
||||
<long>Left or Top color when drawing gradients, or the solid color.</long>
|
||||
@@ -62,7 +62,7 @@
|
||||
<applyto>/desktop/gnome/background/secondary_color</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
- <default>#66ba00</default>
|
||||
+ <default>#142C3D</default>
|
||||
<locale name="C">
|
||||
<short>Secondary Color</short>
|
||||
<long>Right or Bottom color when drawing gradients, not used for solid color.</long>
|
||||
@@ -73,7 +73,7 @@
|
||||
<applyto>/desktop/gnome/background/color_shading_type</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
- <default>solid</default>
|
||||
+ <default>vertical-gradient</default>
|
||||
<locale name="C">
|
||||
<short>Color Shading Type</short>
|
||||
<long>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid"</long>
|
||||
@ -1,11 +0,0 @@
|
||||
--- libgnome-2.22.0/schemas/desktop_gnome_sound.schemas.in.old 2008-03-26 11:40:28.000000000 +0000
|
||||
+++ libgnome-2.22.0/schemas/desktop_gnome_sound.schemas.in 2008-03-26 11:40:33.000000000 +0000
|
||||
@@ -40,7 +40,7 @@
|
||||
<applyto>/desktop/gnome/sound/event_sounds</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>bool</type>
|
||||
- <default>false</default>
|
||||
+ <default>true</default>
|
||||
<locale name="C">
|
||||
<short>Sounds for events</short>
|
||||
<long>Whether to play sounds on user events.</long>
|
||||
@ -1,13 +0,0 @@
|
||||
diff -ur libgnome-2.24.1/schemas/desktop_gnome_interface.schemas.in.in libgnome-2.24.1.hack/schemas/desktop_gnome_interface.schemas.in.in
|
||||
--- libgnome-2.24.1/schemas/desktop_gnome_interface.schemas.in.in 2009-02-03 10:34:18.000000000 -0800
|
||||
+++ libgnome-2.24.1.hack/schemas/desktop_gnome_interface.schemas.in.in 2009-02-03 10:36:13.000000000 -0800
|
||||
@@ -110,7 +110,7 @@
|
||||
<applyto>/desktop/gnome/interface/cursor_blink</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>bool</type>
|
||||
- <default>true</default>
|
||||
+ <default>false</default>
|
||||
<locale name="C">
|
||||
<short>Cursor Blink</short>
|
||||
<long>Whether the cursor should blink.</long>
|
||||
Only in libgnome-2.24.1.hack/schemas: desktop_gnome_interface.schemas.in.in~
|
||||
@ -1,19 +0,0 @@
|
||||
--- libgnome-2.7.2/schemas/desktop_gnome_peripherals_mouse.schemas.in.default-cursor 2004-08-11 13:41:08.255401604 +0200
|
||||
+++ libgnome-2.7.2/schemas/desktop_gnome_peripherals_mouse.schemas.in 2004-08-11 13:41:47.042682149 +0200
|
||||
@@ -100,6 +100,7 @@
|
||||
<schema>
|
||||
<key>/schemas/desktop/gnome/peripherals/mouse/cursor_theme</key>
|
||||
<applyto>/desktop/gnome/peripherals/mouse/cursor_theme</applyto>
|
||||
+ <default>dmz-aa</default>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
<locale name="C">
|
||||
@@ -118,7 +119,7 @@
|
||||
<applyto>/desktop/gnome/peripherals/mouse/cursor_size</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>int</type>
|
||||
- <default>18</default>
|
||||
+ <default>24</default>
|
||||
<locale name="C">
|
||||
<short>Cursor size</short>
|
||||
<long>
|
||||
@ -1,11 +0,0 @@
|
||||
--- libgnome-2.8.0/schemas/desktop_gnome_applications_browser.schemas.in.default-browser 2004-10-18 14:45:49.060808464 -0400
|
||||
+++ libgnome-2.8.0/schemas/desktop_gnome_applications_browser.schemas.in 2004-10-18 14:46:08.920076823 -0400
|
||||
@@ -6,7 +6,7 @@
|
||||
<applyto>/desktop/gnome/applications/browser/exec</applyto>
|
||||
<owner>gnome</owner>
|
||||
<type>string</type>
|
||||
- <default>mozilla</default>
|
||||
+ <default>firefox</default>
|
||||
<locale name="C">
|
||||
<short>Default browser</short>
|
||||
<long>Default browser for all URLs</long>
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
Name: libgnome
|
||||
Version: 2.32.1
|
||||
Release: 19
|
||||
Release: 20
|
||||
Summary: Gnome 2.x desktop base library
|
||||
URL: http://www.gnome.org
|
||||
Source0: http://download.gnome.org/sources/libgnome/2.32/%{name}-%{version}.tar.bz2
|
||||
@ -34,17 +34,10 @@ Requires: utempter GConf2
|
||||
BuildRequires: zlib-devel glib2-devel libbonobo-devel GConf2-devel gnome-vfs2-devel
|
||||
BuildRequires: libxml2-devel ORBit2-devel libxslt-devel libcanberra-devel intltool
|
||||
BuildRequires: gnome-common autoconf automake libtool gettext popt-devel
|
||||
#patch1,2,3,4,6,7,9,10,11 are all come from fedora
|
||||
Patch1: default-background.patch
|
||||
Patch2: libgnome-2.11.1-scoreloc.patch
|
||||
Patch3: libgnome-2.7.2-default-cursor.patch
|
||||
Patch4: libgnome-2.8.0-default-browser.patch
|
||||
Patch7: libgnome-2.22.0-default-sound-effects.patch
|
||||
#patch8 backport from upstream
|
||||
Patch8: im-setting.patch
|
||||
Patch9: libgnome-2.24.1-default-noblink.patch
|
||||
Patch10: 0001-Don-t-use-G_DISABLE_DEPRECATED.patch
|
||||
Patch11: 0001-gnome-config.h-Fix-invalid-UTF-8-in-header.patch
|
||||
|
||||
Patch1: libgnome-2.11.1-scoreloc.patch
|
||||
Patch2: im-setting.patch
|
||||
Patch3: 0001-Don-t-use-G_DISABLE_DEPRECATED.patch
|
||||
|
||||
%description
|
||||
This package contains the basic libraries for the GNOME 2.x Desktop
|
||||
@ -131,6 +124,12 @@ mv COPYING.LIB COPYING
|
||||
%{_datadir}/gtk-doc
|
||||
|
||||
%changelog
|
||||
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.32.1-20
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:optimization the spec
|
||||
|
||||
* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.32.1-19
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user