summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Logan Rathbone <poprocks@gmail.com>2023-01-25 18:15:31 -0500
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2023-01-28 08:23:08 +0700
commit07da5c3ea99fad926bf218abc6e23a97615e8bc6 (patch)
tree61aaf6b44a62beb4fc4c5b74128b3f4b04db60d1
parentdbc4be0a4a23f1b647a964dbe4333172d44c00e5 (diff)
downloadslackbuilds-07da5c3ea99fad926bf218abc6e23a97615e8bc6.tar.gz
slackbuilds-07da5c3ea99fad926bf218abc6e23a97615e8bc6.tar.xz
libraries/libadwaita: Patch usage of nonexistent property on gtk4.4
Also update README. libadwaita 1.2.x will be the end of the line for Slackware 15.0 in SBo. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/libadwaita/README12
-rw-r--r--libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch15
-rw-r--r--libraries/libadwaita/libadwaita.SlackBuild3
3 files changed, 26 insertions, 4 deletions
diff --git a/libraries/libadwaita/README b/libraries/libadwaita/README
index 4ea2fa7ae1..82c462be4e 100644
--- a/libraries/libadwaita/README
+++ b/libraries/libadwaita/README
@@ -9,16 +9,22 @@ preference.
NOTE:
This version of libadwaita for Slackware 15.0 has been patched to
support GTK 4.4. libadwaita upstream advertises its minimum version as
-4.5, although it does not use any C API that is not provided by version
+4.6, although it does not use any C API that is not provided by version
4.4. However, according to the libadwaita git logs, it libadwaita relies
-on some fixes from GTK 4.5+ to work 100% correctly. I have found
+on some fixes from GTK 4.6+ to work 100% correctly. I have found
libadwaita to work perfectly reasonably with GTK 4.4. Adding one patch
to suppress a CSS runtime warning, the only issue I have run into is
that some fonts may render as larger than the developers have intended,
and window widths and heights are slightly larger as well.
+As well, starting with libadwaita 1.2, more GObject properties are
+starting to get used that only exist on GTK >= 4.6. I have patched out
+one such usage that I have observed. However, continuing to patch
+libadwaita will not be maintainable in the long run. For that reason,
+libadwaita 1.2.x will be the end of the line for Slackware 15.0.
+
If you wish to use libadwaita as fully intended by the developers, you
-can build a local copy of GTK 4 >= 4.5 on your system.
+can build a local copy of GTK 4 >= 4.6 on your system.
Build options:
diff --git a/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch b/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch
new file mode 100644
index 0000000000..4b1f004b9a
--- /dev/null
+++ b/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch
@@ -0,0 +1,15 @@
+diff -Naur libadwaita-1.2.0/src/adw-message-dialog.ui libadwaita-1.2.0.new/src/adw-message-dialog.ui
+--- libadwaita-1.2.0/src/adw-message-dialog.ui 2022-09-14 20:41:34.000000000 -0400
++++ libadwaita-1.2.0.new/src/adw-message-dialog.ui 2023-01-25 18:00:34.228428374 -0500
+@@ -5,11 +5,6 @@
+ <style>
+ <class name="messagedialog"/>
+ </style>
+- <property name="titlebar">
+- <object class="GtkBox">
+- <property name="visible">False</property>
+- </object>
+- </property>
+ <property name="child">
+ <object class="GtkWindowHandle">
+ <property name="child">
diff --git a/libraries/libadwaita/libadwaita.SlackBuild b/libraries/libadwaita/libadwaita.SlackBuild
index 3eaa5cbe94..3f0441b401 100644
--- a/libraries/libadwaita/libadwaita.SlackBuild
+++ b/libraries/libadwaita/libadwaita.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=libadwaita
VERSION=${VERSION:-1.2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -73,6 +73,7 @@ cd $PRGNAM-$VERSION
patch -p1 < $CWD/libadwaita-1.0.5-support-gtk-4.4.patch
patch -p1 < $CWD/libadwaita-1.0.5-suppress-line-break-warnings.patch
+patch -p1 < $CWD/libadwaita-1.2.0-dont-use-titlebar-property.patch
chown -R root:root .
find -L . \