- update to 1.1.6

- updated gtkdoc patch, require gtk-doc with cmake fix applied

diff --git a/libinstpatch-gtkdoc.patch b/libinstpatch-gtkdoc.patch
index 43e5779958bf42cf2a85cd235fa5f838c23623f5..909ade144241d55108442d1afd48ab890943d200 100644 (file)
--- a/libinstpatch-gtkdoc.patch
+++ b/libinstpatch-gtkdoc.patch
@@ -1,87 +1,3 @@
---- libinstpatch-1.1.5/cmake/FindGtkDoc.cmake.orig     2020-05-26 13:09:21.000000000 +0200
-+++ libinstpatch-1.1.5/cmake/FindGtkDoc.cmake  2021-01-17 17:02:54.626330817 +0100
-@@ -34,12 +34,6 @@
-     set(GTKDOC_FOUND 0)
- 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")
- if(NOT GTKDOC_MKDB_EXE)
-       message(STATUS "gtkdoc-mkdb not found")
---- libinstpatch-1.1.5/cmake/UseGtkDoc.cmake.orig      2020-05-26 13:09:21.000000000 +0200
-+++ libinstpatch-1.1.5/cmake/UseGtkDoc.cmake   2021-01-17 18:15:40.099347687 +0100
-@@ -130,26 +130,6 @@
-             WORKING_DIRECTORY "${_output_dir}"
-             VERBATIM)
- 
--        # add a command to make the templates
--        add_custom_command(
--            OUTPUT
--                "${_output_unused}"
--                "${_output_undeclared}"
--                "${_output_undocumented}"
--                "${_output_tmpl_dir}"
--                "${_output_tmpl_stamp}"
--            DEPENDS
--                "${_output_types}"
--                "${_output_signals}"
--                "${_output_sections}"
--                "${_output_overrides}"
--                ${ARG_DEPENDS}
--            COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_tmpl_dir}
--            COMMAND ${GTKDOC_MKTMPL_EXE}
--                "--module=${_doc_prefix}"
--            WORKING_DIRECTORY "${_output_dir}"
--            VERBATIM)
--
-         set(_copy_xml_if_needed "")
-         if(ARG_XML)
-             get_filename_component(ARG_XML ${ARG_XML} ABSOLUTE)
-@@ -169,10 +149,10 @@
-                 "${_output_sgml_stamp}"
-                 "${_default_xml_file}"
-             DEPENDS
--                "${_output_tmpl_stamp}"
--                "${_output_unused}"
--                "${_output_undeclared}"
--                "${_output_undocumented}"
-+                "${_output_overrides}"
-+                "${_output_sections}"
-+                "${_output_signals}"
-+                "${_output_types}"
-                 ${ARG_DEPENDS}
-                 ${_remove_xml_if_needed}
-             COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_xml_dir}
-@@ -162,6 +162,7 @@
-                 "--source-suffixes=${_doc_source_suffixes}"
-                 "--output-format=xml"
-                 "--main-sgml-file=${_default_xml_file}"
-+            COMMAND sh -c "printf '<!ENTITY package \"${PACKAGE}\">\\n<!ENTITY package_bugreport \"\">\\n<!ENTITY package_name \"${PACKAGE})\">\\n<!ENTITY package_string \"${PACKAGE}\">\\n<!ENTITY package_tarname \"${PACKAGE}\">\\n<!ENTITY package_url \"http://www.swamiproject.org/\">\\n<!ENTITY package_version \"${VERSION}\">\\n' > ${_output_xml_dir}/gtkdocentities.ent"
-             ${_copy_xml_if_needed}
-             WORKING_DIRECTORY "${_output_dir}"
-             VERBATIM)
-@@ -200,7 +180,6 @@
-             DEPENDS
-                 "${_output_html_dir_stamp}"
-                 "${_output_sgml_stamp}"
--                "${_output_tmpl_stamp}"
-                 "${ARG_XML}"
-                 ${ARG_DEPENDS}
-             ${_copy_xml_if_needed}
-@@ -196,7 +197,7 @@
-                 ${ARG_DEPENDS}
-             COMMAND ${GTKDOC_FIXXREF_EXE}
-                 "--module=${_doc_prefix}"
--                "--module-dir=."
-+                "--module-dir=html"
-                 ${ARG_FIXXREFOPTS}
-             #${_remove_xml_if_needed}
-             WORKING_DIRECTORY "${_output_dir}"
 --- libinstpatch-1.1.5/docs/reference/CMakeLists.txt.orig      2020-05-26 13:09:21.000000000 +0200
 +++ libinstpatch-1.1.5/docs/reference/CMakeLists.txt   2021-01-17 18:01:36.473917998 +0100
 @@ -40,7 +40,7 @@
