upg gtk3 inxi mpv
This commit is contained in:
parent
9b34eff460
commit
2d76015388
|
|
@ -0,0 +1,50 @@
|
|||
From 6880ac90a0211095cfea753316e002bd668a4e92 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Wyraz <mw@brick4u.de>
|
||||
Date: Fri, 19 Jan 2024 19:15:52 +0100
|
||||
Subject: [PATCH 1/2] don't free monitor->name twice (fixes #6345)
|
||||
|
||||
---
|
||||
gdk/x11/gdkscreen-x11.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
|
||||
index f54bf51d04f..4ac3167b309 100644
|
||||
--- a/gdk/x11/gdkscreen-x11.c
|
||||
+++ b/gdk/x11/gdkscreen-x11.c
|
||||
@@ -922,7 +922,6 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
|
||||
g_object_ref (monitor);
|
||||
g_ptr_array_remove (x11_display->monitors, monitor);
|
||||
gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
|
||||
- free (monitor->name);
|
||||
g_object_unref (monitor);
|
||||
*changed = TRUE;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From ba58b3a23df4213e17a80816c7687a59e104769d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Wyraz <mw@brick4u.de>
|
||||
Date: Fri, 19 Jan 2024 22:20:02 +0100
|
||||
Subject: [PATCH 2/2] Fix for #6342
|
||||
|
||||
---
|
||||
gdk/x11/gdkscreen-x11.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
|
||||
index 4ac3167b309..6207b5f4434 100644
|
||||
--- a/gdk/x11/gdkscreen-x11.c
|
||||
+++ b/gdk/x11/gdkscreen-x11.c
|
||||
@@ -851,7 +851,7 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
|
||||
monitor = g_object_new (gdk_x11_monitor_get_type (),
|
||||
"display", display,
|
||||
NULL);
|
||||
- monitor->name = g_steal_pointer (&name);
|
||||
+ monitor->name = g_strdup (name);
|
||||
monitor->output = output;
|
||||
monitor->add = TRUE;
|
||||
g_ptr_array_add (x11_display->monitors, monitor);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#pkgbase=gtk3
|
||||
pkgname=gtk3 # gtk3-docs gtk3-demos)
|
||||
pkgver=3.24.40
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
epoch=1
|
||||
pkgdesc="GObject-based multi-platform GUI toolkit"
|
||||
url="https://www.gtk.org/"
|
||||
|
|
@ -18,6 +18,7 @@ makedepends=(git glib2-docs gobject-introspection meson sassc wayland-protocols)
|
|||
_commit=f926323d04db220ba2ba9a9026a5bf54e81fbb39 # tags/3.24.40^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" ## getting impossible on the day of the release to download the entire gtk git
|
||||
# https://gitlab.gnome.org/GNOME/gtk/-/archive/3.24.37/gtk-3.24.37.tar.gz
|
||||
6786.patch
|
||||
gtk-query-immodules-3.0.hook)
|
||||
|
||||
pkgver() {
|
||||
|
|
@ -35,6 +36,11 @@ prepare() {
|
|||
# # https://bugs.archlinux.org/task/76018
|
||||
# # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4381#note_1465559
|
||||
# git revert -n da4066774b926880631af099469d308714b5606c
|
||||
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/issues/5
|
||||
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6786
|
||||
git apply -3 ../6786.patch
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -131,9 +137,12 @@ arch=(x86_64)
|
|||
license=(LGPL-2.0-only)
|
||||
|
||||
b2sums=('SKIP'
|
||||
'137f4c03dd88c02f6171ab40e0c040d9c08aa5c2ee76260742ded966962b64ef4988ccb46a8261178ca1c88e0a5c2815e319d9f8e3af5c6b0a7d22eb3243b322'
|
||||
'8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407')
|
||||
|
||||
sha256sums=(SKIP
|
||||
# b9978e73629ce15be4b7ef085ee61d2b57d684c9980b8082c6f65059cf8b3445 # gtk-3.24.37.tar.gz
|
||||
7f516d54967d1115e901127e817ccbe7ee6d657b20add30afd41044d4eadfaaf # 6786.patch
|
||||
a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229) # gtk-query-immodules-3.0.hook
|
||||
|
||||
# Note to packager:
|
||||
|
|
@ -142,5 +151,4 @@ sha256sums=(SKIP
|
|||
#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
##
|
||||
|
||||
## 3d1c94adf4febac1d4d82ec0e7826f5f1f67a34af6c5962aab22181a817eb83d gtk3-1_3.24.40-01-x86_64.pkg.tar.lz
|
||||
## 326f11fbaefbe19c459d9106d7d26e23b90205c78bad0adffe713d61d7851c15 gtk3-1:3.24.40-01-x86_64.pkg.tar.lz
|
||||
## 660a9bc14f2c247430325e658c5336500eb81b8b76421591ea30e93480337aef gtk3-1_3.24.40-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ pkgname=(
|
|||
gtk3-docs
|
||||
)
|
||||
pkgver=3.24.40
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc="GObject-based multi-platform GUI toolkit"
|
||||
url="https://www.gtk.org/"
|
||||
|
|
@ -63,9 +63,11 @@ _commit=f926323d04db220ba2ba9a9026a5bf54e81fbb39 # tags/3.24.40^0
|
|||
source=(
|
||||
"git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
|
||||
gtk-query-immodules-3.0.hook
|
||||
6786.patch
|
||||
)
|
||||
b2sums=('SKIP'
|
||||
'8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407')
|
||||
'8e6a3906126749c6d853f582e3802254cdbba099c6af7190ad576eff6ea5425404a72b1b36950a87e3afdac82295cfe246003172c3e0341a73bd931a36f3b407'
|
||||
'137f4c03dd88c02f6171ab40e0c040d9c08aa5c2ee76260742ded966962b64ef4988ccb46a8261178ca1c88e0a5c2815e319d9f8e3af5c6b0a7d22eb3243b322')
|
||||
|
||||
pkgver() {
|
||||
cd gtk
|
||||
|
|
@ -74,6 +76,10 @@ pkgver() {
|
|||
|
||||
prepare() {
|
||||
cd gtk
|
||||
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/issues/5
|
||||
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6786
|
||||
git apply -3 ../6786.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
pkgname=inxi
|
||||
_pkgver=3.3.31-1
|
||||
pkgver=${_pkgver//-/.}
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="Full featured CLI system information tool"
|
||||
url="https://smxi.org/docs/inxi.htm"
|
||||
depends=(coreutils pciutils perl procps-ng util-linux net-tools)
|
||||
|
|
@ -63,9 +63,9 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(GPL3)
|
||||
license=('GPL-3.0-or-later')
|
||||
|
||||
sha256sums=(5e2cce705a1dc865e8d90e63d4668f7a946b1349bf8bad141ddb69718fd46b60) # inxi-3.3.31.1.tar.gz
|
||||
|
||||
## 01e35f0bc49637d6fa4b486188028c7b0c3bf9a586f703ba1c325194878512a9 inxi-3.3.31.1-01-x86_64.pkg.tar.lz
|
||||
## d996c1c9f5f19ebe34189c2ae3423709f0d60959ab29037a11160daf8c9f8a5d inxi-3.3.31.1-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
pkgname=inxi
|
||||
_pkgver=3.3.31-1
|
||||
pkgver=${_pkgver//-/.}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Full featured CLI system information tool"
|
||||
arch=(any)
|
||||
url="https://smxi.org/docs/inxi.htm"
|
||||
license=(GPL3)
|
||||
license=('GPL-3.0-or-later')
|
||||
depends=(coreutils pciutils perl procps-ng util-linux)
|
||||
optdepends=(
|
||||
"bind: dig: -i wlan IP"
|
||||
|
|
|
|||
10
mpv/PKGBUILD
10
mpv/PKGBUILD
|
|
@ -9,7 +9,7 @@ pkgname=mpv
|
|||
epoch=1
|
||||
_tag='807b9343ef911d138950411cdb83c16a151d2018' # git rev-parse v${pkgver}
|
||||
pkgver=0.37.0
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='a free, open source, and cross-platform media player - alsa no-pipew'
|
||||
url='https://mpv.io/'
|
||||
depends=('alsa-lib' 'libasound.so' 'desktop-file-utils' 'ffmpeg' 'libavcodec.so' 'libavdevice.so'
|
||||
|
|
@ -19,7 +19,7 @@ depends=('alsa-lib' 'libasound.so' 'desktop-file-utils' 'ffmpeg' 'libavcodec.so'
|
|||
'libcdio-paranoia' 'libdrm' 'libdvdnav' 'libdvdread' 'libegl' 'libgl' 'libglvnd'
|
||||
'libjpeg' 'libjpeg.so' 'libplacebo' 'libplacebo.so' 'libpulse' 'libpulse.so' 'libsixel'
|
||||
'libva' 'libva.so' 'libva-drm.so' 'libva-wayland.so' 'libva-x11.so' 'libvdpau' 'libx11'
|
||||
'libxext' 'libxinerama' 'libxkbcommon' 'libxkbcommon.so' 'libxpresent' 'libxrandr' 'libxss'
|
||||
'libxext' 'libxkbcommon' 'libxkbcommon.so' 'libxpresent' 'libxrandr' 'libxss'
|
||||
'libxv' 'luajit' 'mesa' 'mujs' 'rubberband' 'librubberband.so' 'shaderc'
|
||||
'libshaderc_shared.so' 'openal' 'uchardet' 'vapoursynth' 'vulkan-icd-loader' 'wayland' 'zlib')
|
||||
makedepends=('git' 'meson' 'python-docutils' 'ladspa' 'wayland-protocols'
|
||||
|
|
@ -73,9 +73,7 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
# We link against libraries that are licensed GPLv3 explicitly, so our
|
||||
# package is GPLv3 only as well. (Is this still correct?)
|
||||
license=('GPL3')
|
||||
license=('GPL-2.0-or-later AND LGPL-2.1-or-later')
|
||||
|
||||
validpgpkeys=('145077D82501AA20152CACCE8D769208D5E31419') # sfan5 <sfan5@live.de>
|
||||
|
||||
|
|
@ -89,5 +87,5 @@ sha256sums=(SKIP)
|
|||
#echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
|
||||
## 0309c3822d2bcbb8737e841de5dc4f571c7e239b4e50ed77d6518b43a10840c0 mpv-1_0.37.0-01-x86_64.pkg.tar.lz
|
||||
## c3243a02747b49f621303087a70488af865d4dc16eeb0086c6674654f49ab8b2 mpv-1_0.37.0-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,10 @@ pkgname=mpv
|
|||
epoch=1
|
||||
_tag='807b9343ef911d138950411cdb83c16a151d2018' # git rev-parse v${pkgver}
|
||||
pkgver=0.37.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='a free, open source, and cross-platform media player'
|
||||
arch=('x86_64')
|
||||
# We link against libraries that are licensed GPLv3 explicitly, so our
|
||||
# package is GPLv3 only as well. (Is this still correct?)
|
||||
license=('GPL3')
|
||||
license=('GPL-2.0-or-later AND LGPL-2.1-or-later')
|
||||
url='https://mpv.io/'
|
||||
depends=('alsa-lib' 'libasound.so' 'desktop-file-utils' 'ffmpeg' 'libavcodec.so' 'libavdevice.so'
|
||||
'libavfilter.so' 'libavformat.so' 'libavutil.so' 'libswresample.so' 'libswscale.so'
|
||||
|
|
@ -21,7 +19,7 @@ depends=('alsa-lib' 'libasound.so' 'desktop-file-utils' 'ffmpeg' 'libavcodec.so'
|
|||
'libcdio-paranoia' 'libdrm' 'libdvdnav' 'libdvdread' 'libegl' 'libgl' 'libglvnd'
|
||||
'libjpeg' 'libjpeg.so' 'libplacebo' 'libplacebo.so' 'libpulse' 'libpulse.so' 'libsixel'
|
||||
'libva' 'libva.so' 'libva-drm.so' 'libva-wayland.so' 'libva-x11.so' 'libvdpau' 'libx11'
|
||||
'libxext' 'libxinerama' 'libxkbcommon' 'libxkbcommon.so' 'libxpresent' 'libxrandr' 'libxss'
|
||||
'libxext' 'libxkbcommon' 'libxkbcommon.so' 'libxpresent' 'libxrandr' 'libxss'
|
||||
'libxv' 'luajit' 'mesa' 'mujs' 'libpipewire' 'rubberband' 'librubberband.so' 'shaderc'
|
||||
'libshaderc_shared.so' 'openal' 'uchardet' 'vapoursynth' 'vulkan-icd-loader' 'wayland' 'zlib')
|
||||
makedepends=('git' 'meson' 'python-docutils' 'ladspa' 'wayland-protocols'
|
||||
|
|
|
|||
Loading…
Reference in New Issue