diff --git a/glade-3.40.0-use-webkit2gtk-4.1.patch b/glade-3.40.0-use-webkit2gtk-4.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..377bb6676a4670ee29ea3d53c460e33c73ba3de5 --- /dev/null +++ b/glade-3.40.0-use-webkit2gtk-4.1.patch @@ -0,0 +1,11 @@ +--- glade-3.40.0/meson.build.orig 2024-12-01 13:48:02.129315700 +0800 ++++ glade-3.40.0/meson.build 2024-12-01 13:48:15.898789000 +0800 +@@ -162,7 +162,7 @@ + endif + + # WebKit2GTK support +-webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>= 2.28.0', required: get_option('webkit2gtk')) ++webkit2gtk_dep = dependency('webkit2gtk-4.1', version: '>= 2.28.0', required: get_option('webkit2gtk')) + have_webkit2gtk = webkit2gtk_dep.found() + + # Check for GDK Quartz and MacOSX integration package diff --git a/glade.spec b/glade.spec index 240c835deea6edbb009ccb9dda593de40abe6dc3..db8c8de61f732e9966c9e64527d740ca7962c0e1 100644 --- a/glade.spec +++ b/glade.spec @@ -1,15 +1,27 @@ Name: glade Version: 3.40.0 -Release: 1 +Release: 2 Summary: User Interface Designer for GTK+ -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later and LGPL-2.1-or-later URL: https://glade.gnome.org/ Source0: https://download.gnome.org/sources/glade/3.40/glade-%{version}.tar.xz - -BuildRequires: desktop-file-utils docbook-style-xsl gettext gtk3-devel intltool -BuildRequires: itstool libxml2-devel pygobject3-devel python3-devel webkit2gtk3-devel -BuildRequires: meson gjs-devel gcc gtk-doc -BuildRequires: /usr/bin/appstream-util /usr/bin/xsltproc +Patch0: glade-3.40.0-use-webkit2gtk-4.1.patch +BuildRequires: meson >= 0.53.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.64.0 +BuildRequires: pkgconfig(gjs-1.0) >= 1.64.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.64.0 +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gmodule-export-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.4.0 +BuildRequires: pkgconfig(pygobject-3.0) >= 3.8.0 +BuildRequires: pkgconfig(webkit2gtk-4.1) >= 2.28.0 +BuildRequires: python3-devel +BuildRequires: gtk-doc +BuildRequires: itstool +BuildRequires: /usr/bin/appstream-util +BuildRequires: /usr/bin/desktop-file-validate Requires: %{name}-libs = %{version}-%{release} @@ -59,19 +71,15 @@ developing applications that use Glade widget library. appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Glade.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Glade.desktop -%files -%defattr(-,root,root) +%files -f glade.lang %license COPYING* %{_bindir}/glade %{_bindir}/glade-previewer -%{_datadir}/locale/* %{_datadir}/applications/org.gnome.Glade.desktop -%{_datadir}/help/* -%{_datadir}/icons/* +%{_datadir}/icons/*/*/*/* %{_datadir}/metainfo/org.gnome.Glade.appdata.xml %files libs -%defattr(-,root,root) %{_libdir}/libgladeui-2.so.* %dir %{_libdir}/glade/modules/ %{_libdir}/glade/modules/*.so @@ -80,7 +88,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Glade.deskt %{_datadir}/glade/ %files devel -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/ %{_includedir}/libgladeui-2.0/ %{_libdir}/libgladeui-2.so @@ -94,6 +101,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Glade.deskt %{_mandir}/man1/* %changelog +* Sun Dec 01 2024 Funda Wang - 3.40.0-2 +- use webkit2gtk-4.1 +- cleanup spec + * Wed Aug 02 2023 haomimi - 3.40.0-1 - update to 3.40.0 diff --git a/glade.yaml b/glade.yaml index 36bbac72c6c8d11a6b6420f77b9e491b30f8514c..0d7efdd64d0a448e41233a801ff92c9cd44c62b3 100644 --- a/glade.yaml +++ b/glade.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: glade -tag_prefix: GLADE3?_ -seperator: "_" +tag_prefix: ^GLADE_ +separator: "_"