gtkmm3: upgrade 3.24.2 -> 3.24.3

Moved to meson build

3.24.3 (stable):

The tarball for 3.24.3 has been created with 'meson dist'.
If you build with Autotools from the tarball, please read the relevant
part of the README file.

Gtk:
* Actionable::get_action_target_value(): Fix ref count
  (Kjell Ahlstedt)

Documentation:
* Improve the documentation of Gtk::Application::add_window()
  and Gtk::Window::set_application()
  (Kjell Ahlstedt) Issue #56 (Daniel Boles)
* Gtk::Button::set_image(): Fix the documentation
  (Daniel Boles) Issue #58, merge request !22
* Gtk::TreeView::append_column(): Add code example
  (Pavlo Solntsev) Merge request !21
* README: Add instructions for building gtkmm
  (Kjell Ahlstedt)
* Explain key values
  (Kjell Ahlstedt) Issue #6 (Mark Vender)

Demos:
* Don't use C++14 auto deduction
  (Daniel Boles)
* Update the GLArea demo (similar to updates in gtk+)
  (Kjell Ahlstedt)
* GLArea demo: Fix a crash
  (Kjell Ahlstedt) Issue #63 (Gerlof Fokkema)

Tests:
* Builder test: Test derived props declared in C++
  (Daniel Boles) Merge request !23

Build:
* Improve NMake support
  (Chun-wei Fan)
* Fix Autotools build with X11 backend disabled (--enable-x11-backend=no)
  (Kjell Ahlstedt)
* Use __declspec(dllexport) when building with Visual Studio
  (Chun-wei Fan) Merge request !25
* Add support for building gtkmm with Meson
  (Chun-wei Fan, Kjell Ahlstedt) Merge request !24, !26
* docs/reference/: Update for Doxygen >= 1.8.16
  (Kjell Ahlstedt)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller 2021-02-10 21:55:38 +01:00 committed by Khem Raj
parent d9ad178c12
commit 94de45a02c
2 changed files with 5 additions and 56 deletions

View File

@ -1,51 +0,0 @@
From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 31 Mar 2018 22:29:16 +0200
Subject: [PATCH] do not build demos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
They are not installed anyway and add libepoxy dependency
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.am | 3 ++-
configure.ac | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 984b6a7..6c754a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,8 @@ doc_subdirs = docs
else
doc_subdirs =
endif
-SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs)
+
+SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs)
gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME)
gdkmm_include_HEADERS = gdk/gdkmm.h
diff --git a/configure.ac b/configure.ac
index e5e82dc..c1c7658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno],
[GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"])
AC_SUBST([GTKMM_MODULES])
-AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2'])
-
PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES])
PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES])
-PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES])
MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
--
2.14.3

View File

@ -6,18 +6,18 @@ LICENSE = "LGPLv2.1 & GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm"
DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm"
BPN = "gtkmm"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase features_check
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b"
SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3"
SRC_URI += "file://0001-do-not-build-demos.patch"
SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435"
EXTRA_OECONF = " --disable-documentation "
EXTRA_OEMESON = "-Dbuild-demos=false"
FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"