3.36.6
This commit is contained in:
parent
8d6e751acc
commit
04ce138061
3 changed files with 8 additions and 41 deletions
8
.SRCINFO
8
.SRCINFO
|
@ -1,6 +1,6 @@
|
|||
pkgbase = gnome-shell-performance
|
||||
pkgdesc = Next generation desktop shell
|
||||
pkgver = 3.36.5+2+g6b20eb8ee
|
||||
pkgver = 3.36.6
|
||||
pkgrel = 1
|
||||
epoch = 1
|
||||
url = https://wiki.gnome.org/Projects/GnomeShell
|
||||
|
@ -39,10 +39,10 @@ pkgbase = gnome-shell-performance
|
|||
optdepends = gnome-control-center: System settings
|
||||
optdepends = evolution-data-server: Evolution calendar integration
|
||||
provides = gnome-shell
|
||||
provides = gnome-shell=3.36.5+2+g6b20eb8ee
|
||||
provides = gnome-shell=1:3.36.5+2+g6b20eb8ee
|
||||
provides = gnome-shell=3.36.6
|
||||
provides = gnome-shell=1:3.36.6
|
||||
conflicts = gnome-shell
|
||||
source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=6b20eb8eea73eb814f142922a5fbadf827b466ee
|
||||
source = git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=682d4588bc6b2c1826013f98c52cc0b5afccea29
|
||||
source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
|
||||
source = 1126.diff
|
||||
sha256sums = SKIP
|
||||
|
|
32
536-2.diff
32
536-2.diff
|
@ -1,32 +0,0 @@
|
|||
--- a/src/st/st-theme.c
|
||||
+++ b/src/st/st-theme.c
|
||||
@@ -303,16 +303,16 @@
|
||||
GFile *file)
|
||||
{
|
||||
CRStyleSheet *stylesheet;
|
||||
+ StyleSheetData *stylesheet_data;
|
||||
|
||||
stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
|
||||
- if (!stylesheet)
|
||||
+ if (!stylesheet || !stylesheet->app_data)
|
||||
return;
|
||||
|
||||
- if (!g_slist_find (theme->custom_stylesheets, stylesheet))
|
||||
+ stylesheet_data = stylesheet->app_data;
|
||||
+ if (!stylesheet_data->extension_stylesheet)
|
||||
return;
|
||||
|
||||
- theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
|
||||
-
|
||||
g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
|
||||
|
||||
/* We need to remove the entry from the hashtable after emitting the signal
|
||||
@@ -320,8 +320,6 @@
|
||||
* _st_theme_resolve_url() during the signal emission.
|
||||
*/
|
||||
g_hash_table_remove (theme->stylesheets_by_file, file);
|
||||
- g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
|
||||
- cr_stylesheet_unref (stylesheet);
|
||||
}
|
||||
|
||||
/**
|
9
PKGBUILD
9
PKGBUILD
|
@ -7,14 +7,14 @@
|
|||
### MERGE REQUESTS SELECTION
|
||||
|
||||
# available MR: ('536' '786' '923')
|
||||
_merge_requests_to_use=() # safe pick
|
||||
_merge_requests_to_use=('536') # safe pick
|
||||
|
||||
### IMPORTANT: Do no edit below this line unless you know what you're doing
|
||||
|
||||
|
||||
pkgname=gnome-shell-performance
|
||||
_pkgname=gnome-shell
|
||||
pkgver=3.36.5+2+g6b20eb8ee
|
||||
pkgver=3.36.6
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Next generation desktop shell"
|
||||
|
@ -32,7 +32,7 @@ groups=(gnome)
|
|||
provides=(gnome-shell gnome-shell=$pkgver gnome-shell=$epoch:$pkgver)
|
||||
conflicts=(gnome-shell)
|
||||
install=$pkgname.install
|
||||
_commit=6b20eb8eea73eb814f142922a5fbadf827b466ee # tags/3.36.5^2
|
||||
_commit=682d4588bc6b2c1826013f98c52cc0b5afccea29 # tags/3.36.6^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/gnome-shell.git#commit=$_commit"
|
||||
"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
|
||||
"1126.diff")
|
||||
|
@ -117,8 +117,7 @@ prepare() {
|
|||
if [ "536" = "$mr" ]; then
|
||||
echo "Downloading then Merging 536..."
|
||||
curl -O "https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/536.diff"
|
||||
patch -Np1 -i 536.diff || true
|
||||
patch -Np1 -i ../../536-2.diff # dirty fix
|
||||
patch -Np1 -i 536.diff
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue