- updated am, doc and mono patches, disable -Werror

diff --git a/libindicate-am.patch b/libindicate-am.patch
index ebc6006b8e734bdf6ecfe5a6c7b0453846f3d923..4fc833ec3be483cfdd2683017b98d3f3b8b7f43c 100644 (file)
--- a/libindicate-am.patch
+++ b/libindicate-am.patch
@@ -26,18 +26,7 @@
  
  # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
 -INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
-+INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python"
- 
- AC_SUBST(INDICATE_PYTHON_CFLAGS)
- AC_SUBST(INDICATE_PYTHON_LIBS)
---- libindicate-12.10.1/configure.ac~  2016-12-31 00:43:38.000000000 +0100
-+++ libindicate-12.10.1/configure.ac   2016-12-31 00:45:23.246139564 +0100
-@@ -216,7 +216,7 @@ PKG_CHECK_MODULES([INDICATE_PYTHON], [py
- )
- 
- # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
--INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python"
-+INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python2"
++INDICATE_PYTHON_LIBS="$INDICATE_PYTHON_LIBS -lpyglib-2.0-python2"
  
  AC_SUBST(INDICATE_PYTHON_CFLAGS)
  AC_SUBST(INDICATE_PYTHON_LIBS)

diff --git a/libindicate-doc.patch b/libindicate-doc.patch
index 3d27af4f65083447a84ec7b68ebcff18084af143..c799fd0217141e2eb0eac2d6447d41ff783013e4 100644 (file)
--- a/libindicate-doc.patch
+++ b/libindicate-doc.patch
@@ -12,3 +12,62 @@
  <part id="listeners">
        <title>Classes for Listeners</title>
        <xi:include href="xml/listener.xml" />
+--- libindicate-12.10.1/docs/reference/Makefile.am.orig        2012-07-11 19:59:02.000000000 +0200
++++ libindicate-12.10.1/docs/reference/Makefile.am     2023-01-30 06:17:39.817127714 +0100
+@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sg
+ DOC_SOURCE_DIR=../../libindicate
+ 
+ # Extra options to pass to gtkdoc-scangobj. Not normally needed.
+-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
++SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
+ 
+ # Extra options to supply to gtkdoc-scan.
+ # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+@@ -37,7 +37,7 @@ MKTMPL_OPTIONS=
+ 
+ # Extra options to supply to gtkdoc-fixref. Not normally needed.
+ # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+-FIXXREF_OPTIONS=
++FIXXREF_OPTIONS=--module=$(DOC_MODULE)
+ 
+ # Used for dependencies. The docs will be rebuilt if any of these change.
+ # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+--- libindicate-12.10.1/gtk-doc.local.make.orig        2012-07-11 19:59:02.000000000 +0200
++++ libindicate-12.10.1/gtk-doc.local.make     2023-01-30 06:22:28.946232193 +0100
+@@ -28,8 +28,8 @@ EXTRA_DIST =                                 \
+       $(HTML_IMAGES)                  \
+       $(DOC_MAIN_SGML_FILE)
+ 
+-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+-         $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp \
++         $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+ 
+ SCANOBJ_FILES =                \
+       $(DOC_MODULE).args       \
+@@ -75,24 +75,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+       @true
+ 
+-#### templates ####
+-
+-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+-      @echo 'gtk-doc: Rebuilding template files'
+-      @-chmod -R u+w $(srcdir)
+-      cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+-      touch tmpl-build.stamp
+-
+-tmpl.stamp: tmpl-build.stamp
+-      @true
+-
+-tmpl/*.sgml:
+-      @true
+-
+-
+ #### xml ####
+ 
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+       @echo 'gtk-doc: Building XML'
+       @-chmod -R u+w $(srcdir)
+       cd $(srcdir) && \

diff --git a/libindicate.spec b/libindicate.spec
index 5145f1d77f29196e4a8d4910ec15f292729a7d28..d6d38b708b6042a307684dba0efaa68280aff624 100644 (file)
--- a/libindicate.spec
+++ b/libindicate.spec
@@ -51,7 +51,9 @@ BuildRequires:        python-devel >= 2.3.5
 BuildRequires: python-pygobject-devel >= 0.22
 BuildRequires: python-pygtk-devel >= 2:2.14.0
 %endif
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: sed >= 4.0
 BuildRequires: vala
 %if %{with doc}
 BuildRequires: docbook-dtd412-xml
@@ -317,6 +319,11 @@ API języka Vala do biblioteki libindicate-gtk3.
 %patch1 -p1
 %patch2 -p1
 
+# avoid errors on glib deprecations
+%{__sed} -i -e 's/ -Werror//' \
+       libindicate/Makefile.am \
+       libindicate-gtk/Makefile.am
+
 %build
 %if %{with apidocs}
 %{__gtkdocize}

diff --git a/mono4.patch b/mono4.patch
index 13714930113ba39eb22fee3c967473611dd766e4..7dddbf8966d7620175048c55411a1c22f25a384d 100644 (file)
--- a/mono4.patch
+++ b/mono4.patch
@@ -5,7 +5,7 @@
     fi
  
 -   AC_PATH_PROG(CSC, gmcs, no)
-+   AC_PATH_PROG(CSC, dmcs, no)
++   AC_PATH_PROG(CSC, mcs, no)
     LIB_PREFIX=.so
     LIB_SUFFIX=
  fi