diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 0001-Let-the-notification-icon-use-the-size-specified-by-.patch | 56 | ||||
| -rw-r--r-- | delete-taboo-words.patch | 51 | ||||
| -rw-r--r-- | gtk3.spec | 322 | ||||
| -rw-r--r-- | sources | 1 |
5 files changed, 431 insertions, 0 deletions
@@ -0,0 +1 @@ +/gtk+-3.24.38.tar.xz diff --git a/0001-Let-the-notification-icon-use-the-size-specified-by-.patch b/0001-Let-the-notification-icon-use-the-size-specified-by-.patch new file mode 100644 index 0000000..68ea6a3 --- /dev/null +++ b/0001-Let-the-notification-icon-use-the-size-specified-by-.patch @@ -0,0 +1,56 @@ +From eeed7eb54ab7c2b462ebc9237cd8cd55af081f53 Mon Sep 17 00:00:00 2001 +From: wangxiaoqing <wangxiaoqing@kylinsec.com.cn> +Date: Mon, 1 Aug 2022 10:26:35 +0800 +Subject: [PATCH] Let the notification icon use the size specified by the tray + to draw +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 让通知图标使用托盘指定的图标大小进行绘制, 避免造成图标过大 + Related #I5HAM8 + +Signed-off-by: wangxiaoqing <wangxiaoqing@kylinsec.com.cn> +--- + gtk/deprecated/gtkstatusicon.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/gtk/deprecated/gtkstatusicon.c b/gtk/deprecated/gtkstatusicon.c +index 52239b1..8b0cbc8 100644 +--- a/gtk/deprecated/gtkstatusicon.c ++++ b/gtk/deprecated/gtkstatusicon.c +@@ -1401,7 +1401,6 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon) + #ifndef GDK_WINDOWING_X11 + GdkPixbuf *pixbuf; + #endif +- gint round_size; + gint scale; + + #ifdef GDK_WINDOWING_X11 +@@ -1415,13 +1414,11 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon) + if (widget == NULL) + return; + +- round_size = round_pixel_size (widget, priv->size); +- + icon_helper = gtk_icon_helper_new (gtk_style_context_get_node (gtk_widget_get_style_context (widget)), widget); + _gtk_icon_helper_set_force_scale_pixbuf (icon_helper, TRUE); + _gtk_icon_helper_set_definition (icon_helper, priv->image_def); + _gtk_icon_helper_set_icon_size (icon_helper, GTK_ICON_SIZE_SMALL_TOOLBAR); +- _gtk_icon_helper_set_pixel_size (icon_helper, round_size); ++ _gtk_icon_helper_set_pixel_size (icon_helper, gtk_image_get_pixel_size (GTK_IMAGE (priv->image))); + surface = gtk_icon_helper_load_surface (icon_helper, scale); + + g_object_unref (icon_helper); +@@ -1567,6 +1564,8 @@ gtk_status_icon_icon_size_changed (GtkStatusIcon *status_icon) + gtk_image_set_pixel_size (GTK_IMAGE (priv->image), icon_size); + else + gtk_image_set_pixel_size (GTK_IMAGE (priv->image), -1); ++ ++ gtk_status_icon_update_image (status_icon); + } + + static void +-- +2.36.1 + diff --git a/delete-taboo-words.patch b/delete-taboo-words.patch new file mode 100644 index 0000000..b3bceb2 --- /dev/null +++ b/delete-taboo-words.patch @@ -0,0 +1,51 @@ +From 90b5761b806ed89908f1316fdd96fbaa2624a5f1 Mon Sep 17 00:00:00 2001 +From: wuchaochao <wuchaochao4@h-partners.com> +Date: Sat, 4 Jun 2022 19:00:27 +0800 +Subject: [PATCH] delete-taboo-words.patch + +--- + gtk/emoji/de.data | Bin 131243 -> 131243 bytes + gtk/emoji/en.data | Bin 101455 -> 101455 bytes + gtk/emoji/es.data | Bin 117567 -> 117567 bytes + gtk/emoji/fr.data | Bin 106235 -> 106235 bytes + 4 files changed, 0 insertions(+), 0 deletions(-) + +diff --git a/gtk/emoji/de.data b/gtk/emoji/de.data +index 48adfca7f1dbff1f2d0934492be9f8e5ad00b1c7..c4705381ee9cf83fd770c85a9a9cda1c1bae1a5f 100644 +GIT binary patch +delta 23 +ecmZ48$g#SSqhSkU#v@k8{G|Nk?YWN_?c@M+HVHHU + +delta 23 +ecmZ48$g#SSqhSkU#v@km{Nntw?YWN_?c@M-!U<vk + +diff --git a/gtk/emoji/en.data b/gtk/emoji/en.data +index 49e321646eb7daf5cb68a0fc931731f0e852b29b..1630c39e92c7a0eb763f5c52b776ff127690b9b7 100644 +GIT binary patch +delta 40 +wcmX><gYEnbwuUW?O@3UCNyR0pMR^L2N!xq;7#GR2I_4+kCvP{-W0a8t06~ThO8@`> + +delta 40 +wcmX><gYEnbwuUW?O@3VAsl_F!MR^LriQ9Yp7#GR2dgmACmu)xBW0a8t07oDWqW}N^ + +diff --git a/gtk/emoji/es.data b/gtk/emoji/es.data +index 68bfcee17de7819734670b58ce5331e3cb96ffd0..128c81bd8058e641a3aedcefb37b3d9855b3b3bf 100644 +GIT binary patch +delta 23 +fcmdl#jeY+#_J%EtFW0a-<|pMRZ-2LjF;ETwf9nb@ + +delta 23 +fcmdl#jeY+#_J%EtFW0bo=NIRfZGX3hF;ETwfp-d9 + +diff --git a/gtk/emoji/fr.data b/gtk/emoji/fr.data +index 930de4bb112ac0479ee92a581f9d1a1699822c54..7b934957f08e965cb92edf0558fb444479b3b63c 100644 +GIT binary patch +delta 23 +ecmeypm+kjnwuUW?9Sy9G`APZ7+j|=r^W*@AG70nm + +delta 23 +ecmeypm+kjnwuUW?9SyAB`NjEV+j|=r^W*@Bz6v4$ + +-- +2.27.0 + diff --git a/gtk3.spec b/gtk3.spec new file mode 100644 index 0000000..daf6022 --- /dev/null +++ b/gtk3.spec @@ -0,0 +1,322 @@ +#Global macro or variable +%define atk_version 2.15.1 +%define glib2_version 2.49.4 +%define cairo_version 1.14.0 +%define pango_version 1.41.0 +%define gdk_pixbuf_version 2.30.0 +%define epoxy_version 1.4 +%define wayland_version 1.9.91 +%define wayland_protocols_version 1.12 +%define bin_version 3.0.0 +%define enable_immodules_package 0 +%global __provides_exclude_from %{_libdir}/gtk-3.0 + +#Basic Information +Name: gtk3 +Version: 3.24.38 +Release: 1 +Summary: GTK+ graphical user interface library +License: LGPLv2+ +URL: https://www.gtk.org +Source0: https://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz + +Patch0: 0001-Let-the-notification-icon-use-the-size-specified-by-.patch +Patch9000: delete-taboo-words.patch + +#Dependency +BuildRequires: pkgconfig(atk) >= %{atk_version} pkgconfig(atk-bridge-2.0) +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(cairo) >= %{cairo_version} pkgconfig(cairo-gobject) >= %{cairo_version} +BuildRequires: pkgconfig(pango) >= %{pango_version} pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf_version} +BuildRequires: pkgconfig(xi) pkgconfig(xrandr) pkgconfig(xinerama) pkgconfig(xcomposite) pkgconfig(xdamage) +BuildRequires: pkgconfig(xkbcommon) pkgconfig(epoxy) >= %{epoxy_version} +BuildRequires: wayland-devel >= %{wayland_version} wayland-protocols-devel >= %{wayland_protocols_version} +BuildRequires: pkgconfig(colord) +BuildRequires: gettext gtk-doc libtool desktop-file-utils libXcursor-devel meson git +%if 0%{?openEuler} +BuildRequires: cups-devel +%endif + +Requires: adwaita-icon-theme hicolor-icon-theme +Requires: atk >= %{atk_version} glib2 >= %{glib2_version} pango >= %{pango_version} +Requires: cairo >= %{cairo_version} cairo-gobject >= %{cairo_version} +Requires: libepoxy >= %{epoxy_version} +Requires: libwayland-client >= %{wayland_version} libwayland-cursor >= %{wayland_version} +Requires: gdk-pixbuf2-modules libXrandr +Recommends: dconf + +Obsoletes: adwaita-gtk3-theme < 3.13.3 +Provides: adwaita-gtk3-theme = %{version}-%{release} +Conflicts: gtk2 < 2.24.29 + +Obsoletes: gtk3-engines <= 2.91.5-5.fc15 +Obsoletes: gtk-solidity-engine < 0.4.1-9 +Obsoletes: oxygen-gtk3 < 2:1.4.1 + +%description +GTK+ is an object-oriented widget toolkit written in the programming language C; +it has a C-based object-oriented architecture that allows for maximum +flexibility. The GTK+ library contains a set of graphical control elements +(widgets)for creating graphical user interfaces. This package contains version 3 +of GTK+. + +%if 0%{?enable_immodules_package} +%package immodules +Summary: Input methods for GTK+ +Requires: gtk3 = %{version}-%{release} +Requires: gtk2-immodules + +%description immodules +The gtk3-immodules package contains standalone input methods that +are shipped as part of GTK+ 3. +%endif + +%package immodule-xim +Summary: XIM support for GTK+ +Requires: gtk3 = %{version}-%{release} + +%description immodule-xim +The gtk3-immodule-xim package contains XIM support for GTK+ 3. + +%package -n gtk-update-icon-cache +Summary: Icon theme caching utility +Obsoletes: gtk-update-icon-cache < %{version}-%{release} + +%description -n gtk-update-icon-cache +GTK+ can use the cache files created by gtk-update-icon-cache to avoid alot of system call and disk seek overhead when the application starts.Since the format of the cache files allows them to be mmap()ed shared between multiple applications,the overall memory consumption is reduced as well. + +%package devel +Summary: Development files for gtk+3 +Requires: gtk3 = %{version}-%{release} + +Obsoletes: gtk3-tests < %{version}-%{release} +Provides: gtk3-tests = %{version}-%{release} +Obsoletes: gtk3-engines-devel <= 2.91.5-5 + +%description devel +This package contains the libraries, header files other development files for +GTK+ 3. + +%package help +Summary: Documents for gtk3 +Requires: gtk3 = %{version}-%{release} + +Obsoletes: gtk3-devel-docs < %{version}-%{release} +Provides: gtk3-devel-docs = %{version}-%{release} + +%description help +This package contains man pages and other related documents for gtk3. + +#Build sections +%prep +%autosetup -n gtk+-%{version} -p1 -S git + +%build +export CFLAGS='-fno-strict-aliasing %optflags' +%meson \ + -Dbroadway_backend=true \ + -Dbuiltin_immodules=auto\ + -Dcolord=yes \ + -Dgtk_doc=true \ + -Dinstalled_tests=true \ + -Dman=true \ + -Dxinerama=yes \ + -Dbuiltin_immodules=wayland,waylandgtk \ + %if 0%{?openEuler} + -Dprint_backends=cups,file,lpr,test \ + %endif +%meson_build + +%install +%meson_install + +%find_lang gtk30 +%find_lang gtk30-properties + +(cd $RPM_BUILD_ROOT%{_bindir} +mv gtk-query-immodules-3.0 gtk-query-immodules-3.0-64 +) + +echo ".so man1/gtk-query-immodules-3.0.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk-query-immodules-3.0-64.1 + +# rm unpackaged files +find $RPM_BUILD_ROOT -name '*.la' -delete + +touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0 +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/theming-engines + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop + +%transfiletriggerin -- %{_libdir}/gtk-3.0/3.0.0/immodules +gtk-query-immodules-3.0-64 --update-cache &>/dev/null || : + +%transfiletriggerpostun -- %{_libdir}/gtk-3.0/3.0.0/immodules +gtk-query-immodules-3.0-64 --update-cache &>/dev/null || : + +#Install and uninstall scripts +%pre + +%preun + +%post + +%postun + +#Files list +%files -f gtk30.lang +%license COPYING +%{_bindir}/broadwayd +%{_bindir}/gtk-launch +%{_bindir}/gtk-query-immodules-3.0* +%{_libdir}/libgtk-3.so.* +%{_libdir}/libgdk-3.so.* +%{_libdir}/libgailutil-3.so.* +%dir %{_libdir}/gtk-3.0 +%dir %{_libdir}/gtk-3.0/%{bin_version} +%dir %{_datadir}/gtk-3.0 +%{_libdir}/gtk-3.0/%{bin_version}/theming-engines +%dir %{_libdir}/gtk-3.0/%{bin_version}/immodules +%{_libdir}/gtk-3.0/%{bin_version}/printbackends +%{_libdir}/gtk-3.0/modules +%{_libdir}/gtk-3.0/immodules +%{_datadir}/themes/Default +%{_datadir}/themes/Emacs +%{_libdir}/girepository-1.0 +%ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml +%{_datadir}/gtk-3.0/emoji/ +%if ! 0%{?enable_immodules_package} +%exclude %{_libdir}/gtk-3.0/%{bin_version}/immodules/* +%exclude %{_sysconfdir}/gtk-3.0/im-multipress.conf +%endif + +%files -n gtk-update-icon-cache +%license COPYING +%{_bindir}/gtk-update-icon-cache + +%if 0%{?enable_immodules_package} +%files immodules +%config(noreplace) %{_sysconfdir}/gtk-3.0/im-multipress.conf +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-broadway.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ipa.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-multipress.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-thai.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-er.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-et.so +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-viqr.so +%endif + +%files immodule-xim +%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-xim.so + +%files devel -f gtk30-properties.lang +%{_libdir}/lib*.so +%{_includedir}/* +%{_datadir}/aclocal/* +%{_libdir}/pkgconfig/* +%{_bindir}/gtk3-demo +%{_bindir}/gtk3-icon-browser +%{_bindir}/gtk-builder-tool +%{_bindir}/gtk-encode-symbolic-svg +%{_bindir}/gtk-query-settings +%{_datadir}/gtk-3.0/valgrind/gtk.supp +%{_datadir}/applications/gtk3-demo.desktop +%{_datadir}/applications/gtk3-icon-browser.desktop +%{_datadir}/applications/gtk3-widget-factory.desktop +%{_datadir}/icons/hicolor/*/apps/gtk3-demo.png +%{_datadir}/icons/hicolor/*/apps/gtk3-demo-symbolic.symbolic.png +%{_datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png +%{_datadir}/icons/hicolor/*/apps/gtk3-widget-factory-symbolic.symbolic.png +%{_bindir}/gtk3-demo-application +%{_bindir}/gtk3-widget-factory +%{_datadir}/gettext/ +%{_datadir}/gtk-3.0/gtkbuilder.rng +%{_datadir}/gir-1.0 +%{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml +%{_libexecdir}/installed-tests/gtk+ +%{_datadir}/installed-tests + +%files help +%doc NEWS +%{_datadir}/gtk-doc +%{_mandir}/man1/broadwayd.1* +%{_mandir}/man1/gtk-builder-tool.1* +%{_mandir}/man1/gtk-encode-symbolic-svg.1* +%{_mandir}/man1/gtk-launch.1* +%{_mandir}/man1/gtk-query-immodules-3.0* +%{_mandir}/man1/gtk-query-settings.1* +%{_mandir}/man1/gtk-update-icon-cache.1* +%{_mandir}/man1/gtk3-demo.1* +%{_mandir}/man1/gtk3-demo-application.1* +%{_mandir}/man1/gtk3-icon-browser.1* +%{_mandir}/man1/gtk3-widget-factory.1* + +%changelog +* Sat Jul 22 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 3.24.38-1 +- update to 3.24.38 + +* Thu Jun 15 2023 zhangpan <zhangpan103@h-partners.com> - 3.24.36-2 +- delete taboo words + +* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 3.24.36-1 +- update to 3.24.36 + +* Thu Jul 28 2022 wangxiaoqing <wangxiaoqing@kylinsec.com.cn> - 3.24.34-3 +- Let the notification icon use the size specified by the tray + +* Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.24.34-2 +- remove meson option wayland-backend + +* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.24.34-1 +- Upgrade to 3.24.34 + +* Wed Mar 23 2022 wangkerong <wangkerong@h-partners.com> - 3.24.30-5 +- use meson build system and remove librest and json-gilb buildrequires + +* Tue Mar 08 2022 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 3.24.30-4 +- Remove 'Provides: gtk-update-icon-cache' from gtk3 package + +* Fri Jan 14 2022 wangkerong <wangkerong@huawei.com> - 3.24.30-3 +- Other distros disable cups + +* Mon Dec 06 2021 liuyumeng <liuyumeng5@huawei.com> - 3.24.30-2 +- fix the date in the changelog,Split the update-icon-cache sub-package from the main package + +* Fri Dec 03 2021 liuyumeng <liuyumeng5@huawei.com> - 3.24.30-1 +- update to gtk3-3.24.30-1 + +* Wed Jun 23 2021 chenbo pan <panchenbo@uniontech.com> - 3.24.29-2 +- Fix virt-manager 'NoneType' object has no attribute 'conn' error + +* Wed May 19 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.24.29-1 +- Upgrade to 3.24.29 +- Update Version +- Delete '^' char + +* Wed Dec 23 2020 huanghaitao <huanghaitao8@huawei.com> - 3.24.22-1 +- update gtk3.24.22 + +* Thu Jul 23 2020 hanhui <hanhui15@huawei.com> - 3.24.21-1 +- update gtk3.24.21 + +* Tue Jun 23 2020 hanhui <hanhui15@huawei.com> - 3.24.20-1 +- update gtk3.24.20 + +* Sat Mar 14 2020 songnannan <songnannan2@huawei.com> - 3.24.1-3 +- disable package + +* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.24.1-2 +- Package init @@ -0,0 +1 @@ +7ed2f5914683ebd515da22f5784389f4 gtk+-3.24.38.tar.xz |