This commit is contained in:
songnannan 2019-12-31 22:12:02 +08:00
parent ea3215f448
commit 995c1e2014
13 changed files with 379 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 64a0443e26a50745c8fdc02eddf60985a977275f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 2 May 2013 17:58:00 -0400
Subject: [PATCH] Don't use G_DISABLE_DEPRECATED
Because really, no one cares about this code, we're not going to
stay on the GLib treadmill.
---
libgnome/Makefile.am | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 9c8cd3e..aa01f6c 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -17,7 +17,6 @@ INCLUDES = \
-I$(srcdir)/.. \
$(WARN_CFLAGS) \
$(LIBGNOME_CFLAGS) \
- -DG_DISABLE_DEPRECATED \
-DLIBGNOME_PREFIX=\""$(prefix)"\" \
-DLIBGNOME_LIBDIR=\""$(libdir)"\" \
-DLIBGNOME_DATADIR=\""$(datadir)"\" \
--
1.7.1

View File

@ -0,0 +1,26 @@
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

48
default-background.patch Normal file
View File

@ -0,0 +1,48 @@
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>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/desktop/gnome/peripherals/monitor/resolution_size</key>
<applyto>/desktop/gnome/peripherals/monitor/resolution_size</applyto>
<owner>gnome</owner>
<type>string</type>
<locale name="C">
<short>The resolution of the monitor.</short>
<long>The resolution of the monitor. Stored in the form
"WIDTHxHEIGHT". If an invalid value is stored, the default
resultion is used.</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>

21
im-setting.patch Normal file
View File

@ -0,0 +1,21 @@
diff -pruN libgnome-2.20.1.orig/schemas/desktop_gnome_interface.schemas.in.in libgnome-2.20.1/schemas/desktop_gnome_interface.schemas.in.in
--- libgnome-2.20.1.orig/schemas/desktop_gnome_interface.schemas.in.in 2007-12-07 22:37:02.000000000 +0900
+++ libgnome-2.20.1/schemas/desktop_gnome_interface.schemas.in.in 2007-12-07 22:39:53.000000000 +0900
@@ -192,6 +192,17 @@
</locale>
</schema>
<schema>
+ <key>/schemas/desktop/gnome/interface/gtk-im-module</key>
+ <applyto>/desktop/gnome/interface/gtk-im-module</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+ <default></default>
+ <locale name="C">
+ <short>GTK IM Module</short>
+ <long>Name of the input method module used by GTK+.</long>
+ </locale>
+ </schema>
+ <schema>
<applyto>/desktop/gnome/interface/document_font_name</applyto>
<key>/schemas/desktop/gnome/interface/document_font_name</key>
<owner>gnome</owner>

View File

@ -0,0 +1,15 @@
--- libgnome-2.11.1/libgnome/gnome-score.c.scoreloc 2005-03-28 10:45:07.000000000 -0500
+++ libgnome-2.11.1/libgnome/gnome-score.c 2005-07-11 11:56:34.233156000 -0400
@@ -91,10 +91,12 @@
{
if (level)
return g_strconcat (LIBGNOME_LOCALSTATEDIR,
+ G_DIR_SEPARATOR_S "lib"
G_DIR_SEPARATOR_S "games" G_DIR_SEPARATOR_S,
progname, ".", level, ".scores", NULL);
else
return g_strconcat (LIBGNOME_LOCALSTATEDIR,
+ G_DIR_SEPARATOR_S "lib"
G_DIR_SEPARATOR_S "games" G_DIR_SEPARATOR_S,
progname, ".scores", NULL);
}

View File

