Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cinnamon-desktop

Browse Source
This commit is contained in:
ayhanyalcinsoy
2022-07-25 11:45:37 +03:00
parent 662e1a1083
commit 3579d5aded
24 changed files with 1485 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/cinnamon/cinnamon-control-center/actions.py
+25
View File
@@ -0,0 +1,25 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import mesontools, pisitools
def setup():
mesontools.configure("--prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib/cinnamon-control-center \
--localstatedir=/var \
--buildtype=plain")
#pisitools.dosed("libtool", "( -shared )", " -Wl,-O1,--as-needed\\1")
#pisitools.dosed("libtool", '( if test "\$export_dynamic" = yes && test -n "\$export_dynamic_flag_spec"; then)', ' func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\\1')
def build():
mesontools.build()
def install():
mesontools.install()
pisitools.dodoc("AUTHORS", "ChangeLog", "README*", "NEWS")
desktop/cinnamon/cinnamon-control-center/files/5d4eeb09309eb073235fec1418bc988306c99c98.patch
+56
View File
@@ -0,0 +1,56 @@
From 5d4eeb09309eb073235fec1418bc988306c99c98 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Tue, 21 Jun 2022 22:03:15 -0400
Subject: [PATCH] meson: fix installation of symlinks
Fixes regression in commit 5aa5fab4348de4496efe9ec0b5faa20be234d56e. The
created symlinks always considered the directory to be installed to, and
created absolute symlinks pointing from the source to the destination.
This is wrong, because while the source needs to be installed *into* the
directory to be installed to, the destination needs to not include the
$DESTDIR.
There are also some sub-optimal design points around scripting the
install prefix. Particularly, Meson has a dedicated variable for the
combination of DESTDIR + prefix, so use that instead of manually slicing
up the prefix so that `os.path.join` won't drop the DESTDIR. The other
solution would be to acknowledge that DESTDIR (at least on non-Windows
systems) uses string concatenation, not path-joining semantics, but...
Meson already supplies this pre-done, so why bother?
Fixes #285
---
install-scripts/desktop-file-links.py | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/install-scripts/desktop-file-links.py b/install-scripts/desktop-file-links.py
index 6120b98..fdcd47c 100755
--- a/install-scripts/desktop-file-links.py
+++ b/install-scripts/desktop-file-links.py
@@ -4,16 +4,11 @@
import subprocess
# Symlinks desktop files to c-c-c's panel dir so the cinnamon-control-center binary can find the plugins.
-dest = os.environ.get('DESTDIR')
+destdir_prefix = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX')
prefix = os.environ.get('MESON_INSTALL_PREFIX')
-if dest:
- root = dest
-else:
- root = "/"
-
-source_location = os.path.join(root, prefix[1:], "share", "applications")
-target_location = os.path.join(root, prefix[1:], "share", "cinnamon-control-center", "panels")
+source_location = os.path.join(prefix, "share", "applications")
+target_location = os.path.join(destdir_prefix, "share", "cinnamon-control-center", "panels")
links = [
"cinnamon-color-panel.desktop",
@@ -32,4 +27,4 @@
subprocess.call(['ln', '-s', orig_path, link_path])
-exit(0)
\ No newline at end of file
+exit(0)
desktop/cinnamon/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
+61
View File
@@ -0,0 +1,61 @@
https://bugs.gentoo.org/840317
https://github.com/linuxmint/cinnamon/issues/10616
From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Mon, 31 Jan 2022 08:56:28 -0500
Subject: [PATCH] network: Remove old workaround for openvpn widgets.
I can't reproduce the original issue anymore, and NMACertChooser
is removed in network-manager-openvpn 1.8.34.
Fixes #10616
ref:
6db4961fd3a002182984d0e71ec364c9befdd93b
---
meson.build | 2 --
panels/network/cc-network-panel.c | 10 ----------
2 files changed, 12 deletions(-)
diff --git a/meson.build b/meson.build
index f1f213b..c4d7d86 100644
--- a/meson.build
+++ b/meson.build
@@ -56,8 +56,6 @@ else
libnma= dependency('', required: false)
endif
-config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
-
if get_option('modemmanager')
if not get_option('networkmanager')
error('*** NetworkManager is required by ModemManager ***')
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index a4289de..d1925e4 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -47,10 +47,6 @@
#include <libmm-glib.h>
#endif
-#ifdef HAVE_NMA_18
-#include <nma-cert-chooser.h>
-#endif
-
CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
#define NETWORK_PANEL_PRIVATE(o) \
@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
return;
}
-#ifdef HAVE_NMA_18
- /* some newer VPN plugins pre-require internal resources from libnma */
- /* this solution is really ugly, but works clean */
- gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
-#endif
-
panel->priv->cancellable = g_cancellable_new ();
panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
desktop/cinnamon/cinnamon-control-center/pspec.xml
+142
View File
@@ -0,0 +1,142 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>cinnamon-control-center</Name>
<Homepage>https://github.com/linuxmint/cinnamon-control-center</Homepage>
<Packager>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>cinnamon-control-center</Icon>
<IsA>app:gui</IsA>
<Summary>The Control Center for Cinnamon</Summary>
<Description>The Control Center for Cinnamon</Description>
<Archive sha1sum="fabff56cfb1ff27a8217ceceeeefc4a81e1da548" type="targz">https://github.com/linuxmint/cinnamon-control-center/archive/refs/tags/5.4.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>samurai</Dependency>
<Dependency>libnma-devel</Dependency>
<Dependency>regionset</Dependency>
<Dependency>intltool</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>colord-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>upower-devel</Dependency>
<Dependency>libwacom-devel</Dependency>
<Dependency>libnotify-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>libmm-glib-devel</Dependency>
<Dependency>libnma-devel</Dependency>
<Dependency>NetworkManager-devel</Dependency>
<Dependency>gnome-online-accounts-devel</Dependency>
<Dependency>ModemManager-devel</Dependency>
<Dependency>xorg-input-wacom-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>accountsservice-devel</Dependency>
<Dependency>libxkbfile-devel</Dependency>
<Dependency>polkit-devel</Dependency>
<Dependency>iso-codes-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>cinnamon-settings-daemon-devel</Dependency>
<Dependency>cinnamon-desktop-devel</Dependency>
<Dependency>cinnamon-menus-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>libgnomekbd-devel</Dependency>
<Dependency>libxklavier-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>timezone</Dependency>
<Dependency>fontconfig-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch>cinnamon-control-center-5.2.1-fix-libnma.patch</Patch-->
<!--Patch>5d4eeb09309eb073235fec1418bc988306c99c98.patch</Patch-->
</Patches>
</Source>
<Package>
<Name>cinnamon-control-center</Name>
<RuntimeDependencies>
<Dependency>atk</Dependency>
<Dependency>cups</Dependency>
<Dependency>mesa</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>dbus</Dependency>
<Dependency>cairo</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libXi</Dependency>
<Dependency>pango</Dependency>
<Dependency>upower</Dependency>
<Dependency>libnma</Dependency>
<Dependency>colord</Dependency>
<Dependency>libX11</Dependency>
<Dependency>polkit</Dependency>
<Dependency>libwacom</Dependency>
<Dependency>regionset</Dependency>
<Dependency>freetype</Dependency>
<Dependency>iso-codes</Dependency>
<Dependency>dbus-glib</Dependency>
<Dependency>libnotify</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libmm-glib</Dependency>
<Dependency>libgnomekbd</Dependency>
<Dependency>libxklavier</Dependency>
<Dependency>ModemManager</Dependency>
<Dependency>polkit-gnome</Dependency>
<Dependency>NetworkManager</Dependency>
<Dependency>cinnamon-menus</Dependency>
<Dependency>accountsservice</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>cinnamon-desktop</Dependency>
<Dependency>gnome-color-manager</Dependency>
<Dependency>gnome-online-accounts</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>cinnamon-translations</Dependency>
<Dependency>network-manager-applet</Dependency>
<Dependency>cinnamon-settings-daemon</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/cinnamon-control-center-1</Path>
<Path fileType="library">/usr/lib/libcinnamon-control-center*</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/cinnamon-control-center</Path>
<Path fileType="data">/usr/share/doc</Path>
<Path fileType="data">/usr/share/glib-2.0</Path>
<Path fileType="icon">/usr/share/icons</Path>
</Files>
</Package>
<Package>
<Name>cinnamon-control-center-devel</Name>
<Icon>development</Icon>
<RuntimeDependencies>
<Dependency release="current">cinnamon-control-center</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2022-05-30</Date>
<Version>5.4.3</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/cinnamon/cinnamon-control-center/translations.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>cinnamon-control-center</Name>
<Summary xml:lang="tr">Cinnamon için kontrol merkezi</Summary>
<Description xml:lang="tr">Cinnamon için kontrol merkezi</Description>
</Source>
<Package>
<Name>cinnamon-control-center-devel</Name>
<Summary xml:lang="tr">cinnamon-control-center için geliştirme dosyaları</Summary>
</Package>
</PISI>