From fa1469d8adfbfa5dcf38b81b3997957bc53db6da Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 4 Mar 2021 19:09:23 +0100 Subject: [PATCH] - initial version of gtksourceview5 (based on gtksourceview4.spec) - added meson patch (hack to fix meson dependencies problem(?)) --- gtksourceview5-meson.patch | 26 +++++++ gtksourceview4.spec => gtksourceview5.spec | 89 +++++++++------------- 2 files changed, 62 insertions(+), 53 deletions(-) create mode 100644 gtksourceview5-meson.patch rename gtksourceview4.spec => gtksourceview5.spec (65%) diff --git a/gtksourceview5-meson.patch b/gtksourceview5-meson.patch new file mode 100644 index 0000000..e7c074a --- /dev/null +++ b/gtksourceview5-meson.patch @@ -0,0 +1,26 @@ +--- gtksourceview-4.99.0/gtksourceview/meson.build.orig 2021-03-04 18:38:12.955634203 +0100 ++++ gtksourceview-4.99.0/gtksourceview/meson.build 2021-03-04 18:39:15.741960727 +0100 +@@ -194,6 +194,11 @@ + install_dir: join_paths(pkgincludedir, 'gtksourceview'), + ) + ++gtksource_res = gnome.compile_resources( ++ 'gtksourceview-gresources', ++ 'gtksourceview.gresource.xml' ++) ++ + core_sources = [ + core_public_c, + core_private_c, +@@ -238,11 +243,6 @@ + + subdir('completion-providers') + +-gtksource_res = gnome.compile_resources( +- 'gtksourceview-gresources', +- 'gtksourceview.gresource.xml' +-) +- + + # We can't use the static libs on Visual Studio builds + # to form our DLL here directly, so we must use diff --git a/gtksourceview4.spec b/gtksourceview5.spec similarity index 65% rename from gtksourceview4.spec rename to gtksourceview5.spec index a61bb71..e53cd01 100644 --- a/gtksourceview4.spec +++ b/gtksourceview5.spec @@ -1,34 +1,32 @@ # # Conditional build: -%bcond_without apidocs # API documentation -%bcond_with glade # install glade catalog +%bcond_without apidocs # API documentation (broken in 4.99) %bcond_without static_libs # static library %bcond_without vala # do not build Vala API Summary: Text widget that extends the standard GTK+ 3.x Summary(pl.UTF-8): Widget tekstowy rozszerzający standardowy z GTK+ 3.x -Name: gtksourceview4 -Version: 4.8.1 +Name: gtksourceview5 +Version: 4.99.0 Release: 1 License: LGPL v2+ (library), GPL v2+ (some language specs files) Group: X11/Libraries -Source0: https://download.gnome.org/sources/gtksourceview/4.8/gtksourceview-%{version}.tar.xz -# Source0-md5: d10c624feb48412542f9e3447e75d6bc +Source0: https://download.gnome.org/sources/gtksourceview/4.99/gtksourceview-%{version}.tar.xz +# Source0-md5: 7b7a6f74d2dc459b8687f9bf6ae13bfa +Patch0: %{name}-meson.patch URL: https://wiki.gnome.org/Projects/GtkSourceView BuildRequires: docbook-dtd412-xml BuildRequires: fribidi-devel >= 0.19.7 BuildRequires: gettext-tools >= 0.19.4 -BuildRequires: glib2-devel >= 1:2.48.0 +BuildRequires: glib2-devel >= 1:2.62 BuildRequires: gobject-introspection-devel >= 1.42.0 -BuildRequires: gtk+3-devel >= 3.24 +BuildRequires: gtk4-devel >= 3.99 %{?with_apidocs:BuildRequires: gtk-doc >= 1.25} BuildRequires: itstool -%if %{with glade} -BuildRequires: libgladeui-devel >= 3.9.0 -%endif BuildRequires: libxml2-devel >= 1:2.6.31 BuildRequires: meson >= 0.50.0 BuildRequires: ninja >= 1.5 +BuildRequires: pcre2-8-devel >= 10.21 BuildRequires: pkgconfig BuildRequires: rpm-build >= 4.6 BuildRequires: rpm-pythonprov @@ -38,9 +36,10 @@ BuildRequires: tar >= 1:1.22 BuildRequires: vala BuildRequires: xz Requires: fribidi >= 0.19.7 -Requires: glib2 >= 1:2.48.0 -Requires: gtk+3 >= 3.24 +Requires: glib2 >= 1:2.62 +Requires: gtk4 >= 3.99 Requires: libxml2 >= 1:2.6.31 +Requires: pcre2-8 >= 10.21 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -60,9 +59,10 @@ Summary(pl.UTF-8): Pliki nagłówkowe dla GtkSourceView Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Requires: fribidi-devel >= 0.19.7 -Requires: glib2-devel >= 1:2.48.0 -Requires: gtk+3-devel >= 3.24 +Requires: glib2-devel >= 1:2.62 +Requires: gtk4-devel >= 3.99 Requires: libxml2-devel >= 1:2.6.31 +Requires: pcre2-8-devel >= 10.21 %description devel Header files for GtkSourceView. @@ -95,20 +95,7 @@ GtkSourceView API documentation. %description apidocs -l pl.UTF-8 Dokumentacja API GtkSourceView. -%package -n glade3-gtksourceview -Summary: Glade3 catalog entry for GtkSourceView library -Summary(pl.UTF-8): Wpis katalogu Glade3 dla biblioteki GtkSourceView -Group: X11/Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: libgladeui >= 3.9.0 - -%description -n glade3-gtksourceview -Glade3 catalog entry for GtkSourceView library. - -%description -n glade3-gtksourceview -l pl.UTF-8 -Wpis katalogu Glade3 dla biblioteki GtkSourceView. - -%package -n vala-gtksourceview4 +%package -n vala-gtksourceview5 Summary: GtkSourceView API for Vala language Summary(pl.UTF-8): API GtkSourceView dla języka Vala Group: Development/Libraries @@ -116,14 +103,15 @@ Requires: %{name}-devel = %{version}-%{release} Requires: vala BuildArch: noarch -%description -n vala-gtksourceview4 +%description -n vala-gtksourceview5 GtkSourceView API for Vala language. -%description -n vala-gtksourceview4 -l pl.UTF-8 +%description -n vala-gtksourceview5 -l pl.UTF-8 API GtkSourceView dla języka Vala. %prep %setup -q -n gtksourceview-%{version} +%patch0 -p1 %if %{with static_libs} %{__sed} -i -e 's/gtksource_lib = shared_library/gtksource_lib = library/' gtksourceview/meson.build @@ -131,7 +119,6 @@ API GtkSourceView dla języka Vala. %build %meson build \ - %{?with_glade:-Dglade_catalog=true} \ %{?with_apidocs:-Dgtk_doc=true} %ninja_build -C build @@ -141,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT %ninja_install -C build -%find_lang gtksourceview-4 +%find_lang gtksourceview-5 %clean rm -rf $RPM_BUILD_ROOT @@ -149,41 +136,37 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f gtksourceview-4.lang +%files -f gtksourceview-5.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgtksourceview-4.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgtksourceview-4.so.0 -%{_datadir}/gtksourceview-4 -%{_libdir}/girepository-1.0/GtkSource-4.typelib +%attr(755,root,root) %{_libdir}/libgtksourceview-5.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgtksourceview-5.so.0 +%{_datadir}/gtksourceview-5 +%{_libdir}/girepository-1.0/GtkSource-5.typelib +%{_iconsdir}/hicolor/scalable/actions/completion-*-symbolic.svg +%{_iconsdir}/hicolor/scalable/actions/lang-*-symbolic.svg %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgtksourceview-4.so -%{_includedir}/gtksourceview-4 -%{_pkgconfigdir}/gtksourceview-4.pc -%{_datadir}/gir-1.0/GtkSource-4.gir +%attr(755,root,root) %{_libdir}/libgtksourceview-5.so +%{_includedir}/gtksourceview-5 +%{_pkgconfigdir}/gtksourceview-5.pc +%{_datadir}/gir-1.0/GtkSource-5.gir %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/libgtksourceview-4.a +%{_libdir}/libgtksourceview-5.a %endif %if %{with apidocs} %files apidocs %defattr(644,root,root,755) -%{_gtkdocdir}/gtksourceview-4.0 -%endif - -%if %{with glade} -%files -n glade3-gtksourceview -%defattr(644,root,root,755) -%{_datadir}/glade3/catalogs/gtksourceview.xml +%{_gtkdocdir}/gtksourceview-5.0 %endif %if %{with vala} -%files -n vala-gtksourceview4 +%files -n vala-gtksourceview5 %defattr(644,root,root,755) -%{_datadir}/vala/vapi/gtksourceview-4.deps -%{_datadir}/vala/vapi/gtksourceview-4.vapi +%{_datadir}/vala/vapi/gtksourceview-5.deps +%{_datadir}/vala/vapi/gtksourceview-5.vapi %endif -- 2.43.0