Commit dfc6b598 authored by Mark Wagie's avatar Mark Wagie
Browse files

[prepare] merge branch conflicts

parents d9875592 562c3846
......@@ -3,7 +3,7 @@
pkgname=gnome-control-center-cosmic
_pkgname=${pkgname%-cosmic}
pkgver=41.2
pkgrel=1
pkgrel=1.1
pkgdesc="GNOME's main interface to configure various aspects of the desktop (with Pop!_OS COSMIC patches)"
url="https://gitlab.gnome.org/GNOME/gnome-control-center"
license=(GPL2)
......@@ -42,9 +42,9 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'607b419fdc925a22ca8842e9d2ae679b4c4b57fc083d8ab84ea28f4d8251943a'
'd3c3ba0404f60df6c5a471b47b233e61164dc34713f623dc593196236f77e163'
'cb24b170a765fb4e20ec50603c0ea9d725547f51729d2961db384c5e0a0f1c15')
'df026703f37efb29e6eadae5cf78da7fb4027a5e524d8952d96381c2532845c6'
'ef5e75971c8ecfa76b54032617c5837ec59c54a8c8fb12467c588f1e338dc60e'
'8d296828ead3ab3e0ad8889e1e8c42fb5aa684c8648d34abf1ff2f5388cd4609')
pkgver() {
cd $_pkgname
......@@ -83,6 +83,6 @@ check() {
}
package() {
DESTDIR="$pkgdir" meson install -C build
meson install -C build --destdir "$pkgdir"
install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
}
......@@ -148,4 +148,7 @@ index 3db143d80..434850e7a 100644
--
2.31.1
<<<<<<< HEAD
=======
>>>>>>> 41
......@@ -235,4 +235,7 @@ diff --unified --recursive --text --color a/panels/background/meson.build b/pane
]
cflags += [
<<<<<<< HEAD
=======
>>>>>>> 41
......@@ -37,4 +37,7 @@
gtk_widget_hide (GTK_WIDGET (self->software_updates_row));
info_overview_panel_setup_overview (self);
<<<<<<< HEAD
=======
>>>>>>> 41
pkgname=gnome-shell-extension-cosmic-dock
pkgver=70~ubuntu1pop0.r1535.c7dff83
pkgrel=4
pkgver=70~ubuntu1pop0.r1558.cc9b5b1
pkgrel=1
pkgdesc="Cosmic Dock for GNOME Shell"
arch=('any')
url="https://github.com/pop-os/cosmic-dock"
......@@ -9,7 +9,7 @@ groups=('cosmic')
depends=('gnome-shell')
makedepends=('dpkg' 'git' 'sassc')
conflicts=('gnome-shell-extension-dash-to-dock')
_commit=c7dff831afb6e5ddeb9c4f8e888748bfe1412c4b
_commit=cc9b5b1377ecd85cd5688ae7fd64da347a2ea829
source=("git+https://github.com/pop-os/cosmic-dock.git#commit=$_commit"
'0001-Remove-schema-handling-from-Makefile.patch')
sha256sums=('SKIP'
......@@ -24,8 +24,6 @@ pkgver() {
prepare() {
cd "$srcdir/cosmic-dock"
patch -Np1 -i ../0001-Remove-schema-handling-from-Makefile.patch
sed -i 's/AppIconMenu/AppMenu/g' appIcons.js
}
build() {
......
# Maintainer: Mark Wagie <mark@manjaro.org>
pkgname=gnome-shell-extension-cosmic-workspaces
pkgver=0.1.0.r141.a06e0a7
pkgrel=2
pkgver=0.1.0.r143.76071cf
pkgrel=1
pkgdesc="Bringing back vertically stacked workspaces (Pop!_OS Vertical Overview fork)"
arch=('any')
url="https://github.com/pop-os/cosmic-workspaces"
......@@ -12,7 +12,7 @@ depends=('gnome-shell')
makedepends=('dpkg' 'git')
conflicts=('gnome-shell-extension-vertical-overview' 'gnome-shell-extension-vertical-overview-cosmic')
replaces=('gnome-shell-extension-vertical-overview-cosmic')
_commit=a06e0a756bc50ba2eaee8305149dcbfe1813e63c
_commit=76071cf9f9b421b3d5f1ad28cf5e0557372d44ef
source=("git+https://github.com/pop-os/cosmic-workspaces.git#commit=$_commit"
'0001-Remove-schema-handling-from-Makefile.patch')
sha256sums=('SKIP'
......
# Maintainer: Mark Wagie <mark@manjaro.org>
pkgname=pop-cosmic
pkgver=0.1.0.r76.fbcaa2c
pkgrel=4
pkgver=0.1.0.r114.5c8a2f7
pkgrel=1
pkgdesc="Computer Operating System Main Interface Components"
arch=('any')
url="https://github.com/pop-os/cosmic"
......@@ -12,13 +12,11 @@ depends=('adwaita-maia' 'gnome-shell' 'gnome-shell-extension-cosmic-dock'
'gnome-shell-extension-cosmic-workspaces' 'gnome-shell-extension-pop-shell')
makedepends=('dpkg' 'git')
optdepends=('pop-gtk-theme: Pop!_OS theme')
_commit=fbcaa2c071330a73e7b13b407e8b7fb0251eeace
_commit=5c8a2f7b4e8000d1c1dec39f9a1024227e76b7a3
source=("git+https://github.com/pop-os/cosmic.git#commit=$_commit"
'0001-Remove-schema-handling-from-Makefile.patch'
'theme.patch')
'0001-Remove-schema-handling-from-Makefile.patch')
sha256sums=('SKIP'
'3af468faaa7b744b772b111fbb8f04ee8324713354a204e4862b21fea84989f5'
'72aac6229812ca9abca187c156798774a07d178e590dde2f89a02faa97cbf05a')
'3af468faaa7b744b772b111fbb8f04ee8324713354a204e4862b21fea84989f5')
#validpgpkeys=('DA0878FCF806089ED4FDDF58E988B49EE78A7FB1') # Jeremy Soller <jeremy@system76.com>
pkgver() {
......@@ -30,9 +28,6 @@ pkgver() {
prepare() {
cd "$srcdir/cosmic"
patch -Np1 -i ../0001-Remove-schema-handling-from-Makefile.patch
patch --strip=1 extension.js < ../theme.patch
sed -i 's/AppIconMenu/AppMenu/g' extension.js
}
build() {
......
--- extension-a.js 2021-11-04 11:19:13.524413000 -0600
+++ extension-b.js 2021-11-04 11:25:34.256116432 -0600
@@ -205,10 +205,10 @@
}
}
-function shell_theme_is_pop() {
+function shell_theme_is_adwaita_maia() {
const stylesheet = Main.getThemeStylesheet();
if (stylesheet)
- return stylesheet.get_path().startsWith("/usr/share/themes/Pop");
+ return stylesheet.get_path().startsWith("/usr/share/themes/Adwaita-maia");
else
return true;
}
@@ -226,9 +226,9 @@
function hide_overview_backgrounds() {
if (GNOME_VERSION.startsWith("3.38")) {
- const is_pop = shell_theme_is_pop();
+ const is_adwaita_maia = shell_theme_is_adwaita_maia();
Main.overview._backgroundGroup.get_children().forEach(background => {
- background.visible = !is_pop && (background.monitor == Main.layoutManager.primaryIndex);
+ background.visible = !is_adwaita_maia && (background.monitor == Main.layoutManager.primaryIndex);
});
} else {
Main.layoutManager.overviewGroup.style = null;
......@@ -2,8 +2,8 @@
# Contributor: Bogdan Covaciu
pkgname=pop-desktop-widget
pkgver=0.1.0.r60.1652fc8
pkgrel=6
pkgver=0.1.0.r61.f7a34e7
pkgrel=1
pkgdesc="Pop Desktop Settings Widget"
arch=('x86_64' 'aarch64')
url="https://github.com/pop-os/desktop-widget"
......@@ -12,7 +12,7 @@ groups=('cosmic')
depends=('gstreamer' 'gtk3' 'libhandy')
makedepends=('cargo' 'dpkg' 'git')
provides=('libpop_desktop_widget.so')
_commit=1652fc89aa16dcf652422c4c3dfe1095e6286b7d
_commit=f7a34e7a14dedc86ece421348b936ed340a489be
source=("git+https://github.com/pop-os/desktop-widget.git#commit=$_commit"
'theme.patch'
'dark.svg'
......@@ -21,7 +21,7 @@ sha256sums=('SKIP'
'bd9d1c756fa72f54d5e15550f0280f3bf188e378802f316910d3ab617b452c13'
'434a43a080d9470f1e592a26ef6c62cc446ebffe629d8ee25e2eb20388239099'
'f51ad2be97cb538a2e3655861a1f76c10f224053dd55a299be09e9a593b8f38b')
validpgpkeys=('DA0878FCF806089ED4FDDF58E988B49EE78A7FB1') # Jeremy Soller <jeremy@system76.com>
#validpgpkeys=('DA0878FCF806089ED4FDDF58E988B49EE78A7FB1') # Jeremy Soller <jeremy@system76.com>
pkgver() {
cd "$srcdir/desktop-widget"
......
# Maintainer: Mark Wagie <mark@manjaro.org>
pkgname=pop-icon-theme
pkgver=2.1.0.r2415.a5a10f9725
pkgver=2.1.0.r2419.9998b20b78
pkgrel=1
pkgdesc="Pop Icons"
arch=('any')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment