[packages/libgit2-glib] - updated to 1.0.0.1 - removed obsolete vapi* patches
qboosh
qboosh at pld-linux.org
Thu Dec 23 19:05:35 CET 2021
commit 20ad9226050ca9cda5e36616c3af53232e343bb5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Dec 23 19:06:17 2021 +0100
- updated to 1.0.0.1
- removed obsolete vapi* patches
libgit2-glib-vapi20.patch | 26 --------
libgit2-glib-vapi22.patch | 158 ----------------------------------------------
libgit2-glib.spec | 14 ++--
3 files changed, 5 insertions(+), 193 deletions(-)
---
diff --git a/libgit2-glib.spec b/libgit2-glib.spec
index 15b6a3a..e369a79 100644
--- a/libgit2-glib.spec
+++ b/libgit2-glib.spec
@@ -6,14 +6,12 @@
Summary: GLib wrapper library around the libgit2 git access library
Summary(pl.UTF-8): Biblioteka obudowania GLib do biblioteki dostępu do gita libgit2
Name: libgit2-glib
-Version: 0.99.0.1
-Release: 3
+Version: 1.0.0.1
+Release: 1
License: LGPL v2.1+
Group: Libraries
-Source0: https://download.gnome.org/sources/libgit2-glib/0.99/%{name}-%{version}.tar.xz
-# Source0-md5: 0507d588f149f7b002256e5e8e733156
-Patch0: %{name}-vapi20.patch
-Patch1: %{name}-vapi22.patch
+Source0: https://download.gnome.org/sources/libgit2-glib/1.0/%{name}-%{version}.tar.xz
+# Source0-md5: d5b64b1cea56253301bcc87e3d50fb56
URL: https://wiki.gnome.org/Libgit2-glib
BuildRequires: glib2-devel >= 1:2.44.0
BuildRequires: gobject-introspection-devel >= 0.10.1
@@ -55,7 +53,7 @@ Requires: %{name} = %{version}-%{release}
Requires: glib2-devel >= 1:2.44.0
Requires: gobject-introspection-devel >= 0.10.1
Requires: libgit2-devel >= 0.26.0
-Obsoletes: libgit2-glib-static
+Obsoletes: libgit2-glib-static < 0.26.4
%description devel
Header files for libgit2-glib library.
@@ -106,8 +104,6 @@ API języka Vala do biblioteki libgit2-glib.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%meson build \
diff --git a/libgit2-glib-vapi20.patch b/libgit2-glib-vapi20.patch
deleted file mode 100644
index 6f20bc5..0000000
--- a/libgit2-glib-vapi20.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7f63349fd0405439532f2ff0896a3697c73ccaaf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny at gentoo.org>
-Date: Thu, 27 Feb 2020 15:20:20 +0100
-Subject: [PATCH] Fix meson_vapi_link.py to respect DESTDIR
-
-Fixes #5
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6d314b5..3a423b3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,7 +135,7 @@ if enable_vapi
- assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
- assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
-
-- meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
-+ meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
- endif
-
- # Check for libgit2 ssh support
---
-2.24.1
-
diff --git a/libgit2-glib-vapi22.patch b/libgit2-glib-vapi22.patch
deleted file mode 100644
index be22e1e..0000000
--- a/libgit2-glib-vapi22.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 272024b9370380a538417004d478ef594bd0703c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 1 Mar 2020 17:33:12 +0000
-Subject: [PATCH 1/4] meson_vapi_link.py: Don't reset the cwd
-
-We're exiting anyway so it's unnecessary.
----
- meson_vapi_link.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/meson_vapi_link.py b/meson_vapi_link.py
-index eb64fd6..5b33063 100644
---- a/meson_vapi_link.py
-+++ b/meson_vapi_link.py
-@@ -5,18 +5,14 @@ import subprocess
- import sys
-
- vapidir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], sys.argv[1], 'vala', 'vapi')
-+os.chdir(vapidir)
-
- # FIXME: meson will not track the creation of these files
- # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
- old = 'ggit-1.0'
- new = 'libgit2-glib-1.0'
-
--wd = os.getcwd()
--os.chdir(vapidir)
--
- for ext in ['vapi', 'deps']:
- src = os.path.join('{}.{}'.format(new, ext))
- dest = os.path.join('{}.{}'.format(old, ext))
- subprocess.call(['ln', '-s', '-f', src, dest])
--
--os.chdir(wd)
---
-2.24.1
-
-
-From f49f3f5a6cc20f54cdd9001f64912ca4d018ffec Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 1 Mar 2020 17:33:12 +0000
-Subject: [PATCH 2/4] meson_vapi_link.py: Remove unnecessary os.path.join
-
-We only have one argument, so it does nothing.
----
- meson_vapi_link.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson_vapi_link.py b/meson_vapi_link.py
-index 5b33063..58e0f6b 100644
---- a/meson_vapi_link.py
-+++ b/meson_vapi_link.py
-@@ -13,6 +13,6 @@ old = 'ggit-1.0'
- new = 'libgit2-glib-1.0'
-
- for ext in ['vapi', 'deps']:
-- src = os.path.join('{}.{}'.format(new, ext))
-- dest = os.path.join('{}.{}'.format(old, ext))
-+ src = '{}.{}'.format(new, ext)
-+ dest = '{}.{}'.format(old, ext)
- subprocess.call(['ln', '-s', '-f', src, dest])
---
-2.24.1
-
-
-From 170e1c31dad2208e3ce659628efdbf0623ebbda7 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 1 Mar 2020 17:33:12 +0000
-Subject: [PATCH 3/4] meson_vapi_link.py: Improve calculation of vapidir
-
-The script gets the *absolute* datadir passed as its argument. This
-means os.path.join will throw away the MESON_INSTALL_DESTDIR_PREFIX,
-breaking the symlinking when DESTDIR is set.
-
-Also handle the case where the datadir is not inside the prefix by
-prepending the destdir ourselves. We make the datadir relative to the
-root by stripping the drive letter (if any) and the initial separator.
----
- meson.build | 2 +-
- meson_vapi_link.py | 9 ++++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3a423b3..6d314b5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,7 +135,7 @@ if enable_vapi
- assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
- assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
-
-- meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
-+ meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
- endif
-
- # Check for libgit2 ssh support
-diff --git a/meson_vapi_link.py b/meson_vapi_link.py
-index 58e0f6b..d7fc729 100644
---- a/meson_vapi_link.py
-+++ b/meson_vapi_link.py
-@@ -4,7 +4,14 @@ import os
- import subprocess
- import sys
-
--vapidir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], sys.argv[1], 'vala', 'vapi')
-+datadir = sys.argv[1]
-+
-+destdir = os.environ.get('DESTDIR')
-+if destdir:
-+ datadir = os.path.splitdrive(datadir)[1].lstrip(os.path.sep)
-+ datadir = os.path.join(destdir, datadir)
-+
-+vapidir = os.path.join(datadir, 'vala', 'vapi')
- os.chdir(vapidir)
-
- # FIXME: meson will not track the creation of these files
---
-2.24.1
-
-
-From 29db98df0f65519bbcc9827253b0849ce7fb741c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 1 Mar 2020 17:33:12 +0000
-Subject: [PATCH 4/4] meson_vapi_link.py: Use python's own utils instead of
- calling 'ln'
-
-Replace the use of 'ln' with os.symlink. Since subprocess.call does not
-raise any exception when the called process fails, this script likely
-silently did nothing on Windows. Instead, fall back to using shutil.copy
-to copy instead of symlinking.
----
- meson_vapi_link.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/meson_vapi_link.py b/meson_vapi_link.py
-index d7fc729..db1e4e8 100644
---- a/meson_vapi_link.py
-+++ b/meson_vapi_link.py
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python3
-
- import os
--import subprocess
-+import shutil
- import sys
-
- datadir = sys.argv[1]
-@@ -22,4 +22,7 @@ new = 'libgit2-glib-1.0'
- for ext in ['vapi', 'deps']:
- src = '{}.{}'.format(new, ext)
- dest = '{}.{}'.format(old, ext)
-- subprocess.call(['ln', '-s', '-f', src, dest])
-+ try:
-+ os.symlink(src, dest)
-+ except OSError:
-+ shutil.copy(src, dest)
---
-2.24.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgit2-glib.git/commitdiff/20ad9226050ca9cda5e36616c3af53232e343bb5
More information about the pld-cvs-commit
mailing list