Update to 1.28.2-libmateweather-AtomGit

已关闭

Update to 1.28.2 #27

pengmeng-123创建于 6月22日关闭于 9 天前从已删除 :openEuler-24.03-LTS-SP3 合入到 src-openeuler/libmateweather： openEuler-24.03-LTS-SP3

Update to 1.28.2 #27

已关闭

pengmeng-123创建于 6月22日关闭于 9 天前

从已删除 :openEuler-24.03-LTS-SP3合入到src-openeuler/libmateweather openEuler-24.03-LTS-SP3

共 4 个文件变更+1538-1068

Abackport-Port-to-libsoup-3.0.patch+595-0

@@ -0,0 +1,595 @@
	1	+From c1c54a15545f13f3dabd2bcd303533d818905c7b Mon Sep 17 00:00:00 2001
	2	+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
	3	+ <congdanhqx@gmail.com>
	4	+Date: Mon, 4 Mar 2024 23:47:37 +0700
	5	+Subject: [PATCH] Port to libsoup-3.0
	6	+
	7	+---
	8	+ configure.ac \| 6 ++-
	9	+ libmateweather/mateweather-uninstalled.pc.in \| 2 +-
	10	+ libmateweather/mateweather.pc.in \| 2 +-
	11	+ libmateweather/weather-bom.c \| 36 ++++++++-----
	12	+ libmateweather/weather-iwin.c \| 37 ++++++++-----
	13	+ libmateweather/weather-met.c \| 34 ++++++++----
	14	+ libmateweather/weather-metar.c \| 56 ++++++++++++++------
	15	+ libmateweather/weather-priv.h \| 6 ++-
	16	+ libmateweather/weather-wx.c \| 53 +++++++++---------
	17	+ libmateweather/weather.c \| 7 +--
	18	+ 10 files changed, 152 insertions(+), 87 deletions(-)
	19	+
	20	+diff --git a/configure.ac b/configure.ac
	21	+index 133108e..d9fcf9c 100644
	22	+--- a/configure.ac
	23	++++ b/configure.ac
	24	+@@ -8,6 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux])
	25	+ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar check-news])
	26	+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
	27	+
	28	++AC_USE_SYSTEM_EXTENSIONS
	29	+ # Before making a release, the LT_VERSION string should be modified.
	30	+ # The string is of the form C:R:A.
	31	+ # - If interfaces have been changed or added, but binary compatibility has
	32	+@@ -23,7 +24,7 @@ AC_CANONICAL_HOST
	33	+
	34	+ GLIB_REQUIRED=2.56.0
	35	+ GTK_REQUIRED=3.22.0
	36	+-LIBSOUP_REQUIRED=2.34.0
	37	++LIBSOUP_REQUIRED=3.0.0
	38	+ GIO_REQUIRED=2.25.0
	39	+ LIBXML_REQUIRED=2.6.0
	40	+
	41	+@@ -65,7 +66,7 @@ dnl -- Check for libxml (required) ------------------------------------------
	42	+ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED)
	43	+
	44	+ dnl -- check for libsoup (required) -----------------------------------------
	45	+-PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= $LIBSOUP_REQUIRED])
	46	++PKG_CHECK_MODULES(LIBSOUP, [libsoup-3.0 >= $LIBSOUP_REQUIRED])
	47	+
	48	+ dnl -- check for gio (required) -----------------------------------------
	49	+ PKG_CHECK_MODULES(GIO,
	50	+@@ -100,6 +101,7 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
	51	+ [AC_MSG_ERROR([No regex library found])])])
	52	+ AC_SUBST(REGEX_LIBS)
	53	+
	54	++AC_CHECK_FUNC(memmem,[],[AC_MSG_ERROR([memmem is required])])
	55	+
	56	+ dnl ***************************************************************************
	57	+ dnl * Check for presence of tm.tm_gmtoff on the system *
	58	+diff --git a/libmateweather/mateweather-uninstalled.pc.in b/libmateweather/mateweather-uninstalled.pc.in
	59	+index 03e7461..c692842 100644
	60	+--- a/libmateweather/mateweather-uninstalled.pc.in
	61	++++ b/libmateweather/mateweather-uninstalled.pc.in
	62	+@@ -8,6 +8,6 @@ Name: MateWeather
	63	+ Description: MateWeather shared library
	64	+ Version: @VERSION@
	65	+ Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gio-2.0
	66	+-Requires.private: libxml-2.0 libsoup-2.4
	67	++Requires.private: libxml-2.0 libsoup-3.0
	68	+ Libs: ${pc_top_builddir}/${pcfiledir}/libmateweather.la
	69	+ Cflags: -I${pc_top_builddir}/${pcfiledir}/..
	70	+diff --git a/libmateweather/mateweather.pc.in b/libmateweather/mateweather.pc.in
	71	+index a617c33..bea024d 100644
	72	+--- a/libmateweather/mateweather.pc.in
	73	++++ b/libmateweather/mateweather.pc.in
	74	+@@ -8,7 +8,7 @@ Name: MateWeather
	75	+ Description: MateWeather shared library
	76	+ Version: @VERSION@
	77	+ Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gio-2.0
	78	+-Requires.private: libxml-2.0 libsoup-2.4
	79	++Requires.private: libxml-2.0 libsoup-3.0
	80	+ Libs: -L${libdir} -lmateweather
	81	+ Libs.private: -lm
	82	+ Cflags: -I${includedir}
	83	+diff --git a/libmateweather/weather-bom.c b/libmateweather/weather-bom.c
	84	+index 47b2d0b..f5c7a87 100644
	85	+--- a/libmateweather/weather-bom.c
	86	++++ b/libmateweather/weather-bom.c
	87	+@@ -27,34 +27,45 @@
	88	+ #include "weather-priv.h"
	89	+
	90	+ static void
	91	+-bom_finish (SoupSession session, SoupMessage msg, gpointer data)
	92	++bom_finish (GObject source, GAsyncResult result, gpointer data)
	93	+ {
	94	+ char p, rp;
	95	+ WeatherInfo info = (WeatherInfo )data;
	96	++ GError *error = NULL;
	97	++ GBytes *bytes;
	98	++ const char *response_body = NULL;
	99	++ gsize len = 0;
	100	+

Rlibmateweather-1.28.0-fix-sensitive-words.patch→libmateweather-1.28.2-fix-sensitive-words.patch+920-1047

Alibmateweather-1.28.2.tar.xz+0-0

Binary files do not support preview

Mlibmateweather.spec+23-21

	@@ -1,21 +1,25 @@
1	Name: libmateweather	1	Name: libmateweather
2	-Version: 1.28.0	2	+Version: 1.28.2
3	-Release: 2	3	+Release: 1
4	Summary: Libraries to allow MATE Desktop to display weather information	4	Summary: Libraries to allow MATE Desktop to display weather information
5	-License: GPLv2+ and LGPLv2+	5	+License: GPL-2.0-or-later AND LicenseRef-Callaway-LGPLv2+
6	-URL: http://mate-desktop.org	6	+URL: https://mate-desktop.org
7		7
8	# for downloading the tarball use 'spectool -g -R libmateweather.spec'	8	# for downloading the tarball use 'spectool -g -R libmateweather.spec'
9	# Source for release-builds.	9	# Source for release-builds.
10	-Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz	10	+Source0: https://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz
11	-Patch01: libmateweather-1.28.0-fix-sensitive-words.patch	11	+Patch01: libmateweather-1.28.2-fix-sensitive-words.patch
		12	+Patch02: backport-Port-to-libsoup-3.0.patch
12		13
13	-BuildRequires: glib2-devel	14	+
14	-BuildRequires: gtk3-devel	15	+BuildRequires: make gcc
15	-BuildRequires: libsoup-devel	16	+BuildRequires: autoconf automake libtool
16	-BuildRequires: libxml2-devel	17	+BuildRequires: pkgconfig(gio-2.0) >= 2.25.0
		18	+BuildRequires: pkgconfig(glib-2.0) >= 2.56.0
		19	+BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
		20	+BuildRequires: pkgconfig(libsoup-3.0) >= 3.0.0
		21	+BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0
17	BuildRequires: mate-common	22	BuildRequires: mate-common
18	-BuildRequires: make
19		23
20	Requires: %{name}-data = %{version}-%{release}	24	Requires: %{name}-data = %{version}-%{release}
21		25
	@@ -42,26 +46,22 @@ Development files for libmateweather
42	%autosetup -p1	46	%autosetup -p1
43		47
44	%build	48	%build
		49	+NOCONFIGURE=yes ./autogen.sh
45	%configure --disable-static \	50	%configure --disable-static \
46	--disable-schemas-compile \	51	--disable-schemas-compile \
47	--enable-gtk-doc-html	52	--enable-gtk-doc-html
48		53
49	-# fix unused-direct-shlib-dependency	54	+%make_build
50	-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
51	-
52	-make %{?_smp_mflags} V=1
53		55
54	%install	56	%install
55	%{make_install}	57	%{make_install}
56	-	58	+find %{buildroot} -type f -name "*.la" -delete -print
57	-find %{buildroot} -name '*.la' -exec rm -fv {} ';'
58	-find %{buildroot} -name '*.a' -exec rm -fv {} ';'
59		59
60	%find_lang %{name} --with-gnome --all-name	60	%find_lang %{name} --with-gnome --all-name
61		61
62	-
63	%files	62	%files
64	-%doc AUTHORS COPYING README	63	+%license COPYING
		64	+%doc AUTHORS README
65	%{_datadir}/glib-2.0/schemas/org.mate.weather.gschema.xml	65	%{_datadir}/glib-2.0/schemas/org.mate.weather.gschema.xml
66	%{_libdir}/libmateweather.so.1*	66	%{_libdir}/libmateweather.so.1*
67		67
	@@ -75,8 +75,10 @@ find %{buildroot} -name '*.a' -exec rm -fv {} ';'
75	%{_includedir}/libmateweather/	75	%{_includedir}/libmateweather/
76	%{_libdir}/pkgconfig/mateweather.pc	76	%{_libdir}/pkgconfig/mateweather.pc
77		77
78	-
79	%changelog	78	%changelog
		79	+* Thu Jun 18 2026 pengmeng <pengmeng@kylinsec.com.cn> - 1.28.2-1
		80	+- update to 1.28.2
		81	+
80	* Mon Jul 28 2025 peijiankang <peijiankang@kylinos.cn> - 1.28.0-2	82	* Mon Jul 28 2025 peijiankang <peijiankang@kylinos.cn> - 1.28.0-2
81	- fix sensitive words	83	- fix sensitive words
82		84