From abd122df8870baef6cd30cfe58121be95f023f81 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Sun, 5 Mar 2023 21:27:37 +0530 Subject: [PATCH] Removed gtk/gtk-sharp and updated gtk build list Upgraded gtk/libexiv2 to 0.14.0 Upgraded gtk/pango to 1.50.3 Upgraded gtk/pangomm to 2.46.3 Replaced http with https in the URL in some gtk build files --- gtk/gegl/gegl.SMBuild | 35 +++++++++++++---------------- gtk/gegl/libraw-0.21.patch | 13 +++++++++++ gtk/gtkspell/gtkspell.SMBuild | 4 ++-- gtk/libcanberra/libcanberra.SMBuild | 4 ++-- gtk/libgexiv2/libgexiv2.SMBuild | 19 ++++++++-------- gtk/pango/CVE-2019-1010238.patch | 34 ---------------------------- gtk/pango/pango.SMBuild | 28 +++++++++-------------- gtk/pangomm/pangomm.SMBuild | 21 ++++++++--------- 8 files changed, 63 insertions(+), 95 deletions(-) create mode 100644 gtk/gegl/libraw-0.21.patch delete mode 100644 gtk/pango/CVE-2019-1010238.patch diff --git a/gtk/gegl/gegl.SMBuild b/gtk/gegl/gegl.SMBuild index 862f416..17afafe 100755 --- a/gtk/gegl/gegl.SMBuild +++ b/gtk/gegl/gegl.SMBuild @@ -1,8 +1,8 @@ app=gegl -version=0.2.2 -build=1sml +version=0.4.40 +build=2sml homepage="https://www.gegl.org/" -download="https://download.gimp.org/pub/gegl/0.2/gegl-$version.tar.bz2" +download="https://slackware.uk/slackware/slackware64-current/source/l/gegl/gegl-$version.tar.xz" desc="Graph based image processing framework" requires="json-glib gobject-introspection babl lcms2" @@ -14,26 +14,23 @@ build() { cd $app-$version fixbuilddirpermissions - ac_cv_prog_RUBY=no \ - ./configure \ - --prefix="" \ - --without-sdl \ - --disable-docs \ - --disable-glibtest \ - --disable-nls \ - --without-vala \ - --without-lua \ - --disable-silent-rules \ - --without-libavformat + applypatch $srcdir/libraw-0.21.patch - make - make install DESTDIR=$pkg - - cp COPYING* $pkgdocs/ + mkdir smbuild && cd smbuild + meson .. \ + --prefix="/" \ + -Ddocs=false \ + -Dvapigen=disabled \ + -Dintrospection=false + + ninja + DESTDIR="$pkg" ninja install + + cp ../COPYING* $pkgdocs/ mkfinalpkg } sha512sums=" -2da32f5abba1a7fdc658a1a1d9d854a1e4b5e80e2a189842aed3e68d8d1412c2fe4b1a81cdd143c8154ba9fbecc1b855dc812ae39d5f1845078819b54919d892 gegl-0.2.2.tar.lz +8e61dae55928fce8c3b5af078329fdffa7b506e7badcbf2e49eb3e37348241cb0491a0dc1b08f006506040080590065c5387a68c04be3cb79d15983e5229fd77 gegl-0.4.40.tar.lz " diff --git a/gtk/gegl/libraw-0.21.patch b/gtk/gegl/libraw-0.21.patch new file mode 100644 index 0000000..bdea8d6 --- /dev/null +++ b/gtk/gegl/libraw-0.21.patch @@ -0,0 +1,13 @@ +diff --git a/operations/external/raw-load.c b/operations/external/raw-load.c +index 13eb661..0a3cc47 100644 +--- a/operations/external/raw-load.c ++++ b/operations/external/raw-load.c +@@ -114,7 +114,7 @@ prepare (GeglOperation *operation) + g_warning ("raw-load: Error Initializing raw library"); + else + { +- p->LibRaw->params.shot_select = o->image_num; ++ p->LibRaw->rawparams.shot_select = o->image_num; + + p->LibRaw->params.aber[0] = 1.0; + p->LibRaw->params.aber[2] = 1.0; diff --git a/gtk/gtkspell/gtkspell.SMBuild b/gtk/gtkspell/gtkspell.SMBuild index a221277..7211249 100755 --- a/gtk/gtkspell/gtkspell.SMBuild +++ b/gtk/gtkspell/gtkspell.SMBuild @@ -1,8 +1,8 @@ app=gtkspell version=2.0.16 build=1sml -homepage="http://gtkspell.sourceforge.net/" -download="http://gtkspell.sourceforge.net/download/gtkspell-$version.tar.gz" +homepage="https://gtkspell.sourceforge.net/" +download="https://gtkspell.sourceforge.net/download/gtkspell-$version.tar.gz" desc="Provides word-processor-style misspelling highlighting and replacement library for Gtk apps" requires="intltool enchant gtk2" diff --git a/gtk/libcanberra/libcanberra.SMBuild b/gtk/libcanberra/libcanberra.SMBuild index c22c9ad..b21fab1 100755 --- a/gtk/libcanberra/libcanberra.SMBuild +++ b/gtk/libcanberra/libcanberra.SMBuild @@ -1,8 +1,8 @@ app=libcanberra version=0.30 build=1sml -homepage="http://0pointer.de/lennart/projects/libcanberra/" -download="http://0pointer.de/lennart/projects/libcanberra/libcanberra-$version.tar.xz" +homepage="https://0pointer.de/lennart/projects/libcanberra/" +download="https://0pointer.de/lennart/projects/libcanberra/libcanberra-$version.tar.xz" desc="A small and lightweight implementation of the XDG Sound Theme Specification" requires="alsa-lib libtool libvorbis gtk2 gtk3" diff --git a/gtk/libgexiv2/libgexiv2.SMBuild b/gtk/libgexiv2/libgexiv2.SMBuild index ea21538..10e4304 100755 --- a/gtk/libgexiv2/libgexiv2.SMBuild +++ b/gtk/libgexiv2/libgexiv2.SMBuild @@ -1,8 +1,8 @@ app=libgexiv2 -version=0.10.3 +version=0.14.0 build=1sml homepage="https://wiki.gnome.org/Projects/gexiv2" -download="https://gitlab.gnome.org/GNOME/gexiv2/-/archive/gexiv2-$version/gexiv2-gexiv2-$version.tar.bz2" +download="https://slackware.uk/slackware/slackware-15.0/source/l/gexiv2/gexiv2-$version.tar.xz" desc="GObject wrapper around Exiv2 library" requires="exiv2 glib gobject-introspection vala" @@ -14,16 +14,17 @@ build() { cd gexiv2-$version fixbuilddirpermissions - ./configure \ - --prefix="" + mkdir smbuild && cd smbuild + meson .. \ + --prefix="/" - make - make install DESTDIR=$pkg + ninja + DESTDIR="$pkg" ninja install - cp COPYING $pkgdocs/ + cp ../COPYING $pkgdocs/ mkfinalpkg } sha512sums=" -05bef568b70238c8be209737de39a660f36f8b6b4ae5766503c28c58befb87d163190d91dc832a1f3bceb690c50eadac95e5c77ec39eee939ae8b9451141e076 gexiv2-0.10.3.tar.lz -" +d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50 gexiv2-0.14.0.tar.xz +" \ No newline at end of file diff --git a/gtk/pango/CVE-2019-1010238.patch b/gtk/pango/CVE-2019-1010238.patch deleted file mode 100644 index cc65b3d..0000000 --- a/gtk/pango/CVE-2019-1010238.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Wed, 10 Jul 2019 20:26:23 -0400 -Subject: [PATCH] bidi: Be safer against bad input - -Don't run off the end of an array that we -allocated to certain length. - -Closes: https://gitlab.gnome.org/GNOME/pango/issues/342 ---- - pango/pango-bidi-type.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c -index 3e46b66c..5c02dbbb 100644 ---- a/pango/pango-bidi-type.c -+++ b/pango/pango-bidi-type.c -@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar *text, - for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) - { - gunichar ch = g_utf8_get_char (p); -- FriBidiCharType char_type; -- char_type = fribidi_get_bidi_type (ch); -+ FriBidiCharType char_type = fribidi_get_bidi_type (ch); -+ -+ if (i == n_chars) -+ break; -+ - bidi_types[i] = char_type; - ored_types |= char_type; - if (FRIBIDI_IS_STRONG (char_type)) --- -2.22.0 - diff --git a/gtk/pango/pango.SMBuild b/gtk/pango/pango.SMBuild index 54da4df..3f91d50 100755 --- a/gtk/pango/pango.SMBuild +++ b/gtk/pango/pango.SMBuild @@ -1,8 +1,8 @@ app=pango -version=1.42.4 +version=1.50.3 build=1sml homepage="https://www.pango.org/" -download="https://download.gnome.org/sources/pango/1.42/pango-$version.tar.xz" +download="https://download.gnome.org/sources/pango/1.50/pango-$version.tar.xz" desc="A library for layout and rendering of text" requires="fribidi libxft harfbuzz" @@ -14,26 +14,20 @@ build() { cd $app-$version fixbuilddirpermissions - applypatch $srcdir/CVE-2019-1010238.patch + mkdir -p smbuild && cd smbuild + meson .. \ + --prefix="/" \ + -Dintrospection=enabled \ + -Dgtk_doc=false - touch pango/s-enum-types-h - touch pango/s-enum-types-c + ninja + DESTDIR="$pkg" ninja install - printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in - - FREETYPE_LIBS=-lfreetype - ./configure \ - --prefix="" - - make - make install DESTDIR=$pkg - - cp COPYING $pkgdocs/ + cp ../COPYING $pkgdocs mkfinalpkg } sha512sums=" -82f160c26cb096697d69f05fe9d9e1f5887c9aecd33c8949af41e2aabe144956c0551f8b5ad2b148a416774c14cf701bada82c72c49c35eec4ca531218c6c1ea pango-1.42.4.tar.lz -d11af8e56c59286f998d136d795d9ed22bea96b7dfaf4e02fe294ab0b147606ecb43ddfbd8caaa0eee1ee27b5a2f5c5a6f6f7a0b3193750649cf6b121cb6de50 CVE-2019-1010238.patch +6b31690ce9746b47fd8ea2f30f26c242d85cc836c812dba273a4d3e43df5484e7b3450b11de019136781dfd3dcac41f1e34189324e4700583eec1fb757763d33 pango-1.50.3.tar.xz " diff --git a/gtk/pangomm/pangomm.SMBuild b/gtk/pangomm/pangomm.SMBuild index 9e41470..e10af09 100755 --- a/gtk/pangomm/pangomm.SMBuild +++ b/gtk/pangomm/pangomm.SMBuild @@ -1,5 +1,5 @@ app=pangomm -version=2.38.1 +version=2.46.3 build=1sml homepage="https://gtkmm.org" download="https://gitlab.gnome.org/GNOME/pangomm/-/archive/$version/pangomm-$version.tar.bz2" @@ -14,21 +14,18 @@ build() { cd $app-$version fixbuilddirpermissions - ./configure \ - --prefix="" + mkdir -p smbuild && cd smbuild + meson .. \ + --prefix="/" - for i in docs ; do - printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile - done + ninja + DESTDIR="$pkg" ninja install - make - make install DESTDIR=$pkg - - cp COPYING* $pkgdocs/ + cp ../COPYING* $pkgdocs/ mkfinalpkg } sha512sums=" -386f702f97be35bb5567bff3e61a6f9d1091487e40b8fbf245b5bcd593914ce2ce191775dc2171d877b29b3f994d9b7428ae992af127b6b6d8bb768c65d0d4cf pangomm-2.38.1.tar.lz -" +2a817b125e32daaf2bede971ffb5718e344bc140c8f86c6f66a143132679a77640fa9182c78c24ddb3207c6cc1b21d75d838c131bcfcec96673a0e496ca3f8b7 pangomm-2.46.3.tar.lz +" \ No newline at end of file