46768830ae
Now x11-packages repository will use original names for packages. For example, libgtk2 now will be provided as gtk2, libgtk3 will be available as gtk3, libsdl - as sdl. List of changed packages: libatk --> atk libglu --> glu libgtk2 --> gtk2 libgtk3 --> gtk3 libmesa --> mesa libsdl --> sdl libsdl2 --> sdl2 libsdl-net --> sdl-net riscvemu-sdl --> riscvemu xorg-xvfb --> xorg-server-xvfb List of dependent packages (should be rebuilt with new deps): dosbox, emacs-x, galculator, geany, libepoxy, mtpaint, qemu-system-x86_64, the-powder-toy, tigervnc, wireshark-gtk, xarchiver. Note: depending on which packages are installed, it may be necessary to upgrade with 'apt dist-upgrade'.
93 lines
3.5 KiB
Diff
93 lines
3.5 KiB
Diff
diff -uNr gtk-3.22.30/m4/gtk-doc.m4 gtk-3.22.30.mod/m4/gtk-doc.m4
|
|
--- gtk-3.22.30/m4/gtk-doc.m4 1970-01-01 03:00:00.000000000 +0300
|
|
+++ gtk-3.22.30.mod/m4/gtk-doc.m4 2018-06-22 20:55:46.574626255 +0300
|
|
@@ -0,0 +1,88 @@
|
|
+dnl -*- mode: autoconf -*-
|
|
+
|
|
+# serial 2
|
|
+
|
|
+dnl Usage:
|
|
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
|
|
+AC_DEFUN([GTK_DOC_CHECK],
|
|
+[
|
|
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
|
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
|
+
|
|
+ ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
|
|
+ AC_MSG_CHECKING([for gtk-doc])
|
|
+ PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
|
|
+ AC_MSG_RESULT($have_gtk_doc)
|
|
+
|
|
+ if test "$have_gtk_doc" = "no"; then
|
|
+ AC_MSG_WARN([
|
|
+ You will not be able to create source packages with 'make dist'
|
|
+ because $gtk_doc_requires is not found.])
|
|
+ fi
|
|
+
|
|
+ dnl check for tools we added during development
|
|
+ dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
|
|
+ dnl may not be writable by the user. Currently, automake requires that the
|
|
+ dnl test name must end in '.test'.
|
|
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
|
|
+ AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
|
|
+ AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
|
|
+ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
|
|
+ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
|
|
+
|
|
+ dnl for overriding the documentation installation directory
|
|
+ AC_ARG_WITH([html-dir],
|
|
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
|
|
+ [with_html_dir='${datadir}/gtk-doc/html'])
|
|
+ HTML_DIR="$with_html_dir"
|
|
+ AC_SUBST([HTML_DIR])
|
|
+
|
|
+ dnl enable/disable documentation building
|
|
+ AC_ARG_ENABLE([gtk-doc],
|
|
+ AS_HELP_STRING([--enable-gtk-doc],
|
|
+ [use gtk-doc to build documentation [[default=no]]]),,
|
|
+ [enable_gtk_doc=no])
|
|
+
|
|
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
|
|
+ AC_MSG_RESULT($enable_gtk_doc)
|
|
+
|
|
+ if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
|
|
+ AC_MSG_ERROR([
|
|
+ You must have $gtk_doc_requires installed to build documentation for
|
|
+ $PACKAGE_NAME. Please install gtk-doc or disable building the
|
|
+ documentation by adding '--disable-gtk-doc' to '[$]0'.])
|
|
+ fi
|
|
+
|
|
+ dnl don't check for glib if we build glib
|
|
+ if test "x$PACKAGE_NAME" != "xglib"; then
|
|
+ dnl don't fail if someone does not have glib
|
|
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
|
|
+ fi
|
|
+
|
|
+ dnl enable/disable output formats
|
|
+ AC_ARG_ENABLE([gtk-doc-html],
|
|
+ AS_HELP_STRING([--enable-gtk-doc-html],
|
|
+ [build documentation in html format [[default=yes]]]),,
|
|
+ [enable_gtk_doc_html=yes])
|
|
+ AC_ARG_ENABLE([gtk-doc-pdf],
|
|
+ AS_HELP_STRING([--enable-gtk-doc-pdf],
|
|
+ [build documentation in pdf format [[default=no]]]),,
|
|
+ [enable_gtk_doc_pdf=no])
|
|
+
|
|
+ if test -z "$GTKDOC_MKPDF"; then
|
|
+ enable_gtk_doc_pdf=no
|
|
+ fi
|
|
+
|
|
+ if test -z "$AM_DEFAULT_VERBOSITY"; then
|
|
+ AM_DEFAULT_VERBOSITY=1
|
|
+ fi
|
|
+ AC_SUBST([AM_DEFAULT_VERBOSITY])
|
|
+
|
|
+ AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
|
|
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
|
|
+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
|
|
+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
|
|
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
|
|
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
|
|
+])
|