diff --git a/gtk/.buildlist.gtk b/gtk/.buildlist.gtk index 448a393..ee52e17 100644 --- a/gtk/.buildlist.gtk +++ b/gtk/.buildlist.gtk @@ -15,10 +15,8 @@ gegl libgsf librsvg wv -fltk gtk3 gnome-desktop -dconf-editor libnotify libcanberra dbus-glib @@ -37,27 +35,13 @@ openjpeg libgd gnome-themes-extra clearlooks-phenix-theme -gst-plugins-base -gst-plugins-good -gst-plugins-bad gnome-icon-theme libsigcpp -glibmm -cairomm -pangomm -atkmm -gtkmm2 -gtkmm3 libraqm -gtksourceview gspell -gcr -rest -libunique +py3cairo pygobject3 libgexiv2 libgphoto2 -py3cairo libmanette libportal -libdazzle diff --git a/gtk/atkmm/atkmm.SMBuild b/gtk/atkmm/atkmm.SMBuild deleted file mode 100755 index f3ed05e..0000000 --- a/gtk/atkmm/atkmm.SMBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: PktSurf -app=atkmm -version=2.24.3 -build=1sml -homepage="https://www.gtkmm.org/" -download="https://gitlab.gnome.org/GNOME/atkmm/-/archive/$version/atkmm-$version.tar.bz2" -desc="C++ bindings for ATK" -requires="perl atk glibmm" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions -} - -build() { - ./configure \ - --prefix="" \ - --disable-documentation - - make - make install DESTDIR=$pkg - - cp COPYING* $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -fcf1ab1e6e1e869e0bafca5c865b6fb2f94f4dc288d102631e00247655726b45204e9c2e37f4df001b5db298fc58dc592b4804f3499a346a7071f8f5c95a6b66 atkmm-2.24.3.tar.lz -" diff --git a/gtk/babl/babl.SMBuild b/gtk/babl/babl.SMBuild index 20cf6c8..a911b72 100755 --- a/gtk/babl/babl.SMBuild +++ b/gtk/babl/babl.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=babl -version=0.1.78 +version=0.1.106 build=1sml homepage="https://gegl.org/babl/" download="https://download.gimp.org/pub/babl/0.1/babl-$version.tar.xz" @@ -18,11 +18,11 @@ prepbuilddir() { build() { # Fix when building with meson 0.63.2 - sed -i 's@Description@description@' meson.build + #sed -i 's@Description@description@' meson.build mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ -Denable-vapi=false \ -Dwith-docs=false @@ -35,5 +35,5 @@ build() { } sha512sums=" -0a2c113fc5cfea807f9c5772987e5c1f55b068f6af4dcac2513f214873ede71a7b44cb4e3765c5187f4ac8b34984b1b125b44ee2e4ec6e3545e2a2b9524b11f1 babl-0.1.78.tar.lz -" +2a32332bc19f920481518fde381247cdc83c7535dd8322292d89332f1e8d496bfe7858edfdd33e9b55e1730e2d8367fa56f243254a6c8732b8e79892523e3e02 babl-0.1.106.tar.lz +" \ No newline at end of file diff --git a/gtk/cairo/CVE-2018-19876.patch b/gtk/cairo/CVE-2018-19876.patch deleted file mode 100644 index 33731e4..0000000 --- a/gtk/cairo/CVE-2018-19876.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.21.0 - diff --git a/gtk/cairo/cairo.SMBuild b/gtk/cairo/cairo.SMBuild index e6a26e0..e068c72 100755 --- a/gtk/cairo/cairo.SMBuild +++ b/gtk/cairo/cairo.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=cairo -version=1.16.0 +version=1.17.6 build=1sml homepage="https://cairographics.org/" download="https://cairographics.org/releases/cairo-$version.tar.xz" @@ -14,16 +14,11 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - - applypatch $srcdir/CVE-2018-19876.patch - applypatch $srcdir/musl-stacksize.patch - - autoreconf -vif } build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make @@ -35,7 +30,5 @@ build() { } sha512sums=" -5b2f4c66622e71d68567e8cc52128961d6a2eee0c61ab56919a73c2357bf6c2fd93caec73c00ab971405a21618259c2dea276822e494fb8f43ee081586f25135 cairo-1.16.0.tar.lz -9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch -86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch +329f1492b4c1e9aae23eaffe87dae817bfac213211aef5863ae78c50fbe2ffb235fa6fdcd1bdad58d9d37e924a504d8c21ceb10da15c6098dd3096bf781fe051 cairo-1.17.6.tar.lz " diff --git a/gtk/cairo/musl-stacksize.patch b/gtk/cairo/musl-stacksize.patch deleted file mode 100644 index d10469e..0000000 --- a/gtk/cairo/musl-stacksize.patch +++ /dev/null @@ -1,23 +0,0 @@ -Reduce the footprint of stack frame usage by turning -some large(r) structures as `static __thread` instead. - ---- a/src/cairo-rectangular-scan-converter.c 2015-10-27 22:04:21.000000000 +0100 -+++ b/src/cairo-rectangular-scan-converter.c 2016-05-07 04:25:26.640851782 +0200 -@@ -489,7 +489,7 @@ - cairo_span_renderer_t *renderer, - rectangle_t **rectangles) - { -- sweep_line_t sweep_line; -+ static __thread sweep_line_t sweep_line; - rectangle_t *start, *stop; - cairo_status_t status; - -@@ -656,7 +656,7 @@ - cairo_span_renderer_t *renderer) - { - cairo_rectangular_scan_converter_t *self = converter; -- rectangle_t *rectangles_stack[CAIRO_STACK_ARRAY_LENGTH (rectangle_t *)]; -+ static __thread rectangle_t *rectangles_stack[CAIRO_STACK_ARRAY_LENGTH (rectangle_t *)]; - rectangle_t **rectangles; - struct _cairo_rectangular_scan_converter_chunk *chunk; - cairo_status_t status; diff --git a/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild b/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild index 6f248e3..bb3c2c7 100755 --- a/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild +++ b/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=gdk-pixbuf -version=2.40.0 +version=2.42.10 build=1sml homepage="https://wiki.gnome.org/Projects/GdkPixbuf" download="https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/$version/gdk-pixbuf-$version.tar.bz2" @@ -19,9 +19,10 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ -Dman=false \ - -Dinstalled_tests=false + -Dinstalled_tests=false \ + --wrap-mode=nofallback ninja DESTDIR="$pkg" ninja install @@ -32,5 +33,5 @@ build() { } sha512sums=" -e5717f2d22ffe32e3f282552d183d6a3f2a49bc0fe305a8fe9cb359ef0ccfe7b0a1c2c1d892305dca1aa2d3f2e30220eecac3ba556565ca612e083ed098cb216 gdk-pixbuf-2.40.0.tar.lz +648a056a54a7a3aea0929ad70f9489dac059e9777f6679488f68e80bda65bdc19c276c3fc7870f9008a583b33690b5dc155d07ec22b2946c9f0cb08cd3db3672 gdk-pixbuf-2.42.10.tar.lz " diff --git a/gtk/gegl/gegl.SMBuild b/gtk/gegl/gegl.SMBuild index ebed21c..06ab9d4 100755 --- a/gtk/gegl/gegl.SMBuild +++ b/gtk/gegl/gegl.SMBuild @@ -1,9 +1,9 @@ # Maintainer: PktSurf app=gegl -version=0.4.40 -build=2sml +version=0.4.44 +build=1sml homepage="https://www.gegl.org/" -download="https://slackware.uk/slackware/slackware64-current/source/l/gegl/gegl-$version.tar.xz" +download="https://download.gimp.org/pub/gegl/0.2/gegl-0.2.2.tar.bz2" desc="Graph based image processing framework" requires="json-glib gobject-introspection babl lcms2" @@ -14,26 +14,23 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions - - applypatch $srcdir/libraw-0.21.patch } build() { mkdir -p smbuild && cd smbuild - meson .. \ - --prefix="/" \ + meson .. --prefix=/ \ -Ddocs=false \ -Dvapigen=disabled \ - -Dintrospection=false + -Dparallel-tests=false ninja DESTDIR="$pkg" ninja install - + cp ../COPYING* $pkgdocs/ mkfinalpkg } sha512sums=" -8e61dae55928fce8c3b5af078329fdffa7b506e7badcbf2e49eb3e37348241cb0491a0dc1b08f006506040080590065c5387a68c04be3cb79d15983e5229fd77 gegl-0.4.40.tar.lz +2cdfd804abe9022959381cc46fb9f4c1e2f3f0ac8506547adde88a44988950a7ef543c68e79349cd88d6f9edd477fe0e0faa03cfb3dec224a9100eadc6fed71e gegl-0.4.44.tar.lz " diff --git a/gtk/gegl/libraw-0.21.patch b/gtk/gegl/libraw-0.21.patch deleted file mode 100644 index bdea8d6..0000000 --- a/gtk/gegl/libraw-0.21.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/glib-networking/glib-networking.SMBuild b/gtk/glib-networking/glib-networking.SMBuild index 81a2e3a..6bfde8a 100755 --- a/gtk/glib-networking/glib-networking.SMBuild +++ b/gtk/glib-networking/glib-networking.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=glib-networking -version=2.46.1 +version=2.76.0 build=1sml homepage="https://gitlab.gnome.org/GNOME/glib-networking" download="https://gitlab.gnome.org/GNOME/glib-networking/-/archive/$version/glib-networking-$version.tar.bz2" @@ -17,17 +17,18 @@ prepbuilddir() { } build() { - ./configure \ - --prefix="" + mkdir -p smbuild && cd smbuild + meson .. --prefix=/ \ + -Dlibproxy=disabled - make - make install DESTDIR=$pkg + ninja + DESTDIR="$pkg" ninja install - cp COPYING $pkgdocs/ + cp ../COPYING $pkgdocs/ mkfinalpkg } sha512sums=" -bea5de10af83d68020dd9363622b5fb31ad077ee51f9f62187bdf3e6c8dbc2ade9bf466ad62109cbbcab4d95a67318fc6a38f19c2d19f2f6b018d3da0fa10dd6 glib-networking-2.46.1.tar.lz +412cb317605ad3074dcc45144ae41bb64bd3d67be12a910efb863bcb04dc18a0fafcbfb1b3c77cf21f121b2346246c3944e04cc67e9259bb12d3b5a8942f1c96 glib-networking-2.76.0.tar.lz " diff --git a/gtk/gnome-desktop/gnome-desktop.SMBuild b/gtk/gnome-desktop/gnome-desktop.SMBuild index 410effb..e4d29c1 100755 --- a/gtk/gnome-desktop/gnome-desktop.SMBuild +++ b/gtk/gnome-desktop/gnome-desktop.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=gnome-desktop -version=42.4 +version=44.0 build=1sml homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" download="https://gitlab.gnome.org/GNOME/gnome-desktop/-/archive/$version/gnome-desktop-$version.tar.bz2" @@ -19,8 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ - -Dgnome_distributor="SMLinux" \ + --prefix=/ \ -Dbuild_gtk4=false ninja @@ -32,5 +31,5 @@ build() { } sha512sums=" -49c0be1176b4f934ca5a3cc127b60b73265ca03c78feae05316f781e5f8efbe5a671f70e0b7b7158a3a0516741f800930b6bc696a6a62f26b3bb9ee1a44a0d17 gnome-desktop-42.4.tar.lz +131d5abace5949c42db3ab7b3fbc7476863758c72fdaaded98ac09983fd4f78598f6662d5aa49e82795bf9c76985e8456f4cc91c8e8de92826fc33af831e0d71 gnome-desktop-44.0.tar.lz " diff --git a/gtk/gobject-introspection/gobject-introspection.SMBuild b/gtk/gobject-introspection/gobject-introspection.SMBuild index 0adfa1c..22e55e2 100755 --- a/gtk/gobject-introspection/gobject-introspection.SMBuild +++ b/gtk/gobject-introspection/gobject-introspection.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=gobject-introspection -version=1.72.1 +version=1.76.1 build=1sml homepage="https://wiki.gnome.org/Projects/GObjectIntrospection" download="https://gitlab.gnome.org/GNOME/gobject-introspection/-/archive/$version/gobject-introspection-$version.tar.bz2" @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ --buildtype=release ninja @@ -31,5 +31,5 @@ build() { } sha512sums=" -245025444c03b0f698041c9d34a380087bec1e12da28d16bd5b7b616b15e54077a13aa11bcbcba85f95f3252d4ab5bae62cb94c1c44e79061ce236e3703c5f27 gobject-introspection-1.72.1.tar.lz -" +d5f0d2467f679a098d51f770aeb607a800969e3144de9ab61de0d40955776d46c7545ea60d45eeeb54404c4ab5bec5238471c97405e5233cf2142e60bec2d381 gobject-introspection-1.76.1.tar.lz +" \ No newline at end of file diff --git a/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild b/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild index 330060a..0ad3904 100755 --- a/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild +++ b/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild @@ -1,9 +1,9 @@ # Maintainer: PktSurf app=gsettings-desktop-schemas -version=3.34.0 +version=44.0 build=1sml homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" -download="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/archive/$version/gsettings-desktop-schemas-$version.tar.bz2" +download="https://download.gnome.org/sources/gsettings-desktop-schemas/44/gsettings-desktop-schemas-$version.tar.xz" desc="Shared GSettings schemas for the desktop" requires="dconf gobject-introspection" @@ -21,7 +21,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" + --prefix=/ ninja DESTDIR="$pkg" ninja install @@ -32,5 +32,5 @@ build() { } sha512sums=" -e35c25484e7a0a03d38a864ed3cbc08054be41053248679ff02202f6305c40e05d4596ecfd071612118f30bc6700152888b1a97f4ecedfc978e521cc451bf0dd gsettings-desktop-schemas-3.34.0.tar.lz -" +f8ed90a4d85ba4444feacefecab1dbb7731a48fc4c20e5dcccbdc34674ed9ca7b2fa4b0bc696da0db13142d8bcf45ce2979e78e78b39cc8cf39e6a6cacf740a6 gsettings-desktop-schemas-44.0.tar.lz +" \ No newline at end of file diff --git a/gtk/gtk3/gtk3.SMBuild b/gtk/gtk3/gtk3.SMBuild index b98d49c..037332b 100755 --- a/gtk/gtk3/gtk3.SMBuild +++ b/gtk/gtk3/gtk3.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=gtk3 -version=3.24.13 +version=3.24.38 build=1sml homepage="https://gtk.org" download="https://gitlab.gnome.org/GNOME/gtk/-/archive/$version/gtk-$version.tar.bz2" @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ -Dgtk_doc=false \ -Dman=false \ -Dbroadway_backend=true \ @@ -40,5 +40,5 @@ build() { } sha512sums=" -739ea8c764d3afc52417cadc9b2f69965441325cd001694fedf63de9a4a80b90e6f2b82ea6a3b6255b6c4f842652cd6090f8896b724bd6d4b4d808870968be93 gtk+-3.24.13.tar.lz -" +1d2d05759614520b6d80f0992343c0c81811b712e36b6d9ec007ae2da9ff41785c9645902af8fc8b1825dd136720168a0fa4d7264c63b8826b866ba019b3de32 gtk+-3.24.38.tar.lz +" \ No newline at end of file diff --git a/gtk/harfbuzz/harfbuzz.SMBuild b/gtk/harfbuzz/harfbuzz.SMBuild index 6c35077..7729b79 100755 --- a/gtk/harfbuzz/harfbuzz.SMBuild +++ b/gtk/harfbuzz/harfbuzz.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=harfbuzz -version=7.1.0 +version=7.3.0 build=1sml homepage="https://www.freedesktop.org/wiki/Software/HarfBuzz" download="https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$version.tar.gz" @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ -Dgraphite2=enabled ninja @@ -31,5 +31,5 @@ build() { } sha512sums=" -1f5735dc79c4a395faa2798eaad941b964baabedcf40bcdd6e501464c6b411ceddbddc214a67ee798a4364b57e128a92ab8b2ac5e94286158999bb42ebdd1703 harfbuzz-7.1.0.tar.lz +29865c2d973f5251706cf428824ea30a6fc09086146afecca7ffd5927d2c0c9818639238249757bee064b4ddcc919d7b43bef058405811427b24e96fda94a789 harfbuzz-7.3.0.tar.lz " \ No newline at end of file diff --git a/gtk/libgsf/libgsf.SMBuild b/gtk/libgsf/libgsf.SMBuild index 39edae9..64d73f8 100755 --- a/gtk/libgsf/libgsf.SMBuild +++ b/gtk/libgsf/libgsf.SMBuild @@ -1,9 +1,9 @@ # Maintainer: PktSurf app=libgsf -version=1.14.45 -build=2sml +version=1.14.50 +build=1sml homepage="https://gitlab.gnome.org/GNOME/libgsf.git" -download="https://gitlab.gnome.org/GNOME/libgsf/-/archive/LIBGSF_1_14_45/libgsf-LIBGSF_1_14_45.tar.bz2" +download="https://download.gnome.org/sources/libgsf/1.14/libgsf-$version.tar.xz" desc="An extensible I/O abstraction library for dealing with structured file formats" requires="bzip2 libxml2 unzip perl-modules gdk-pixbuf xz" @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --with-bz2 @@ -35,5 +35,5 @@ build() { } sha512sums=" -78312e73771ca64375d713e9890b6492ea573d75a3742d4e1ca189fea4ff2292a597462137c11a3451205c99c661bab8cc59bd31a482d21eedb9e0a1be161b96 libgsf-1.14.45.tar.lz -" +179292acc75846e1e65a824f8b7c41ed4fdf558359bc9ef8f2ea9bb88e025678106acdf79a98acab9473a654396d280c5ddd7334e40c7ee450dcb1fd5aee80df libgsf-1.14.50.tar.lz +" \ No newline at end of file diff --git a/gtk/libnotify/libnotify.SMBuild b/gtk/libnotify/libnotify.SMBuild index 56da79e..03b9ae6 100755 --- a/gtk/libnotify/libnotify.SMBuild +++ b/gtk/libnotify/libnotify.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=libnotify -version=0.7.7 +version=0.8.2 build=1sml homepage="https://gitlab.gnome.org/GNOME/libnotify" download="https://gitlab.gnome.org/GNOME/libnotify/-/archive/$version/libnotify-$version.tar.bz2" @@ -17,22 +17,19 @@ prepbuilddir() { } build() { - ./configure \ - --prefix="" \ - --enable-static=no \ - --enable-shared=yes \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf + mkdir -p smbuild && cd smbuild + meson .. --prefix=/ \ + -Dgtk_doc=false \ + -Dman=false - make - make install DESTDIR=$pkg + ninja + DESTDIR="$pkg" ninja install - cp COPYING $pkgdocs/ + cp ../COPYING $pkgdocs/ mkfinalpkg } sha512sums=" -0765c5851742e54846fd0e12b4a8bcc045c5a5cfbcac70f07f62d91e40d480ca817223d1326dbd50d4ee1e3fb7abb31daacebff5bb233874765cca2d01370dc1 libnotify-0.7.7.tar.lz -" +630662c5a317e2a405e078d278299f69fb8faafcec75d1231adddc0072165e8ed36fe12ea9734762a80683e6e63c4cadc7933f2846a9b4ad567b6c03a9315493 libnotify-0.8.2.tar.lz +" \ No newline at end of file diff --git a/gtk/librsvg/librsvg.SMBuild b/gtk/librsvg/librsvg.SMBuild index f9aa963..43c47db 100755 --- a/gtk/librsvg/librsvg.SMBuild +++ b/gtk/librsvg/librsvg.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=librsvg -version=2.40.20 +version=2.56.1 build=1sml homepage="https://wiki.gnome.org/Projects/LibRsvg" download="https://download-fallback.gnome.org/sources/librsvg/2.40/librsvg-$version.tar.xz" @@ -18,13 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --disable-static \ - --disable-tools \ - --disable-gtk-doc-html - - touch s-enum-types-h - touch s-enum-types-c + --prefix= \ + --disable-static make make install DESTDIR=$pkg @@ -35,5 +30,5 @@ build() { } sha512sums=" -fea3cdd573d65ccb48a3477ad150689a88ebd408f29beb164d351c6bc1604b5882b9d780d6fc21a21621c92da9d119a31f8b82b48ce16587405c743a452270a7 librsvg-2.40.20.tar.lz +0370fd5b1ff8df83f9cbec3a7eef81a0768869b5cf23f3a9118bc00b8bd5ec106a985ca5ca0ff2dbaf4cb547e2b7f63ed2388b7c848c89def4cd8f5989565ffe librsvg-2.56.1.tar.lz " diff --git a/gtk/libwebp/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch b/gtk/libwebp/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch new file mode 100644 index 0000000..65c2cf7 --- /dev/null +++ b/gtk/libwebp/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch @@ -0,0 +1,52 @@ +From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Wed, 22 Feb 2023 22:15:47 -0800 +Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error + +This avoids a double free should the function fail prior to +VP8BitWriterInit() and a previous trial result's buffer carried over. +Previously in ApplyFiltersAndEncode() trial.bw (with a previous +iteration's buffer) would be freed, followed by best.bw pointing to the +same buffer. + +Since: +187d379d add a fallback to ALPHA_NO_COMPRESSION + +In addition, check the return value of VP8BitWriterInit() in this +function. + +Bug: webp:603 +Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 +--- + src/enc/alpha_enc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c +index f7c02690e3..7d205586fe 100644 +--- a/src/enc/alpha_enc.c ++++ b/src/enc/alpha_enc.c +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "src/enc/vp8i_enc.h" + #include "src/dsp/dsp.h" +@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + } + } else { + VP8LBitWriterWipeOut(&tmp_bw); ++ memset(&result->bw, 0, sizeof(result->bw)); + return 0; + } + } +@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + header = method | (filter << 2); + if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; + +- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); ++ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; + ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); + ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); + diff --git a/gtk/libwebp/libwebp.SMBuild b/gtk/libwebp/libwebp.SMBuild index 814dce9..d3709c9 100755 --- a/gtk/libwebp/libwebp.SMBuild +++ b/gtk/libwebp/libwebp.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=libwebp -version=1.1.0 +version=1.3.0 build=1sml homepage="https://developers.google.com/speed/webp/" download="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$version.tar.gz" @@ -14,23 +14,26 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions + applypatch $srcdir/a486d800b60d0af4cc0836bf7ed8f21e12974129.patch } build() { - ./configure \ - --prefix="" \ - --disable-static \ - --enable-everything \ - --enable-swap-16bit-csp + mkdir -p smbuild && cd smbuild + cmake .. \ + -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_LIBDIR="lib" \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_SKIP_INSTALL_RPATH=ON make make install DESTDIR=$pkg - cp COPYING $pkgdocs/ + cp ../COPYING $pkgdocs/ mkfinalpkg } sha512sums=" -5df747f059b0e92ea090ce08d74990944e6cd4d60afbbefa17528887ef805dea70bb4c16afabdaf72df7c71408117338f0e81cc389848675de3416d793757d37 libwebp-1.1.0.tar.lz +48e528d05b00ee6a5496867d66fc0265c78fd454b6c36d0b6a340fe8f126e48bc570acec026bebb65043e632381b789e75e6a1201066782e2418b3aec62104c6 libwebp-1.3.0.tar.lz +b1f592e0a7274b90cf031bd87ed296f6050a134d31b8eac9f3256e40e2e331c245fcfcbfbb592133ca060ec251ac707692d112a3439edac7d1c881b94c150906 a486d800b60d0af4cc0836bf7ed8f21e12974129.patch " diff --git a/gtk/pango/pango.SMBuild b/gtk/pango/pango.SMBuild index 28064ae..b861804 100755 --- a/gtk/pango/pango.SMBuild +++ b/gtk/pango/pango.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=pango -version=1.50.3 +version=1.50.14 build=1sml homepage="https://www.pango.org/" download="https://download.gnome.org/sources/pango/1.50/pango-$version.tar.xz" @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ -Dgtk_doc=false ninja @@ -31,5 +31,5 @@ build() { } sha512sums=" -45574a574fc435be092df488caad05bc0cf0d1ed1713548c4ee7d15a174c1656e2cede319bf49fc9beb9820bbfbaf59d36eb126ac9d69e13bce9d1f215944d80 pango-1.50.3.tar.lz -" +8177976f90cd2b684ee26f0ff470fa3e3e78cb84dea96a3f7f98c023410850ae38e1f581c383d3db9b7e97f9b194d8eb08ad5b878689abd862a3fe73b1d34910 pango-1.50.14.tar.lz +" \ No newline at end of file diff --git a/gtk/pinentry/pinentry.SMBuild b/gtk/pinentry/pinentry.SMBuild index b2e2b29..2c67655 100755 --- a/gtk/pinentry/pinentry.SMBuild +++ b/gtk/pinentry/pinentry.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=pinentry -version=1.1.0 +version=1.2.1 build=1sml homepage="https://gnupg.org/related_software/pinentry/" download="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-$version.tar.bz2" @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-pinentry-tty \ --disable-pinentry-qt5 @@ -31,5 +31,5 @@ build() { } sha512sums=" -a9de40224698761a064c3215e3112841f828eda67882298db13a437f80a93b765eeb52f95d7c1931a16a79f0148ac3c82a74a728eb09a2b14b7e533eaffccb98 pinentry-1.1.0.tar.lz +8998a1c137f1934213cdc52eda507bf8af7dcab2c717e9aa645370406e829982cba1f3f7b22f59832455a65977738a41015058cb7c2dc92f92d00d36b8a7e1ec pinentry-1.2.1.tar.lz " diff --git a/gtk/shared-mime-info/shared-mime-info.SMBuild b/gtk/shared-mime-info/shared-mime-info.SMBuild index 73cbc28..eacf502 100755 --- a/gtk/shared-mime-info/shared-mime-info.SMBuild +++ b/gtk/shared-mime-info/shared-mime-info.SMBuild @@ -1,9 +1,9 @@ # Maintainer: PktSurf app=shared-mime-info -version=1.7 -build=2sml +version=2.2 +build=1sml homepage="https://freedesktop.org/wiki/Software/shared-mime-info/" -download="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-1-7/shared-mime-info-Release-1-7.tar.bz2" +download="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-2-2/shared-mime-info-Release-2-2.tar.bz2" desc="Freedesktop.org Shared MIME Info" requires="glib libxml2 xmlto" @@ -17,26 +17,17 @@ prepbuilddir() { } build() { - ac_cv_func_fdatasync=no \ - ./configure \ - --prefix="" + mkdir -p smbuild && cd smbuild + meson .. --prefix=/ - mkdir -p .deps - touch .deps/update_mime_database-update-mime-database.Tpo + ninja + DESTDIR="$pkg" ninja install - sed -i 's@$(AM_V_at)$(am__mv) $(DEPDIR)/update_mime_database-update-mime-database.Tpo@#@' Makefile - for i in po ; do - printf 'check:\n\ttrue\n\nall:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n\n' > "$i"/Makefile - done - - make -j1 - make install DESTDIR=$pkg - - cp COPYING $pkgdocs/ + cp ../COPYING $pkgdocs/ mkfinalpkg } sha512sums=" -c9925bfb0f9d8dc7994a9b71a3a26540ae6c92ac549de46401d8399306a380e8b2213defd5a884f416ad6e0a928e59bcddd63a163cdc1c16b1a427a2e922876d shared-mime-info-1.7.tar.lz -" +cd5e65c27b0474c4d01759d009c6f6aaca875272c1de5f2c1808999fe5cbb4e842b06bb2f91d9336b92558f413a3d81d769308ccc7739bbdcdbc93d450efd2d2 shared-mime-info-2.2.tar.lz +" \ No newline at end of file