summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShengyu Zhang2020-10-13 15:02:48 +0800
committerShengyu Zhang2020-10-13 15:02:48 +0800
commit08de4cbd4d985ce7c860f338e201a2504a37d4b9 (patch)
tree607ac25a557f4039922f634bb786d529a7d881ea
parent4197cc846d5d9bd15195cf5a001cccfad7ef77e5 (diff)
downloadaur-08de4cbd4d985ce7c860f338e201a2504a37d4b9.tar.gz
gtk4: fix conflict with pango and gtk-doc
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD24
2 files changed, 24 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1aa2ff2c5c2f..5c450c654788 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
# Generated by mksrcinfo v8
-# Mon Oct 5 04:17:44 UTC 2020
+# Tue Oct 13 07:02:30 UTC 2020
pkgbase = gtk4
pkgdesc = GObject-based multi-platform GUI toolkit
pkgver = 3.99.2
- pkgrel = 1
+ pkgrel = 2
url = https://www.gtk.org/
install = gtk4.install
arch = i686
arch = x86_64
license = LGPL
makedepends = gobject-introspection
- makedepends = gtk-doc
makedepends = meson
makedepends = ninja
makedepends = vulkan-headers
@@ -29,7 +28,7 @@ pkgbase = gtk4
depends = libxkbcommon
depends = libxrandr
depends = mesa
- depends = pango
+ depends = pango-git
depends = wayland
depends = wayland-protocols
depends = graphene
diff --git a/PKGBUILD b/PKGBUILD
index 8038b77fce57..947cad9d340b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gtk4
pkgver=3.99.2
-pkgrel=1
+pkgrel=2
pkgdesc="GObject-based multi-platform GUI toolkit"
arch=('i686' 'x86_64')
url="https://www.gtk.org/"
@@ -24,7 +24,7 @@ depends=('hicolor-icon-theme'
'libxkbcommon'
'libxrandr'
'mesa'
- 'pango'
+ 'pango-git'
'wayland'
'wayland-protocols'
'graphene'
@@ -36,7 +36,6 @@ depends=('hicolor-icon-theme'
'gdk-pixbuf2'
'gst-plugins-bad')
makedepends=('gobject-introspection'
- 'gtk-doc'
'meson'
'ninja'
'vulkan-headers'
@@ -67,6 +66,7 @@ build() {
--libdir=/usr/lib \
-Dbroadway-backend=true \
-Dvulkan=enabled \
+ -Dgtk_doc=false \
_build .
cd _build
@@ -93,4 +93,22 @@ package() {
rm -f "$pkgdir/usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml"
rm -f "$pkgdir/usr/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml"
rm -f "$pkgdir/usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml"
+
+ # Remove conflicts with gtk-doc
+ rm -f "$pkgdir/usr/bin/gtkdoc-check"
+ rm -f "$pkgdir/usr/bin/gtkdoc-depscan"
+ rm -f "$pkgdir/usr/bin/gtkdoc-fixxref"
+ rm -f "$pkgdir/usr/bin/gtkdoc-mkdb"
+ rm -f "$pkgdir/usr/bin/gtkdoc-mkhtml"
+ rm -f "$pkgdir/usr/bin/gtkdoc-mkhtml2"
+ rm -f "$pkgdir/usr/bin/gtkdoc-mkman"
+ rm -f "$pkgdir/usr/bin/gtkdoc-mkpdf"
+ rm -f "$pkgdir/usr/bin/gtkdoc-rebase"
+ rm -f "$pkgdir/usr/bin/gtkdoc-scan"
+ rm -f "$pkgdir/usr/bin/gtkdoc-scangobj"
+ rm -f "$pkgdir/usr/bin/gtkdocize"
+ rm -f "$pkgdir/usr/share/aclocal/gtk-doc.m4"
+ rm -rf "$pkgdir/usr/share/cmake/GtkDoc"
+ rm -rf "$pkgdir/usr/share/gtk-doc"
+ rm -f "$pkgdir/usr/share/pkgconfig/gtk-doc.pc"
}