@ -0,0 +1,30 @@
diff -up libgnome-2.19.1/schemas/desktop_gnome_interface.schemas.in.in.default-settings libgnome-2.19.1/schemas/desktop_gnome_interface.schemas.in.in
--- libgnome-2.19.1/schemas/desktop_gnome_interface.schemas.in.in.default-settings 2006-12-31 10:15:22.000000000 -0500
+++ libgnome-2.19.1/schemas/desktop_gnome_interface.schemas.in.in 2007-08-11 23:55:43.000000000 -0400
@@ -130,7 +130,7 @@
<applyto>/desktop/gnome/interface/icon_theme</applyto>
<owner>gnome</owner>
<type>string</type>
- <default>gnome</default>
+ <default>Fedora</default>
<locale name="C">
<short>Icon Theme</short>
<long>Icon theme to use for the panel, nautilus etc.</long>
@@ -265,7 +265,7 @@
<applyto>/desktop/gnome/interface/show_input_method_menu</applyto>
<owner>gnome</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Show the 'Input Methods' menu</short>
<long>Whether the context menus of entries and text views
@@ -277,7 +277,7 @@
<applyto>/desktop/gnome/interface/show_unicode_menu</applyto>
<owner>gnome</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Show the 'Unicode Control Character' menu</short>
<long>Whether the context menus of entries and text views

View File

@ -0,0 +1,11 @@
--- 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>

View File

@ -0,0 +1,13 @@
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~

BIN
libgnome-2.32.1.tar.bz2 Normal file

Binary file not shown.

View File

@ -0,0 +1,19 @@
--- 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>

View File

@ -0,0 +1,11 @@
--- 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>

141
libgnome.spec Normal file
View File

@ -0,0 +1,141 @@
%global _default_patch_fuzz 2
%global schemalist \\\
desktop_gnome_accessibility_keyboard \\\
desktop_gnome_accessibility_startup \\\
desktop_gnome_applications_at_mobility \\\
desktop_gnome_applications_at_visual \\\
desktop_gnome_applications_browser \\\
desktop_gnome_applications_office \\\
desktop_gnome_applications_terminal \\\
desktop_gnome_applications_window_manager \\\
desktop_gnome_background \\\
desktop_gnome_file_views \\\
desktop_gnome_interface \\\
desktop_gnome_lockdown \\\
desktop_gnome_peripherals_keyboard \\\
desktop_gnome_peripherals_monitor \\\
desktop_gnome_peripherals_mouse \\\
desktop_gnome_sound \\\
desktop_gnome_thumbnail_cache \\\
desktop_gnome_thumbnailers \\\
desktop_gnome_typing_break
Name: libgnome
Version: 2.32.1
Release: 19
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
Source1: desktop_gnome_peripherals_monitor.schemas
License: LGPLv2+
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
%description
This package contains the basic libraries for the GNOME 2.x Desktop
platform and it includes non-GUI-related libraries that are needed to run GNOME.
%package devel
Summary: Provides files and libraries for development
Requires: %{name} = %{version}-%{release}
%description devel
This package contains all necessary include files and libraries when
develop applications.
%package help
Summary: Provides help for libgnome
%description help
This package contains all help for libgnome.
%prep
%autosetup -p1
%build
autoreconf -v --install --force
%configure --disable-gtk-doc --disable-esd
%make_build
pushd po
grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
mv POTFILES.keep POTFILES.in
intltool-update --pot
sed -ie 's|POT-Creation-Date.*|POT-Creation-Date: 2008-10-01 00:00-0400\\n"|g' %{name}-2.0.pot
for p in *.po; do
msgmerge $p %{name}-2.0.pot > $p.out
msgfmt -o `basename $p .po`.gmo $p.out
done
popd
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%make_install
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/
%delete_la_and_a
for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
done
rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties $RPM_BUILD_ROOT%{_datadir}/pixmaps
mv COPYING.LIB COPYING
%find_lang %{name}-2.0
%post
/sbin/ldconfig
%gconf_schema_upgrade %{schemalist}
%pre
%gconf_schema_prepare %{schemalist}
%preun
%gconf_schema_remove %{schemalist}
%postun -p /sbin/ldconfig
%files -f %{name}-2.0.lang
%doc COPYING
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_libdir}/bonobo/monikers/*
%{_libdir}/bonobo/servers/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/sound
%files devel
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*
%files help
%doc AUTHORS NEWS README
%{_mandir}/man7/*
%{_datadir}/gtk-doc
%changelog
* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.32.1-19
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:optimization the spec
* Sat Sep 14 2019 liyongqiang<liyongqiang10@huawei.com> - 2.32.1-18
- Package init