@@ -93,10 +9,3 @@
    )
  endif ()
  
---- libinstpatch-1.1.5/cmake/GtkDocScanGObjWrapper.cmake.orig  2020-05-26 13:09:21.000000000 +0200
-+++ libinstpatch-1.1.5/cmake/GtkDocScanGObjWrapper.cmake       2021-01-17 19:29:27.275363616 +0100
-@@ -1,3 +1,4 @@
-+include(CMakeGenericSystem)
- if(NOT APPLE)
-     # We use pkg-config to fing glib et al
-     find_package(PkgConfig)

diff --git a/libinstpatch.spec b/libinstpatch.spec
index b72719a18c43e3bddbc7461e169b0bd6fd1591a7..b521e0ac7d154ad762f815e374b3c70f77e12ee7 100644 (file)
--- a/libinstpatch.spec
+++ b/libinstpatch.spec
@@ -1,25 +1,27 @@
 #
 # Conditional build:
-%bcond_without apidocs # API documentation
+%bcond_without apidocs         # API documentation
+%bcond_with    introspection   # GObject Introspection [broken cmake support in 1.1.[3-6]]
 
 Summary:       Library for processing digital sample based MIDI instrument "patch" files
 Summary(pl.UTF-8):     Biblioteka do przetwarzania plików "wstawek" instrumentów MIDI opartych na próbkach cyfrowych
 Name:          libinstpatch
-Version:       1.1.5
+Version:       1.1.6
 Release:       1
 License:       LGPL v2.1
 Group:         Libraries
 #Source0Download: https://github.com/swami/libinstpatch/releases
 Source0:       https://github.com/swami/libinstpatch/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: e2b4a0867a72e464aab0fd7dae9c1abe
+# Source0-md5: 159f70ffb53f56dd54e4827ef77b1804
 Patch0:                %{name}-gtkdoc.patch
 URL:           http://www.swamiproject.org/
 BuildRequires: cmake >= 2.6.3
 BuildRequires: glib2-devel >= 1:2.14
-#BuildRequires:        gobject-introspection-devel
-%{?with_apidocs:BuildRequires: gtk-doc}
+%{?with_introspection:BuildRequires:   gobject-introspection-devel}
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.33.2-3}
 BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,8 +76,8 @@ Dokumentacja API biblioteki libinstpatch.
 install -d build
 cd build
 %cmake .. \
-       %{?with_apidocs:-DGTKDOC_ENABLED=ON}
-#      -DINTROSPECTION_ENABLED=ON broken cmake support in 1.1.[35]
+       %{?with_apidocs:-DGTKDOC_ENABLED=ON} \
+       %{?with_introspection:-DINTROSPECTION_ENABLED=ON}
 
 %{__make}
 
@@ -87,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with apidocs}
 install -d $RPM_BUILD_ROOT%{_gtkdocdir}/libinstpatch
-cp -p build/docs/reference/libinstpatch/html/* $RPM_BUILD_ROOT%{_gtkdocdir}/libinstpatch
+cp -p build/docs/reference/html/* $RPM_BUILD_ROOT%{_gtkdocdir}/libinstpatch
 %endif
 
 %clean