From acf4e650beb08db64c5e197eaf9cadff0ce1ef0c Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 5 Mar 2023 16:50:52 +0100 Subject: [PATCH] gtk4: always build introspection, made gst-plugins-bad optional --- gtk4/.footprint | 12 ++++++++++-- gtk4/.signature | 6 +++--- gtk4/Pkgfile | 11 ++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/gtk4/.footprint b/gtk4/.footprint index 3fb5e2427..6a9dd1f9e 100644 --- a/gtk4/.footprint +++ b/gtk4/.footprint @@ -384,10 +384,13 @@ drwxr-xr-x root/root usr/include/gtk-4.0/unix-print/gtk/ -rw-r--r-- root/root usr/include/gtk-4.0/unix-print/gtk/gtkunixprint-autocleanups.h -rw-r--r-- root/root usr/include/gtk-4.0/unix-print/gtk/gtkunixprint.h drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/girepository-1.0/ +-rw-r--r-- root/root usr/lib/girepository-1.0/Gdk-4.0.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/GdkX11-4.0.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/Gsk-4.0.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/Gtk-4.0.typelib drwxr-xr-x root/root usr/lib/gtk-4.0/ drwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/ -drwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/media/ --rwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/media/libmedia-gstreamer.so drwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/printbackends/ -rwxr-xr-x root/root usr/lib/gtk-4.0/4.0.0/printbackends/libprintbackend-file.so lrwxrwxrwx root/root usr/lib/libgtk-4.so -> libgtk-4.so.1 @@ -403,6 +406,11 @@ drwxr-xr-x root/root usr/share/gettext/ drwxr-xr-x root/root usr/share/gettext/its/ -rw-r--r-- root/root usr/share/gettext/its/gtk4builder.its -rw-r--r-- root/root usr/share/gettext/its/gtk4builder.loc +drwxr-xr-x root/root usr/share/gir-1.0/ +-rw-r--r-- root/root usr/share/gir-1.0/Gdk-4.0.gir +-rw-r--r-- root/root usr/share/gir-1.0/GdkX11-4.0.gir +-rw-r--r-- root/root usr/share/gir-1.0/Gsk-4.0.gir +-rw-r--r-- root/root usr/share/gir-1.0/Gtk-4.0.gir drwxr-xr-x root/root usr/share/glib-2.0/ drwxr-xr-x root/root usr/share/glib-2.0/schemas/ -rw-r--r-- root/root usr/share/glib-2.0/schemas/org.gtk.gtk4.Settings.ColorChooser.gschema.xml diff --git a/gtk4/.signature b/gtk4/.signature index 0b61ff976..db73a69e7 100644 --- a/gtk4/.signature +++ b/gtk4/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wl1PqU7thGZ8Q4qTUx/ONZ4D6oCaI1lhcckIUUsaKvR+ApK1w4B7cHtMxKCN1jL6wg3IiFzpuHVN7GbcZjYDQ0= -SHA256 (Pkgfile) = f7a71b942cb03bb8679aa4a7c7e565ce6ad43bb1686c7b577162f7a01efc5760 -SHA256 (.footprint) = 3a548e8a527f510d1c8046c44682e94f8849b7d3443a4f8fbf4425d429e9ec9e +RWSagIOpLGJF37J9UXkHrx9Nq5kY0/UsFPqXFlmSSTvsWNj04M7KpYIXM0xuc7cZG9oGyaTwvsuceQO+iYyE6grUZwvShuDjTAE= +SHA256 (Pkgfile) = 1eeaa1f95f5453f6288f488bbd2ef7858a5f22edfa3106fb6535d0c917c2f1ac +SHA256 (.footprint) = 21ec925b44098a28f6ef1bb9685329e156f643664a4e36ee7399334ddfb3a31e SHA256 (gtk-4.10.0.tar.bz2) = 727a977ce7c67929ac92a00094345e55308fefb10d9d078e5d5615134ce3cd51 diff --git a/gtk4/Pkgfile b/gtk4/Pkgfile index 719dcd415..f298bd39e 100644 --- a/gtk4/Pkgfile +++ b/gtk4/Pkgfile @@ -1,16 +1,19 @@ # Description: A multi-platform toolkit for creating graphical user interfaces, version 4 # URL: https://www.gtk.org/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: adwaita-icon-theme docbook-xsl graphene gst-plugins-bad libxkbcommon sassc xorg-libxcursor xorg-libxinerama -# Optional: colord cups vulkan wayland-protocols +# Depends on: adwaita-icon-theme docbook-xsl graphene libxkbcommon sassc xorg-libxcursor xorg-libxinerama +# Optional: colord cups gst-plugins-bad wayland-protocols name=gtk4 version=4.10.0 -release=1 +release=2 source=(https://gitlab.gnome.org/GNOME/gtk/-/archive/$version/gtk-$version.tar.bz2) build() { prt-get isinst colord && PKGMK_GTK4+=' -D colord=enabled' + ## ffmpeg is experimental + #prt-get isinst ffmpeg || PKGMK_GTK4+=' -D ffmpeg=disabled' + prt-get isinst gst-plugins-bad || PKGMK_GTK4+=' -D media-gstreamer=disabled' prt-get isinst wayland-protocols || PKGMK_GTK4+=' -D wayland-backend=false' # manpages need rst2man, which we don't have @@ -21,8 +24,10 @@ build() { -D b_lto=true \ -D b_pie=true \ -D broadway-backend=true \ + -D introspection=enabled \ -D man-pages=false \ -D build-tests=false \ + -D build-testsuite=false \ -D build-examples=false \ -D demos=false meson compile -C build