!12 upgrade to 42.1

From: @dillon_chen 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2022-06-07 03:36:38 +00:00 committed by Gitee
commit 7a53f6bdd9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 29 additions and 31 deletions

View File

@ -9,16 +9,18 @@ left corner.
src/yelp-application.c | 1 + src/yelp-application.c | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/src/yelp-application.c b/src/yelp-application.c diff --git a/src/yelp-application.c b/src/yelp-application.c
index b284757..b6ed9d7 100644 index 2d004c2..e669661 100644
--- a/src/yelp-application.c --- a/src/yelp-application.c
+++ b/src/yelp-application.c +++ b/src/yelp-application.c
@@ -486,6 +486,7 @@ application_uri_resolved (YelpUri *uri, @@ -444,6 +444,7 @@ application_uri_resolved (YelpUri *uri,
g_settings_get (settings, "geometry", "(ii)", &width, &height); g_settings_get (settings, "geometry", "(ii)", &width, &height);
window = yelp_window_new (data->app); window = yelp_window_new (data->app);
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_default_size (GTK_WINDOW (window), width, height); gtk_window_set_default_size (GTK_WINDOW (window), width, height);
g_signal_connect (window, "resized", G_CALLBACK (window_resized), data->app); g_signal_connect (window, "resized", G_CALLBACK (window_resized), data->app);
priv->windows = g_slist_prepend (priv->windows, window); priv->windows = g_slist_prepend (priv->windows, window);
--
1.7.12.1

Binary file not shown.

BIN
yelp-42.1.tar.xz Normal file

Binary file not shown.

View File

@ -1,19 +1,25 @@
%global libhandy_version 1.5.0
Name: yelp Name: yelp
Epoch: 2 Epoch: 2
Version: 3.38.3 Version: 42.1
Release: 1 Release: 1
Summary: Help browser for the GNOME desktop Summary: Help browser for the GNOME desktop
License: LGPLv2+ and ASL 2.0 and GPLv2+ License: LGPLv2+ and ASL 2.0 and GPLv2+
URL: https://wiki.gnome.org/Apps/Yelp URL: https://wiki.gnome.org/Apps/Yelp
Source: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz Source: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=687960 # https://bugzilla.gnome.org/show_bug.cgi?id=687960
Patch1: 0001-Center-new-windows.patch Patch1: 0001-Center-new-windows.patch
BuildRequires: gcc gtk3-devel xz-devel libxml2-devel libxslt-devel BuildRequires: gcc make bzip2-devel gettext-devel gtk3-devel xz-devel
BuildRequires: sqlite-devel webkit2gtk3-devel yelp-xsl-devel BuildRequires: libxml2-devel libxslt-devel sqlite-devel yelp-xsl-devel
BuildRequires: desktop-file-utils bzip2-devel gettext-devel intltool itstool BuildRequires: intltool itstool desktop-file-utils
BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version}
Requires: yelp-xsl Requires: yelp-xsl
Requires: libhandy%{?_isa} >= %{libhandy_version}
Provides: %{name}-libs = %{epoch}:%{version}-%{release} Provides: %{name}-libs = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release} Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
@ -24,8 +30,6 @@ It can locate documents according to the freedesktop.org help system specificati
Yelp development has led to the development of various tools, and the Mallard and DocBook transformations live in standalone XSLT module. Yelp development has led to the development of various tools, and the Mallard and DocBook transformations live in standalone XSLT module.
All of these are under the umbrella name Yelp. All of these are under the umbrella name Yelp.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
@ -33,32 +37,29 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel %description devel
The %{name}-devel package contains libraries and header files for %{name}. The %{name}-devel package contains libraries and header files for %{name}.
%package_help
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
%configure %configure --disable-static --with-webkit2gtk-4-0
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' \
-e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
%make_build V=1 %make_build V=1
%install %install
%make_install %make_install
%delete_la %delete_la_and_a
%find_lang %{name}
%check %check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop
%ldconfig_scriptlets %ldconfig_scriptlets
%files
%defattr(-,root,root)
%doc AUTHORS %files -f %{name}.lang
%doc AUTHORS NEWS README
%license COPYING %license COPYING
%{_bindir}/* %{_bindir}/*
%{_libdir}/libyelp.so.* %{_libdir}/libyelp.so.*
@ -73,18 +74,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Yelp-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Yelp-symbolic.svg
%files devel %files devel
%defattr(-,root,root)
%{_libdir}/libyelp.so %{_libdir}/libyelp.so
%{_libdir}/libyelp.a
%{_libdir}/yelp/web-extensions/libyelpwebextension.a
%{_includedir}/libyelp %{_includedir}/libyelp
%files help
%defattr(-,root,root)
%doc NEWS README
%{_datadir}/gtk-doc
%changelog %changelog
* Wed Apr 20 2022 dillon chen <dillon.chen@gmail.com> - 2:42.1-1
- Update to 42.1
* Tue Jun 22 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2:3.38.3-1 * Tue Jun 22 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2:3.38.3-1
- Upgrade to 2:3.38.3 - Upgrade to 2:3.38.3