commit e070aaf2219b0014ec41ad1f746a49de8c12acb2
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Fri Apr 19 16:43:51 2024 +0200
- added patches for current gpgme, gtk-doc, appstream 1.0.x; release 3
Limba-appstream1.0.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
Limba-gpgme.patch | 51 +++++++++++++++++++++++++++++++++++++++++++
Limba-gtkdoc.patch | 10 +++++++++
Limba.spec | 8 ++++++-
4 files changed, 125 insertions(+), 1 deletion(-)
---
diff --git a/Limba.spec b/Limba.spec
index cf597b0..23237d8 100644
--- a/Limba.spec
+++ b/Limba.spec
@@ -2,13 +2,16 @@ Summary: Experimental software installation system
Summary(pl.UTF-8): Eksperymentalny system do instalowania oprogramowania
Name: Limba
Version: 0.5.6
-Release: 2
+Release: 3
License: LGPL v2.1+
Group: Libraries
Source0:
https://people.freedesktop.org/~mak/limba/releases/%{name}-%{version}.tar.xz
# Source0-md5: aa3fbfef65087e26079510e409d4c443
#
https://github.com/ximion/limba/commit/55c1cdda6766a01d6004aa16955ddf59f9f0c6c9.patch
Patch0: %{name}-appstream0.10.patch
+Patch1: %{name}-gpgme.patch
+Patch2: %{name}-gtkdoc.patch
+Patch3: %{name}-appstream1.0.patch
URL: https://people.freedesktop.org/~mak/limba/
BuildRequires: AppStream-devel >= 0.10.0
BuildRequires: cmake >= 2.8.6
@@ -101,6 +104,9 @@ Pliki nagłówkowe biblioteki Limba.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%{__sed} -i -e '1s,/usr/bin/env perl,/usr/bin/perl,'
contrib/licompile/{lig++,ligcc}
diff --git a/Limba-appstream1.0.patch b/Limba-appstream1.0.patch
new file mode 100644
index 0000000..3ed2533
--- /dev/null
+++ b/Limba-appstream1.0.patch
@@ -0,0 +1,57 @@
+--- Limba-0.5.6/src/li-package.c.orig 2024-04-18 22:02:38.396340424 +0200
++++ Limba-0.5.6/src/li-package.c 2024-04-19 06:12:41.427249195 +0200
+@@ -417,8 +417,9 @@ li_package_read_component_data (LiPackag
+ /* do not filter languages */
+ as_metadata_set_locale (mdata, "ALL");
+
+- as_metadata_parse (mdata,
++ as_metadata_parse_data (mdata,
+ data,
++ -1,
+ AS_FORMAT_KIND_XML,
+ &tmp_error);
+ priv->cpt = g_object_ref (as_metadata_get_component (mdata));
+--- Limba-0.5.6/src/li-repository.c.orig 2024-04-18 22:02:38.396340424
+0200
++++ Limba-0.5.6/src/li-repository.c 2024-04-19 06:14:04.956676577 +0200
+@@ -546,7 +546,7 @@ li_repository_save_asmeta (gchar *arch,
+ g_mkdir_with_parents (dir, 0755);
+
+ fname = g_build_filename (dir, "Metadata.xml.gz", NULL);
+- as_metadata_save_collection (metad,
++ as_metadata_save_catalog (metad,
+ fname,
+ AS_FORMAT_KIND_XML,
+ &helper->error);
+--- Limba-0.5.6/src/li-pkg-cache.c.orig 2024-04-18 22:02:38.396340424
+0200
++++ Limba-0.5.6/src/li-pkg-cache.c 2024-04-19 06:14:44.365466608 +0200
+@@ -715,7 +715,7 @@ li_pkg_cache_update (LiPkgCache *cache,
+ }
+
+ /* save AppStream XML data */
+- as_metadata_save_collection (metad,
++ as_metadata_save_catalog (metad,
+ li_repo_entry_get_appstream_fname
(re),
+ AS_FORMAT_KIND_XML,
+ &tmp_error);
+--- Limba-0.5.6/src/li-utils.c.orig 2016-02-28 17:45:24.000000000 +0100
++++ Limba-0.5.6/src/li-utils.c 2024-04-19 06:21:46.782354181 +0200
+@@ -352,15 +352,15 @@ li_compute_checksum_for_file (const gcha
+ const gchar*
+ li_get_last_version_from_component (AsComponent *cpt)
+ {
+- GPtrArray *releases;
++ AsReleaseList *releases;
+ AsRelease *release = NULL;
+ guint64 timestamp = 0;
+ guint i;
+ const gchar *version = NULL;
+
+- releases = as_component_get_releases (cpt);
+- for (i = 0; i < releases->len; i++) {
+- AsRelease *r = AS_RELEASE (g_ptr_array_index (releases, i));
++ releases = as_component_load_releases (cpt, FALSE, NULL);
++ for (i = 0; i < as_release_list_get_size(releases); i++) {
++ AsRelease *r = as_release_list_index(releases, i);
+ if (as_release_get_timestamp (r) >= timestamp) {
+ release = r;
+ timestamp = as_release_get_timestamp (r);
diff --git a/Limba-gpgme.patch b/Limba-gpgme.patch
new file mode 100644
index 0000000..2b28beb
--- /dev/null
+++ b/Limba-gpgme.patch
@@ -0,0 +1,51 @@
+--- Limba-0.5.6/data/cmake/FindGPGMe.cmake.orig 2016-02-28
17:45:24.000000000 +0100
++++ Limba-0.5.6/data/cmake/FindGPGMe.cmake 2024-04-18 21:57:49.314573181
+0200
+@@ -186,14 +186,14 @@ else() # not WIN32
+ set( GPGME_PTHREAD_FOUND false )
+ set( GPGME_PTH_FOUND false )
+
+- find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
++ find_program( _GPGMECONFIG_EXECUTABLE NAMES pkg-config )
+
+ # if gpgme-config has been found
+ if ( _GPGMECONFIG_EXECUTABLE )
+
+ message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" )
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE
GPGME_VERSION )
++ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS gpgme --modversion
OUTPUT_VARIABLE GPGME_VERSION )
+
+ set( _GPGME_MIN_VERSION "1.4.0" )
+
+@@ -205,21 +205,11 @@ else() # not WIN32
+
+ message( STATUS "Found gpgme v${GPGME_VERSION}, checking for
flavours..." )
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs
OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
++ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS gpgme
--libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
+ if ( _ret )
+ set( _gpgme_config_vanilla_libs )
+ endif()
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs
OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
+- if ( _ret )
+- set( _gpgme_config_pthread_libs )
+- endif()
+-
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs
OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
+- if ( _ret )
+- set( _gpgme_config_pth_libs )
+- endif()
+-
+ # append -lgpg-error to the list of libraries, if necessary
+ foreach ( _flavour vanilla pthread pth )
+ if ( _gpgme_config_${_flavour}_libs AND NOT
_gpgme_config_${_flavour}_libs MATCHES "lgpg-error" )
+@@ -229,7 +219,7 @@ else() # not WIN32
+
+ if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR
_gpgme_config_pth_libs )
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags
OUTPUT_VARIABLE _GPGME_CFLAGS )
++ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS gpgme --cflags
OUTPUT_VARIABLE _GPGME_CFLAGS )
+
+ if ( _GPGME_CFLAGS )
+ string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS
"${_GPGME_CFLAGS}" )
diff --git a/Limba-gtkdoc.patch b/Limba-gtkdoc.patch
new file mode 100644
index 0000000..48c301a
--- /dev/null
+++ b/Limba-gtkdoc.patch
@@ -0,0 +1,10 @@
+--- Limba-0.5.6/data/cmake/FindGtkDoc.cmake.orig 2016-02-28
17:45:24.000000000 +0100
++++ Limba-0.5.6/data/cmake/FindGtkDoc.cmake 2024-04-18 22:02:17.536453432
+0200
+@@ -37,7 +37,6 @@ endif(NOT GTKDOC_SCANGOBJ_WRAPPER)
+ find_program(GTKDOC_MKTMPL_EXE gtkdoc-mktmpl PATH "${GLIB_PREFIX}/bin")
+ if(NOT GTKDOC_MKTMPL_EXE)
+ message(STATUS "gtkdoc-mktmpl not found")
+- set(GTKDOC_FOUND 0)
+ endif(NOT GTKDOC_MKTMPL_EXE)
+
+ find_program(GTKDOC_MKDB_EXE gtkdoc-mkdb PATH "${GLIB_PREFIX}/bin")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Limba.git/commitdiff/e070aaf2219b0014ec41ad1f746a49de8c12acb2
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
