From 8bc1ec7ecf3c9a197d2ca6f1cfe3d426358712a0 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 21 Mar 2021 00:01:09 +0100 Subject: [PATCH] up to 1.30.0 --- libpeas-tests-with-static.patch | 28 ---------------------------- libpeas.spec | 14 +++++--------- 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 libpeas-tests-with-static.patch diff --git a/libpeas-tests-with-static.patch b/libpeas-tests-with-static.patch deleted file mode 100644 index 811524a..0000000 --- a/libpeas-tests-with-static.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- libpeas-1.24.0/libpeas-gtk/meson.build.orig 2019-09-10 02:41:29.000000000 +0200 -+++ libpeas-1.24.0/libpeas-gtk/meson.build 2019-09-30 20:10:09.963943989 +0200 -@@ -42,16 +42,6 @@ - ) - ) - --# Static library used for testing symbol access --libpeas_gtk_test = static_library( -- package_gtk_string.strip('lib'), -- libpeas_gtk_c, -- include_directories: rootdir, -- dependencies: libpeas_gtk_deps, -- c_args: libpeas_gtk_c_args, -- link_args: libpeas_gtk_link_args, --) -- - libpeas_gtk_sha = library( - package_gtk_string.strip('lib'), - libpeas_gtk_c, -@@ -105,7 +95,7 @@ - ) - - libpeas_gtk_test_dep = declare_dependency( -- link_with: libpeas_gtk_test, -+ link_with: libpeas_gtk_sha.get_static_lib(), - dependencies: libpeas_gtk_deps, - include_directories: rootdir, - sources: libpeas_gtk_dep_sources, diff --git a/libpeas.spec b/libpeas.spec index 0e07a10..3261d6b 100644 --- a/libpeas.spec +++ b/libpeas.spec @@ -16,14 +16,13 @@ Summary: GObject Plugin System Summary(pl.UTF-8): System wtyczek GObject Name: libpeas -Version: 1.28.0 -Release: 2 +Version: 1.30.0 +Release: 1 License: LGPL v2.1+ Group: Libraries -Source0: https://download.gnome.org/sources/libpeas/1.28/%{name}-%{version}.tar.xz -# Source0-md5: 62a5d01e9561f8fafca68e2863640735 -Patch0: %{name}-tests-with-static.patch -Patch1: %{name}-gtkdocdir.patch +Source0: https://download.gnome.org/sources/libpeas/1.30/%{name}-%{version}.tar.xz +# Source0-md5: 60b9d9fe2ee9dd518fb12d5d404e296a +Patch0: %{name}-gtkdocdir.patch URL: https://wiki.gnome.org/Libpeas BuildRequires: gettext-tools >= 0.19.7 %{?with_glade:BuildRequires: glade-devel >= 2.0} @@ -240,10 +239,7 @@ Aplikacja demonstracyjna libpeas. %prep %setup -q -%if %{with static_libs} %patch0 -p1 -%endif -%patch1 -p1 %if %{with lua} # meson buildsystem expects .pc file for lua-lgi detection -- 2.44.0